ryry-cli 2.100__tar.gz → 3.0__tar.gz

{ryry_cli-2.100 → ryry_cli-3.0}/PKG-INFO

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

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="2.100"
-app_bulld_anchor="Noh_2025-05-06 12:02:37.711242"
+app_version="3.0"
+app_bulld_anchor="Noh_2025-05-16 16:51:25.132313"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/ryry_service.py

@@ -139,15 +139,24 @@ class ryryStateThread(Thread):
                     if cnt >= (60*60) and cnt/(60*60)%1 <= self.tik_time/3600:
                         taskUtils.idlingNotify(cnt)
                         #clear trush
-                        for root,dirs,files in os.walk(constant.base_path):
+                        now = time.time()
+                        threshold = 24 * 3600 
+                        for root, dirs, files in os.walk(constant.base_path):
                             for file in files:
-                                if file.find(".") <= 0:
-                                    continue
-                                ext = file[file.rindex("."):]
-                                if ext in [ ".in", ".out" ]:
-                                    os.remove(os.path.join(constant.base_path, file))
-                            if root != files:
-                                break
+                                full_path = os.path.join(root, file)
+                                if (
+                                    file.endswith(".in") or
+                                    file.endswith(".out") or
+                                    file.startswith("local_")
+                                ):
+                                    # 检查文件是否超过 24 小时
+                                    mtime = os.path.getmtime(full_path)
+                                    if now - mtime > threshold:
+                                        try:
+                                            os.remove(full_path)
+                                        except Exception as e:
+                                            pass
+                            break  # 只处理当前目录，不递归子目录
                 #更新机器性能
                 store.writeDeviceInfo(utils.deviceInfo())
             except:

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/ryry_webapi.py

