Merge pull request #106 from ctripcorp/105-依赖包安装优化

105 依赖包安装优化

flybirds/core/plugin/plugins/default/ui_driver/paddleocr/ocr_manage.py

@@ -14,11 +14,13 @@ def ocr_init(lang=None):
         ocr_lang = gr.get_app_config_value("ocr_lang")
     else:
         ocr_lang = lang
-    from paddleocr import PaddleOCR
-    # Paddleocr support languages
-    # example`ch`, `en`, `fr`, `german`, `korean`, `japan`
-    ocr = PaddleOCR(use_angle_cls=True,
-                    lang=ocr_lang)  # need to run only once to download and load model into memory
 
-    return ocr
+    if ocr_lang != "":
+        from paddleocr import PaddleOCR
+        # Paddleocr support languages
+        # example`ch`, `en`, `fr`, `german`, `korean`, `japan`
+        ocr = PaddleOCR(use_angle_cls=True,
+                        lang=ocr_lang)  # need to run only once to download and load model into memory
+
+        return ocr
 

flybirds/core/plugin/plugins/default/ui_driver/poco/findsnap.py

@@ -60,7 +60,7 @@ def snap_find(source, config):
     name: name, id
     textMatches: Regular
     """
-    print("config", config)
+    # print("config", config)
     text = config.get("text")
     name = config.get("name")
     textMatches = config.get("textMatches")

flybirds/template/config/flybirds_config.json

@@ -4,7 +4,7 @@
     "packagePath": "https://download2.ctrip.com/html5/Ctrip_V8.43.0_SIT4-100053_Product_9725895.apk",
     "overwriteInstallation": false,
     "uniqueTag": "",
-    "ocrLang": "ch"
+    "ocrLang": ""
   },
   "device_info": {
     "deviceId": "%{{deviceId}}",

requirements.txt

@@ -11,7 +11,7 @@ pyOpenSSL==19.1.0
 click==8.0.3
 jsonpath_ng>=1.5.3
 deepdiff>=5.8.1
-numpy==1.22.4
+numpy<1.23
 paddleocr>=2.5.0
 paddlepaddle>=2.3.0
 protobuf==3.20.1

requirements_ml.txt

@@ -0,0 +1,3 @@
+paddleocr>=2.5.0
+paddlepaddle>=2.3.0
+protobuf==3.20.1

setup.py

@@ -4,14 +4,20 @@
 tool setup
 """
 from setuptools import setup, find_packages
+import sys
 
 
 def parse_requirements(filename):
     """
     get requirements list from config file
     """
     line_iter = (line.strip() for line in open(filename))
-    return [line for line in line_iter if line and not line.startswith("#")]
+    reqs = [line for line in line_iter if line and not line.startswith("#")]
+    if sys.platform == "win32":
+        reqs.remove("paddleocr>=2.5.0")
+        reqs.remove("paddlepaddle>=2.3.0")
+        reqs.remove("protobuf==3.20.1")
+    return reqs
 
 
 req = parse_requirements("requirements.txt")