update Raw url

szad670401 · Feb 28, 2023 · cf44359 · cf44359
1 parent ea1d0b1
commit cf44359
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Prj-Python/hyperlpr3/__init__.py b/Prj-Python/hyperlpr3/__init__.py
@@ -1,7 +1,5 @@
 from .hyperlpr3 import LicensePlateCatcher
 from .common.typedef import *
-from .config.configuration import initialization
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
-initialization()
diff --git a/Prj-Python/hyperlpr3/config/configuration.py b/Prj-Python/hyperlpr3/config/configuration.py
@@ -42,17 +42,22 @@ def down_model_zip(url, save_path, is_unzip=False):
         os.remove(name)
 
 
+# def initialization(re_download=False):
+#     models_dir = os.path.join(_DEFAULT_FOLDER_, _MODEL_VERSION_, "onnx")
+#     os.makedirs(models_dir, exist_ok=True)
+#     for model_key in onnx_model_maps:
+#         save_path = onnx_runtime_config[model_key]
+#         basename = os.path.basename(save_path)
+#         remote_url = os.path.join(_REMOTE_URL_, basename + "?raw=true")
+#         down_path = os.path.join(models_dir, basename)
+#         if not os.path.exists(down_path) or re_download:
+#             down_model_file(remote_url, down_path)
+
 def initialization(re_download=False):
-    models_dir = os.path.join(_DEFAULT_FOLDER_, _MODEL_VERSION_, "onnx")
-    os.makedirs(models_dir, exist_ok=True)
-    for model_key in onnx_model_maps:
-        save_path = onnx_runtime_config[model_key]
-        basename = os.path.basename(save_path)
-        remote_url = os.path.join(_REMOTE_URL_, basename + "?raw=true")
-        down_path = os.path.join(models_dir, basename)
-        if not os.path.exists(down_path) or re_download:
-            down_model_file(remote_url, down_path)
+    os.makedirs(_DEFAULT_FOLDER_, exist_ok=True)
+    models_dir = os.path.join(_DEFAULT_FOLDER_, _MODEL_VERSION_)
     # print(models_dir)
-    # if not os.path.exists(models_dir) or re_download:
-    #     target_url = os.path.join(_ONLINE_URL_, _MODEL_VERSION_) + '.zip'
-    #     down_model_zip(target_url, _DEFAULT_FOLDER_, True)
+    if not os.path.exists(models_dir) or re_download:
+        target_url = os.path.join(_ONLINE_URL_, _MODEL_VERSION_) + '.zip'
+        down_model_zip(target_url, _DEFAULT_FOLDER_, True)
+
diff --git a/Prj-Python/hyperlpr3/config/settings.py b/Prj-Python/hyperlpr3/config/settings.py
@@ -8,7 +8,7 @@
 else:
     _DEFAULT_FOLDER_ = os.path.join(os.environ['HOME'], ".hyperlpr3")
 
-_ONLINE_URL_ = "https://tunm.oss-cn-hangzhou.aliyuncs.com/hyperlpr3/"
+_ONLINE_URL_ = "http://hyperlpr.tunm.top/raw/"
 
 onnx_runtime_config = dict(
     det_model_path_320x=os.path.join(_MODEL_VERSION_, "onnx", "y5fu_320x_sim.onnx"),

diff --git a/Prj-Python/hyperlpr3/hyperlpr3.py b/Prj-Python/hyperlpr3/hyperlpr3.py
@@ -3,8 +3,11 @@
 from .common.typedef import *
 from os.path import join
 from .config.settings import _DEFAULT_FOLDER_
+from .config.configuration import initialization
 
 
+initialization()
+
 class LicensePlateCatcher(object):
 
     def __init__(self,

diff --git a/resource/models/onnx/litemodel_cls_96x_r1.onnx b/resource/models/onnx/litemodel_cls_96x_r1.onnx
diff --git a/resource/models/onnx/rpv3_mdict_160_r3.onnx b/resource/models/onnx/rpv3_mdict_160_r3.onnx
diff --git a/resource/models/onnx/y5fu_320x_sim.onnx b/resource/models/onnx/y5fu_320x_sim.onnx
diff --git a/resource/models/onnx/y5fu_640x_sim.onnx b/resource/models/onnx/y5fu_640x_sim.onnx