ryry-cli 2.79__tar.gz → 2.81__tar.gz

{ryry_cli-2.79 → ryry_cli-2.81}/PKG-INFO

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

ryry_cli-2.81/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.81"
+app_bulld_anchor="Noh_2025-01-17 18:37:26.952556"
+app_name="ryry-cli"

{ryry_cli-2.79 → ryry_cli-2.81}/ryry/ryry_webapi.py

@@ -335,4 +335,22 @@ def checkTask(checkUUID):
     elif r3["status"] == 2:
         return True, True, json.loads(r3["task_result"]), r3["progress"]
     elif r3["status"] == 3:
-        return True, False, r3["fail_reason"], r3["progress"]
+        return True, False, r3["fail_reason"], r3["progress"]
+    
+def multiCheckTask(checkUUIDs):
+    req = {
+        "task_uuids": checkUUIDs
+    }
+    r1, r2, r3 = _aigc_post("aigc/task/checkTasks", req)
+    result = []
+    if r1 != 0:
+        for checkUUID in checkUUIDs:
+            result.append([checkUUID, False, False, "server fail", 0])
+    for r3_item in r3:
+        if r3_item["status"] < 2:
+            result.append([r3_item["uuid"], False, False, "", r3_item["progress"]])
+        elif r3_item["status"] == 2:
+            result.append([r3_item["uuid"], True, True, json.loads(r3_item["task_result"]), r3_item["progress"]])
+        elif r3_item["status"] == 3:
+            result.append([r3_item["uuid"], True, False, r3_item["fail_reason"], r3_item["progress"]])
+    return result

{ryry_cli-2.79 → ryry_cli-2.81}/ryry/server_func.py

@@ -114,6 +114,55 @@ class Task:
         for t in self.thread_data.keys():
             result.append(self.thread_data[t]["result"])
         return result
+       
+class AsyncTask:
+    import urllib3
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     
+    def __init__(self, func: str, params: dict, fromUUID=""):
+        self.params = params
+        self.func = func
+        
+        realTaskUUID = fromUUID
+        if realTaskUUID == None or len(realTaskUUID) <= 0:
+            realTaskUUID = taskUtils.taskInfoWithFirstTask()
+            
+        support_subdomain = upload.getFirstSupportSubdomain()
+        domain = ""
+        if support_subdomain:
+            domain = support_subdomain["readpath"]
+        self.params["fromUUID"] = realTaskUUID
+        self.params["domain"] = domain
+        
+    def call(self):
+        cmd = task.cmdWithWidgetName(self.func)
+        if cmd:
+            raise Exception("local widget not support AsyncTask, please use Task")
+        else:
+            self.checkUUID = ryry_webapi.createTask(self.func, self.params)
+            return self.checkUUID
+            
+    def cancel(self, taskUUID=None):
+        ryry_webapi.TaskCancel(taskUUID if taskUUID else self.checkUUID)
+        return True
     
-    
+    def check(self, taskUUID=None):
+        finish, success, data, progress = ryry_webapi.checkTask(taskUUID if taskUUID else self.checkUUID)
+        return {
+            "finish": finish,
+            "success": success,
+            "data": data,
+            "progress": progress
+        }
+        
+    def multiCheck(self, taskUUIDs):
+        results = ryry_webapi.multiCheckTask(taskUUIDs)
+        json_results = {}
+        for [taskUUID, finish, success, data, progress] in results:
+            json_results[taskUUID] = {
+                "finish": finish,
+                "success": success,
+                "data": data,
+                "progress": progress
+            }
+        return json_results

{ryry_cli-2.79 → ryry_cli-2.81}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.79 → ryry_cli-2.81}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.79"
+ryry_version = "2.81"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:

ryry_cli-2.79/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.79"
-app_bulld_anchor="Noh_2024-12-30 11:08:43.067080"
-app_name="ryry-cli"