ryry-cli 2.35__tar.gz → 2.37__tar.gz

{ryry_cli-2.35 → ryry_cli-2.37}/PKG-INFO

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

ryry_cli-2.37/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.37"
+app_bulld_number=237
+app_bulld_anchor="Noh_2024-08-23 10:43:12.640901"
+app_name="ryry-cli"

{ryry_cli-2.35 → ryry_cli-2.37}/ryry/ryry_webapi.py

@@ -198,7 +198,7 @@ def uploadWidget(widget_id, name, whl, ext, version):
         }
         r1, r2, r3 = _aigc_post("aigc/task/publishWidget", params, files=files, timeout=100)
     if r1 != 0:
-        raise Exception(f"upload fail!, reason={r2}")
+        raise Exception(f"upload widget fail!, reason={r2}")
     return r3
 
 def CreateWidgetUUID():

{ryry_cli-2.35 → ryry_cli-2.37}/ryry/ryry_widget.py

@@ -169,7 +169,7 @@ def addWidgetToEnv(root, mute=False):
         root = os.path.join(package.location, name.replace("-", "_"))
     except:
         pass
-
+    print(root)
     if CheckWidgetDataInPath(root) == False:
         return
     data = GetWidgetConfig(root)
@@ -424,5 +424,5 @@ def installWidget(name):
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)
     else:
-        print(f"本地 {local_version} 版本较高，请卸载后再安装")
+        print(f"本地已是最新版本 {remote_version}")
         

{ryry_cli-2.35 → ryry_cli-2.37}/ryry/server_func.py

@@ -56,7 +56,7 @@ class TaskThread(Thread):
                 self.checking = True
                 self.checkCount = 0
                 time.sleep(5)
-                while self.checking and self.checkCount < 200:
+                while self.checking and self.checkCount < 400:
                     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:
@@ -65,7 +65,7 @@ class TaskThread(Thread):
                             self.call_back(self.idx, data)
                             return
                     self.checkCount += 1
-                    time.sleep(3)
+                    time.sleep(5)
         else:
             print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
@@ -75,11 +75,12 @@ class TaskThread(Thread):
             ryry_webapi.TaskCancel(self.checkUUID)
         
 class Task:
+    import urllib3
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     thread_data = {}
-
+    
     def __init__(self, func: str, multi_params: list[dict], fromUUID=""):
-        urllib3.disable_warnings()
-        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+        self.thread_data = {}
         
         realTaskUUID = fromUUID
         if realTaskUUID == None or len(realTaskUUID) <= 0:

{ryry_cli-2.35 → ryry_cli-2.37}/ryry/taskUtils.py

@@ -99,8 +99,8 @@ def _uploadLog(taskUUID):
 def notifyTaskFail(taskUUID, reason):
     try:
         real_reason = ""
-        if len(reason) > 610:
-            real_reason = f"{reason[0:300]}\n...\n{reason[len(reason)-300:]}"
+        if len(reason) > 2010:
+            real_reason = f"{reason[0:1000]}\n...\n{reason[len(reason)-1000:]}"
         else:
             real_reason = reason
         notifyWechatRobot({

{ryry_cli-2.35 → ryry_cli-2.37}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.35 → ryry_cli-2.37}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.35"
+ryry_version = "2.37"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")

ryry_cli-2.35/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.35"
-app_bulld_number=235
-app_bulld_anchor="Noh_2024-08-15 19:33:09.127913"
-app_name="ryry-cli"