ryry-cli 1.8__tar.gz → 2.1__tar.gz

{ryry_cli-1.8/ryry_cli.egg-info → ryry_cli-2.1}/PKG-INFO

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

ryry_cli-2.1/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.1"
+app_bulld_number=21
+app_bulld_anchor="Noh_2024-05-24 16:29:00.913157"
+app_name="ryry-cli"

{ryry_cli-1.8 → ryry_cli-2.1}/ryry/main.py

@@ -271,8 +271,8 @@ def widget():
         ryry_widget.enable(work_path)
     elif command == 'disable':
         ryry_widget.disable(work_path)
-    elif command == 'pending_task':
-        ryry_widget.getTaskCount(work_path)
+    elif command == 'install':
+        ryry_widget.installWidget(work_path)
     else:
         print("Unknown command:", command)
 
@@ -287,9 +287,6 @@ def main():
             service()
         elif module == "status":
             status()
-        elif module == "report":
-            utils.reportLog()
-            print(f"report success")
         else:
             print(f"Unknown command:{module}")
             sys.exit(0)

{ryry_cli-1.8 → ryry_cli-2.1}/ryry/ryry_webapi.py

@@ -229,13 +229,15 @@ def findWidget(name):
     }
     r1, r2, r3 = _aigc_post("aigc/task/findWidget", req)
     if r1 != 0:
-        return 0
+        return "", "", ""
     for it in r3:
         widget_id = it["widget_id"]
         widget_name = it["name"]
+        version = it["version"]
+        package = it["package"]
         if widget_name.strip().lower() == name.strip().lower():
-            return widget_id
-    return 0
+            return widget_id, version, package
+    return "", "", ""
 
 def checkTask(checkUUID):
     req = {

{ryry_cli-1.8 → ryry_cli-2.1}/ryry/ryry_widget.py

@@ -85,20 +85,6 @@ def GetWidgetConfig(path):
                 return json.load(f)
     return {}
 
-def folderIsH5(path):
-    configFileExist = False
-    iconFileExist = False
-    htmlFileExist = False
-    for filename in os.listdir(path):
-        pathname = os.path.join(path, filename) 
-        if (os.path.isfile(pathname)) and filename == "config.json":
-            configFileExist = True
-        if (os.path.isfile(pathname)) and filename == "icon.png":
-            iconFileExist = True
-        if (os.path.isfile(pathname)) and filename == "index.html":
-            htmlFileExist = True
-    return configFileExist and iconFileExist and htmlFileExist
-
 def PathIsEmpty(path):
     return len(os.listdir(path)) == 0
 
@@ -129,7 +115,7 @@ def setWidgetData(root, widgetid):
     data = GetWidgetConfig(root)
     data["widget_id"] = widgetid
     data["name"] = "Demo"
-    data["version"] = "1.8"
+    data["version"] = "2.1"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]
@@ -173,7 +159,7 @@ def addWidgetToEnv(root, mute=False):
         local_version = package.version
         name = package.project_name
         version = package.version
-        root = os.path.join(package.location, _pypi_folder_name(name))
+        root = os.path.join(package.location, name.replace("-", "_"))
     except:
         pass
 
@@ -222,21 +208,6 @@ def disable(args):
         widget_id = data["widget_id"]
     store.disableWidget(widget_id)
     print(f"widget:{widget_id} updated")
-        
-def getTaskCount(args):
-    widget_id = args
-    if os.path.exists(args):
-        #find widgetid in args path
-        data = GetWidgetConfig(args)
-        if "widget_id" not in data:
-            print(f"path {args} is not widget folder!")
-            return
-        widget_id = data["widget_id"]
-    datas = ryry_webapi.GetTaskCount(widget_id)
-    for it in datas:
-        if it["widgetUUID"] == widget_id:
-            return it["taskCount"]
-    return -1
 
 def publishWidget(package_folder):
     if CheckWidgetDataInPath(package_folder) == False:
@@ -247,12 +218,6 @@ def publishWidget(package_folder):
     name = data["name"]
     local_version = data["version"]
     user_id = utils.generate_unique_id()
-
-    #override setting
-    remote_version = _remote_package_version(name)
-    if compare_versions(remote_version, local_version) >= 0:
-        print(f"version {local_version} must be larger than {remote_version}, publish abandon")
-        return
         
     #if in h5&script parent folder, add env path
     if len(package_folder) > 0:
@@ -368,6 +333,17 @@ def widgetUpdateNotify(widgetName, oldver, newver):
             "content": f"机器<{machine_name}[{device_id}]>[{ver}] widget:[{widgetName}]升级版本[{oldver}]->[{newver}]"
         }
     })
+    
+def widgetInstallNotify(widgetName, newver):
+    device_id = utils.generate_unique_id()
+    machine_name = socket.gethostname()
+    ver = get_distribution("ryry-cli").version
+    taskUtils.notifyWechatRobot({
+        "msgtype": "text",
+        "text": {
+            "content": f"机器<{machine_name}[{device_id}]>[{ver}] 安装widget:[{widgetName}][{newver}]"
+        }
+    })
 
 def UpdateWidgetFromPypi():
     map = store.widgetMap()
@@ -384,15 +360,29 @@ def UpdateWidgetFromPypi():
             if "py_package" in data and len(data["py_package"]) > 0:
                 try:
                     py_package = data["py_package"]
