ryry-cli 2.28__tar.gz → 2.29__tar.gz

{ryry_cli-2.28/ryry_cli.egg-info → ryry_cli-2.29}/PKG-INFO

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

ryry_cli-2.29/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.29"
+app_bulld_number=229
+app_bulld_anchor="Noh_2024-08-14 18:08:47.761550"
+app_name="ryry-cli"

{ryry_cli-2.28 → ryry_cli-2.29}/ryry/ryry_widget.py

@@ -174,8 +174,9 @@ def addWidgetToEnv(root, mute=False):
         return
     data = GetWidgetConfig(root)
     widget_id = data["widget_id"]
+    name = data["name"]
     mainPythonPath = os.path.join(root, "main.py")
-    store.insertWidget(widget_id, mainPythonPath)
+    store.insertWidget(widget_id, name, mainPythonPath)
     if mute == False:
         print(f"add {widget_id.ljust(len(widget_id)+4)} {mainPythonPath}")
 

{ryry_cli-2.28 → ryry_cli-2.29}/ryry/script_template/run.py

@@ -10,11 +10,7 @@ def runTask(data):
                 "type" : "text", #text audio image video
                 "content": [ 
                     "hello world"
-                ],
-                "extension" : {
-                    "info": "",
-                    "cover_url": ""
-                }
+                ]
             }
         ],
         "status" : 0,  #0 is success

{ryry_cli-2.28 → ryry_cli-2.29}/ryry/server_func.py

@@ -1,9 +1,10 @@
-import time, urllib3, sys, os
+import time, urllib3, sys, os, uuid
 from threading import Thread, Lock
 
 from ryry import ryry_webapi
 from ryry import upload
 from ryry import taskUtils
+from ryry import task
 
 lock = Lock()
 def print_progress_bar(iteration, total, name, idx, total_bars):
@@ -35,24 +36,37 @@ class TaskThread(Thread):
         if self.call_back == None:
             raise Exception("need callback function")
         self.start()
+    
     def run(self):
         self.checking = False
         self.result = False, "Unknow"
         if len(self.func) > 0:
-            self.checkUUID = ryry_webapi.createTask(self.func, self.params)
-            self.checking = True
-            self.checkCount = 0
-            time.sleep(5)
-            while self.checking and self.checkCount < 200:
-                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:
-                    self.checking = False
-                    if success:
-                        self.call_back(self.idx, data)
-                        return
-                self.checkCount += 1
-                time.sleep(3)
+            cmd = task.cmdWithWidgetName(self.func)
+            if cmd:
+                print("======")
+                executeSuccess, result_obj = task.executeLocalPython("local_" + ''.join(str(uuid.uuid4()).split('-')), cmd, self.params)
+                print(result_obj)
+                if executeSuccess and result_obj["status"] == 0:
+                    self.call_back(self.idx, result_obj["result"])
+                return
+            else:
+                print("=====123123123=")
+                # run_server
+                self.checkUUID = ryry_webapi.createTask(self.func, self.params)
+                print("")
+                self.checking = True
+                self.checkCount = 0
+                time.sleep(5)
+                while self.checking and self.checkCount < 200:
+                    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:
+                        self.checking = False
+                        if success:
+                            self.call_back(self.idx, data)
+                            return
+                    self.checkCount += 1
+                    time.sleep(3)
         else:
             print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
@@ -64,7 +78,7 @@ class TaskThread(Thread):
 class Task:
     thread_data = {}
 
-    def __init__(self, func: str, multi_params: list[dict], fromUUID=None):
+    def __init__(self, func: str, multi_params: list[dict], fromUUID=""):
         urllib3.disable_warnings()
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
         

{ryry_cli-2.28 → ryry_cli-2.29}/ryry/store.py

@@ -29,14 +29,6 @@ class Store(object):
     def write(self, data):
         with open(self.path, 'w') as f:
             json.dump(data, f)
-
-def token():
-    sp = Store()
-    read_data = sp.read()
-    if "token" in read_data:
-        return read_data["token"]
-    else:
-        return ""
     
 #============================== widget ================================
 def isCreateWidget():
@@ -61,7 +53,7 @@ def widgetMap():
     else:
         return {}
     
-def insertWidget(widget_id, path):
+def insertWidget(widget_id, name, path):
     sp = Store()
     read_data = sp.read()
     if "widgets" not in read_data:
@@ -72,7 +64,8 @@ def insertWidget(widget_id, path):
     else:
         widgetsMap[widget_id] = {
             "isBlock": False,
-            "path" : path
+            "path" : path,
+            "name" : name
         }
     for k in list(widgetsMap.keys()):
         if isinstance(widgetsMap[k], (dict)):
@@ -135,13 +128,17 @@ def writeDeviceInfo(data):
     read_data["deviceInfo"] = data
     sp.write(read_data)
     
+cache_device_info = None
 def readDeviceInfo():
