ryry-cli 2.86__tar.gz → 2.88__tar.gz

{ryry-cli-2.86/ryry_cli.egg-info → ryry-cli-2.88}/PKG-INFO

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

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="2.86"
-app_bulld_anchor="Noh_2025-01-23 17:50:55.792174"
+app_version="2.88"
+app_bulld_anchor="Noh_2025-02-08 11:55:33.954153"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/ryry_server_socket.py

@@ -157,7 +157,7 @@ class RyryShortConnectThread(Thread):
 
     def __init__(self, executor):
         super().__init__()
-        self.name = f"RyryShortConnectThread"
+        self.name = f"ShortConnect"
         self.is_running = True
         self.executor = executor
         self.start()

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/ryry_webapi.py

@@ -264,7 +264,7 @@ def createTask(widget_name, params):
     req = {
         "widget_name": widget_name,
         "widget_data": json.dumps(params),
-        "extend": json.dumps(store.extend())
+        "extend": store.extend()
     }
     r1, r2, r3 = _aigc_post("aigc/task/createTask", req)
     if r1 != 0:
@@ -288,7 +288,9 @@ def findWidget(name):
     return "", "", ""
 
 def getAutoDeployWidget():
-    req = {}
+    req = {
+        "extend": store.extend()
+    }
     r1, r2, r3 = _aigc_post("aigc/task/getAutoDeployWidget", req)
     result = []
     if r1 != 0:
@@ -298,7 +300,8 @@ def getAutoDeployWidget():
         widget_name = it["name"]
         version = it["version"]
         package = it["package"]
-        result.append([widget_id, widget_name, version, package])
+        is_install = it["is_install"]
+        result.append([widget_id, widget_name, version, package, is_install])
     return result
 
 def checkTask(checkUUID):

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/ryry_widget.py

@@ -285,7 +285,7 @@ def widgetReInstall(name, url, local_path):
             if pip_path:
                 return cmd
 
-        for version in range(12, 8, -1):
+        for version in range(12, 11, 10, 9, 8, 13, -1):
             cmd = f"pip3.{version}"
             pip_path = shutil.which(cmd)
             if pip_path:
@@ -322,6 +322,30 @@ def widgetReInstall(name, url, local_path):
             if os.path.exists(download_file):
                 os.remove(download_file)
         
+def widgetUninstall(name, url):
+    def find_pip_command():
+        possible_pips = ['pip3.11', 'pip', 'pip3']
+        for cmd in possible_pips:
+            pip_path = shutil.which(cmd)
+            if pip_path:
+                return cmd
+
+        for version in range(12, 11, 10, 9, 8, 13, -1):
+            cmd = f"pip3.{version}"
+            pip_path = shutil.which(cmd)
+            if pip_path:
+                return cmd
+                
+        raise RuntimeError("No pip command found on the system.")
+    if url.endswith(".whl"):
+        if name:
+            pip_cmd = find_pip_command()
+            subprocess.run(f"{pip_cmd} uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    elif url.endswith(".zip"):
+        local_path = os.path.join(constant.base_path, "widget", name)
+        if os.path.exists(local_path):
+            shutil.rmtree(local_path)
+                
 def UpdateWidgetFromPypi():
     _map = store.widgetMap()
     for it in _map:
@@ -350,16 +374,23 @@ def UpdateWidgetFromPypi():
                 except Exception as ex:
                     print(ex)
                     continue
-    for widget_id, widget_name, remote_version, package_url in ryry_webapi.getAutoDeployWidget():
+    for widget_id, widget_name, remote_version, package_url, is_install in ryry_webapi.getAutoDeployWidget():
         if widget_id not in _map:
             try:
                 local_version, local_path = _local_package_info(widget_name)
                 widgetReInstall(widget_name, package_url, local_path)
                 widgetInstallNotify(widget_name, remote_version)
                 addWidgetToEnv(widget_name)
+                print(f"auto install ${widget_name}")
             except Exception as ex:
                 print(ex)
                 continue
+        else:
+            is_block = _map[widget_id]["isBlock"]
+            if is_install == False:
+                print(f"auto remove ${widget_name}")
+                widgetUninstall(widget_name, package_url)
+                store.removeWidget(widget_id)
 
 def installWidget(name):
     widgetid, remote_version, package_url = ryry_webapi.findWidget(name)

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/store.py

@@ -129,15 +129,15 @@ def writeDeviceInfo(data):
     sp.write(read_data)
     extend()
     
-GLOBAL_EXT_JSON = {}
+GLOBAL_EXT_JSON = "{}"
 def extend():
-    global GLOBAL_EXT_JSON
-    if len(GLOBAL_EXT_JSON.keys()) < 3:
+    global GLOBAL_EXT_JSON   
+    if len(GLOBAL_EXT_JSON) < 10:
         sp = Store()
         read_data = sp.read()
         if "extend" in read_data:
-            GLOBAL_EXT_JSON = read_data["extend"]
-            if len(GLOBAL_EXT_JSON.keys()) < 3:
+            GLOBAL_EXT_JSON = json.dumps(read_data["extend"])
+            if len(GLOBAL_EXT_JSON) < 10:
                 _genExtend()
         else:
             _genExtend()
@@ -157,7 +157,7 @@ def _genExtend():
     extInfo["device_model"] = platform.machine()
 
     try:
-        extInfo["ip_address"] = requests.get('https://api.ipify.org').text
+        extInfo["ip_address"] = requests.get('https://api.ipify.org', timeout=3).text
     except Exception as e:
         extInfo["ip_address"] = "unknown"
 
@@ -169,7 +169,7 @@ def _genExtend():
     read_data["extend"] = extInfo
     sp.write(read_data)
     global GLOBAL_EXT_JSON
-    GLOBAL_EXT_JSON = extInfo   
+    GLOBAL_EXT_JSON = json.dumps(extInfo)
     
 def is_multithread():
     return get_multithread() > 1

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/task.py

@@ -6,10 +6,7 @@ import signal
 import subprocess, multiprocessing
 from threading import Thread, current_thread, Lock
 
-from ryry import ryry_webapi
-from ryry import store
-from ryry import taskUtils
-from ryry import utils
+from ryry import ryry_webapi,store,taskUtils,utils,constant
 from pathlib import Path
 
 def runTask(it, timeout):
@@ -60,12 +57,12 @@ def cmdWithWidgetName(name):
     return None
 
 def executeLocalPython(taskUUID, cmd, param, timeout=3600):
-    inputArgs = os.path.join(base_path, f"{taskUUID}.in")
+    inputArgs = os.path.join(constant.base_path, f"{taskUUID}.in")
     if os.path.exists(inputArgs):
         os.remove(inputArgs)
     with open(inputArgs, 'w') as f:
         json.dump(param, f)
-    outArgs = os.path.join(base_path, f"{taskUUID}.out")
+    outArgs = os.path.join(constant.base_path, f"{taskUUID}.out")
     if os.path.exists(outArgs):
         os.remove(outArgs)
         
@@ -103,8 +100,8 @@ def executeLocalPython(taskUUID, cmd, param, timeout=3600):
             o2 = error.decode(encoding="utf8", errors="ignore")
             error_msg = f"{o1}\n{o2}"
             short_error_msg = ""
-            if len(error_msg) > 610:
-                short_error_msg = f"{error_msg[0:300]}\n...\n{error_msg[len(error_msg)-300:]}"
+            if len(error_msg) > 1010:
+                short_error_msg = f"{error_msg[0:500]}\n...\n{error_msg[len(error_msg)-500:]}"
             else:
                 short_error_msg = error_msg
             outData["message"] = short_error_msg

{ryry-cli-2.86 → ryry-cli-2.88}/ryry/utils.py

@@ -13,6 +13,7 @@ import json
 from pathlib import Path
 import socket
 from PIL import Image
+from ryry import constant
 
 def get_mac_from_nettools():
     try:

{ryry-cli-2.86 → ryry-cli-2.88/ryry_cli.egg-info}/PKG-INFO

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

{ryry-cli-2.86 → ryry-cli-2.88}/ryry_cli.egg-info/requires.txt

@@ -7,7 +7,6 @@ pynvml
 requests_toolbelt
 matplotlib
 fake_useragent
-piexif
 gputil
 urlparser
 urllib3

{ryry-cli-2.86 → ryry-cli-2.88}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.86"
+ryry_version = "2.88"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -67,7 +67,6 @@ setuptools.setup(
         'requests_toolbelt',
         'matplotlib',
         'fake_useragent',
-        'piexif',
         'gputil',
         'urlparser',
         'urllib3',