From 72794f699e950ca6e1bddde3981db1e13453b200 Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Wed, 25 Sep 2024 16:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3docker=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose-test.yml                       |  2 +-
 photo_review/auto_photo_review.py             |  6 ++--
 services/__init__.py                          | 34 -------------------
 services/paddle_services/Dockerfile           |  2 +-
 services/paddle_services/__init__.py          | 34 +++++++++++++++++++
 services/{ => paddle_services}/clas_api.py    |  0
 services/{ => paddle_services}/cost_api.py    |  2 +-
 services/{ => paddle_services}/det_api.py     |  2 +-
 services/{ => paddle_services}/dewarp_api.py  |  2 +-
 .../{ => paddle_services}/discharge_api.py    |  2 +-
 services/{ => paddle_services}/ocr_api.py     |  0
 .../{ => paddle_services}/settlement_api.py   |  2 +-
 services/{ => paddle_services}/utils.py       |  2 --
 13 files changed, 44 insertions(+), 46 deletions(-)
 rename services/{ => paddle_services}/clas_api.py (100%)
 rename services/{ => paddle_services}/cost_api.py (87%)
 rename services/{ => paddle_services}/det_api.py (92%)
 rename services/{ => paddle_services}/dewarp_api.py (92%)
 rename services/{ => paddle_services}/discharge_api.py (87%)
 rename services/{ => paddle_services}/ocr_api.py (100%)
 rename services/{ => paddle_services}/settlement_api.py (90%)
 rename services/{ => paddle_services}/utils.py (85%)

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index ccc7275..45d36a2 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -24,7 +24,7 @@ services:
       context: ./services/paddle_services
     container_name: ocr_api
     hostname: ocr_api
-    command: [ '-w 1 ./services/ocr_api:app --bind 0.0.0.0:5001' ]
+    command: [ '-w 1 ocr_api:app --bind 0.0.0.0:5001' ]
     deploy:
       resources:
         reservations:
diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py
index 2b325ab..56db655 100644
--- a/photo_review/auto_photo_review.py
+++ b/photo_review/auto_photo_review.py
@@ -20,9 +20,9 @@ from db.mysql import BdYljg, BdYlks, ZxIeResult, ZxIeCost, ZxIeDischarge, ZxIeSe
 from log import HOSTNAME
 from photo_review import PHHD_BATCH_SIZE, SLEEP_MINUTES, HOSPITAL_ALIAS, HOSPITAL_FILTER, DEPARTMENT_ALIAS, \
     DEPARTMENT_FILTER
-from services import PATIENT_NAME, ADMISSION_DATE, DISCHARGE_DATE, MEDICAL_EXPENSES, PERSONAL_CASH_PAYMENT, \
-    PERSONAL_ACCOUNT_PAYMENT, PERSONAL_FUNDED_AMOUNT, MEDICAL_INSURANCE_TYPE, HOSPITAL, DEPARTMENT, DOCTOR, \
-    ADMISSION_ID, SETTLEMENT_ID, AGE, UPPERCASE_MEDICAL_EXPENSES
+from services.paddle_services import PATIENT_NAME, ADMISSION_DATE, DISCHARGE_DATE, MEDICAL_EXPENSES, \
+    PERSONAL_CASH_PAYMENT, PERSONAL_ACCOUNT_PAYMENT, PERSONAL_FUNDED_AMOUNT, MEDICAL_INSURANCE_TYPE, HOSPITAL, \
+    DEPARTMENT, DOCTOR, ADMISSION_ID, SETTLEMENT_ID, AGE, UPPERCASE_MEDICAL_EXPENSES
 from ucloud import ufile
 from util import image_util, common_util, html_util, model_util
 from util.data_util import handle_date, handle_decimal, parse_department, handle_name, handle_insurance_type, \