-    sp = Store()
-    read_data = sp.read()
-    if "deviceInfo" in read_data:
-        return read_data["deviceInfo"]
-    else:
-        return {}
+    global cache_device_info
+    if cache_device_info == None:
+        sp = Store()
+        read_data = sp.read()
+        if "deviceInfo" in read_data:
+            cache_device_info = read_data["deviceInfo"]
+        else:
+            cache_device_info = {}
+    return cache_device_info
 
 def is_multithread():
     return get_multithread() > 1

{ryry_cli-2.28 → ryry_cli-2.29}/ryry/task.py

@@ -30,8 +30,6 @@ def runTask(it, timeout):
     msg = ""
     if len(result_obj["message"]) > 0:
         msg = str(result_obj["message"])
-    if is_ok:
-        checkResult(taskUUID, result_obj)
     taskUtils.taskPrint(taskUUID, f"{current_thread().name}=== task {taskUUID} is_ok={is_ok} ")
     taskUtils.saveCounter(taskUUID, (calendar.timegm(time.gmtime()) - start_time), is_ok)
     return is_ok, msg, json.dumps(result_obj["result"], separators=(',', ':'))
@@ -51,7 +49,15 @@ def cmdWithWidget(widget_id):
             return path
     return None
 
-def executeLocalPython(taskUUID, cmd, param, timeout):
+def cmdWithWidgetName(name):
+    map = store.widgetMap()
+    for widget_id in map.keys():
+        if map[widget_id]["name"] == name and map[widget_id]["isBlock"] == False:
+            is_block = map[widget_id]["isBlock"]
+            return map[widget_id]["path"]
+    return None
+
+def executeLocalPython(taskUUID, cmd, param, timeout=3600):
     inputArgs = os.path.join(os.path.dirname(os.path.abspath(__file__)), f"{taskUUID}.in")
     if os.path.exists(inputArgs):
         os.remove(inputArgs)
@@ -127,58 +133,6 @@ def executeLocalPython(taskUUID, cmd, param, timeout):
             os.remove(outArgs)
     return executeSuccess, outData
 
-def _needChangeValue(taskUUID, data, type, key):
-    if "type" not in data:
-        taskUtils.taskPrint(taskUUID, "result is not avalid")
-        return False
-    if data["type"] != type:
-        return False
-    if "extension" not in data or key not in data["extension"] or len(data["extension"][key]) == 0:
-        return True
-    return False
-            
-def checkResult(taskUUID, data):
-    try:
-        for it in data["result"]:
-            if "extension" not in it:
-                continue
-            if _needChangeValue(taskUUID, it, "text", "cover_url"):
-                it["extension"]["cover_url"] = ""
-            if _needChangeValue(taskUUID, it, "audio", "cover_url"):
-                it["extension"]["cover_url"] = ""
-            if _needChangeValue(taskUUID, it, "image", "cover_url"):
-                it["extension"]["cover_url"] = ""
-            if _needChangeValue(taskUUID, it, "video", "cover_url"):
-                it["extension"]["cover_url"] = ""
-                
-            if "cover_url" in it["extension"] and len(it["extension"]["cover_url"]) > 0:
-                cover_url = str(it["extension"]["cover_url"]).replace('\\u0026', '&')
-                parsed_url = urlparse(cover_url)
-                params = parse_qs(parsed_url.query)
-                #add width & height if need
-                if "width" not in params and "height" not in params:
-                    w, h = utils.getOssImageSize(cover_url)
-                    if w > 0 and h > 0:
-                        params["width"] = w
-                        params["height"] = h
-                        it["extension"]["width"] = w
-                        it["extension"]["height"] = h
-                #remove optional parameters
-                for k in ["Expires","OSSAccessKeyId","Signature","security-token"]:
-                    params.pop(k, None)
-                if "width" in it["extension"]:
-                    if isinstance(it["extension"]["width"], str):
-                        it["extension"]["width"] = int(it["extension"]["width"])
-                if "height" in it["extension"]:
-                    if isinstance(it["extension"]["height"], str):
-                        it["extension"]["height"] = int(it["extension"]["height"])
-                updated_query_string = urlencode(params, doseq=True)
-                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} , ignore")
-        pass
-
 def updateProgress(data, progress=50, taskUUID=None):
     realTaskUUID = taskUUID
     if realTaskUUID == None or len(realTaskUUID) <= 0:
@@ -188,7 +142,8 @@ def updateProgress(data, progress=50, taskUUID=None):
         progress = 0
     if progress > 100:
         progress = 100
-    return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
+    if realTaskUUID.startswith("local_") == False:
+        return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
 
 def timeout_killprocess(proc, timeout): # """超过指定的秒数后杀死进程"""
     import threading

{ryry_cli-2.28 → ryry_cli-2.29/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.28 → ryry_cli-2.29}/setup.py

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

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.28"
-app_bulld_number=228
-app_bulld_anchor="Noh_2024-08-13 19:00:57.272337"
-app_name="ryry-cli"