ryry-cli 2.80__tar.gz → 2.82__tar.gz

{ryry_cli-2.80 → ryry_cli-2.82}/PKG-INFO

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

ryry_cli-2.82/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.82"
+app_bulld_anchor="Noh_2025-01-20 17:01:59.142246"
+app_name="ryry-cli"

{ryry_cli-2.80 → ryry_cli-2.82}/ryry/ryry_webapi.py

@@ -1,38 +1,41 @@
-import json, os, locale, datetime, platform
+import json, os, datetime
 import uuid, requests, calendar, time
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 from ryry import store 
 from ryry import utils 
 from ryry import taskUtils 
-from ryry import constant 
 
-def _aigc_post(func, params, files={}, timeout=10):
-    s = requests.session()
+def _domain_post(func, params, files={}, timeout=10, domain="api.dalipen.com"):
+    headers = {
+        'Connection': 'close',
+        'Usertoken': "0cce7cfe3629e16ee9b3ea8563305d3a15c524804da1861db07c2c867d79da63"
+    }
+    url = f"https://{domain}/{func}"
     try:
-        requests.adapters.DEFAULT_RETRIES = 2
-        s.keep_alive = False
-        s.headers.update({'Connection':'close'})
-        s.headers.update({'Usertoken':"0cce7cfe3629e16ee9b3ea8563305d3a15c524804da1861db07c2c867d79da63"})
-        if len(files) <= 0:
-            s.headers.update({'Content-Type':'application/json'})
-            res = s.post(url=f"https://api.dalipen.com/{func}", json=params, timeout=timeout, verify=False)
+        if not files:
+            headers['Content-Type'] = 'application/json'
+            res = requests.post(url, json=params, timeout=timeout, verify=False, headers=headers)
         else:
-            res = s.post(url=f"https://api.dalipen.com/{func}", data=params, files=files, timeout=timeout, verify=False)
+            res = requests.post(url, data=params, files=files, timeout=timeout, verify=False, headers=headers)
         if res.status_code == 200:
-            result_data = json.loads(res.content)
-            res.close()
-            if result_data["code"] == 0:
-                return 0, "", result_data["data"]
+            result_data = res.json()
+            if result_data.get("code") == 0:
+                return 0, "", result_data.get("data", "")
             else:
-                return result_data["code"], result_data["msg"], ""
-        else:
-            raise Exception(f'''request {func} status_code={res.status_code}''')
+                return result_data.get("code", -1), result_data.get("msg", "Unknown error"), ""
+        return -99, f"HTTP {res.status_code}: {res.text}", ""
+    except requests.RequestException as e:
+        return -99, f"request {func} RequestException!", ""
     except Exception as e:
-        return -1, str(e), ""
-    finally:
-        s.close()
-    return -1, "", ""
-    
+        return -99, f"request {func} Exception!", ""
+
+def _aigc_post(func, params, files={}, timeout=10):
+    status, msg, data = _domain_post(func, params, files, timeout, "api.dalipen.com")
+    if status != -99:
+        return status, msg, data
+    return _domain_post(func, params, files, timeout, "aigc.zjtemplate.com")
 #======================================== Task Function ==============================
 def ServerTaskConfig():
     r1, r2, r3 = _aigc_post("aigc/task/config", {})
@@ -44,29 +47,6 @@ def ServerTaskConfig():
     consecutive_step = r3["step"]
     return min_wait_time, max_wait_time, consecutive_step
 
-GLOBAL_EXT_JSON = "{}"
-def _extend():
-    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 = []
     map = store.widgetMap()
@@ -79,7 +59,7 @@ def GetTask():
     req = {
         "widget_map": json.dumps(widget_map),
         "limit": 1,
-        "extend": _extend()
+        "extend": store.extend()
     }
     r1, r2, r3 = _aigc_post("aigc/task/getTask", req)
     if r1 != 0:
@@ -286,7 +266,7 @@ def createTask(widget_name, params):
     req = {
         "widget_name": widget_name,
         "widget_data": json.dumps(params),
-        "extend": _extend()
+        "extend": json.dumps(store.extend())
     }
     r1, r2, r3 = _aigc_post("aigc/task/createTask", req)
     if r1 != 0:
@@ -335,4 +315,22 @@ def checkTask(checkUUID):
     elif r3["status"] == 2:
         return True, True, json.loads(r3["task_result"]), r3["progress"]
     elif r3["status"] == 3:
-        return True, False, r3["fail_reason"], r3["progress"]
+        return True, False, r3["fail_reason"], r3["progress"]
+    
+def multiCheckTask(checkUUIDs):
+    req = {
+        "task_uuids": checkUUIDs
+    }
+    r1, r2, r3 = _aigc_post("aigc/task/checkTasks", req)
+    result = []
+    if r1 != 0:
+        for checkUUID in checkUUIDs:
+            result.append([checkUUID, False, False, "server fail", 0])
+    for r3_item in r3:
+        if r3_item["status"] < 2:
+            result.append([r3_item["uuid"], False, False, "", r3_item["progress"]])
+        elif r3_item["status"] == 2:
+            result.append([r3_item["uuid"], True, True, json.loads(r3_item["task_result"]), r3_item["progress"]])
+        elif r3_item["status"] == 3:
+            result.append([r3_item["uuid"], True, False, r3_item["fail_reason"], r3_item["progress"]])
+    return result