-                    remote_version = _remote_package_version(py_package)
+                    widgetid, remote_version, package_url = ryry_webapi.findWidget(py_package)
                     local_version = _local_package_version(py_package)
                     if compare_versions(remote_version, local_version) > 0:
                         #update
-                        subprocess.run(f"pip uninstall {py_package}", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-                        subprocess.run(f"pip install -U {py_package} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+                        subprocess.run(f"pip uninstall {py_package} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                        subprocess.run(f"pip install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
                         widgetUpdateNotify(py_package, local_version, remote_version)
                 except Exception as ex:
                     print(ex)
                     continue
-               
+               
+def installWidget(name):
+    widgetid, remote_version, package_url = ryry_webapi.findWidget(name)
+    if len(widgetid) <= 0:
+        print(f"{name} 不存在")
+        return
+    local_version = _local_package_version(name)
+    if compare_versions(remote_version, local_version) > 0:
+        #update
+        subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"pip install {package_url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        widgetInstallNotify(name, remote_version)
+        addWidgetToEnv(name)
+        

{ryry_cli-1.8 → ryry_cli-2.1}/ryry/server_func.py

@@ -23,12 +23,12 @@ class TaskThread(Thread):
         self.checking = False
         self.result = False, "Unknow"
         if self.widgetid == None:
-            self.widgetid = ryry_webapi.findWidget(self.func)
+            self.widgetid, _, _ = ryry_webapi.findWidget(self.func)
         if len(self.widgetid) > 0:
             checkUUID = ryry_webapi.createTask(self.widgetid, self.params)
             checking = True
             checkCount = 0
-            while checking or checkCount > 6000:
+            while checking or checkCount > 600:
                 finish, success, data = ryry_webapi.checkTask(checkUUID)
                 if finish:
                     checking = False
@@ -36,7 +36,7 @@ class TaskThread(Thread):
                         self.call_back(self.idx, data)
                         return
                 checkCount += 1
-                time.sleep(0.1)
+                time.sleep(1)
         else:
             print(f"widget {self.func}-{self.widgetid} not found")
         self.call_back(self.idx, None)

{ryry_cli-1.8 → ryry_cli-2.1}/ryry/utils.py

@@ -168,66 +168,6 @@ def deviceInfo():
         data["gpu"]["list"].append(f"GPU0: Normal")
     return data
 
-def reportLog():
-    reason = ""
-    if len(sys.argv) >= 2:
-        reason = sys.argv[2].strip().replace("\n","").replace(",","").replace(" ","").replace(";","")
-    d = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
-    uid = generate_unique_id()
-
-    thisFileDir = os.path.dirname(os.path.abspath(__file__))
-    dist = os.path.join(thisFileDir, f"{uid}_{reason}_{d}.zip")
-    zip = zipfile.ZipFile(dist, "w", zipfile.ZIP_DEFLATED) 
-
-    for root,dirs,files in os.walk(thisFileDir):
-        for file in files:
-            if str(file).startswith("~$"):
-                continue
-            ext = file[file.rindex("."):]
-            if ext == ".log" or ext == ".json" or ".log." in file:
-                filepath = os.path.join(root, file)
-                zip.write(filepath, file)
-        if root != files:
-            break
-    zip.close()
-    ossurl = uploadOSS(dist)
-    os.remove(dist)
-    return ossurl
-
-def uploadOSS(file):
-    conn = http.client.HTTPSConnection("api.ryryai.com")
-    payload = json.dumps({
-        "sign": "f0463f490eb84133c0aab3a8576ed2fc"
-    })
-    headers = {
-        'Content-Type': 'application/json'
-    }
-    conn.request("POST", "/proxymsg/get_oss_config", payload, headers)
-    res = conn.getresponse()
-    data = json.loads(res.read().decode("utf-8"))
-    if data["code"] == 0:
-        AccessKeyId = data["data"]["AccessKeyId"]
-        AccessKeySecret = data["data"]["AccessKeySecret"]
-        SecurityToken = data["data"]["SecurityToken"]
-        BucketName = data["data"]["BucketName"]
-        Expiration = data["data"]["Expiration"]
-        Endpoint = data["data"]["Endpoint"]
-        CallbackUrl = data["data"]["CallbackUrl"]
-        cdn = data["data"]["cdn"]
-        
-        if len(AccessKeyId) > 0:  
-            import oss2
-            auth = oss2.StsAuth(AccessKeyId, AccessKeySecret, SecurityToken)
-            bucket = oss2.Bucket(auth, Endpoint, BucketName, connect_timeout=600)
-            with open(file, "rb") as f:
-                byte_data = f.read()
-            file_name = Path(file).name
-            publish_name = f"ryry/report/{file_name}" 
-            bucket.put_object(publish_name, byte_data)
-            return f"{cdn}{publish_name}" 
-    else:
-        print(f"get_oss_config fail: response={data}")
-
 def process_is_alive(pid: int) -> bool:
     try:
         process = psutil.Process(pid)

{ryry_cli-1.8 → ryry_cli-2.1/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-1.8 → ryry_cli-2.1}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "1.8"
+ryry_version = "2.1"
 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")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
 except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
-app_version="1.8"
+app_version="2.1"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"

ryry_cli-1.8/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="1.8"
-app_bulld_number=18
-app_bulld_anchor="Noh_2024-05-23 19:14:58.050058"
-app_name="ryry-cli"