ryry-cli 2.95__tar.gz → 2.97__tar.gz

{ryry_cli-2.95 → ryry_cli-2.97}/PKG-INFO

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

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="2.95"
-app_bulld_anchor="Noh_2025-03-11 16:13:17.594374"
+app_version="2.97"
+app_bulld_anchor="Noh_2025-04-03 13:56:32.263867"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/ryry_server_socket.py

@@ -1,19 +1,13 @@
-import os, time, json
+import os, time, json, calendar
 from urllib.parse import *
 import threading
 from datetime import datetime, timedelta
-import calendar
 from threading import Thread, current_thread, Lock
 import uuid
 import queue
 import subprocess, platform
 
-from ryry import store
-from ryry import ryry_webapi
-from ryry import task 
-from ryry import constant 
-from ryry import utils
-from ryry import taskUtils
+from ryry import store, ryry_widget, ryry_webapi, task, constant, utils, taskUtils
 
 class RyryTaskExecutor(Thread):
     THEADING_LIST = []
@@ -189,11 +183,43 @@ class RyryShortConnectThread(Thread):
         self.name = f"ShortConnect"
         self.is_running = True
         self.executor = executor
+        self.last_check_time = calendar.timegm(time.gmtime())
         self.start()
     
     def taskCallback(self, taskUUID, is_ok, msg, result):
         ryry_webapi.TaskNotify(taskUUID, is_ok, msg, result)
 
+    def checkWidgetVersion(self):
+        if calendar.timegm(time.gmtime()) - self.last_check_time > 300:
+            self.last_check_time = calendar.timegm(time.gmtime())
+            try:
+                #update widget
+                ryry_widget.UpdateWidgetFromPypi()
+            except Exception as ex:
+                print(f'update widget fail, {ex}')
+
+        # if platform.system() != 'Darwin':
+        #     try:
+        #         #update cli
+        #         remote_version = ryry_widget._remote_package_version("ryry-cli")
+        #         simple = "https://pypi.python.org/simple/"
+        #         local_version, local_path = ryry_widget._local_package_info("ryry-cli")
+        #         if ryry_widget.compare_versions(remote_version, local_version) > 0:
+        #             print("start update progress...")
+        #             utils.begin_restart("auto upgrade ryry-cli", True, simple)
+        #             device_id = utils.generate_unique_id()
+        #             machine_name = socket.gethostname()
+        #             ver = get_distribution("ryry-cli").version
+        #             taskUtils.notifyWechatRobot({
+        #                 "msgtype": "text",
+        #                 "text": {
+        #                     "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
+        #                 }
+        #             })
+        #             break
+        #     except Exception as ex:
+        #         print(f'update ryry-cli fail, {ex}')
+
     def run(self):
         print(f"   {self.name} start")
         min_wait_time = 5
@@ -243,6 +269,9 @@ class RyryShortConnectThread(Thread):
             except Exception as ex:
                 taskUtils.taskPrint(None, f"{self.name} === exception : {ex}")
             time.sleep(wait_time)
+            if self.executor.isWorking() == False:
+                #自动更新widget
+                self.checkWidgetVersion()
             
         print(f"   {self.name} stop")
 

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/ryry_service.py

@@ -76,7 +76,6 @@ class ryryService:
         self.THEADING_LIST.append(executor)
         self.THEADING_LIST.append(TaskConnector.RyryShortConnectThread(executor))
         self.THEADING_LIST.append(ryryStateThread())
-        self.THEADING_LIST.append(ryryPackageThread())
         #3: service step
         while (os.path.exists(stop_file) == False):
             time.sleep(10)
@@ -122,64 +121,6 @@ class ryryService:
             time.sleep(1)
         print("ryryService has ended!")
     
-class ryryPackageThread(Thread):
-    def __init__(self):
-        super().__init__()
-        self.name = f"ryryPackageThread"
-        if platform.system() == 'Windows':
-            self.time_task_file = os.path.join(constant.base_path, "update_ryry.bat")
-        elif platform.system() == 'Linux' or platform.system() == 'Darwin':
-            self.time_task_file = os.path.join(constant.base_path, "update_ryry.sh")
-        if os.path.exists(self.time_task_file):
-            os.remove(self.time_task_file)
-        self.last_check_time = calendar.timegm(time.gmtime())
-        self.start()
-    def getCommandResult(self, cmd):
-        try:
-            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-            if result.returncode == 0:
-                return result.stdout.decode(encoding="utf8", errors="ignore").replace("\n","").strip()
-        except subprocess.CalledProcessError as e:
-            print(f"getCommandResult fail {e}")
-        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:
-                self.last_check_time = calendar.timegm(time.gmtime())
-                try:
-                    #update widget
-                    ryry_widget.UpdateWidgetFromPypi()
-                except Exception as ex:
-                    print(f'update widget fail, {ex}')
-
-                # if platform.system() != 'Darwin':
-                #     try:
-                #         #update cli
-                #         remote_version = ryry_widget._remote_package_version("ryry-cli")
-                #         simple = "https://pypi.python.org/simple/"
-                #         local_version, local_path = ryry_widget._local_package_info("ryry-cli")
-                #         if ryry_widget.compare_versions(remote_version, local_version) > 0:
-                #             print("start update progress...")
-                #             utils.begin_restart("auto upgrade ryry-cli", True, simple)
-                #             device_id = utils.generate_unique_id()
-                #             machine_name = socket.gethostname()
-                #             ver = get_distribution("ryry-cli").version
-                #             taskUtils.notifyWechatRobot({
-                #                 "msgtype": "text",
-                #                 "text": {
-                #                     "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
-                #                 }
-                #             })
-                #             break
-                #     except Exception as ex:
-                #         print(f'update ryry-cli fail, {ex}')
-            time.sleep(10)
-        print(f"   PackageChecker stop")
-        notify_other_stoped() #because other thread is waiting some signal to close
-    def markStop(self):
-        print(f"   PackageChecker waiting stop")
-
 class ryryStateThread(Thread):
     def __init__(self):
         super().__init__()
@@ -207,9 +148,12 @@ class ryryStateThread(Thread):
                                     os.remove(os.path.join(constant.base_path, file))
                             if root != files:
                                 break
+                #更新机器性能
+                store.writeDeviceInfo(utils.deviceInfo())
             except:
                 time.sleep(60)
         print(f"   StateChecker stop")
+        notify_other_stoped() #because other thread is waiting some signal to close
     def markStop(self):
         print(f"   StateChecker waiting stop")
         

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/ryry_webapi.py

@@ -176,6 +176,15 @@ def TaskCancel(taskUUID):
         return False
     return True
 
+def multiTaskCancel(checkUUIDs):
+    req = {
+        "task_uuids": checkUUIDs
+    }
+    r1, r2, r3 = _aigc_post("aigc/task/taskCancels", req)
+    if r1 != 0:
+        return False
+    return True
+
 def _upload(localFilePath, ext, keep_it_always=False):
     with open(localFilePath, "rb") as f:
         files = { 'file':f }

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/server_func.py

@@ -143,6 +143,10 @@ class AsyncTask:
         ryry_webapi.TaskCancel(taskUUID if taskUUID else self.checkUUID)
         return True
     
