From 3f6384a2fb8f00ca45ac6dacdde7d4a58dcbb9d7 Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Wed, 28 Aug 2024 14:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=B5=8B=E7=9F=AB?=
 =?UTF-8?q?=E6=AD=A3=E5=90=8E=E7=94=A8=E6=97=B6=E4=B8=8A=E5=8D=87=E6=AF=94?=
 =?UTF-8?q?=E8=BE=83=E6=98=8E=E6=98=BE=EF=BC=8C=E5=B8=B8=E8=A7=84=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8photo=5Freview=5F6=E6=9D=A5=E5=BC=A5=E8=A1=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 det_test.py                       | 10 --------
 docker-compose.yml                | 38 +++++++++++++++----------------
 photo_review/auto_photo_review.py |  4 ----
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 det_test.py

diff --git a/det_test.py b/det_test.py
deleted file mode 100644
index ab4e253..0000000
--- a/det_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import time
-
-from paddle_detection import detector
-from util import image_util
-
-if __name__ == '__main__':
-    image = image_util.read("paddle_detection/docs/images/000000014439.jpg")
-    start = time.time()
-    images = detector.get_book_areas(image)
-    print(f"耗时：{time.time() - start}")
diff --git a/docker-compose.yml b/docker-compose.yml
index f0d4b66..475b544 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 x-env:
   &template
-  image: fcb_photo_review:1.13.6
+  image: fcb_photo_review:1.13.7
   restart: always
 
 services:
@@ -94,23 +94,23 @@ services:
               capabilities: [ "gpu" ]
               driver: "nvidia"
 
-#  photo_review_6:
-#    <<: *template
-#    container_name: photo_review_6
-#    hostname: photo_review_6
-#    volumes:
-#      - ./log:/app/log
-#      - ./model:/app/model
-#    depends_on:
-#      - photo_review_5
-#    command: [ "photo_review.py" ]
-#    deploy:
-#      resources:
-#        reservations:
-#          devices:
-#            - device_ids: [ "0", "1" ]
-#              capabilities: [ "gpu" ]
-#              driver: "nvidia"
+  photo_review_6:
+    <<: *template
+    container_name: photo_review_6
+    hostname: photo_review_6
+    volumes:
+      - ./log:/app/log
+      - ./model:/app/model
+    depends_on:
+      - photo_review_5
+    command: [ "photo_review.py" ]
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - device_ids: [ "0", "1" ]
+              capabilities: [ "gpu" ]
+              driver: "nvidia"
 
   photo_mask_1:
     <<: *template
@@ -119,7 +119,7 @@ services:
     volumes:
       - ./log:/app/log
     depends_on:
-      - photo_review_5
+      - photo_review_6
     command: [ "photo_mask.py", "--clean", "True" ]
     deploy:
       resources:
diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py
index f38d259..a9b1317 100644
--- a/photo_review/auto_photo_review.py
+++ b/photo_review/auto_photo_review.py
@@ -82,16 +82,12 @@ def information_extraction(ie, phrecs, identity):
 
         image = image_util.read(img_path)
         target_images = []
-        det_time = time.time()
         target_images += detector.get_book_areas(image)  # 识别文档区域并裁剪
-        logging.info(f"det耗时：{time.time() - det_time}")
         if not target_images:
             target_images.append(image)  # 识别失败
         angle_count = defaultdict(int, {"0": 0})  # 分割后图片的最优角度统计
         for target_image in target_images:
-            dewarp_time = time.time()
             dewarped_image = dewarp.dewarp_image(target_image)  # 去扭曲
-            logging.info(f"dewarp耗时：{time.time() - dewarp_time}")
             angles = image_util.parse_rotation_angles(dewarped_image)
             zx_ie_results = []
             split_results = image_util.split(dewarped_image)