diff --git a/docker-compose-test.yml b/docker-compose-test.yml deleted file mode 100644 index 356a3f0..0000000 --- a/docker-compose-test.yml +++ /dev/null @@ -1,40 +0,0 @@ -x-env: - &template - image: fcb_photo_review:1.13.8 - -services: - det_api: - <<: *template - build: - context: . - container_name: det_api - hostname: det_api - volumes: - - ./log:/app/log - - ./model:/app/model - command: [ "det_api.py" ] - deploy: - resources: - reservations: - devices: - - device_ids: [ "0" ] - capabilities: [ "gpu" ] - driver: "nvidia" - - photo_review_test: - <<: *template - container_name: photo_review_test - hostname: photo_review_test - volumes: - - ./log:/app/log - - ./model:/app/model - depends_on: - - det_api - command: [ "photo_review.py" ] - deploy: - resources: - reservations: - devices: - - device_ids: [ "0", "1" ] - capabilities: [ "gpu" ] - driver: "nvidia" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3ce49a8..1712053 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,8 @@ x-env: &template - image: fcb_photo_review:1.13.8 + # 启动时可以指定环境变量TAG来手动选择镜像版本 + # docker-compose up -d -e TAG=1.0.0 + image: fcb_photo_review:${TAG:-1.13.8} restart: always services: @@ -14,8 +16,6 @@ services: - ./log:/app/log - ./model:/app/model command: [ "det_api.py" ] - ports: - - "5000:5000" # 映射端口 deploy: resources: reservations: diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py index 6d2f89f..3a80e2d 100644 --- a/photo_review/auto_photo_review.py +++ b/photo_review/auto_photo_review.py @@ -82,9 +82,7 @@ def information_extraction(ie, phrecs, identity): image = image_util.read(img_path) target_images = [] - det_time = time.time() target_images += detector.request_book_areas(image) # 识别文档区域并裁剪 - logging.info(f"检测目标耗时{time.time() - det_time}秒") if not target_images: target_images.append(image) # 识别失败 angle_count = defaultdict(int, {"0": 0}) # 分割后图片的最优角度统计