From 8ea5420520d588eb53b9b9644d50302c560429d7 Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Thu, 28 Nov 2024 10:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=88=B0=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=B8=BB=E5=8A=A8=E6=8A=9B=E5=87=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=AD=A2=E7=A8=8B=E5=BA=8F=EF=BC=8C=E4=BB=A5=E9=87=8A=E6=94=BE?=
 =?UTF-8?q?=E6=98=BE=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                | 2 +-
 photo_mask/auto_photo_mask.py     | 2 ++
 photo_review/auto_photo_review.py | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 77a672a..2cb30ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 x-env:
   &template
-  image: fcb_photo_review:1.14.7
+  image: fcb_photo_review:1.14.8
   restart: always
 
 x-review:
diff --git a/photo_mask/auto_photo_mask.py b/photo_mask/auto_photo_mask.py
index fd1c18d..89592e5 100644
--- a/photo_mask/auto_photo_mask.py
+++ b/photo_mask/auto_photo_mask.py
@@ -160,6 +160,8 @@ def get_mask_layout(image, name, id_card_num):
                     result += _find_boxes_by_keys(ID_CARD_NUM_KEYS)
 
             return result
+    except MemoryError as e:
+        raise e
     except Exception as e:
         logging.error("涂抹时出错！", exc_info=e)
         return result
diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py
index 41520ac..808ad64 100644
--- a/photo_review/auto_photo_review.py
+++ b/photo_review/auto_photo_review.py
@@ -48,6 +48,9 @@ def ie_temp_image(ie, ocr, image):
             ie_result = []
         else:
             ie_result = ie({"doc": temp_file.name, "layout": layout})[0]
+    except MemoryError as e:
+        # 显存不足时应该抛出错误，让程序重启，同时释放显存
+        raise e
     except Exception as e:
         logging.error("信息抽取时出错", exc_info=e)
     finally: