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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.18
+Version: 2.20
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -15,7 +15,6 @@ Requires-Dist: requests
 Requires-Dist: uuid
 Requires-Dist: Image
 Requires-Dist: pillow
-Requires-Dist: protobuf
 Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
@@ -28,7 +27,6 @@ Requires-Dist: setuptools
 Requires-Dist: twine
 Requires-Dist: python-crontab
 Requires-Dist: urllib3
-Requires-Dist: requests_toolbelt
 
 ryry Python Tool
 ===============================================

ryry_cli-2.20/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.20"
+app_bulld_number=220
+app_bulld_anchor="Noh_2024-07-18 18:44:35.929214"
+app_name="ryry-cli"

{ryry_cli-2.18 → ryry_cli-2.20}/ryry/ryry_server_socket.py

@@ -96,7 +96,7 @@ class RyryTaskExecutor(Thread):
         self.is_running = False
         print(f"   {self.name} waiting stop")
         for _ in range(self.max_counter*2):
-            self.task_queue.put([None, -1, None])
+            self.task_queue.put([None, None])
         print(f"   {self.name} stop")
 
 lock = Lock()

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

@@ -367,8 +367,8 @@ def widgetInstallNotify(widgetName, newver):
 
 def pipReInstall(name, url):
     if name:
-        subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-        subprocess.run(f"pip3 uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"ryry widget install {name}", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"sudo ryry widget install {name}", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     subprocess.run(f"pip install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
         stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     subprocess.run(f"pip3 install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
@@ -386,11 +386,13 @@ def UpdateWidgetFromPypi():
         path = os.path.dirname(path)
         if is_block == False and os.path.exists(path):
             data = GetWidgetConfig(path)
-            if "py_package" in data and len(data["py_package"]) > 0:
+            if "name" in data and len(data["name"]) > 0:
                 try:
-                    py_package = data["py_package"]
+                    py_package = data["name"]
+                    local_version = data.get("version", "")
                     widgetid, remote_version, package_url = ryry_webapi.findWidget(py_package)
-                    local_version = _local_package_version(py_package)
+                    if len(local_version) <= 0:
+                        local_version = _local_package_version(py_package)
                     if len(local_version) <= 0:
                         continue
                     if compare_versions(remote_version, local_version) > 0:
@@ -409,7 +411,7 @@ def UpdateWidgetFromPypi():
             except Exception as ex:
                 print(ex)
                 continue
-            
+
 def installWidget(name):
     widgetid, remote_version, package_url = ryry_webapi.findWidget(name)
     if len(widgetid) <= 0:
@@ -421,4 +423,6 @@ def installWidget(name):
         pipReInstall(name, package_url)
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)
+    else:
+        print(f"本地 {local_version} 版本较高，请卸载后再安装")
         

{ryry_cli-2.18 → ryry_cli-2.20}/ryry/task.py

@@ -95,8 +95,8 @@ def executeLocalPython(taskUUID, cmd, param, timeout):
             o2 = error.decode(encoding="utf8", errors="ignore")
             error_msg = f"{o1}\n{o2}"
             short_error_msg = ""
-            if len(error_msg) > 310:
-                short_error_msg = f"{error_msg[0:99]}\n...\n{error_msg[len(error_msg)-200:]}"
+            if len(error_msg) > 610:
+                short_error_msg = f"{error_msg[0:300]}\n...\n{error_msg[len(error_msg)-300:]}"
             else:
                 short_error_msg = error_msg
             outData["message"] = short_error_msg

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.18
+Version: 2.20
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -15,7 +15,6 @@ Requires-Dist: requests
 Requires-Dist: uuid
 Requires-Dist: Image
 Requires-Dist: pillow
-Requires-Dist: protobuf
 Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
@@ -28,7 +27,6 @@ Requires-Dist: setuptools
 Requires-Dist: twine
 Requires-Dist: python-crontab
 Requires-Dist: urllib3
-Requires-Dist: requests_toolbelt
 
 ryry Python Tool
 ===============================================

{ryry_cli-2.18 → ryry_cli-2.20}/ryry_cli.egg-info/requires.txt

@@ -2,7 +2,6 @@ requests
 uuid
 Image
 pillow
-protobuf
 psutil
 pynvml
 requests_toolbelt
@@ -15,4 +14,3 @@ setuptools
 twine
 python-crontab
 urllib3
-requests_toolbelt

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

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.18"
+ryry_version = "2.20"
 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")
@@ -53,7 +53,6 @@ setuptools.setup(
         'uuid',
         'Image',
         'pillow',
-        'protobuf',
         'psutil',
         'pynvml',
         'requests_toolbelt',
@@ -66,7 +65,6 @@ setuptools.setup(
         'twine',
         'python-crontab',
         'urllib3',
-        'requests_toolbelt',
     ],
     dependency_links=[],
     entry_points={

ryry_cli-2.18/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! 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"