ryry-cli 2.94__tar.gz → 2.96__tar.gz

{ryry_cli-2.94 → ryry_cli-2.96}/PKG-INFO

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

{ryry_cli-2.94 → ryry_cli-2.96}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="2.94"
-app_bulld_anchor="Noh_2025-03-10 19:34:06.015293"
+app_version="2.96"
+app_bulld_anchor="Noh_2025-03-20 18:02:55.610325"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-2.94 → ryry_cli-2.96}/ryry/main.py

@@ -95,9 +95,9 @@ def widget_status(stdscr, idx):
         end_args = ""
         if is_block:
             end_args = "[X]"
-        real_stdsrc(idx, 0, scr_str(f'{f"[{name} {version}]{it}{end_args} @ {max_task_number} ".ljust(maxJust)}'.ljust(ll*3-2)))
+        real_stdsrc(idx, 0, scr_str(f'{f"[{name} {version}] {it}{end_args} @ {max_task_number} ".ljust(maxJust)}'.ljust(ll*3-2)))
         idx+=1
-        real_stdsrc(idx, 0, scr_str(f'          {path}'.ljust(ll*3-2)))
+        real_stdsrc(idx, 0, scr_str(f'      {path}'.ljust(ll*3-2)))
         idx+=1
         real_stdsrc(idx, 0, scr_str(f' '.ljust(ll*3-2)))
         idx+=1

{ryry_cli-2.94 → ryry_cli-2.96}/ryry/ryry_service.py

@@ -152,7 +152,6 @@ class ryryPackageThread(Thread):
                     ryry_widget.UpdateWidgetFromPypi()
                 except Exception as ex:
                     print(f'update widget fail, {ex}')
-
                 # if platform.system() != 'Darwin':
                 #     try:
                 #         #update cli
@@ -207,6 +206,8 @@ 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")

{ryry_cli-2.94 → ryry_cli-2.96}/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.94 → ryry_cli-2.96}/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.94 → ryry_cli-2.96}/ryry/task.py

@@ -46,6 +46,12 @@ def cmdWithWidget(widget_id):
             return path
     return None
 
+def maxTaskNumberWithWidget(widget_id):
+    map = store.widgetMap()
+    if widget_id in map:
+        return map[widget_id].get("max_task_number", 1)
+    return 100
+
 def cmdWithWidgetName(name):
     map = store.widgetMap()
     for widget_id in map.keys():

{ryry_cli-2.94 → ryry_cli-2.96}/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.94 → ryry_cli-2.96}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.94 → ryry_cli-2.96}/setup.py

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