ryry-cli 2.36__tar.gz → 2.39__tar.gz

{ryry_cli-2.36 → ryry_cli-2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.36
+Version: 2.39
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -19,6 +19,7 @@ Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
 Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil

ryry_cli-2.39/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.39"
+app_bulld_number=239
+app_bulld_anchor="Noh_2024-08-26 19:53:13.939259"
+app_name="ryry-cli"

{ryry_cli-2.36 → ryry_cli-2.39}/ryry/ryry_server_socket.py

@@ -170,7 +170,7 @@ class RyryShortConnectThread(Thread):
     def run(self):
         print(f"   {self.name} start")
         min_wait_time = 2
-        max_wait_time = 10
+        max_wait_time = 30
         wait_time = min_wait_time
         consecutive_step = 2
         consecutive_failures = 0

{ryry_cli-2.36 → ryry_cli-2.39}/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.36 → ryry_cli-2.39}/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.36 → ryry_cli-2.39}/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)

{ryry_cli-2.36 → ryry_cli-2.39}/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.36 → ryry_cli-2.39}/ryry/upload.py

@@ -160,11 +160,9 @@ def download(url, saveDir):
         return None
     try:
         name = ''.join(str(uuid.uuid4()).split('-'))
-        ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
-        savePath = os.path.join(saveDir, f"{name}{ext}")
         
         if url.startswith("ftp"):
-            import ftplib
+            import ftplib, random
             parsed_url = urlparse(url)  
             host = parsed_url.hostname
             if host in SUBDOMAIN:
@@ -177,8 +175,21 @@ def download(url, saveDir):
                 ftp.login(username, password)  
             
                 remote_filepath = parsed_url.path[1:]
-                with open(savePath, 'wb') as f:  
-                    ftp.retrbinary(f'RETR {remote_filepath}', f.write)  
+                if "." in urlparser.urlparse(url).path:
+                    ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
+                    savePath = os.path.join(saveDir, f"{name}{ext}")
+                    with open(savePath, 'wb') as f:  
+                        ftp.retrbinary(f'RETR {remote_filepath}', f.write)
+                else:
+                    if remote_filepath[-1:] != "/":
+                        remote_filepath += "/"
+                    ftp.cwd(remote_filepath)
+                    files = ftp.nlst()
+                    if files:
+                        random_file = random.choice(files)
+                        savePath = os.path.join(saveDir, f"{name}_{random_file}")
+                        with open(savePath, 'wb') as f:  
+                            ftp.retrbinary(f'RETR {random_file}', f.write)  
                 ftp.quit()  
             else:
                 print(f"download fail: domain {host} not support")
@@ -205,4 +216,4 @@ def download(url, saveDir):
     return None
 
 # url = upload("D:\\0505.mp4", "111", 300)
-# download(url, "D:\\")
+# download("ftp://192.168.3.220/1TB01/data/mcn/digital_female_2", "D:\\")

{ryry_cli-2.36 → ryry_cli-2.39}/ryry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.36
+Version: 2.39
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -19,6 +19,7 @@ Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
 Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil

{ryry_cli-2.36 → ryry_cli-2.39}/ryry_cli.egg-info/requires.txt

@@ -6,6 +6,7 @@ psutil
 pynvml
 requests_toolbelt
 matplotlib
+fake_useragent
 ping3
 piexif
 gputil

{ryry_cli-2.36 → ryry_cli-2.39}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.36"
+ryry_version = "2.39"
 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")
@@ -57,6 +57,7 @@ setuptools.setup(
         'pynvml',
         'requests_toolbelt',
         'matplotlib',
+        'fake_useragent',
         'ping3',
         'piexif',
         'gputil',

ryry_cli-2.36/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.36"
-app_bulld_number=236
-app_bulld_anchor="Noh_2024-08-15 19:46:31.832917"
-app_name="ryry-cli"