upgrade the interface; use cnocr >= 2.3

README.md

@@ -4,7 +4,7 @@ emoji: 🎡
 colorFrom: indigo
 colorTo: yellow
 sdk: gradio
-sdk_version: 3.44.4
+sdk_version: 4.11.0
 app_file: app.py
 pinned: false
 license: apache-2.0

app.py

@@ -189,10 +189,14 @@ def main():
     det_models = [f'{m}::{b}' for m, b in det_models]
 
     all_models = list(REC_AVAILABLE_MODELS.all_models())
-    all_models.sort()
     all_models = [f'{m}' for m, b in all_models if b == 'onnx']
+    cnocr_models = [name for name in all_models if 'densenet' in name]
+    cnocr_models.sort()
+    other_models = [name for name in all_models if 'densenet' not in name]
+    other_models.sort()
+    all_models = cnocr_models + other_models
 
-    title = '开源Python OCR工具：'
+    title = 'Python 开源中英 OCR 工具：'
     desc = (
         '<p style="text-align: center">详细说明参见：<a href="https://github.com/breezedeus/CnOCR" target="_blank">Github</a>；'
         '<a href="https://cnocr.readthedocs.io" target="_blank">在线文档</a>；'
@@ -261,13 +265,30 @@ def main():
         ],
     ]
 
+    table_desc = """
+<div align="center">
+<img src="https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F9341931a-53f0-48e1-b026-0f1ad17b457c%2Fc41e0b1d-4869-4e39-93db-631569e6a38d%2FUntitled.png?table=block&id=3d0819ca-2e1a-46a7-b6f3-b4cf89cd045c" width="120px"/>
+
+[![Visitors](https://api.visitorbadge.io/api/visitors?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Fbreezedeus%2FCnOCR-Demo&labelColor=%23697689&countColor=%23f5c791&style=flat&labelStyle=upper)](https://visitorbadge.io/status?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Fbreezedeus%2FCnOCR-Demo)
+
+|                                 |                                         |
+| ------------------------------- | --------------------------------------- |
+| 📀 **Code**              | [Github](https://github.com/breezedeus/cnocr) |
+| 📖 **Doc**             | [在线文档](https://cnocr.readthedocs.io) |
+| 🧳 **Models**             | [可用模型](https://cnocr.readthedocs.io/zh/latest/models/) |
+| 💬 **Contact**              | [交流群](https://www.breezedeus.com/join-group) |
+| 👨🏻‍💻 **Author**            | [Breezedeus](https://www.breezedeus.com) |
+
+有用还请帮忙 **star 🌟 [CnOCR](https://github.com/breezedeus/cnocr)** 🙏
+</div>
+    """
+
     with gr.Blocks() as demo:
-        gr.Markdown(
-            f'<h1 style="text-align: center; margin-bottom: 1rem;">{title} <a href="https://github.com/breezedeus/cnocr" target="_blank">CnOCR</a></h1>'
+        gr.HTML(
+            f'<h1 style="text-align: center; margin-bottom: 1rem;">{title} <a href="https://github.com/breezedeus/cnocr" target="_blank">CnOCR V2.3</a></h1>'
         )
-        gr.Markdown(desc)
         with gr.Row(equal_height=False):
-            with gr.Column(min_width=200, variant='panel', scale=1):
+            with gr.Column(min_width=200, variant='panel', scale=3):
                 gr.Markdown('### 模型设置')
                 det_model_name = gr.Dropdown(
                     label='选择检测模型', choices=det_models, value='ch_PP-OCRv3_det::onnx',
@@ -277,48 +298,51 @@ def main():
                 rec_model_name = gr.Dropdown(
                     label='选择识别模型',
                     choices=all_models,
-                    value='densenet_lite_136-fc',
+                    value='densenet_lite_136-gru',
                 )
 
                 gr.Markdown('### 检测参数')
                 rotated_bbox = gr.Checkbox(label='检测带角度文本框', value=True)
                 use_angle_clf = gr.Checkbox(label='使用角度预测模型校正文本框', value=False)
-                new_size = gr.Slider(
-                    label='resize 后图片（长边）大小', minimum=124, maximum=4096, value=768
-                )
-                box_score_thresh = gr.Slider(
-                    label='得分阈值（低于阈值的结果会被过滤掉）', minimum=0.05, maximum=0.95, value=0.3
-                )
-                min_box_size = gr.Slider(
-                    label='框大小阈值（更小的文本框会被过滤掉）', minimum=4, maximum=50, value=10
-                )
-
-            with gr.Column(scale=3, variant='compact'):
+                with gr.Accordion('更多选项', open=False):
+                    new_size = gr.Slider(
+                        label='resize 后图片（长边）大小', minimum=124, maximum=4096, value=768
+                    )
+                    box_score_thresh = gr.Slider(
+                        label='得分阈值（低于阈值的结果会被过滤掉）', minimum=0.05, maximum=0.95, value=0.3
+                    )
+                    min_box_size = gr.Slider(
+                        label='框大小阈值（更小的文本框会被过滤掉）', minimum=4, maximum=50, value=10
+                    )
+
+            with gr.Column(scale=5, variant='compact'):
                 gr.Markdown('### 选择待识别图片')
                 image_file = gr.Image(label='待识别图片', type="pil", image_mode='RGB')
                 sub_btn = gr.Button("Submit", variant="primary")
-                out_image = gr.Image(label='识别结果', interactive=False, visible=False)
-                naive_warn = gr.Markdown(
-                    '**⚠️ Warning**: "naive_det" 检测模型不返回文本框位置！', visible=False
-                )
-                out_texts = gr.Dataframe(
-                    headers=['得分', '文本'], label='识别结果', interactive=False, visible=False
-                )
-                sub_btn.click(
-                    recognize,
-                    inputs=[
-                        det_model_name,
-                        is_single_line,
-                        rec_model_name,
-                        rotated_bbox,
-                        use_angle_clf,
-                        new_size,
-                        box_score_thresh,
-                        min_box_size,
-                        image_file,
-                    ],
-                    outputs=[out_image, naive_warn, out_texts],
-                )
+            with gr.Column(scale=2, variant='compact'):
+                gr.Markdown(table_desc)
+        out_image = gr.Image(label='识别结果', interactive=False, visible=False)
+        naive_warn = gr.Markdown(
+            '**⚠️ Warning**: "naive_det" 检测模型不返回文本框位置！', visible=False
+        )
+        out_texts = gr.Dataframe(
+            headers=['得分', '文本'], label='识别结果', interactive=False, visible=False
+        )
+        sub_btn.click(
+            recognize,
+            inputs=[
+                det_model_name,
+                is_single_line,
+                rec_model_name,
+                rotated_bbox,
+                use_angle_clf,
+                new_size,
+                box_score_thresh,
+                min_box_size,
+                image_file,
+            ],
+            outputs=[out_image, naive_warn, out_texts],
+        )
 
         gr.Examples(
             label='示例',
@@ -335,7 +359,7 @@ def main():
             cache_examples=os.getenv('CACHE_EXAMPLES') == '1',
         )
 
-    demo.queue(concurrency_count=4)
+    demo.queue(max_size=10)
     demo.launch()
 
 

requirements.txt

@@ -277,7 +277,7 @@ yarl==1.9.2
 zipp==3.15.0
     # via importlib-resources
 
-cnocr==2.2.4.1
+cnocr==2.3
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools