ryry-cli 2.16__tar.gz → 2.18__tar.gz

{ryry_cli-2.16/ryry_cli.egg-info → ryry_cli-2.18}/PKG-INFO

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

ryry_cli-2.18/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.18"
+app_bulld_number=218
+app_bulld_anchor="Noh_2024-06-26 10:19:56.928179"
+app_name="ryry-cli"

{ryry_cli-2.16 → ryry_cli-2.18}/ryry/ryry_webapi.py

@@ -30,14 +30,6 @@ def _aigc_post(func, params, files={}, timeout=10):
         else:
             raise Exception(f'''request {func} status_code={res.status_code}''')
     except Exception as e:
-        taskUtils.taskPrint(None, f'''=============== ryry {func} server error {datetime.datetime.now().strftime('%Y_%m_%d_%H_%M_%S')} ===============
-url={func}
-
-req=
-{params}
-exception={e}
-===============
-''')
         return -1, str(e), ""
     finally:
         s.close()

{ryry_cli-2.16 → ryry_cli-2.18}/ryry/ryry_widget.py

@@ -391,6 +391,8 @@ def UpdateWidgetFromPypi():
                     py_package = data["py_package"]
                     widgetid, remote_version, package_url = ryry_webapi.findWidget(py_package)
                     local_version = _local_package_version(py_package)
+                    if len(local_version) <= 0:
+                        continue
                     if compare_versions(remote_version, local_version) > 0:
                         #update
                         pipReInstall(py_package, package_url)

{ryry_cli-2.16 → ryry_cli-2.18}/ryry/server_func.py

@@ -28,6 +28,8 @@ class TaskThread(Thread):
         self.total = total
         self.func = func
         self.checkUUID = None
+        self.checking = False
+        self.checkCount = 0
         self.params = params
         self.call_back = callback
         if self.call_back == None:
@@ -39,19 +41,19 @@ class TaskThread(Thread):
         if len(self.func) > 0:
             self.checkUUID = ryry_webapi.createTask(self.func, self.params)
             print("")
-            checking = True
-            checkCount = 0
+            self.checking = True
+            self.checkCount = 0
             time.sleep(5)
-            while checking or checkCount > 100:
+            while self.checking and self.checkCount < 200:
                 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:
-                    checking = False
+                    self.checking = False
                     if success:
                         self.call_back(self.idx, data)
                         return
-                checkCount += 1
-                time.sleep(2)
+                self.checkCount += 1
+                time.sleep(3)
         else:
             print(f"widget {self.func} not found")
         self.call_back(self.idx, None)
@@ -81,6 +83,7 @@ class Task:
                 "result" : None
             }
             idx+=1
+            time.sleep(1)
         
     def call(self):
         for t in self.thread_data.keys():

{ryry_cli-2.16 → ryry_cli-2.18/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.16 → ryry_cli-2.18}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.16"
+ryry_version = "2.18"
 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.16/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.16"
-app_bulld_number=216
-app_bulld_anchor="Noh_2024-06-17 09:53:15.110700"
-app_name="ryry-cli"