Update to v2.3.2. Refactor detection model handling in app.py; update requirements for cnocr and numpy

app.py

@@ -34,6 +34,12 @@ from cnocr.utils import set_logger, draw_ocr_results, download
 logger = set_logger()
 MODELS = {}
 
+DET_MODELS = list(DET_AVAILABLE_MODELS.all_models())
+DET_MODELS.append(('naive_det', 'onnx'))
+DET_MODELS.sort()
+DET_MODELS_NAME = [f'{m}' for m, _ in DET_MODELS]
+DET_MODELS_DICT = {f'{m}': f'{b}' for m, b in DET_MODELS}
+
 
 def plot_for_debugging(rotated_img, one_out, box_score_thresh, crop_ncols, prefix_fp):
     import matplotlib.pyplot as plt
@@ -73,8 +79,7 @@ def get_ocr_model(det_model_name, rec_model_name, det_more_configs):
     if (det_model_name, rec_model_name, config_str) in MODELS:
         return MODELS[(det_model_name, rec_model_name, config_str)]
 
-    det_model_name, det_model_backend = det_model_name.split('::')
-    # rec_model_name, rec_model_backend = rec_model_name.split('::')
+    det_model_backend = DET_MODELS_DICT[det_model_name]
     rec_model_backend = 'onnx'
     model = CnOcr(
         det_model_name=det_model_name,
@@ -157,7 +162,6 @@ def recognize(
             min_box_size=min_box_size,
         )
 
-    det_model_name, det_model_backend = det_model_name.split('::')
     if is_single_line or det_model_name == 'naive_det':
         out_texts = visualize_naive_result(
             img, det_model_name, ocr_out, box_score_thresh
@@ -183,11 +187,6 @@ def recognize(
 
 
 def main():
-    det_models = list(DET_AVAILABLE_MODELS.all_models())
-    det_models.append(('naive_det', 'onnx'))
-    det_models.sort()
-    det_models = [f'{m}::{b}' for m, b in det_models]
-
     all_models = list(REC_AVAILABLE_MODELS.all_models())
     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]
@@ -206,7 +205,7 @@ def main():
     )
     example_func = functools.partial(
         recognize,
-        # det_model_name='ch_PP-OCRv3_det::onnx',
+        # det_model_name='ch_PP-OCRv3_det',
         rotated_bbox=True,
         # use_angle_clf=False,
         new_size=768,
@@ -215,49 +214,49 @@ def main():
     )
     examples = [
         [
-            'ch_PP-OCRv3_det::onnx',
+            'ch_PP-OCRv3_det',
             True,
             'number-densenet_lite_136-fc',
             False,
             'docs/examples/card1-s.jpg',
         ],
         [
-            'ch_PP-OCRv3_det::onnx',
+            'ch_PP-OCRv3_det',
             True,
             'number-densenet_lite_136-fc',
             False,
             'docs/examples/card2-s.jpg',
         ],
         [
-            'ch_PP-OCRv3_det::onnx',
+            'ch_PP-OCRv3_det',
             True,
             'number-densenet_lite_136-fc',
             False,
             'docs/examples/cy1-s.jpg',
         ],
         [
-            'ch_PP-OCRv3_det::onnx',
+            'ch_PP-OCRv3_det',
             False,
             'densenet_lite_136-gru',
             False,
             'docs/examples/huochepiao.jpeg',
         ],
         [
-            'ch_PP-OCRv3_det::onnx',
+            'ch_PP-OCRv3_det',
             False,
             'densenet_lite_136-gru',
             False,
             'docs/examples/1_res.jpg',
         ],
         [
-            'db_shufflenet_v2::pytorch',
+            'db_shufflenet_v2',
             False,
             'en_number_mobile_v2.0',
             False,
             'docs/examples/en_book1.jpeg',
         ],
         [
-            'db_shufflenet_v2::pytorch',
+            'db_shufflenet_v2',
             False,
             'densenet_lite_136-gru',
             True,
@@ -291,7 +290,7 @@ def main():
             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',
+                    label='选择检测模型', choices=DET_MODELS_NAME, value='ch_PP-OCRv3_det',
                 )
                 is_single_line = gr.Checkbox(label='单行文字模式（不使用检测模型）', value=False)
 

requirements.txt

@@ -6,278 +6,9 @@
 #
 --extra-index-url https://pypi.org/simple
 
-aiohttp==3.8.4
-    # via fsspec
-aiosignal==1.3.1
-    # via aiohttp
-albumentations==1.3.1
-    # via -r requirements.in
-appdirs==1.4.4
-    # via wandb
-async-timeout==4.0.2
-    # via aiohttp
-attrs==23.1.0
-    # via aiohttp
-certifi==2023.5.7
-    # via
-    #   requests
-    #   sentry-sdk
-charset-normalizer==3.1.0
-    # via
-    #   aiohttp
-    #   requests
-click==8.1.3
-    # via
-    #   -r requirements.in
-    #   cnstd
-    #   wandb
-cnstd>=1.2.3.4
-    # via -r requirements.in
-coloredlogs==15.0.1
-    # via onnxruntime
-contourpy==1.1.0
-    # via matplotlib
-cycler==0.11.0
-    # via matplotlib
-docker-pycreds==0.4.0
-    # via wandb
-filelock==3.12.2
-    # via
-    #   huggingface-hub
-    #   torch
-flatbuffers==23.5.26
-    # via onnxruntime
-fonttools==4.40.0
-    # via matplotlib
-frozenlist==1.3.3
-    # via
-    #   aiohttp
-    #   aiosignal
-fsspec[http]==2023.6.0
-    # via
-    #   huggingface-hub
-    #   pytorch-lightning
-gitdb==4.0.10
-    # via gitpython
-gitpython==3.1.34
-    # via wandb
-huggingface-hub==0.15.1
-    # via cnstd
-humanfriendly==10.0
-    # via coloredlogs
-idna==3.4
-    # via
-    #   requests
-    #   yarl
-imageio==2.31.3
-    # via scikit-image
-importlib-resources==5.12.0
-    # via matplotlib
-jinja2==3.1.2
-    # via torch
-joblib==1.3.2
-    # via scikit-learn
-kiwisolver==1.4.4
-    # via matplotlib
-lazy-loader==0.3
-    # via scikit-image
-lightning-utilities==0.9.0
-    # via pytorch-lightning
-markupsafe==2.1.3
-    # via jinja2
-matplotlib==3.7.1
-    # via
-    #   cnstd
-    #   seaborn
-mpmath==1.3.0
-    # via sympy
-multidict==6.0.4
-    # via
-    #   aiohttp
-    #   yarl
-networkx==3.1
-    # via
-    #   scikit-image
-    #   torch
-numpy==1.25.0
-    # via
-    #   -r requirements.in
-    #   albumentations
-    #   cnstd
-    #   contourpy
-    #   imageio
-    #   matplotlib
-    #   onnx
-    #   onnxruntime
-    #   opencv-python
-    #   opencv-python-headless
-    #   pandas
-    #   pytorch-lightning
-    #   pywavelets
-    #   qudida
-    #   scikit-image
-    #   scikit-learn
-    #   scipy
-    #   seaborn
-    #   shapely
-    #   tifffile
-    #   torchmetrics
-    #   torchvision
-onnx==1.14.0
-    # via
-    #   -r requirements.in
-    #   cnstd
-onnxruntime==1.15.1
-    # via
-    #   -r requirements.in
-    #   cnstd
-opencv-python==4.7.0.72
-    # via cnstd
-opencv-python-headless==4.8.0.76
-    # via
-    #   albumentations
-    #   qudida
-packaging==23.1
-    # via
-    #   huggingface-hub
-    #   lightning-utilities
-    #   matplotlib
-    #   onnxruntime
-    #   pytorch-lightning
-    #   scikit-image
-    #   torchmetrics
-pandas==2.0.3
-    # via
-    #   cnstd
-    #   seaborn
-pathtools==0.1.2
-    # via wandb
-pillow==9.5.0
-    # via
-    #   -r requirements.in
-    #   cnstd
-    #   imageio
-    #   matplotlib
-    #   scikit-image
-    #   torchvision
-polygon3==3.0.9.1
-    # via cnstd
-protobuf==4.23.3
-    # via
-    #   onnx
-    #   onnxruntime
-    #   wandb
-psutil==5.9.5
-    # via wandb
-pyclipper==1.3.0.post4
-    # via cnstd
-pyparsing==3.1.0
-    # via matplotlib
-python-dateutil==2.8.2
-    # via
-    #   matplotlib
-    #   pandas
-pytorch-lightning==2.0.8
-    # via
-    #   -r requirements.in
-    #   cnstd
-pytz==2023.3
-    # via pandas
-pywavelets==1.4.1
-    # via scikit-image
-pyyaml==6.0
-    # via
-    #   albumentations
-    #   cnstd
-    #   huggingface-hub
-    #   pytorch-lightning
-    #   wandb
-qudida==0.0.4
-    # via albumentations
-requests==2.31.0
-    # via
-    #   fsspec
-    #   huggingface-hub
-    #   torchvision
-    #   wandb
-scikit-image==0.21.0
-    # via albumentations
-scikit-learn==1.3.0
-    # via qudida
-scipy==1.11.1
-    # via
-    #   albumentations
-    #   cnstd
-    #   scikit-image
-    #   scikit-learn
-seaborn==0.12.2
-    # via cnstd
-sentry-sdk==1.30.0
-    # via wandb
-setproctitle==1.3.2
-    # via wandb
-shapely==2.0.1
-    # via cnstd
-six==1.16.0
-    # via
-    #   docker-pycreds
-    #   python-dateutil
-smmap==5.0.0
-    # via gitdb
-sympy==1.12
-    # via
-    #   onnxruntime
-    #   torch
-threadpoolctl==3.2.0
-    # via scikit-learn
-tifffile==2023.8.30
-    # via scikit-image
-torch==2.0.1
-    # via
-    #   -r requirements.in
-    #   cnstd
-    #   pytorch-lightning
-    #   torchmetrics
-    #   torchvision
-torchmetrics==0.11.4
-    # via
-    #   -r requirements.in
-    #   pytorch-lightning
-torchvision==0.15.2
-    # via
-    #   -r requirements.in
-    #   cnstd
-tqdm==4.65.0
-    # via
-    #   -r requirements.in
-    #   cnstd
-    #   huggingface-hub
-    #   pytorch-lightning
-typing-extensions==4.7.0
-    # via
-    #   huggingface-hub
-    #   lightning-utilities
-    #   onnx
-    #   pytorch-lightning
-    #   qudida
-    #   torch
-    #   wandb
-tzdata==2023.3
-    # via pandas
-unidecode==1.3.6
-    # via cnstd
-urllib3==2.0.3
-    # via
-    #   requests
-    #   sentry-sdk
-wandb==0.15.10
-    # via -r requirements.in
-yarl==1.9.2
-    # via aiohttp
-zipp==3.15.0
-    # via importlib-resources
-
-cnocr==2.3.0.1
+cnocr>=2.3.2.1,<2.4
+opencv-python
+numpy
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools