ryry-cli 2.7__tar.gz → 2.10__tar.gz

{ryry_cli-2.7/ryry_cli.egg-info → ryry_cli-2.10}/PKG-INFO

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

ryry_cli-2.10/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.10"
+app_bulld_number=210
+app_bulld_anchor="Noh_2024-06-12 17:59:01.639286"
+app_name="ryry-cli"

{ryry_cli-2.7 → ryry_cli-2.10}/ryry/ryry_service.py

@@ -149,8 +149,8 @@ class ryryPackageThread(Thread):
         return ""
     def run(self):
         while (os.path.exists(stop_thread_file) == False):
-            time.sleep(10)
-            if calendar.timegm(time.gmtime()) - self.last_check_time > 300:
+            time.sleep(1)
+            if calendar.timegm(time.gmtime()) - self.last_check_time > 100:
                 self.last_check_time = calendar.timegm(time.gmtime())
                 try:
                     #update widget
@@ -178,7 +178,7 @@ class ryryPackageThread(Thread):
                         break
                 except Exception as ex:
                     print(f'update ryry-cli fail, {ex}')
-            time.sleep(10)
+            time.sleep(1)
         print(f"   PackageChecker stop")
         notify_other_stoped() #because other thread is waiting some signal to close
     def markStop(self):

{ryry_cli-2.7 → ryry_cli-2.10}/ryry/ryry_webapi.py

@@ -55,7 +55,7 @@ def _extend():
     return json.dumps(extInfo)
 
 def GetTask():
-    widget_map = ["TESTTEST"]
+    widget_map = []
     map = store.widgetMap()
     for it in map:
         if isinstance(map[it], (dict)):
@@ -153,6 +153,7 @@ def retryLastTaskNotify():
             json.dump(newData, f)
     except:
         pass
