compatible with pix2text==1.1.1

app.py

@@ -50,18 +50,8 @@ def prepare_mfd_model():
 
 
 def get_p2t_model(lan_list: list, mfd_model_name: str, mfr_model_name: str):
-    mfd_config = {}
-    if 'yolov7_tiny' not in mfd_model_name:
-        mfd_fp = prepare_mfd_model()
-        mfd_config = dict(  # 声明 LayoutAnalyzer 的初始化参数
-            model_type='yolov7',  # 表示使用的是 YoloV7 模型，而不是 YoloV7_Tiny 模型
-            model_fp=mfd_fp,  # 注：修改成你的模型文件所存储的路径
-        )
-    formula_config = {}
-    if 'mfr-pro' in mfr_model_name:
-        formula_config = dict(  # 声明 LayoutAnalyzer 的初始化参数
-            model_name='mfr-pro', model_backend='onnx',
-        )
+    mfd_config = dict(model_name=mfd_model_name, model_backend='onnx')  # 声明 MFD 的初始化参数
+    formula_config = dict(model_name=mfr_model_name, model_backend='onnx')  # 声明 MFR 的初始化参数
     text_formula_config = dict(
         languages=lan_list, mfd=mfd_config, formula=formula_config,
     )
@@ -90,11 +80,7 @@ def recognize(
         OUTPUT_RESULT_DIR.mkdir(exist_ok=True)
 
     out_det_fp = './docs/no-det-res.jpg'
-    kwargs = dict(
-        resized_shape=resized_shape,
-        return_text = True,
-        auto_line_break = True,
-    )
+    kwargs = dict(resized_shape=resized_shape, return_text=True, auto_line_break=True,)
     if rec_type == 'page':
         suffix = list(string.ascii_letters)
         random.shuffle(suffix)
@@ -114,20 +100,20 @@ def recognize(
     out_text = out
     if rec_type == 'page':
         out_text = out.to_markdown(output_dir)
-        out_det_fp =kwargs['save_debug_res'] / 'layout_res.jpg'
+        out_det_fp = kwargs['save_debug_res'] / 'layout_res.jpg'
     elif rec_type == 'text_formula':
         out_det_fp = kwargs['save_analysis_res']
 
     return out_text, out_det_fp
 
 
-def example_func(lang_list, rec_type, image_file):
+def example_func(lang_list, rec_type, resized_shape, image_file):
     return recognize(
         lang_list,
-        mfd_model_name='yolov7 (paid)',
-        mfr_model_name='mfr-pro (paid)',
+        mfd_model_name='mfd-pro',
+        mfr_model_name='mfr-pro',
         rec_type=rec_type,
-        resized_shape=768,
+        resized_shape=resized_shape,
         image_file=image_file,
     )
 
@@ -138,24 +124,35 @@ def main():
 
     title = ': a Free Alternative to Mathpix'
     examples = [
-        [['English'], 'page', 'docs/examples/page.png',],
-        [['English'], 'text_formula', 'docs/examples/mixed-en.jpg',],
-        [['English', 'Chinese Simplified'], 'text_formula', 'docs/examples/mixed-ch_sim.jpg',],
+        [['English'], 'page', 768, 'docs/examples/page.png',],
+        [['English'], 'text_formula', 768, 'docs/examples/mixed-en.jpg',],
+        [
+            ['English', 'Chinese Simplified'],
+            'text_formula',
+            768,
+            'docs/examples/mixed-ch_sim.jpg',
+        ],
         [
             ['English', 'Chinese Traditional'],
             'text_formula',
+            768,
             'docs/examples/mixed-ch_tra.jpg',
         ],
-        [['English', 'Vietnamese'], 'text_formula', 'docs/examples/mixed-vietnamese.jpg',],
-        [['English'], 'formula', 'docs/examples/formula1.png'],
-        [['English'], 'formula', 'docs/examples/formula2.jpg'],
-        [['English'], 'formula', 'docs/examples/hw-formula.png'],
-        [['English', 'Chinese Simplified'], 'text', 'docs/examples/pure-text.jpg',],
+        [
+            ['English', 'Vietnamese'],
+            'text_formula',
+            608,
+            'docs/examples/mixed-vietnamese.jpg',
+        ],
+        [['English'], 'formula', '-', 'docs/examples/formula1.png'],
+        [['English'], 'formula', '-', 'docs/examples/formula2.jpg'],
+        [['English'], 'formula', '-', 'docs/examples/hw-formula.png'],
+        [['English', 'Chinese Simplified'], 'text', '-', 'docs/examples/pure-text.jpg',],
     ]
 
     table_desc = """
 <div align="center">
-<img src="https://pix2text.readthedocs.io/zh/latest/figs/p2t-logo.png" width="120px"/>
+<img src="https://pix2text.readthedocs.io/zh-cn/stable/figs/p2t-logo.png" width="120px"/>
 
 [![Visitors](https://api.visitorbadge.io/api/visitors?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Fbreezedeus%2Fpix2text-demo&labelColor=%23697689&countColor=%23f5c791&style=flat&labelStyle=upper)](https://visitorbadge.io/status?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Fbreezedeus%2Fpix2text-demo)
 
@@ -175,7 +172,7 @@ If useful, please help to **star 🌟 [Pix2Text](https://github.com/breezedeus/p
 
     with gr.Blocks() as demo:
         gr.HTML(
-            f'<h1 style="text-align: center; margin-bottom: 1rem;"><a href="https://github.com/breezedeus/pix2text" target="_blank">Pix2Text V1.1</a>{title}</h1>'
+            f'<h1 style="text-align: center; margin-bottom: 1rem;"><a href="https://github.com/breezedeus/pix2text" target="_blank">Pix2Text V1.1.1</a>{title}</h1>'
         )
         with gr.Row(equal_height=False):
             with gr.Column(min_width=200, variant='panel', scale=3):
@@ -189,16 +186,16 @@ If useful, please help to **star 🌟 [Pix2Text](https://github.com/breezedeus/p
                 )
                 mfd_model_name = gr.Dropdown(
                     label='MFD Models',
-                    choices=['yolov7_tiny (free)', 'yolov7 (paid)'],
-                    value='yolov7 (paid)',
+                    choices=['mfd', 'mfd-advanced', 'mfd-pro'],
+                    value='mfd-pro',
                 )
                 mfr_model_name = gr.Dropdown(
                     label='MFR Models',
-                    choices=['mfr (free)', 'mfr-pro (paid)'],
-                    value='mfr-pro (paid)',
+                    choices=['mfr', 'mfr-pro', 'mfr-plus'],
+                    value='mfr-pro',
                 )
                 rec_type = gr.Dropdown(
-                    label='File Type',
+                    label='file_type',
                     choices=['page', 'text_formula', 'formula', 'text'],
                     value='text_formula',
                     # info='Which type of image to be recognized.',
@@ -257,7 +254,7 @@ If useful, please help to **star 🌟 [Pix2Text](https://github.com/breezedeus/p
         gr.Examples(
             label='Examples',
             examples=examples,
-            inputs=[lang_list, rec_type, image_file,],
+            inputs=[lang_list, rec_type, resized_shape, image_file,],
             outputs=[rec_result, det_result],
             fn=example_func,
             cache_examples=os.getenv('CACHE_EXAMPLES') == '1',

requirements.txt

@@ -1,4 +1,4 @@
 --extra-index-url https://pypi.org/simple
 
 pyyaml
-pix2text[multilingual]>=1.1.0.6
+pix2text[multilingual]>=1.1.1