diff --git a/services/__init__.py b/services/__init__.py
index e012747..e69de29 100644
--- a/services/__init__.py
+++ b/services/__init__.py
@@ -1,34 +0,0 @@
-"""
-信息抽取关键词配置
-"""
-
-# 患者姓名
-PATIENT_NAME = ['患者姓名']
-# 入院日期
-ADMISSION_DATE = ['入院日期']
-# 出院日期
-DISCHARGE_DATE = ['出院日期']
-# 发生医疗费
-MEDICAL_EXPENSES = ['费用总额']
-# 个人现金支付
-PERSONAL_CASH_PAYMENT = ['个人现金支付']
-# 个人账户支付
-PERSONAL_ACCOUNT_PAYMENT = ['个人账户支付']
-# 个人自费金额
-PERSONAL_FUNDED_AMOUNT = ['自费金额', '个人自费']
-# 医保类别
-MEDICAL_INSURANCE_TYPE = ['医保类型']
-# 就诊医院
-HOSPITAL = ['医院']
-# 就诊科室
-DEPARTMENT = ['科室']
-# 主治医生
-DOCTOR = ['主治医生']
-# 住院号
-ADMISSION_ID = ['住院号']
-# 医保结算单号码
-SETTLEMENT_ID = ['医保结算单号码']
-# 年龄
-AGE = ['年龄']
-# 大写总额
-UPPERCASE_MEDICAL_EXPENSES = ['大写总额']
diff --git a/services/paddle_services/Dockerfile b/services/paddle_services/Dockerfile
index 206ff6a..44bdb31 100644
--- a/services/paddle_services/Dockerfile
+++ b/services/paddle_services/Dockerfile
@@ -12,7 +12,7 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 
 # 安装依赖
-COPY ./services/paddle_services/requestments.txt /app/requirements.txt
+COPY requestments.txt /app/requirements.txt
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone \
     && pip install --no-cache-dir -r requirements.txt \
     && pip uninstall -y onnxruntime onnxruntime-gpu \
diff --git a/services/paddle_services/__init__.py b/services/paddle_services/__init__.py
index e69de29..e012747 100644
--- a/services/paddle_services/__init__.py
+++ b/services/paddle_services/__init__.py
@@ -0,0 +1,34 @@
+"""
+信息抽取关键词配置
+"""
+
+# 患者姓名
+PATIENT_NAME = ['患者姓名']
+# 入院日期
+ADMISSION_DATE = ['入院日期']
+# 出院日期
+DISCHARGE_DATE = ['出院日期']
+# 发生医疗费
+MEDICAL_EXPENSES = ['费用总额']
+# 个人现金支付
+PERSONAL_CASH_PAYMENT = ['个人现金支付']
+# 个人账户支付
+PERSONAL_ACCOUNT_PAYMENT = ['个人账户支付']
+# 个人自费金额
+PERSONAL_FUNDED_AMOUNT = ['自费金额', '个人自费']
+# 医保类别
+MEDICAL_INSURANCE_TYPE = ['医保类型']
+# 就诊医院
+HOSPITAL = ['医院']
+# 就诊科室
+DEPARTMENT = ['科室']
+# 主治医生
+DOCTOR = ['主治医生']
+# 住院号
+ADMISSION_ID = ['住院号']
+# 医保结算单号码
+SETTLEMENT_ID = ['医保结算单号码']
+# 年龄
+AGE = ['年龄']
+# 大写总额
+UPPERCASE_MEDICAL_EXPENSES = ['大写总额']
diff --git a/services/clas_api.py b/services/paddle_services/clas_api.py
similarity index 100%
rename from services/clas_api.py
rename to services/paddle_services/clas_api.py
diff --git a/services/cost_api.py b/services/paddle_services/cost_api.py
similarity index 87%
rename from services/cost_api.py
rename to services/paddle_services/cost_api.py
index 97c5ebf..bcadee9 100644
--- a/services/cost_api.py
+++ b/services/paddle_services/cost_api.py
@@ -9,7 +9,7 @@ from . import PATIENT_NAME, ADMISSION_DATE, DISCHARGE_DATE, MEDICAL_EXPENSES
 app = Flask(__name__)
 COST_LIST_SCHEMA = PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + MEDICAL_EXPENSES
 COST = Taskflow('information_extraction', schema=COST_LIST_SCHEMA, model='uie-x-base',
-                task_path='../model/cost_list_model', layout_analysis=False, precision='fp16')
+                task_path='../../model/cost_list_model', layout_analysis=False, precision='fp16')
 
 
 @app.route('/nlp/cost', methods=['POST'])
