ryry-cli 2.43__tar.gz → 2.46__tar.gz

{ryry_cli-2.43 → ryry_cli-2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.43
+Version: 2.46
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

ryry_cli-2.46/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.46"
+app_bulld_number=246
+app_bulld_anchor="Noh_2024-09-02 12:32:14.910188"
+app_name="ryry-cli"

{ryry_cli-2.43 → ryry_cli-2.46}/ryry/ryry_webapi.py

@@ -178,7 +178,7 @@ def TaskCancel(taskUUID):
         return False
     return True
 
-def upload(localFilePath, ext):
+def _upload(localFilePath, ext):
     with open(localFilePath, "rb") as f:
         files = { 'file':f }
         params = { 'ext':ext }
@@ -187,6 +187,51 @@ def upload(localFilePath, ext):
         raise Exception(f"upload fail!, reason={r2}")
     return r3
 
+def upload(localFilePath, ext):
+    try:
+        return _upload(localFilePath, ext)
+    except:
+        pass
+    from mecord import upload as mecord_upload
+    try:
+        return mecord_upload.upload(localFilePath, None, "sg")
+    except:
+        pass
+    try:
+        return mecord_upload.upload(localFilePath, None, "test")
+    except:
+        pass
+    try:
+        import hashlib
+        import hmac
+        import base64
+        timestamp = datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")        
+        content_type = "application/octet-stream"
+        
+        random_name = ''.join(str(uuid.uuid4()).split('-'))
+        object_key = f"temp/{random_name}.{ext}"
+        bucket = "p-template-hk"
+        resource = f"/{bucket}/{object_key}"
+        endpoint = "oss-cn-hongkong.aliyuncs.com"        
+        string_to_sign = f"PUT\n\n{content_type}\n{timestamp}\n{resource}"    
+        signature = base64.b64encode(
+            hmac.new("sZDIL9uhqTgeQOkAjpbSOFm0259fwZ".encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()
+        ).decode('utf-8')        
+        url = f"https://{bucket}.{endpoint}/{object_key}"
+        headers = {
+            "Date": timestamp,
+            "Authorization": f"OSS LTAI5t6YZQo4MZV6LWwt4Rnj:{signature}",
+            "Content-Type": content_type
+        }
+        with open(localFilePath, "rb") as file:
+            file_data = file.read()
+        response = requests.put(url, data=file_data, headers=headers)
+        if response.status_code == 200:
+            return url
+    except:
+        pass
+    raise Exception("all upload target is fail!")
+
 def uploadWidget(widget_id, name, whl, ext, version):
     with open(whl, "rb") as f:
         files = { 'file':f }

{ryry_cli-2.43 → ryry_cli-2.46}/ryry/ryry_widget.py

@@ -56,25 +56,16 @@ def _remote_package_version(py_package):
 
 #real time version get
 def _local_package_version(py_package):
-    find_str = "grep"
-    if platform.system() == 'Windows':
-        find_str = "findstr"
-    local_version = ""
-    for pip in ["pip3","pip"]:
-        result = subprocess.run(f"{pip} list | {find_str} {py_package}", 
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-        ss = result.stdout.decode(encoding="utf8", errors="ignore").split("\n")
-        for s in ss:
-            s = re.sub(r'\s+', ' ', s)
-            sl = s.strip().split(" ")
-            if len(sl) == 2:
-                if py_package.strip() == sl[0].strip():
-                    local_version = sl[1].strip()
-                    break
-        else:
-            continue
-        break
-    return local_version
+    _map = store.widgetMap()
+    for it in _map:
+        try:
+            widget_path = os.path.dirname(_map[it]["path"])
+            widget_config = GetWidgetConfig(widget_path)
+            if widget_config["name"] == py_package:
+                return widget_config["version"]
+        except:
+            pass
+    return ''
 
 def _pypi_folder_name(name):
     import re
@@ -366,23 +357,35 @@ def widgetInstallNotify(widgetName, newver):
     })
 
 def pipReInstall(name, url):
-    if name:       
-        subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-        subprocess.run(f"pip3 uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    subprocess.run(f"pip install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    subprocess.run(f"pip3 install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+    def find_pip_command():
+        possible_pips = ['pip', 'pip3']
+        for cmd in possible_pips:
+            pip_path = shutil.which(cmd)
+            if pip_path:
+                return cmd
+
+        for version in range(12, 8, -1):
+            cmd = f"pip3.{version}"
+            pip_path = shutil.which(cmd)
+            if pip_path:
+                return cmd
+                
+        raise RuntimeError("No pip command found on the system.")
+    pip_cmd = find_pip_command()
+    if name:
+        subprocess.run(f"{pip_cmd} uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    subprocess.run(f"{pip_cmd} install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
         stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     
 def UpdateWidgetFromPypi():
-    map = store.widgetMap()
-    for it in map:
+    _map = store.widgetMap()
+    for it in _map:
         is_block = False
-        if isinstance(map[it], (dict)):
-            is_block = map[it]["isBlock"]
-            path = map[it]["path"]
+        if isinstance(_map[it], (dict)):
+            is_block = _map[it]["isBlock"]
+            path = _map[it]["path"]
         else:
-            path = map[it]
+            path = _map[it]
         path = os.path.dirname(path)
         if is_block == False and os.path.exists(path):
             data = GetWidgetConfig(path)
@@ -403,7 +406,7 @@ def UpdateWidgetFromPypi():
                     print(ex)
                     continue
     for widget_id, widget_name, remote_version, package_url in ryry_webapi.getAutoDeployWidget():
-        if widget_id not in map:
+        if widget_id not in _map:
             try:
                 pipReInstall(widget_name, package_url)
                 widgetInstallNotify(widget_name, remote_version)
@@ -420,7 +423,6 @@ def installWidget(name):
     local_version = _local_package_version(name)
     if compare_versions(remote_version, local_version) > 0:
         #update
-        print(f"install -> {package_url}")
         pipReInstall(name, package_url)
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)

{ryry_cli-2.43 → ryry_cli-2.46}/ryry/server_func.py

@@ -23,7 +23,7 @@ class TaskThread(Thread):
     params = False
     idx = 0
     call_back = None
-    def __init__(self, idx, total, func, params, callback):
+    def __init__(self, idx, total, func, params, callback, timeout=3600):
         super().__init__()
         self.idx = idx
         self.total = total
@@ -32,6 +32,7 @@ class TaskThread(Thread):
         self.checking = False
         self.checkCount = 0
         self.params = params
+        self.timeout = timeout
         self.call_back = callback
         if self.call_back == None:
             raise Exception("need callback function")
@@ -45,7 +46,7 @@ class TaskThread(Thread):
             if cmd:
                 self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
                 self.params["task_id"] = self.checkUUID
-                executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params)
+                executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
                 if executeSuccess and result_obj["status"] == 0:
                     self.call_back(self.idx, result_obj["result"])
                 return
@@ -55,8 +56,9 @@ class TaskThread(Thread):
                 print("")
                 self.checking = True
                 self.checkCount = 0
-                time.sleep(5)
-                while self.checking and self.checkCount < 400:
+                wait_time_step = 5
+                time.sleep(wait_time_step)
+                while self.checking and self.checkCount < self.timeout / wait_time_step:
                     finish, success, data, progress = ryry_webapi.checkTask(self.checkUUID)
                     print_progress_bar(progress, 100, f"Task{self.idx} {self.func}", self.idx+1, self.total)
                     if finish:
@@ -65,7 +67,7 @@ class TaskThread(Thread):
                             self.call_back(self.idx, data)
                             return
                     self.checkCount += 1
-                    time.sleep(5)
+                    time.sleep(wait_time_step)
         else:
             print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
@@ -79,7 +81,7 @@ class Task:
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     thread_data = {}
     
-    def __init__(self, func: str, multi_params: list[dict], fromUUID=""):
+    def __init__(self, func: str, multi_params: list[dict], fromUUID="", timeout=3600):
         self.thread_data = {}
         
         realTaskUUID = fromUUID
@@ -98,7 +100,7 @@ class Task:
             param["fromUUID"] = realTaskUUID
             param["domain"] = domain
             self.thread_data[str(idx)] = {
-                "thread" :  TaskThread(idx, len(multi_params), func, param, _callback),
+                "thread" :  TaskThread(idx, len(multi_params), func, param, _callback, timeout),
                 "result" : None
             }
             idx+=1

{ryry_cli-2.43 → ryry_cli-2.46}/ryry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.43
+Version: 2.46
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-2.43 → ryry_cli-2.46}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.43"
+ryry_version = "2.46"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")

ryry_cli-2.43/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.43"
-app_bulld_number=243
-app_bulld_anchor="Noh_2024-08-26 22:08:34.396686"
-app_name="ryry-cli"