ryry-cli 2.52__tar.gz → 2.53__tar.gz

{ryry_cli-2.52 → ryry_cli-2.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.52
+Version: 2.53
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -20,12 +20,9 @@ Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
 Requires-Dist: fake_useragent
-Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil
 Requires-Dist: urlparser
-Requires-Dist: setuptools
-Requires-Dist: twine
 Requires-Dist: python-crontab
 Requires-Dist: urllib3
 

ryry_cli-2.53/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.53"
+app_bulld_anchor="Noh_2024-09-12 12:08:31.895160"
+app_name="ryry-cli"

{ryry_cli-2.52 → ryry_cli-2.53}/ryry/ryry_service.py

@@ -163,7 +163,7 @@ class ryryPackageThread(Thread):
                 #         #update cli
                 #         remote_version = ryry_widget._remote_package_version("ryry-cli")
                 #         simple = "https://pypi.python.org/simple/"
-                #         local_version = ryry_widget._local_package_version("ryry-cli")
+                #         local_version, local_path = ryry_widget._local_package_info("ryry-cli")
                 #         if ryry_widget.compare_versions(remote_version, local_version) > 0:
                 #             print("start update progress...")
                 #             utils.begin_restart("auto upgrade ryry-cli", True, simple)

{ryry_cli-2.52 → ryry_cli-2.53}/ryry/ryry_widget.py

@@ -1,16 +1,5 @@
-import os
-import json
-import sys
-import shutil
-import zipfile
-import pkg_resources
-import threading
-import time
-import requests
-import random
-import subprocess
-import platform
-import re
+import os, json,sys,shutil,zipfile,pkg_resources,threading,time,requests
+import random, uuid, re, subprocess, platform, zipfile
 from pkg_resources import get_distribution
 import socket
 
@@ -40,17 +29,17 @@ def compare_versions(version1, version2):
     return 0
 
 #real time version get
-def _local_package_version(py_package):
+def _local_package_info(py_package):
     _map = store.widgetMap()
     for it in _map:
         try:
             widget_path = os.path.dirname(_map[it]["path"])
             widget_config = GetWidgetConfig(widget_path)
             if widget_config["name"] == py_package:
-                return widget_config["version"]
+                return widget_config["version"], widget_path
         except:
             pass
-    return ''
+    return '', ''
 
 def _pypi_folder_name(name):
     import re
@@ -135,10 +124,11 @@ def CheckWidgetDataInPath(path):
         
     return True
 
-def addWidgetToEnv(root, mute=False):
+def addWidgetToEnv(name_or_root, mute=False):
     #maybe pip package
+    root = ""
     try:
-        package = pkg_resources.get_distribution(root)
+        package = pkg_resources.get_distribution(name_or_root)
         local_version = package.version
         name = package.project_name
         version = package.version
@@ -146,6 +136,14 @@ def addWidgetToEnv(root, mute=False):
     except:
         pass
     
+    if os.path.exists(root) == False:
+        root = os.path.join(os.path.dirname(os.path.abspath(__file__)), "widget", name_or_root)
+        
+    if os.path.exists(root) == False:
+        if mute == False:
+            print(f"{name_or_root} not found")
+        return
+    
     if CheckWidgetDataInPath(root) == False:
         return
     data = GetWidgetConfig(root)
@@ -204,8 +202,14 @@ def publishWidget(package_folder):
     name = None
     if "name" in data:
         name = data["name"]
+    if name == "Demo":
+        print(f"请修改widget名字, 位置为{package_folder}/config.json")
+        return
     if "py_package" in data:
         name = data["py_package"]
+    if re.match(r'^[A-Za-z0-9_-]+$', name) == False:  
+        print(f"请修改widget名字, 只能包含英文字母、数字、下划线、中划线")
+        return
     local_version = "1.0"
     if "version" in data:
         local_version = data["version"]
@@ -230,94 +234,30 @@ def publishWidget(package_folder):
                         requirements += f"'{reals[:reals.index(';')]}',"  
                     elif "#" not in reals:
                         requirements += f"'{reals}',"
-    pip_dir = os.path.join(os.path.dirname(package_folder), "tmp")
-    if os.path.exists(pip_dir):
-        shutil.rmtree(pip_dir)
-    os.makedirs(pip_dir)
-    source_folder_name = _pypi_folder_name(name)
-    pip_source_dir = os.path.join(pip_dir, source_folder_name)
-    shutil.copytree(package_folder, pip_source_dir)
-    config_json_file = os.path.join(pip_source_dir, "config.json") 
-    if os.path.exists(config_json_file):
-        with open(config_json_file, 'r') as f:
-            cc = json.load(f)
-        cc["py_package"] = name
-        cc["name"] = name
-        cc["version"] = local_version
-        with open(config_json_file, 'w') as f:
-            json.dump(cc, f)
-    if os.path.exists(os.path.join(pip_source_dir, "__init__.py")) == False:
-        with open(os.path.join(pip_source_dir, "__init__.py"), 'w') as f:
-            f.write("")
-    #get datafile
-    data_file_config = {}
-    for root,dirs,files in os.walk(package_folder):
-        for file in files:
-            if file.find(".") > 0 and file[file.rindex("."):] == ".py":
-                continue
-            dir_path = os.path.relpath(root, package_folder)
-            file_path = os.path.join(dir_path, file)
-            file_path = os.path.normpath(file_path).replace("\\", "/")
-            k = dir_path.replace("\\", "/")
-            if k in data_file_config:
-                data_file_config[k].append(file_path)
-            else:
-                data_file_config[k] = [file_path]
-    package_data_str = ""
-    for k in data_file_config:
-        for p in data_file_config[k]:
-            package_data_str += f"'{p}',"
-    setup_py = os.path.join(pip_dir, "setup.py")
-    with open(setup_py, 'w') as f:
-        f.write(f'''import setuptools, os, sys, subprocess, datetime
-    
-setuptools.setup(
-    name="{name}",
-    version="{local_version}",
-    author="{user_id}",
-    author_email="{user_id}@dalipen.com",
-    description="ryry widget",
-    long_description="privide by ryry-cli",
-    long_description_content_type="text/markdown",
-    url="https://ryryai.com/#/",
-    packages=setuptools.find_packages(),
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    py_modules=[],
-    install_requires=[
-        {requirements}
-    ],
-    package_data={{
-        '{name}':[{package_data_str}]
-    }},
-    entry_points={{
-        'console_scripts':[
-            '{name} = {source_folder_name}.main:main'
-        ]
-    }},
-    python_requires='>=3.4',
-)
-''')
+    temp_dir = os.path.join(os.path.dirname(package_folder), "tmp")
+    if os.path.exists(temp_dir):
+        shutil.rmtree(temp_dir)
+    publish_zip_file = os.path.join(os.path.dirname(package_folder), "tmp.zip")
     try:
-        #build
-        subprocess.run(f"python {setup_py} sdist bdist_wheel", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=pip_dir, encoding="utf-8")
-        #uninstall
-        subprocess.run(f"pip uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
-        subprocess.run(f"pip3 uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
-        #install
-        whl = utils.firstExitWithDir(os.path.join(pip_dir, "dist"), "whl")
-        subprocess.run(f"pip install {whl} --extra-index-url https://pypi.python.org/simple/", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
-        subprocess.run(f"pip3 install {whl} --extra-index-url https://pypi.python.org/simple/", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, encoding="utf-8")
+        shutil.copytree(package_folder, temp_dir)
+        #archive zip file
+        with zipfile.ZipFile(publish_zip_file, 'w', zipfile.ZIP_DEFLATED) as zipf:  
+            for root, dirs, files in os.walk(temp_dir):  
+                if root.startswith(".") or root == "__pycache__":
+                    continue
+                for file in files:  
+                    file_path = os.path.join(root, file)  
+                    relative_path = os.path.relpath(file_path, temp_dir)  
+                    zipf.write(file_path, arcname=relative_path)  
         #upload
-        ryry_webapi.uploadWidget(widget_id, name, whl, ".whl", local_version)
+        ryry_webapi.uploadWidget(widget_id, name, publish_zip_file, ".zip", local_version)
         print(f"发布 {name}_{local_version} -> 成功")
     except Exception as ex:
         print(ex)
     finally:
-        shutil.rmtree(pip_dir)
+        shutil.rmtree(temp_dir)
+        if os.path.exists(publish_zip_file)
+            os.remove(publish_zip_file)
 
 def widgetUpdateNotify(widgetName, oldver, newver):
     device_id = utils.generate_unique_id()
@@ -341,7 +281,7 @@ def widgetInstallNotify(widgetName, newver):
         }
     })
 
-def pipReInstall(name, url):
+def widgetReInstall(name, url, local_path):
     def find_pip_command():
         possible_pips = ['pip3.11', 'pip', 'pip3']
         for cmd in possible_pips:
@@ -357,11 +297,33 @@ def pipReInstall(name, url):
                 
         raise RuntimeError("No pip command found on the system.")
     pip_cmd = find_pip_command()
-    if name:
-        subprocess.run(f"{pip_cmd} uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    subprocess.run(f"{pip_cmd} install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    if url.endswith(".whl"):
+        if name:
+            subprocess.run(f"{pip_cmd} uninstall {name} -y", stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        subprocess.run(f"{pip_cmd} install {url} -i https://pypi.python.org/simple/ --extra-index-url https://pypi.python.org/simple/", 
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    elif url.endswith(".zip"):
+        if os.path.exists(local_path) == False:
+            local_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "widget", name)
     
+        download_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), ''.join(str(uuid.uuid4()).split('-')) + ".zip")
+        with open(download_file, 'wb+') as f:
+            f.write(requests.get(url).content)
+        try:
+            if os.path.exists(download_file) and os.stat(download_file).st_size > 100:
+                if os.path.exists(local_path):
+                    shutil.rmtree(local_path)
+                os.makedirs(local_path)
+                with zipfile.ZipFile(download_file, "r") as zip_ref:
+                    zip_ref.extractall(local_path)
+                     = os.path.join(local_path, "requirements.txt")
+                if os.path.exists(requirements_file):
+                    subprocess.run(f"{pip_cmd} install -r {requirements_file} -i https://pypi.python.org/simple/", 
+                    stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        finally:
+            if os.path.exists(download_file):
+                os.remove(download_file)
+        
 def UpdateWidgetFromPypi():
     _map = store.widgetMap()
     for it in _map:
@@ -380,12 +342,12 @@ def UpdateWidgetFromPypi():
                     local_version = data.get("version", "")
                     widgetid, remote_version, package_url = ryry_webapi.findWidget(py_package)
                     if len(local_version) <= 0:
-                        local_version = _local_package_version(py_package)
+                        local_version, local_path = _local_package_info(py_package)
                     if len(local_version) <= 0:
                         continue
                     if compare_versions(remote_version, local_version) > 0:
                         #update
-                        pipReInstall(py_package, package_url)
+                        widgetReInstall(py_package, package_url, local_path)
                         widgetUpdateNotify(py_package, local_version, remote_version)
                 except Exception as ex:
                     print(ex)
@@ -393,7 +355,7 @@ def UpdateWidgetFromPypi():
     for widget_id, widget_name, remote_version, package_url in ryry_webapi.getAutoDeployWidget():
         if widget_id not in _map:
             try:
-                pipReInstall(widget_name, package_url)
+                widgetReInstall(widget_name, package_url)
                 widgetInstallNotify(widget_name, remote_version)
                 addWidgetToEnv(widget_name)
             except Exception as ex:
@@ -405,12 +367,14 @@ def installWidget(name):
     if len(widgetid) <= 0:
         print(f"{name} 不存在")
         return
-    local_version = _local_package_version(name)
+    local_version, local_path = _local_package_info(name)
     if compare_versions(remote_version, local_version) > 0:
         #update
-        pipReInstall(name, package_url)
+        widgetReInstall(name, package_url, local_path)
         widgetInstallNotify(name, remote_version)
-        addWidgetToEnv(name)
+        addWidgetToEnv(name, True)
+        print(f"成功安装 {name} {remote_version}")
     else:
         print(f"本地已是最新版本 {remote_version}")
-  
+  
+installWidget("McnDayTask")

{ryry_cli-2.52 → ryry_cli-2.53}/ryry/taskUtils.py

@@ -81,8 +81,8 @@ def getTaskLog(taskUUID):
     return []
 
 def _uploadLog(taskUUID):
+    log_path = f"{os.path.dirname(os.path.abspath(__file__))}/log_{taskUUID}.log"
     try:
-        log_path = f"{os.path.dirname(os.path.abspath(__file__))}/log_{taskUUID}.log"
         with open(log_path, 'w') as f:
             f.write("\n".join(getTaskLog(taskUUID)))
         notifyWechatRobot({
@@ -91,10 +91,11 @@ def _uploadLog(taskUUID):
                 "media_id": uploadFile2Wechat(log_path)
             }
         })
-        if os.path.exists(log_path):
-            os.remove(log_path)
     except:
         pass
+    finally:
+        if os.path.exists(log_path):
+            os.remove(log_path)
 
 def notifyTaskFail(taskUUID, reason):
     try:

{ryry_cli-2.52 → ryry_cli-2.53}/ryry/utils.py

@@ -11,7 +11,6 @@ from datetime import datetime, timedelta
 import http
 import json
 from pathlib import Path
-import zipfile
 import socket
 from PIL import Image
 

{ryry_cli-2.52 → ryry_cli-2.53}/ryry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.52
+Version: 2.53
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -20,12 +20,9 @@ Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
 Requires-Dist: fake_useragent
-Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil
 Requires-Dist: urlparser
-Requires-Dist: setuptools
-Requires-Dist: twine
 Requires-Dist: python-crontab
 Requires-Dist: urllib3
 

{ryry_cli-2.52 → ryry_cli-2.53}/ryry_cli.egg-info/requires.txt

@@ -7,11 +7,8 @@ pynvml
 requests_toolbelt
 matplotlib
 fake_useragent
-ping3
 piexif
 gputil
 urlparser
-setuptools
-twine
 python-crontab
 urllib3

{ryry_cli-2.52 → ryry_cli-2.53}/setup.py

@@ -3,8 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.52"
-ryry_build_number = int(ryry_version.replace(".",""))
+ryry_version = "2.53"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -17,7 +16,6 @@ try:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
 app_version="{ryry_version}"
-app_bulld_number={ryry_build_number}
 app_bulld_anchor="{build_user}_{build_pts}"
 app_name="ryry-cli"
 ''')
@@ -25,7 +23,6 @@ except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
 app_version="{ryry_version}"
-app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"
 ''')
@@ -58,12 +55,9 @@ setuptools.setup(
         'requests_toolbelt',
         'matplotlib',
         'fake_useragent',
-        'ping3',
         'piexif',
         'gputil',
         'urlparser',
-        'setuptools',
-        'twine',
         'python-crontab',
         'urllib3',
     ],

ryry_cli-2.52/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.52"
-app_bulld_number=252
-app_bulld_anchor="Noh_2024-09-09 11:49:02.049734"
-app_name="ryry-cli"