ryry-cli 2.13__tar.gz → 2.15__tar.gz

{ryry_cli-2.13/ryry_cli.egg-info → ryry_cli-2.15}/PKG-INFO

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

ryry_cli-2.15/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.15"
+app_bulld_number=215
+app_bulld_anchor="Noh_2024-06-14 17:53:27.638521"
+app_name="ryry-cli"

{ryry_cli-2.13 → ryry_cli-2.15}/ryry/ryry_server_socket.py

@@ -25,9 +25,9 @@ class RyryTaskExecutor(Thread):
     task_queue = None
     ttt = 0
     
-    def appendTask(self, data, timeout, callback):
+    def appendTask(self, data, callback):
         self.cur_counter+=1
-        self.task_queue.put([data, timeout, callback])
+        self.task_queue.put([data, callback])
         try:
             taskUUID = data["taskUUID"]
             taskUtils.taskPrint(taskUUID, f"{current_thread().name} === addQueue task : {taskUUID}")
@@ -52,11 +52,14 @@ class RyryTaskExecutor(Thread):
     def taskRunning(self):
         while self.is_running:
             try:
-                data, timeout, callback = self.task_queue.get()
+                data, callback = self.task_queue.get()
                 if data is None: 
                     break
                 try:
                     taskUUID = data["taskUUID"]
+                    timeout = 600
+                    if "timeout" in data:
+                        timeout = data["timeout"]
                     taskUtils.taskPrint(taskUUID, f"{current_thread().name} === receive task : {taskUUID}")
                     _appendTask(taskUUID)
                     is_ok, msg, result = task.runTask(data, timeout)
@@ -166,9 +169,9 @@ class RyryShortConnectThread(Thread):
         what_time = 2
         while (self.is_running):
             try:
-                datas, timeout = ryry_webapi.GetTask()
+                datas = ryry_webapi.GetTask()
                 for it in datas:
-                    self.executor.appendTask(it, timeout, self.taskCallback)
+                    self.executor.appendTask(it, self.taskCallback)
             except Exception as ex:
                 taskUtils.taskPrint(None, f"{self.name} === exception : {ex}")
             time.sleep(what_time)

{ryry_cli-2.13 → ryry_cli-2.15}/ryry/ryry_webapi.py

@@ -76,10 +76,11 @@ def GetTask():
             "taskUUID": it["task_uuid"],
             "config": it["config"],
             "data": it["data"],
+            "timeout": it["timeout"],
         })
     #Previous tasks may have failed due to network problems, so collect and resend
     retryLastTaskNotify()
-    return datas, 600
+    return datas
 
 TASK_NOTIFY_DATA = os.path.join(os.path.dirname(os.path.abspath(__file__)), f"task_notify_data.json")
 def saveTaskNotifyData(taskUUID, status, msg, dataStr):

{ryry_cli-2.13 → ryry_cli-2.15/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.13 → ryry_cli-2.15}/setup.py

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

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.13"
-app_bulld_number=213
-app_bulld_anchor="Noh_2024-06-14 14:07:27.352744"
-app_name="ryry-cli"