ryry-cli 4.17__tar.gz → 4.19__tar.gz

{ryry_cli-4.17/ryry_cli.egg-info → ryry_cli-4.19}/PKG-INFO

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

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.17"
-app_bulld_anchor="Noh_2025-07-23 11:00:45.076043"
+app_version="4.19"
+app_bulld_anchor="Noh_2025-07-23 18:25:48.042147"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/daemon_base.py

@@ -5,6 +5,7 @@ import time
 import signal
 import threading
 from typing import Optional, Dict, Any
+from ryry import ryry_webapi
 
 class SimpleDaemonBase:
     """
@@ -223,6 +224,9 @@ class SimpleDaemonBase:
             
             # 主循环
             self.running = True
+            last_status_report_time = 0  # 上次状态上报时间
+            status_report_interval = 60  # 状态上报间隔（秒）
+            
             while self.running:
                 try:
                     # 处理命令
@@ -231,6 +235,12 @@ class SimpleDaemonBase:
                     # 执行循环函数
                     self.loop_function()
                     
+                    # 每分钟报告一次状态
+                    current_time = time.time()
+                    if current_time - last_status_report_time >= status_report_interval:
+                        ryry_webapi.widgetStatusReport(self.widget_id, self.health_check())
+                        last_status_report_time = current_time
+                    
                     time.sleep(1)
                 except KeyboardInterrupt:
                     print(f"【{self.widget_name}】收到KeyboardInterrupt", file=sys.stderr)

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/main.py

@@ -329,7 +329,7 @@ def widget():
             if is_block:
                 end_args = " [X]"
             if daemon_enabled:
-                end_args += " [支持后台运行]"
+                end_args += " [D]"
             ss = f"{it}{end_args}"
             if showStatus in ["disable", "enable"]:
                 if is_block and showStatus == "disable":

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/ryry_webapi.py

@@ -1,5 +1,8 @@
 import json, os, datetime
 import uuid, requests, calendar, time
+import urllib3
+urllib3.disable_warnings()
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 from urllib.parse import urlparse, urlunparse
@@ -332,6 +335,16 @@ def upload(localFilePath, ext, keepItAlways=False):
         pass
     raise Exception("all upload target is fail!")
 
+def widgetStatusReport(widget_id, data):
+    r1, r2, r3 = _aigc_post("aigc/task/widgetStatus", {
+        "data" : data,
+        "widget_id" : widget_id,
+        "extend": store.extend()
+    })
+    if r1 != 0:
+        raise Exception(f"report widget status fail!, reason={r2}")
+    return r3
+
 def uploadWidget(widget_id, name, whl, ext, version):
     with open(whl, "rb") as f:
         files = { 'file':f }

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/shared_memory.py

@@ -445,7 +445,6 @@ class SharedMemoryService:
                 json.dump(data, f, indent=2, ensure_ascii=False)
                 f.flush()
                 os.fsync(f.fileno())  # 确保数据写入磁盘
-            
             # 原子性地替换文件
             os.replace(temp_file, self.data_file)
         except Exception as e:

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 4.17":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.19":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.17 → ryry_cli-4.19}/ryry/upload.py

@@ -106,7 +106,7 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     if ftp_config:
         return ftpUpload(src, file_name, ftp_config, upload_path)
     
-    if "mnt/NAS/mcn" in upload_path:
+    if "mnt/NAS/mcn" in upload_path or "aigc_output/" in targetDomain:
         ftp_config = getFtpConfig("183.6.90.205")
         return ftpUpload(src, file_name, ftp_config, upload_path)
     elif (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
@@ -114,7 +114,6 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
         ftp_config = getFtpConfig("183.6.90.205")
         return ftpUpload(src, file_name, ftp_config, upload_path)
        
-    
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, keepItAlways)
 

{ryry_cli-4.17 → ryry_cli-4.19/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.17 → ryry_cli-4.19}/setup.py

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