update requirement

app.py

@@ -1,5 +1,6 @@
 import os, io
 from paddleocr import PaddleOCR, draw_ocr,PPStructure
+from ppocr.utils.visual import draw_ser_results
 from PIL import Image, ImageDraw
 import gradio as gr
 
@@ -38,21 +39,10 @@ def inference__ppstructure(img_path):
         ser_dict_path='ppocr/utils/dict/kie/clinical_class_list.txt'
     )
     
-    result = ppsutructure.__call__(img_path)
-
-    for idx in range(len(result)):
-        res = result[idx]
-        for line in res:
-            print(line)
-    
-    result = result[0]
-    image = Image.open(img_path).convert('RGB')
-    boxes = [line[0] for line in result]
-    txts = [line[1][0] if line[1] else '' for line in result]  # 確保在無文字時 txts 還是個空字串
-    scores = [line[1][1] for line in result]
-    im_show_pil = draw_ocr(image, boxes, txts, scores, font_path="./simfang.ttf")
-
-    return im_show_pil, "\n".join(txts)
+    result,res2 = ppsutructure.__call__(img_path)
+    image = draw_ser_results(img_path,result,font_path='./simfang.ttf')
+    result = [''.join(f"{element['pred']}:{element['transcription']}") for element in result if element['pred']!='O']
+    return image, "\n".join(result)
 
     
 gr.Interface(

paddleocr.py

@@ -289,7 +289,7 @@ MODEL_URLS = {
             'kie': {
                 'en': {
                     'url':
-                    'https://huggingface.co/spaces/CallMeMrFern/ocr/ppstructure/models/kie/ser_clinical.tar',
+                    'https://huggingface.co/spaces/CallMeMrFern/ocr/resolve/main/ppstructure/models/kie/ser_clinical.tar',
                     'dict_path':
                     'ppocr/utils/dict/kie/clinical_class_list.txt'
                 },
@@ -571,7 +571,7 @@ class PPStructure(StructureSystem):
         assert params.structure_version in SUPPORT_STRUCTURE_MODEL_VERSION, "structure_version must in {}, but get {}".format(
             SUPPORT_STRUCTURE_MODEL_VERSION, params.structure_version)
         params.use_gpu = check_gpu(params.use_gpu)
-        params.mode = 'structure'
+        params.mode = 'kie'
 
         if not params.show_log:
             logger.setLevel(logging.INFO)
@@ -634,13 +634,14 @@ class PPStructure(StructureSystem):
             params.ser_dict_path = str(
                 Path(__file__).parent / ser_model_config['dict_path'])
         logger.debug(params)
+        print(params)
         super().__init__(params)
 
     def __call__(self, img, return_ocr_result_in_table=False, img_idx=0):
         img = check_img(img)
-        res, _ = super().__call__(
+        res, res2 = super().__call__(
             img, return_ocr_result_in_table, img_idx=img_idx)
-        return res
+        return res, res2
 
 
 def main():

ppocr/postprocess/picodet_postprocess.py

@@ -102,6 +102,7 @@ class PicoDetPostProcess(object):
         self.keep_top_k = keep_top_k
 
     def load_layout_dict(self, layout_dict_path):
+        print(layout_dict_path)
         with open(layout_dict_path, 'r', encoding='utf-8') as fp:
             labels = fp.readlines()
         return [label.strip('\n') for label in labels]

ppstructure/utility.py

@@ -75,12 +75,12 @@ def init_args():
     parser.add_argument(
         "--layout",
         type=str2bool,
-        default=True,
+        default=False,
         help='Whether to enable layout analysis')
     parser.add_argument(
         "--table",
         type=str2bool,
-        default=True,
+        default=False,
         help='In the forward, whether the table area uses table recognition')
     parser.add_argument(
         "--ocr",

requirements.txt

@@ -1,6 +1,8 @@
-paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index
+# paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index
+paddlepaddle==2.5.2
 paddleocr>=2.6
-Pillow
+Pillow==9.5.0
 Gradio
 Polygon3 -i https://pypi.tuna.tsinghua.edu.cn/simple
-lanms-neo==1.0.2 -i https://pypi.tuna.tsinghua.edu.cn/simple
+lanms-neo==1.0.2 -i https://pypi.tuna.tsinghua.edu.cn/simple
+paddlenlp==2.5.2

ser_clinical/inference.pdiparams

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04651c7fd3c8c70109c0cebfc9469341b5d53bd04931256faee571a5fa41aac4
-size 1112005019

ser_clinical/inference.pdiparams.info

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f7c104c03a2783f214b202d1295202b272fed7f79de5ddad00843b033c764fd
-size 23316

ser_clinical/inference.pdmodel

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:555c2329497dc20fa71caf81c386122e376501660571ab13e5e3e0ba483e5304
-size 1068499

test.json

@@ -1 +0,0 @@
-{"table": {"en": {"url": "https://paddleocr.bj.bcebos.com/ppstructure/models/slanet/en_ppstructure_mobile_v2.0_SLANet_infer.tar", "dict_path": "ppocr/utils/dict/table_structure_dict.txt"}, "ch": {"url": "https://paddleocr.bj.bcebos.com/ppstructure/models/slanet/ch_ppstructure_mobile_v2.0_SLANet_infer.tar", "dict_path": "ppocr/utils/dict/table_structure_dict_ch.txt"}}, "layout": {"en": {"url": "https://paddleocr.bj.bcebos.com/ppstructure/models/layout/picodet_lcnet_x1_0_fgd_layout_infer.tar", "dict_path": "ppocr/utils/dict/layout_dict/layout_publaynet_dict.txt"}, "ch": {"url": "https://paddleocr.bj.bcebos.com/ppstructure/models/layout/picodet_lcnet_x1_0_fgd_layout_cdla_infer.tar", "dict_path": "ppocr/utils/dict/layout_dict/layout_cdla_dict.txt"}}, "kie": {"en": {"url": "https://paddleocr.bj.bcebos.com/ppstructure/models/layout/picodet_lcnet_x1_0_fgd_layout_infer.tar", "dict_path": "ppocr/utils/dict/kie/clinical_class_list.txt"}, "ch": {"url": "https://huggingface.co/spaces/CallMeMrFern/ocr/ppstructure/models/kie/ser_clinical.tar", "dict_path": "ppocr/utils/dict/kie/clinical_class_list.txt"}}}