+    def multiCancel(self, taskUUIDs):
+        ryry_webapi.multiTaskCancel(taskUUIDs)
+        return True
+    
     def check(self, taskUUID=None):
         finish, success, data, progress = ryry_webapi.checkTask(taskUUID if taskUUID else self.checkUUID)
         return {

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/task.py

@@ -5,10 +5,66 @@ import sys
 import signal
 import subprocess, multiprocessing
 from threading import Thread, current_thread, Lock
+import xmlrpc.client
 
 from ryry import ryry_webapi,store,taskUtils,utils,constant
 from pathlib import Path
 
+# _rpc_server_process = None
+# _rpc_port = 8000
+# _rpc_server_lock = Lock()
+
+# def stop_rpc_server():
+#     global _rpc_server_process
+#     with _rpc_server_lock:
+#         if _rpc_server_process is not None:
+#             try:
+#                 _rpc_server_process.terminate()
+#                 _rpc_server_process.wait(timeout=5)
+#             except:
+#                 _rpc_server_process.kill()
+#             _rpc_server_process = None
+
+# def restart_rpc_server():
+#     stop_rpc_server()
+#     ensure_rpc_server_running()
+
+# def ensure_rpc_server_running():
+#     global _rpc_server_process
+#     with _rpc_server_lock:
+#         if _rpc_server_process is None or _rpc_server_process.poll() is not None:
+#             backend_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'backend.py')
+#             _rpc_server_process = subprocess.Popen([sys.executable, backend_path])
+#             time.sleep(2)  # 等待服务器启动
+            
+#             # 检查服务器是否成功启动
+#             try:
+#                 client = xmlrpc.client.ServerProxy(f'http://localhost:{_rpc_port}')
+#                 client.initialize_model()
+#             except:
+#                 stop_rpc_server()
+#                 raise Exception("RPC server failed to start")
+
+# def check_code_update():
+#     """检查代码是否有更新，如果有更新则重启服务"""
+#     backend_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'backend.py')
+#     current_mtime = os.path.getmtime(backend_path)
+    
+#     # 获取上次记录的修改时间
+#     last_mtime_file = os.path.join(os.path.dirname(backend_path), '.last_mtime')
+#     last_mtime = 0
+#     if os.path.exists(last_mtime_file):
+#         with open(last_mtime_file, 'r') as f:
+#             last_mtime = float(f.read().strip() or 0)
+    
+#     # 如果文件被修改，重启服务
+#     if current_mtime > last_mtime:
+#         print("Detected code update, restarting RPC server...")
+#         restart_rpc_server()
+#         # 更新最后修改时间
+#         with open(last_mtime_file, 'w') as f:
+#             f.write(str(current_mtime))
+
 def runTask(it, timeout):
     start_time = calendar.timegm(time.gmtime())
     taskUUID = it["taskUUID"]
@@ -63,6 +119,16 @@ def cmdWithWidgetName(name):
     return None
 
 def executeLocalPython(taskUUID, cmd, param, timeout=3600):
+    # # 检查代码更新
+    # check_code_update()
+    
+    # # 确保RPC服务器运行
+    # ensure_rpc_server_running()
+    
+    # # 添加RPC服务器信息到环境变量
+    env = os.environ.copy()
+    # env['RPC_SERVER_PORT'] = str(_rpc_port)
+    
     inputArgs = os.path.join(constant.base_path, f"{taskUUID}.in")
     if os.path.exists(inputArgs):
         os.remove(inputArgs)
@@ -84,8 +150,8 @@ def executeLocalPython(taskUUID, cmd, param, timeout=3600):
     process = None
     try:
         if timeout == 0:
-            timeout = 60*30 #max half hour expire time
-        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            timeout = 60*30
+        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
         timeout_killprocess(process, timeout)
         output, error = process.communicate()
         if process.returncode == 0:

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/taskUtils.py

@@ -40,7 +40,7 @@ def appendTaskAndDomain(taskUUID, subDomain):
     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=f40c5fb0-2734-48b0-a2d0-0faedf7dd2e4"
+WECHAT_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=1b006560-7012-4bf0-8c5e-a23830bc0a0b"
 def uploadFile2Wechat(filepath):
     real_robot_url = WECHAT_URL
     params = parse.parse_qs( parse.urlparse( real_robot_url ).query )

{ryry_cli-2.95 → ryry_cli-2.97}/ryry/utils.py

@@ -139,15 +139,24 @@ def deviceInfo():
         cpu_freq = psutil.cpu_freq().max / 1000
     except:
         pass
+    
+    virtual_mem = psutil.virtual_memory()
+    disk = psutil.disk_usage("/")
     data = {
         "cpu": {
             "logical_count" : psutil.cpu_count(),
             "count" : psutil.cpu_count(logical=False),
             "max_freq" : f"{cpu_freq} GHz",
         },
+        "disk": {
+            "total": f"{(disk.total / G):.1f} G",
+            "used": f"{(disk.used / G):.1f} G",
+            "free": f"{(disk.free / G):.1f} G",
+            "percent": f"{disk.percent}%"
+        },
         "memory": {
-            "total" : f"{(psutil.virtual_memory().total/G):.1f} G",
-            "free" : f"{(psutil.virtual_memory().free/G):.1f} G"
+            "total": f"{(virtual_mem.total / G):.1f} G",
+            "free": f"{(virtual_mem.free / G):.1f} G"
         },
         "gpu": {
             "count" : 0,

{ryry_cli-2.95 → ryry_cli-2.97}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.95 → ryry_cli-2.97}/setup.py

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