{ryry_cli-2.80 → ryry_cli-2.82}/ryry/server_func.py

@@ -153,4 +153,16 @@ class AsyncTask:
             "success": success,
             "data": data,
             "progress": progress
-        }
+        }
+        
+    def multiCheck(self, taskUUIDs):
+        results = ryry_webapi.multiCheckTask(taskUUIDs)
+        json_results = {}
+        for [taskUUID, finish, success, data, progress] in results:
+            json_results[taskUUID] = {
+                "finish": finish,
+                "success": success,
+                "data": data,
+                "progress": progress
+            }
+        return json_results

{ryry_cli-2.80 → ryry_cli-2.82}/ryry/store.py

@@ -1,5 +1,5 @@
-import os
-import json
+import os, platform, json, requests, locale
+from ryry import constant 
 
 def singleton(cls):
     _instance = {}
@@ -127,19 +127,50 @@ def writeDeviceInfo(data):
     read_data = sp.read()
     read_data["deviceInfo"] = data
     sp.write(read_data)
+    extend()
     
-cache_device_info = None
-def readDeviceInfo():
-    global cache_device_info
-    if cache_device_info == None:
+GLOBAL_EXT_JSON = {}
+def extend():
+    global GLOBAL_EXT_JSON
+    if len(GLOBAL_EXT_JSON.keys()) < 3:
         sp = Store()
         read_data = sp.read()
-        if "deviceInfo" in read_data:
-            cache_device_info = read_data["deviceInfo"]
+        if "extend" in read_data:
+            GLOBAL_EXT_JSON = read_data["extend"]
+            if len(GLOBAL_EXT_JSON.keys()) < 3:
+                _genExtend()
         else:
-            cache_device_info = {}
-    return cache_device_info
+            _genExtend()
+    return GLOBAL_EXT_JSON
 
+def _genExtend():
+    sp = Store()
+    read_data = sp.read()
+    if "deviceInfo" in read_data:
+        extInfo = read_data["deviceInfo"]
+    else:
+        extInfo = {}
+    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"
+    #save
+    read_data["extend"] = extInfo
+    sp.write(read_data)
+    global GLOBAL_EXT_JSON
+    GLOBAL_EXT_JSON = extInfo   
+    
 def is_multithread():
     return get_multithread() > 1
 

{ryry_cli-2.80 → ryry_cli-2.82}/ryry/upload.py

@@ -160,12 +160,35 @@ def getSubdomain(targetDomain):
     return None
 
 def getFirstSupportSubdomain():
-    for ip in SUBDOMAIN.keys():
-        for host_item in SUBDOMAIN[ip]:
-            if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
-                return host_item
-    return None
-
+    def get_network_hash():
+        import socket
+        from hashlib import md5
+        local_ip = local_ip = socket.gethostbyname(socket.gethostname())
+        return md5(local_ip.encode('utf-8')).hexdigest()
+    network_hash = get_network_hash()  
+    def _getFirstSupportSubdomain():
+        for ip in SUBDOMAIN.keys():
+            for host_item in SUBDOMAIN[ip]:
+                if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
+                    return host_item
+        return None
+    from ryry import store
+    sp = store.Store()
+    read_data = sp.read()
+    firstSupportDomainConfig = read_data.get("firstSupportDomainConfig", {})
+    if len(firstSupportDomainConfig.keys()) < 1:
+        firstSupportDomainConfig = _getFirstSupportSubdomain()
+        firstSupportDomainConfig["hash"] = network_hash
+        read_data["firstSupportDomainConfig"] = firstSupportDomainConfig
+        sp.write(read_data)
+    else:
+        last_network_hash = firstSupportDomainConfig["hash"]
+        if last_network_hash != network_hash:
+            firstSupportDomainConfig = _getFirstSupportSubdomain()
+            firstSupportDomainConfig["hash"] = network_hash
+            read_data["firstSupportDomainConfig"] = firstSupportDomainConfig
+            sp.write(read_data)
+    return firstSupportDomainConfig
 
 def download(url, saveDir):
     import uuid, requests, os

{ryry_cli-2.80 → ryry_cli-2.82}/ryry/utils.py

@@ -164,7 +164,7 @@ def deviceInfo():
             handle = pynvml.nvmlDeviceGetHandleByIndex(i)
             data["gpu"]["list"].append(f"GPU{i}: {pynvml.nvmlDeviceGetName(handle)}")
             memInfo = pynvml.nvmlDeviceGetMemoryInfo(handle)
-            data["gpu"]["mem"].append(f"GPU{i}: total:{memInfo.total/M} M free:{memInfo.free/M} M")
+            data["gpu"]["mem"].append(f"GPU{i}: total:{(memInfo.total/G):.1f} G free:{(memInfo.free/G):.1f} G")
             
         pynvml.nvmlShutdown()
     except Exception as e:

{ryry_cli-2.80 → ryry_cli-2.82}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.80 → ryry_cli-2.82}/setup.py

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

ryry_cli-2.80/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.80"
-app_bulld_anchor="Noh_2025-01-14 11:20:59.630833"
-app_name="ryry-cli"