rm clp -> add submodule AgentCLPR

Author: jm12138

.gitmodules

@@ -1,3 +1,7 @@
-[submodule "labeling"]
-	path = labeling
+[submodule "AgentOCRLabeling"]
+	path = AgentOCRLabeling
 	url = https://github.com/AgentMaker/AgentOCRLabeling/
+
+[submodule "AgentCLPR"]
+	path = AgentCLPR
+	url = https://github.com/AgentMaker/AgentCLPR/

README.md

@@ -62,16 +62,7 @@
             [[[178.0, 691.0], [709.0, 683.0], [709.0, 717.0], [178.0, 724.0]], ['눈 앞이 아른아른 거리는 잘 생긴 얼굴 자꾸', 0.8839521408081055]]
             [[[225.0, 739.0], [658.0, 738.0], [658.0, 770.0], [225.0, 771.0]], ['귀에 냄도는 크의 측촉한 옥소리 예', 0.8728228211402893]]
 
-* 特色功能 OCR：
-    * 中国车牌识别：
 
-        ![](https://ai-studio-static-online.cdn.bcebos.com/568f2a7e0e75407a8bbb429a929c358acc37cf0bd2254a11aba5971d59ff1e67)
-        
-            [[[[213.0, 239.0], [505.0, 231.0], [507.0, 308.0], [215.0, 316.0]], ['沪AD00806', 0.9884898662567139]]]
-
-        ![](https://ai-studio-static-online.cdn.bcebos.com/7eb3b2e7765c44a290b1931587fc3f407e3eb1b246a04eea9d3d2bc2f07e5c1f)
-
-            [[[[71.0, 190.0], [369.0, 190.0], [369.0, 279.0], [71.0, 279.0]], ['苏E05EV8', 0.9944847822189331]]]
 ## 使用指南
 * Python Package：
 
@@ -159,9 +150,3 @@
     |拉丁文|la|
     |西里尔文|cy|
     |梵文|de|
-
-* 特色功能模型配置：
-
-    | 功能 | 缩写 |
-    |:-:|:-:|
-    |中国车牌识别|clp|

agentocr/infer/utility.py

@@ -43,9 +43,7 @@
         'https://bj.bcebos.com/v1/ai-studio-online/a85db324f5c54a618712ef670fe6a3a5b4dcf68630744b16a322141c577bf39b?responseContentDisposition=attachment%3B%20filename%3Den_mul_m_det.onnx',
         'ch_mul_v2_c_det':
         'https://bj.bcebos.com/v1/ai-studio-online/485da521bb90456b86469443a4bc6ad25f0e7db1aa624a54b4bc9d2f1dc9db67?responseContentDisposition=attachment%3B%20filename%3Dch_mul_v2_c_det.onnx',
-        'clp_m_det':
-        'https://bj.bcebos.com/v1/ai-studio-online/fecf0ac4d0f34b26a1de6663e260a8aed3b88c1644fd4ee5afb7962b118d76ff?responseContentDisposition=attachment%3B%20filename%3Dclp_m_det.onnx',
-        },
+    },
     'rec': {
         'ch_m_rec':
         'https://bj.bcebos.com/v1/ai-studio-online/78a4d8d082e347798c0b46962c74b7a96aa545c79d2642999aa7a138dc0f3793?responseContentDisposition=attachment%3B%20filename%3Dch_m_rec.onnx',
@@ -77,8 +75,6 @@
         'https://bj.bcebos.com/v1/ai-studio-online/68b2ee780b2f4017be955fcb226091e4e557935898004e899614709e9874cc16?responseContentDisposition=attachment%3B%20filename%3Den_m_rec.onnx',
         'de_m_rec':
         'https://bj.bcebos.com/v1/ai-studio-online/d4e698603f6243e98bbf8b7e28585d168e831d6bd852426cb1cbe11a7c487c71?responseContentDisposition=attachment%3B%20filename%3Dde_m_rec.onnx',
-        'clp_v2_c_rec':
-        'https://bj.bcebos.com/v1/ai-studio-online/b591fa763ef046559d2f3fce73ca51b35359c3a6c22e4972817daec2902cde69?responseContentDisposition=attachment%3B%20filename%3Dclp_v2_c_rec.onnx',
         'ch_v2_c_rec':
         'https://bj.bcebos.com/v1/ai-studio-online/365e482fd2f94052924bfe4f5d44aac34866850e00f74625a716fb928da32163?responseContentDisposition=attachment%3B%20filename%3Dch_v2_c_rec.onnx',
     }
@@ -100,7 +96,6 @@
     'en': 'english',
     'de': 'devanagari',
     'la': 'latin',
-    'clp': 'chinese_license_plate',
 }
 
 def get_config(config):
@@ -112,12 +107,10 @@ def get_config(config):
         if config in configs_dict:
             if config in ['ch', 'cht']:
                 det_model = 'ch_mul_v2_c_det'
-            elif config in ['clp']:
-                det_model = 'clp_m_det'
             else:
                 det_model = 'en_mul_m_det'
 
-            if config in ['ch', 'clp']:
+            if config in ['ch']:
                 rec_model = '%s_v2_c_rec' % config
             else:
                 rec_model = "%s_m_rec" % config
@@ -129,9 +122,7 @@ def get_config(config):
                 "rec_model": rec_model,
                 "rec_char_dict_path": char_dict,
             }
-
-            if config == 'clp':
-                kwargs['det_db_unclip_ratio'] = 1.0
+            
         else:
             raise ValueError('Please check your config.')
 

agentocr/resources/char_dicts/clp_dict.txt

@@ -20,7 +20,7 @@ def requirements():
       ],
       include_package_data=True,
       entry_points={"console_scripts": ["agentocr = agentocr:command"]},
-      version='2.0.0b2',
+      version='2.0.0',
       install_requires=requirements(),
       license='Apache License 2.0',
       description='An easy-to-use OCR package with multilingual support.',