ryry-cli 6.11__tar.gz → 6.14__tar.gz

{ryry_cli-6.11/ryry_cli.egg-info → ryry_cli-6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 6.11
+Version: 6.14
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -16,7 +16,7 @@ Requires-Dist: uuid
 Requires-Dist: Image
 Requires-Dist: pillow
 Requires-Dist: psutil
-Requires-Dist: pynvml
+Requires-Dist: nvidia-ml-py
 Requires-Dist: requests_toolbelt
 Requires-Dist: fake_useragent
 Requires-Dist: gputil

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="6.11"
-app_bulld_anchor="Noh_2025-11-13 21:32:21.253519"
+app_version="6.14"
+app_bulld_anchor="Noh_2026-05-15 22:09:11.985350"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/ryry_server_socket.py

@@ -225,13 +225,13 @@ class RyryShortConnectThread(Thread):
 
     def run(self):
         print(f"   {self.name} start")
-        min_wait_time = 5
-        max_wait_time = 60
-        wait_time = min_wait_time
-        consecutive_step = 10
-        consecutive_failures = 0
-        max_consecutive_failures = 10
-        last_check_time = 0
+        min_wait_time = 5 #最小任务拉取间隔
+        max_wait_time = 60 #最大任务拉取间隔
+        wait_time = min_wait_time #当前任务拉取间隔
+        consecutive_step = 10 #连续失败次数增加的间隔
+        consecutive_failures = 0 #连续失败次数
+        max_consecutive_failures = 10 #最大连续失败次数
+        last_check_time = 0 #上次检查时间
         
         while (self.is_running):
             try:
@@ -244,10 +244,10 @@ class RyryShortConnectThread(Thread):
                 for it in map:
                     if isinstance(map[it], (dict)):
                         if map[it]["isBlock"] == False and self.executor.widgetHasPower(it):
-                            widget_list[it] = map[it]["version"]
+                            widget_list[it] = map[it].get("version", "0.0")
                     else:
                         if self.executor.widgetHasPower(it):
-                            widget_list[it] = map[it]["version"]
+                            widget_list[it] = map[it].get("version", "0.0")
                 datas = ryry_webapi.GetTask(widget_list)
                 for it in datas:
                     self.executor.appendTask(it, self.taskCallback)

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/script_template/main.py

@@ -20,6 +20,7 @@ def main(cmd_opts):
     result = runTask(data)
     with open(cmd_opts.out, 'w', encoding='utf-8') as f:
         json.dump(result, f)
+    os._exit(0)
 
 if __name__ == '__main__':
     main(cmd_opts)

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/server_func.py

@@ -49,7 +49,6 @@ class TaskThread(Thread):
                     self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
                     self.params["task_id"] = self.checkUUID
                     executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
-                    print(f"============={result_obj}")
                     if executeSuccess and result_obj["status"] == 0:
                         self.call_back(self.idx, result_obj["result"])
                     return

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/shared_memory.py

@@ -541,7 +541,6 @@ class SharedMemoryService:
         """获取最大计数器（只读操作）"""
         data = self._read_data()
         max_counter = data.get("max_counter", 1)
-        print(f"get_max_counter = {max_counter}")
         return max_counter
     
     def set_cur_counter(self, cur_counter: int):
@@ -556,7 +555,6 @@ class SharedMemoryService:
         """获取当前计数器（只读操作）"""
         data = self._read_data()
         cur_counter = data.get("cur_counter", 0)
-        print(f"get_cur_counter = {cur_counter}")
         return cur_counter
     
     def increment_cur_counter(self) -> int:

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/store.py

@@ -177,7 +177,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 6.11":
+            elif read_data["extend"].get("app", "") == "ryry-cli 6.14":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/taskUtils.py

@@ -235,6 +235,7 @@ def notifyCounterIfNeed():
                                 >失败<font color=\"warning\">{f_cnt}</font>个"
             }
         })
+        os.remove(task_counter_file)
         
         # import subprocess, platform
         # #darwin Command Line cannot create pyplot gui because not application with gui

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/upload.py

@@ -103,6 +103,9 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
                                     needTranscode=needTranscode, 
                                     needAddtionUrl=True) #mecord会使用签名信息，强制needAddtionUrl
     
+    if isMekoConfig(parsed_domain):
+        return uploadToMeko(src, ext=ext)
+    
     oss_config = getOssConfig(parsed_domain)
     if oss_config:
         new_file_name = ''.join(str(uuid.uuid4()).split('-'))
@@ -150,6 +153,17 @@ def parseDomainAndPath(targetDomain):
     
     return targetDomain, ""
 
+def uploadToMeko(file_path: str, ext: str = ".jpg") -> str:
+    import requests
+    url = "https://api.mekoapp.com/upload/create"
+    
+    with open(file_path, "rb") as f:
+        files = {"file": (file_path.split("/")[-1], f)}
+        data = {"ext": ext}
+        response = requests.post(url, files=files, data=data)
+    response.raise_for_status()
+    return response.json()["url"]
+
 def uploadToOss(file, new_file_name, oss_config, upload_path=""):
     import hashlib
     import hmac
@@ -339,6 +353,7 @@ DOMAIN_CONFIG = {
     "oss.zjtemplate.com": {"type": "oss", "config": oss_template_config},
     "*.mecoai.cn": {"type": "mecord-cli", "config": {}},
     "*.mecordai.com": {"type": "mecord-cli", "config": {}},
+    "*.mekoapp.com": {"type": "", "config": {}},
 }
 
 FTP_REPLACEMENT = {
@@ -374,6 +389,12 @@ def isMecordConfig(targetDomain):
         return True
     return False
 
+def isMekoConfig(targetDomain):
+    config = get_domain_config(targetDomain)
+    if config:
+        return True
+    return False
+
 def getFtpConfig(targetDomain):
     config = get_domain_config(targetDomain)
     if config and config["type"] == "ftp":

{ryry_cli-6.11 → ryry_cli-6.14}/ryry/utils.py

@@ -6,7 +6,10 @@ import sys
 import requests
 from io import BytesIO
 import psutil
-import pynvml
+try:
+    import pynvml
+except ImportError:
+    pynvml = None
 from datetime import datetime, timedelta
 import http
 import json
@@ -167,6 +170,8 @@ def deviceInfo():
         "host_name": hostname
     }
     try:
+        if pynvml is None:
+            raise ImportError("pynvml/nvidia-ml-py not available")
         pynvml.nvmlInit()
         gpuCount = pynvml.nvmlDeviceGetCount()
         data["gpu"]["count"] = gpuCount

{ryry_cli-6.11 → ryry_cli-6.14/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 6.11
+Version: 6.14
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -16,7 +16,7 @@ Requires-Dist: uuid
 Requires-Dist: Image
 Requires-Dist: pillow
 Requires-Dist: psutil
-Requires-Dist: pynvml
+Requires-Dist: nvidia-ml-py
 Requires-Dist: requests_toolbelt
 Requires-Dist: fake_useragent
 Requires-Dist: gputil

{ryry_cli-6.11 → ryry_cli-6.14}/ryry_cli.egg-info/requires.txt

@@ -3,7 +3,7 @@ uuid
 Image
 pillow
 psutil
-pynvml
+nvidia-ml-py
 requests_toolbelt
 fake_useragent
 gputil

{ryry_cli-6.11 → ryry_cli-6.14}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "6.11"
+ryry_version = "6.14"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -63,7 +63,7 @@ setuptools.setup(
         'Image',
         'pillow',
         'psutil',
-        'pynvml',
+        'nvidia-ml-py',
         'requests_toolbelt',
         'fake_useragent',
         'gputil',