ryry-cli 2.75__tar.gz → 2.77__tar.gz

{ryry_cli-2.75 → ryry_cli-2.77}/PKG-INFO

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

ryry_cli-2.77/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.77"
+app_bulld_anchor="Noh_2024-12-27 15:57:32.610725"
+app_name="ryry-cli"

{ryry_cli-2.75 → ryry_cli-2.77}/ryry/ryry_server_socket.py

@@ -169,12 +169,13 @@ class RyryShortConnectThread(Thread):
 
     def run(self):
         print(f"   {self.name} start")
-        min_wait_time = 2
-        max_wait_time = 30
+        min_wait_time = 5
+        max_wait_time = 60
         wait_time = min_wait_time
-        consecutive_step = 2
+        consecutive_step = 10
         consecutive_failures = 0
         max_consecutive_failures = 10
+        last_check_time = 0
         
         while (self.is_running):
             try:
@@ -194,6 +195,15 @@ class RyryShortConnectThread(Thread):
                     if consecutive_failures >= max_consecutive_failures:
                         wait_time = min(max_wait_time, wait_time + consecutive_step)
                         consecutive_failures = 0
+                        
+                        
+                if calendar.timegm(time.gmtime()) - last_check_time > 600:
+                    last_check_time = calendar.timegm(time.gmtime())
+                    try:
+                        min_wait_time, max_wait_time, consecutive_step = ryry_webapi.TaskConfig()
+                    except:
+                        pass
+
             except Exception as ex:
                 taskUtils.taskPrint(None, f"{self.name} === exception : {ex}")
             time.sleep(wait_time)

{ryry_cli-2.75 → ryry_cli-2.77}/ryry/ryry_webapi.py

@@ -1,7 +1,5 @@
-import json, os
-import datetime
-import uuid, requests
-import calendar, time
+import json, os, locale, datetime, platform
+import uuid, requests, calendar, time
 
 from ryry import store 
 from ryry import utils 
@@ -36,11 +34,38 @@ def _aigc_post(func, params, files={}, timeout=10):
     return -1, "", ""
     
 #======================================== Task Function ==============================
+def ServerTaskConfig():
+    r1, r2, r3 = _aigc_post("aigc/task/config", {})
+    if r1 != 0:
+        raise Exception("")
+    
+    min_wait_time = r3["min_wait_time"]
+    max_wait_time = r3["max_wait_time"]
+    consecutive_step = r3["step"]
+    return min_wait_time, max_wait_time, consecutive_step
+
+GLOBAL_EXT_JSON = "{}"
 def _extend():
-    extInfo = store.readDeviceInfo()
-    extInfo["app"] = constant.app_name + " " + constant.app_version
-    extInfo["host"] = utils.get_hostname()
-    return json.dumps(extInfo)
+    global GLOBAL_EXT_JSON
+    if len(GLOBAL_EXT_JSON) < 10:
+        extInfo = store.readDeviceInfo()
+        extInfo["app"] = constant.app_name + " " + constant.app_version
+        extInfo["device"] = platform.system()
+        extInfo["device_version"] = platform.version()
+        extInfo["device_name"] = platform.node()
+        extInfo["device_model"] = platform.machine()
+
+        try:
+            extInfo["ip_address"] = requests.get('https://api.ipify.org').text
+        except Exception as e:
+            extInfo["ip_address"] = "unknown"
+
+        system_language, _ = locale.getdefaultlocale()
+        system_platform = platform.system().lower()
+        extInfo["language"] = system_language if system_language else "unknown"
+        extInfo["platform"] = system_platform if system_platform else "unknown"
+        GLOBAL_EXT_JSON = json.dumps(extInfo)
+    return GLOBAL_EXT_JSON
 
 def GetTask():
     widget_map = []

{ryry_cli-2.75 → ryry_cli-2.77}/ryry/upload.py

@@ -155,14 +155,14 @@ def getSubdomain(targetDomain):
     for ip in SUBDOMAIN.keys():
         for host_item in SUBDOMAIN[ip]:
             if targetDomain == host_item["readpath"]:
-                if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+                if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
                     return host_item
     return None
 
 def getFirstSupportSubdomain():
     for ip in SUBDOMAIN.keys():
         for host_item in SUBDOMAIN[ip]:
-            if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+            if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
                 return host_item
     return None
 

{ryry_cli-2.75 → ryry_cli-2.77}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.75 → ryry_cli-2.77}/setup.py

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

ryry_cli-2.75/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.75"
-app_bulld_anchor="Noh_2024-11-29 14:12:33.494076"
-app_name="ryry-cli"