+    
 def TaskNotify(taskUUID, status, msg, dataStr, failSaveNotify=True):
     req = {
         "task_uuid": taskUUID,
@@ -169,16 +170,22 @@ def TaskNotify(taskUUID, status, msg, dataStr, failSaveNotify=True):
     return r3
   
 def TaskUpdateProgress(taskUUID, progress, dataStr):
-    # req = aigc_ext_pb2.TaskUpdateReq()
-    # req.taskUUID = taskUUID
-    # req.progress = progress
-    # req.data = dataStr
-    
-    # rsp = aigc_ext_pb2.TaskUpdateRes()
-    # r1, r2, r3 = _aigc_post(req, "TaskUpdate")
-    # if r1 != 0:
-    #     return False
-    # rsp.ParseFromString(r3)
+    req = {
+        "task_uuid": taskUUID,
+        "progress": progress,
+    }
+    r1, r2, r3 = _aigc_post("aigc/task/taskProgress", req)
+    if r1 != 0:
+        return False
+    return True
+
+def TaskCancel(taskUUID):
+    req = {
+        "task_uuid": taskUUID,
+    }
+    r1, r2, r3 = _aigc_post("aigc/task/taskCancel", req)
+    if r1 != 0:
+        return False
     return True
 
 def upload(localFilePath, ext):
@@ -212,9 +219,9 @@ def CreateWidgetUUID():
     return r3
 
 #======================================== Task Function ==============================
-def createTask(widget_id, params):
+def createTask(widget_name, params):
     req = {
-        "widget_id": widget_id,
+        "widget_name": widget_name,
         "widget_data": json.dumps(params),
         "extend": _extend()
     }
@@ -239,16 +246,30 @@ def findWidget(name):
             return widget_id, version, package
     return "", "", ""
 
+def getAutoDeployWidget():
+    req = {}
+    r1, r2, r3 = _aigc_post("aigc/task/getAutoDeployWidget", req)
+    result = []
+    if r1 != 0:
+        return result
+    for it in r3:
+        widget_id = it["widget_id"]
+        widget_name = it["name"]
+        version = it["version"]
+        package = it["package"]
+        result.append([widget_id, widget_name, version, package])
+    return result
+
 def checkTask(checkUUID):
     req = {
         "task_uuid": checkUUID
     }
     r1, r2, r3 = _aigc_post("aigc/task/checkTask", req)
     if r1 != 0:
-        return False, False, "server fail"
+        return False, False, "server fail", 0
     if r3["status"] < 2:
-        return False, False, ""
+        return False, False, "", r3["progress"]
     elif r3["status"] == 2:
-        return True, True, json.loads(r3["task_result"])
+        return True, True, json.loads(r3["task_result"]), r3["progress"]
     elif r3["status"] == 3:
-        return True, False, r3["fail_reason"]
+        return True, False, r3["fail_reason"], r3["progress"]

{ryry_cli-2.7 → ryry_cli-2.10}/ryry/ryry_widget.py

@@ -277,18 +277,16 @@ def publishWidget(package_folder):
     data_file_config = {}
     for root,dirs,files in os.walk(package_folder):
         for file in files:
-            if file.find(".") <= 0:
+            if file.find(".") > 0 and file[file.rindex("."):] == ".py":
                 continue
-            ext = file[file.rindex("."):]
-            if ext in [ ".json", ".txt", ".md" ]:
-                dir_path = os.path.relpath(root, package_folder)
-                file_path = os.path.join(dir_path, file)
-                file_path = os.path.normpath(file_path).replace("\\", "/")
-                k = dir_path.replace("\\", "/")
-                if k in data_file_config:
-                    data_file_config[k].append(file_path)
-                else:
-                    data_file_config[k] = [file_path]
+            dir_path = os.path.relpath(root, package_folder)
+            file_path = os.path.join(dir_path, file)
+            file_path = os.path.normpath(file_path).replace("\\", "/")
+            k = dir_path.replace("\\", "/")
+            if k in data_file_config:
+                data_file_config[k].append(file_path)
+            else:
+                data_file_config[k] = [file_path]
     package_data_str = ""
     for k in data_file_config:
         for p in data_file_config[k]:
@@ -367,6 +365,15 @@ 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/", 
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    
 def UpdateWidgetFromPypi():
     map = store.widgetMap()
     for it in map:
@@ -386,17 +393,21 @@ def UpdateWidgetFromPypi():
                     local_version = _local_package_version(py_package)
                     if compare_versions(remote_version, local_version) > 0:
                         #update
-                        subprocess.run(f"pip uninstall {py_package} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-                        subprocess.run(f"pip3 uninstall {py_package} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-                        subprocess.run(f"pip install {package_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 {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                        pipReInstall(py_package, package_url)
                         widgetUpdateNotify(py_package, local_version, remote_version)
                 except Exception as ex:
                     print(ex)
                     continue
-               
+    for widget_id, widget_name, remote_version, package_url in ryry_webapi.getAutoDeployWidget():
+        if widget_id not in map:
+            try:
+                pipReInstall(widget_name, package_url)
+                widgetInstallNotify(widget_name, remote_version)
+                addWidgetToEnv(widget_name)
+            except Exception as ex:
+                print(ex)
+                continue
+            
 def installWidget(name):
     widgetid, remote_version, package_url = ryry_webapi.findWidget(name)
     if len(widgetid) <= 0:
@@ -405,12 +416,7 @@ def installWidget(name):
     local_version = _local_package_version(name)
     if compare_versions(remote_version, local_version) > 0:
         #update
-        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 {package_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 {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        pipReInstall(name, package_url)
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)
         

{ryry_cli-2.7 → ryry_cli-2.10}/ryry/server_func.py

@@ -1,19 +1,33 @@
-import time, urllib3
-from threading import Thread
+import time, urllib3, sys, os
+from threading import Thread, Lock
 
 from ryry import ryry_webapi
 from ryry import store
 from ryry import taskUtils
 
+lock = Lock()
+def print_progress_bar(iteration, total, name, idx, total_bars):
+    length=50
+    percent = ("{0:.1f}").format(100 * (iteration / float(total)))
+    filled_length = int(length * iteration // total)
+    bar = '█' * filled_length + '-' * (length - filled_length)
+    with lock:        
+        sys.stdout.write(f'\0337')  # Save cursor position
+        sys.stdout.write(f'\033[{total_bars-idx+1}A')  # Move cursor up to the specific progress bar line
+        sys.stdout.write(f'\r{name}: |{bar}| {percent}% Complete')
+        sys.stdout.write(f'\0338')  # Restore cursor position
+        sys.stdout.flush()
+    
 class TaskThread(Thread):
     params = False
     idx = 0
     call_back = None
-    def __init__(self, idx, func, func_id, params, callback):
+    def __init__(self, idx, total, func, params, callback):
         super().__init__()
         self.idx = idx
+        self.total = total
         self.func = func
-        self.widgetid = func_id
+        self.checkUUID = None
         self.params = params
         self.call_back = callback
         if self.call_back == None:
@@ -22,31 +36,34 @@ class TaskThread(Thread):
     def run(self):
         self.checking = False
         self.result = False, "Unknow"
-        if self.widgetid == None:
-            self.widgetid, _, _ = ryry_webapi.findWidget(self.func)
-        if len(self.widgetid) > 0:
-            checkUUID = ryry_webapi.createTask(self.widgetid, self.params)
+        if len(self.func) > 0:
+            self.checkUUID = ryry_webapi.createTask(self.func, self.params)
+            print("")
             checking = True
             checkCount = 0
-            while checking or checkCount > 600:
-                finish, success, data = ryry_webapi.checkTask(checkUUID)
+            time.sleep(5)
+            while checking or checkCount > 100:
+                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:
                     checking = False
                     if success:
                         self.call_back(self.idx, data)
                         return
                 checkCount += 1
-                if checkCount % 10 == 0:
-                    print(f"waiting...")
-                time.sleep(1)
+                time.sleep(2)
         else:
-            print(f"widget {self.func}-{self.widgetid} not found")
+            print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
-
+        
+    def __del__(self):
+        if self.checking and self.checkUUID:
+            ryry_webapi.TaskCancel(self.checkUUID)
+        
 class Task:
     thread_data = {}
 
-    def __init__(self, func: str, multi_params: list[dict], fromUUID=None, func_id=None):
+    def __init__(self, func: str, multi_params: list[dict], fromUUID=None):
         urllib3.disable_warnings()
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
         
@@ -60,7 +77,7 @@ class Task:
         for param in multi_params:
             param["fromUUID"] = realTaskUUID
             self.thread_data[str(idx)] = {
-                "thread" :  TaskThread(idx, func, func_id, param, _callback),
+                "thread" :  TaskThread(idx, len(multi_params), func, param, _callback),
                 "result" : None
             }
             idx+=1

{ryry_cli-2.7 → ryry_cli-2.10}/ryry/task.py

@@ -176,19 +176,19 @@ def checkResult(taskUUID, data):
                 final_url = parsed_url._replace(query=updated_query_string).geturl()
                 it["extension"]["cover_url"] = final_url
     except Exception as ex:
-        taskUtils.taskPrint(taskUUID, f"result: {data} status is not valid, exception is {ex} ")
+        taskUtils.taskPrint(taskUUID, f"result: {data} status is not valid, exception is {ex} , ignore")
         pass
 
-def updateProgress(data, progress=0.5, taskUUID=None):
+def updateProgress(data, progress=50, taskUUID=None):
     realTaskUUID = taskUUID
     if realTaskUUID == None or len(realTaskUUID) <= 0:
         realTaskUUID = taskUtils.taskInfoWithFirstTask()
         
     if progress < 0:
         progress = 0
-    if progress > 1:
-        progress = progress / 100.0
-    return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data["result"]))
+    if progress > 100:
+        progress = 100
+    return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
 
 def timeout_killprocess(proc, timeout): # """超过指定的秒数后杀死进程"""
     import threading

{ryry_cli-2.7 → ryry_cli-2.10/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.7 → ryry_cli-2.10}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.7"
+ryry_version = "2.10"
 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.7/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.7"
-app_bulld_number=27
-app_bulld_anchor="Noh_2024-06-06 21:29:32.524901"
-app_name="ryry-cli"