ryry-cli 2.78__tar.gz → 2.80__tar.gz

{ryry_cli-2.78 → ryry_cli-2.80}/PKG-INFO

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

ryry_cli-2.80/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.80"
+app_bulld_anchor="Noh_2025-01-14 11:20:59.630833"
+app_name="ryry-cli"

{ryry_cli-2.78 → ryry_cli-2.80}/ryry/server_func.py

@@ -114,6 +114,43 @@ 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
+        }

{ryry_cli-2.78 → ryry_cli-2.80}/ryry/utils.py

@@ -132,7 +132,7 @@ def deviceInfo():
     cpu_serial = get_cpu_serial()
     cpu_serial = "" if cpu_serial == None else cpu_serial
     hostname = get_hostname()
-    M=1024*1024
+    G=1024*1024*1024
     cpu_freq = "None"
     try:
         cpu_freq = psutil.cpu_freq().max / 1000
@@ -145,8 +145,8 @@ def deviceInfo():
             "max_freq" : f"{cpu_freq} GHz",
         },
         "memory": {
-            "total" : f"{psutil.virtual_memory().total/M} M",
-            "free" : f"{psutil.virtual_memory().free/M} M"
+            "total" : f"{(psutil.virtual_memory().total/G):.1f} G",
+            "free" : f"{(psutil.virtual_memory().free/G):.1f} G"
         },
         "gpu": {
             "count" : 0,

{ryry_cli-2.78 → ryry_cli-2.80}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.78 → ryry_cli-2.80}/setup.py

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

ryry_cli-2.78/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.78"
-app_bulld_anchor="Noh_2024-12-27 16:15:46.426766"
-app_name="ryry-cli"