diff --git a/services/det_api.py b/services/paddle_services/det_api.py
similarity index 92%
rename from services/det_api.py
rename to services/paddle_services/det_api.py
index 503021a..bc5b1c5 100644
--- a/services/det_api.py
+++ b/services/paddle_services/det_api.py
@@ -3,7 +3,7 @@ import os.path
 import cv2
 from flask import Flask, request
 
-from paddle_services.paddle_detection import detector
+from paddle_detection import detector
 from utils import process_request, parse_img_path
 
 app = Flask(__name__)
diff --git a/services/dewarp_api.py b/services/paddle_services/dewarp_api.py
similarity index 92%
rename from services/dewarp_api.py
rename to services/paddle_services/dewarp_api.py
index 8e9b4a2..94eb85d 100644
--- a/services/dewarp_api.py
+++ b/services/paddle_services/dewarp_api.py
@@ -3,7 +3,7 @@ import os
 import cv2
 from flask import Flask, request
 
-from paddle_services.doc_dewarp import dewarper
+from doc_dewarp import dewarper
 from utils import process_request, parse_img_path
 
 app = Flask(__name__)
diff --git a/services/discharge_api.py b/services/paddle_services/discharge_api.py
similarity index 87%
rename from services/discharge_api.py
rename to services/paddle_services/discharge_api.py
index 5d8d57a..174cdba 100644
--- a/services/discharge_api.py
+++ b/services/paddle_services/discharge_api.py
@@ -11,7 +11,7 @@ DISCHARGE_RECORD_SCHEMA = (
         HOSPITAL + DEPARTMENT + PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + DOCTOR + ADMISSION_ID + AGE
 )
 DISCHARGE = Taskflow('information_extraction', schema=DISCHARGE_RECORD_SCHEMA, model='uie-x-base',
-                     task_path='../model/discharge_record_model', layout_analysis=False, precision='fp16')
+                     task_path='../../model/discharge_record_model', layout_analysis=False, precision='fp16')
 
 
 @app.route('/nlp/discharge', methods=['POST'])
diff --git a/services/ocr_api.py b/services/paddle_services/ocr_api.py
similarity index 100%
rename from services/ocr_api.py
rename to services/paddle_services/ocr_api.py
diff --git a/services/settlement_api.py b/services/paddle_services/settlement_api.py
similarity index 90%
rename from services/settlement_api.py
rename to services/paddle_services/settlement_api.py
index 22e8d27..248c727 100644
--- a/services/settlement_api.py
+++ b/services/paddle_services/settlement_api.py
@@ -15,7 +15,7 @@ SETTLEMENT_LIST_SCHEMA = (
         + UPPERCASE_MEDICAL_EXPENSES
 )
 SETTLEMENT_IE = Taskflow('information_extraction', schema=SETTLEMENT_LIST_SCHEMA, model='uie-x-base',
-                         task_path='../model/settlement_list_model', layout_analysis=False, precision='fp16')
+                         task_path='../../model/settlement_list_model', layout_analysis=False, precision='fp16')
 
 
 @app.route('/nlp/settlement', methods=['POST'])
diff --git a/services/utils.py b/services/paddle_services/utils.py
similarity index 85%
rename from services/utils.py
rename to services/paddle_services/utils.py
index 5edf5f0..078ebb4 100644
--- a/services/utils.py
+++ b/services/paddle_services/utils.py
@@ -1,4 +1,3 @@
-import logging
 import os
 
 from flask import jsonify
@@ -14,7 +13,6 @@ def process_request(func):
             result = func(*args, **kwargs)
             return jsonify(result), 200
         except Exception as e:
-            logging.getLogger('error').error(f'Error: {e}', exc_info=e)
             return jsonify({'error': str(e)}), 500
 
     return wrapper