@@ -3,7 +3,7 @@ import uuid, requests, calendar, time
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
-from ryry import store, utils, taskUtils, constant
+from ryry import store, utils, taskUtils, constant, task
 
 def _domain_post(func, params, files={}, timeout=10, domain="api.dalipen.com"):
     headers = {
@@ -49,6 +49,29 @@ def ServerTaskConfig():
     return min_wait_time, max_wait_time, consecutive_step
 
 def GetTask(widget_list):
+    all_files = set(os.listdir(constant.base_path))
+    if len(all_files) > 0:
+        for filename in all_files:
+            if filename.startswith("local_") and not filename.endswith(".result"):
+                result_filename = filename + ".result"
+                if result_filename in all_files:
+                    continue  # 有 .result 文件，跳过
+                file_path = os.path.join(constant.base_path, filename)
+                try:
+                    with open(file_path, "r", encoding="utf-8") as f:
+                        params = json.load(f)
+
+                    config = params.get("config", {})
+                    widget_id = config.get("widget_id")
+                    if widget_id in widget_list:
+                        return [{
+                            "taskUUID": params.get("taskUUID", filename),
+                            "config": json.dumps(config),
+                            "data": params.get("data", {}),
+                            "timeout": params.get("timeout", 600)
+                        }]
+                except Exception as e:
+                    continue
     req = {
         "widget_map": json.dumps(widget_list),
         "limit": 1,
@@ -143,6 +166,15 @@ def retryLastTaskNotify():
         pass
     
 def TaskNotify(taskUUID, status, msg, dataStr, failSaveNotify=True):
+    if taskUUID.startswith("local_"):
+        with open(os.path.join(constant.base_path, taskUUID + ".result"), "w") as f:
+            json.dump( {
+                "finish": True,
+                "success": status,
+                "data": dataStr,
+                "progress": 100
+            }, f)
+        return True
     req = {
         "task_uuid": taskUUID,
         "status": status,
@@ -158,6 +190,15 @@ def TaskNotify(taskUUID, status, msg, dataStr, failSaveNotify=True):
     return r3
   
 def TaskUpdateProgress(taskUUID, progress, dataStr):
+    if taskUUID.startswith("local_"):
+        with open(os.path.join(constant.base_path, taskUUID + ".result"), "w") as f:
+            json.dump( {
+                "finish": False,
+                "success": False,
+                "data": dataStr,
+                "progress": progress
+            }, f)
+        return True
     req = {
         "task_uuid": taskUUID,
         "progress": progress,
@@ -168,6 +209,15 @@ def TaskUpdateProgress(taskUUID, progress, dataStr):
     return True
 
 def TaskCancel(taskUUID):
+    if taskUUID.startswith("local_"):
+        with open(os.path.join(constant.base_path, taskUUID + ".result"), "w") as f:
+            json.dump( {
+                "finish": True,
+                "success": False,
+                "data": "",
+                "progress": 100
+            }, f)
+        return True
     req = {
         "task_uuid": taskUUID,
     }
@@ -176,6 +226,14 @@ def TaskCancel(taskUUID):
         return False
     return True
 
+def removeLocalTask(taskUUID):
+    if taskUUID.startswith("local_"):
+        if os.path.exists(os.path.join(constant.base_path, taskUUID)):
+            os.remove(os.path.join(constant.base_path, taskUUID))
+        if os.path.exists(os.path.join(constant.base_path, taskUUID + ".result")):
+            os.remove(os.path.join(constant.base_path, taskUUID + ".result"))
+    return True
+
 def multiTaskCancel(checkUUIDs):
     req = {
         "task_uuids": checkUUIDs
@@ -264,6 +322,23 @@ def CreateWidgetUUID():
     return r3
 
 #======================================== Task Function ==============================
+def createLocalTask(widget_name, params, timeout):
+    taskUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
+    params["task_id"] = taskUUID
+    widget_id = task.widgetIDWithWidgetName(widget_name)
+    with open(os.path.join(constant.base_path, taskUUID), "w") as f:
+        []
+        json.dump({
+            "taskUUID": taskUUID,
+            "config": {
+                "widget_id": widget_id
+            },
+            "data": json.dumps(params),
+            "timeout": timeout
+        }, f)
+    print(f"local task {taskUUID} is ready!")
+    return taskUUID
+
 def createTask(widget_name, params):
     req = {
         "widget_name": widget_name,
@@ -273,6 +348,7 @@ def createTask(widget_name, params):
     r1, r2, r3 = _aigc_post("aigc/task/createTask", req)
     if r1 != 0:
         raise Exception(f"create task fail!, reason={r2}")
+    print(f"task {r3} is pending now!")
     return r3
 
 def findWidget(name):
@@ -309,6 +385,17 @@ def getAutoDeployWidget():
     return result
 
 def checkTask(checkUUID):
+    if checkUUID.startswith("local_"):
+        if os.path.exists(os.path.join(constant.base_path, checkUUID + ".result")):
+            with open(os.path.join(constant.base_path, checkUUID + ".result"), "r") as f:
+                result_data = json.load(f)
+            finish = result_data["finish"]
+            success = result_data["success"]
+            data = result_data["data"]
+            progress = result_data["progress"]
+            return finish, success, data, progress
+        else:
+            return False, False, "", 0
     req = {
         "task_uuid": checkUUID
     }
@@ -338,4 +425,4 @@ def multiCheckTask(checkUUIDs):
             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
+    return result

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/server_func.py

@@ -1,7 +1,7 @@
-import time, urllib3, sys, os, uuid
+import time, urllib3, sys, os, uuid, json
 from threading import Thread, Lock
 
-from ryry import ryry_webapi, upload, taskUtils, task
+from ryry import ryry_webapi, upload, taskUtils, task, constant
 
 lock = Lock()
 def print_progress_bar(iteration, total, name, idx, total_bars):
@@ -39,33 +39,25 @@ class TaskThread(Thread):
         self.checking = False
         self.result = False, "Unknow"
         if len(self.func) > 0:
+            self.checking = True
+            self.checkCount = 0
+            wait_time_step = 5
             cmd = task.cmdWithWidgetName(self.func)
             if cmd:
-                self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
-                self.params["task_id"] = self.checkUUID
-                taskUtils.appendTaskAndDomain(self.checkUUID, self.params["domain"])
-                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
+                self.checkUUID = ryry_webapi.createLocalTask(self.func, self.params, self.timeout)
             else:
-                # run_server
                 self.checkUUID = ryry_webapi.createTask(self.func, self.params)
-                print("")
-                self.checking = True
-                self.checkCount = 0
-                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:
+                    self.checking = False
+                    if success:
+                        self.call_back(self.idx, data)
+                        return
+                self.checkCount += 1
                 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:
-                        self.checking = False
-                        if success:
-                            self.call_back(self.idx, data)
-                            return
-                    self.checkCount += 1
-                    time.sleep(wait_time_step)
         else:
             print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
@@ -73,6 +65,7 @@ class TaskThread(Thread):
     def __del__(self):
         if self.checking and self.checkUUID:
             ryry_webapi.TaskCancel(self.checkUUID)
+        ryry_webapi.removeLocalTask(self.checkUUID)
         
 class Task:
     import urllib3

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/store.py

@@ -84,42 +84,56 @@ def removeWidget(widget_id):
     if "widgets" not in read_data:
         read_data["widgets"] = {}
     widgetsMap = read_data["widgets"]
-    if widget_id in widgetsMap:
-        del widgetsMap[widget_id]
+    if widget_id == "all":
+        read_data["widgets"] = {}
+    else:
+        if widget_id in widgetsMap:
+            del widgetsMap[widget_id]
     sp.write(read_data)
     
 def disableWidget(widget_id):
     sp = Store()
     read_data = sp.read()
-    if "widgets" not in read_data:
+    if "widgets" not in read_data or not isinstance(read_data["widgets"], dict):
         read_data["widgets"] = {}
     widgetsMap = read_data["widgets"]
-    if widget_id in widgetsMap:
-        if isinstance(widgetsMap[widget_id], (dict)):
-            widgetsMap[widget_id]["isBlock"] = True
+    def block_one(key):
+        value = widgetsMap[key]
+        if isinstance(value, dict):
+            widgetsMap[key]["isBlock"] = True
         else:
-            path = widgetsMap[widget_id]
-            widgetsMap[widget_id] = {
+            widgetsMap[key] = {
                 "isBlock": True,
-                "path" : path
+                "path": value
             }
-    sp.write(read_data)
 
+    if widget_id == "all":
+        for key in widgetsMap:
+            block_one(key)
+    elif widget_id in widgetsMap:
+        block_one(widget_id)
+    sp.write(read_data)
+    
 def enableWidget(widget_id):
     sp = Store()
     read_data = sp.read()
-    if "widgets" not in read_data:
-        read_data["widgets"] = {}
+    if "widgets" not in read_data or not isinstance(read_data["widgets"], dict):
+        read_data["widgets"] = {}    
     widgetsMap = read_data["widgets"]
-    if widget_id in widgetsMap:
-        if isinstance(widgetsMap[widget_id], (dict)):
-            widgetsMap[widget_id]["isBlock"] = False
+    def unblock_one(key):
+        value = widgetsMap[key]
+        if isinstance(value, dict):
+            widgetsMap[key]["isBlock"] = False
         else:
-            path = widgetsMap[widget_id]
-            widgetsMap[widget_id] = {
+            widgetsMap[key] = {
                 "isBlock": False,
-                "path" : path
+                "path": value
             }
+    if widget_id == "all":
+        for key in widgetsMap:
+            unblock_one(key)
+    elif widget_id in widgetsMap:
+        unblock_one(widget_id)
     sp.write(read_data)
     
 #============================== device id ================================

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/task.py

@@ -118,6 +118,15 @@ def cmdWithWidgetName(name):
             return map[widget_id]["path"]
     return None
 
+def widgetIDWithWidgetName(name):
+    map = store.widgetMap()
+    for widget_id in map.keys():
+        if "name" not in map[widget_id]:
+            continue
+        if map[widget_id]["name"] == name and map[widget_id]["isBlock"] == False:
+            return widget_id
+    return None
+
 def executeLocalPython(taskUUID, cmd, param, timeout=3600):
     # # 检查代码更新
     # check_code_update()

{ryry_cli-2.100 → ryry_cli-3.0}/ryry/taskUtils.py

@@ -27,18 +27,6 @@ def taskDomainWithUUID(taskUUID):
         if taskUUID in task_config:
             return task_config[taskUUID]["domain"]
     return ""
-def appendTaskAndDomain(taskUUID, subDomain):
-    task_config = {}
-    if os.path.exists(task_config_file):
-        with open(task_config_file, 'r') as f:
-            task_config = json.load(f)
-    task_config[taskUUID] = {
-        "pts": calendar.timegm(time.gmtime()),
-        "domain": subDomain
-    }
-    task_config["last_task_pts"] = task_config[taskUUID]["pts"]
-    with open(task_config_file, 'w') as f:
-        json.dump(task_config, f)
     
 WECHAT_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=1b006560-7012-4bf0-8c5e-a23830bc0a0b"
 def uploadFile2Wechat(filepath):

{ryry_cli-2.100 → ryry_cli-3.0}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.100 → ryry_cli-3.0}/setup.py

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