ryry-cli 5.4__tar.gz → 6.1__tar.gz

{ryry_cli-5.4/ryry_cli.egg-info → ryry_cli-6.1}/PKG-INFO

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

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="5.4"
-app_bulld_anchor="Noh_2025-09-28 22:05:40.262632"
+app_version="6.1"
+app_bulld_anchor="Noh_2025-11-13 16:05:25.080846"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/main.py

@@ -8,6 +8,14 @@ from ryry import utils
 from ryry import taskUtils
 from ryry import proxy_manager
 
+# 获取版本信息的兼容函数
+def get_version():
+    try:
+        from importlib.metadata import version
+        return version("ryry-cli")
+    except ImportError:
+        from importlib_metadata import version
+        return version("ryry-cli")
 ll = 29
 def scr_str(s):
     return "| " + s + " |"
@@ -161,8 +169,7 @@ def widget_status(stdscr, idx):
     return idx
 
 def status():
-    from pkg_resources import parse_version, get_distribution
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     deviceid = utils.generate_unique_id()
     import socket
     machine_name = socket.gethostname()
@@ -329,10 +336,6 @@ def get_widget_config_from_path(main_path):
         pass
     return None
 
-
-
-
-
 def widget():
     if len(sys.argv) <= 2:
         print('please set command! Usage: ryry widget [init|publish|list|add|remove|enable|disable|install]')
@@ -397,6 +400,23 @@ def widget():
     else:
         print("Unknown command:", command)
 
+def token():
+    if len(sys.argv) <= 2:
+        print('please set command! Usage: ryry token [set/get]')
+        return
+    
+    command = sys.argv[2]
+    if command == 'set':
+        user_token = sys.argv[3]
+        store.save_authorization(user_token)
+        print("✅ token saved")
+    elif command == 'get':
+        user_token, author = store.get_token_and_authorization()
+        print(f"Usertoken: {user_token}")
+        print(f"Authorization: {author}")
+    else:
+        print("Unknown command:", command)
+    
 def proxy():
     """代理管理功能"""
     if len(sys.argv) <= 2:
@@ -447,6 +467,10 @@ def main():
     if len(sys.argv) >= 2:
         module = sys.argv[1]
         if module == "widget":
+            _, author = store.get_token_and_authorization()
+            if not author or len(author) < 3:
+                print("❌ token not found, please set token first")
+                sys.exit(0)
             widget()
         elif module == "service":
             service()
@@ -454,6 +478,8 @@ def main():
             status()
         elif module == "proxy":
             proxy()
+        elif module == "token":
+            token()
         else:
             print(f"Unknown command:{module}")
             sys.exit(0)

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/ryry_webapi.py

@@ -9,10 +9,12 @@ from urllib.parse import urlparse, urlunparse
 
 from ryry import store, utils, taskUtils, constant, task
 
+user_token, author = store.get_token_and_authorization()
 def _domain_post(func, params, files={}, timeout=10, domain="api.dalipen.com"):
     headers = {
         'Connection': 'close',
-        'Usertoken': "0cce7cfe3629e16ee9b3ea8563305d3a15c524804da1861db07c2c867d79da63"
+        'Usertoken': user_token,
+        'Authorization': f"Bearer {author}"
     }
     url = f"https://{domain}/{func}"
     try:
@@ -41,6 +43,11 @@ def _aigc_post(func, params, files={}, timeout=10):
     if status != -99:
         return status, msg, data
     return _domain_post(func, params, files, timeout, "aigc.zjtemplate.com")
+
+def set_authorization(author):
+    store.save_authorization(author)
+def set_user_token(user_token):
+    store.save_user_token(user_token)
 #======================================== Task Function ==============================
 def ServerTaskConfig():
     r1, r2, r3 = _aigc_post("aigc/task/config", {})

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/ryry_widget.py

@@ -1,11 +1,38 @@
-import os, json,sys,shutil,zipfile,pkg_resources,threading,time,requests
+import os, json,sys,shutil,zipfile,threading,time,requests
 import random, uuid, re, subprocess, platform, zipfile
-from pkg_resources import get_distribution
 import socket
 
 from pathlib import Path
 from ryry import store, ryry_webapi, upload, taskUtils, utils, constant
 
+# 获取版本信息的兼容函数
+def get_version():
+    try:
+        from importlib.metadata import version
+        return version("ryry-cli")
+    except ImportError:
+        from importlib_metadata import version
+        return version("ryry-cli")
+
+# 获取包信息的兼容函数
+def get_package_info(package_name):
+    try:
+        from importlib.metadata import distribution
+        dist = distribution(package_name)
+        return {
+            'version': dist.version,
+            'project_name': dist.metadata['Name'],
+            'location': dist.locate_file('')
+        }
+    except ImportError:
+        from importlib_metadata import distribution
+        dist = distribution(package_name)
+        return {
+            'version': dist.version,
+            'project_name': dist.metadata['Name'],
+            'location': dist.locate_file('')
+        }
+
 def compare_versions(version1, version2):
     if len(version1) <= 0:
         version1 = "0"
@@ -127,11 +154,11 @@ def addWidgetToEnv(name_or_root, mute=False):
     #maybe pip package
     root = ""
     try:
-        package = pkg_resources.get_distribution(name_or_root)
-        local_version = package.version
-        name = package.project_name
-        version = package.version
-        root = os.path.join(package.location, name.replace("-", "_"))
+        package_info = get_package_info(name_or_root)
+        local_version = package_info['version']
+        name = package_info['project_name']
+        version = package_info['version']
+        root = os.path.join(package_info['location'], name.replace("-", "_"))
     except:
         pass
     
@@ -262,7 +289,7 @@ def publishWidget(package_folder):
 def widgetUpdateNotify(widgetName, oldver, newver):
     device_id = utils.generate_unique_id()
     machine_name = socket.gethostname()
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     taskUtils.notifyWechatRobot({
         "msgtype": "text",
         "text": {
@@ -273,7 +300,7 @@ def widgetUpdateNotify(widgetName, oldver, newver):
 def widgetUninstallNotify(widgetName, newver):
     device_id = utils.generate_unique_id()
     machine_name = socket.gethostname()
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     taskUtils.notifyWechatRobot({
         "msgtype": "text",
         "text": {
@@ -284,7 +311,7 @@ def widgetUninstallNotify(widgetName, newver):
 def widgetInstallNotify(widgetName, newver):
     device_id = utils.generate_unique_id()
     machine_name = socket.gethostname()
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     taskUtils.notifyWechatRobot({
         "msgtype": "text",
         "text": {

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/server_func.py

@@ -49,6 +49,7 @@ class TaskThread(Thread):
                     self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
                     self.params["task_id"] = self.checkUUID
                     executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
+                    print(f"============={result_obj}")
                     if executeSuccess and result_obj["status"] == 0:
                         self.call_back(self.idx, result_obj["result"])
                     return

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 5.4":
+            elif read_data["extend"].get("app", "") == "ryry-cli 6.1":
                 _genExtend()
         else:
             _genExtend()
@@ -207,4 +207,27 @@ def save_multithread(n):
         with open(file, 'w', encoding='utf-8') as f:
             f.write(str(n))
     except:
-        pass
+        pass
+    
+def get_token_and_authorization():
+    sp = Store()
+    read_data = sp.read()
+    author = "0ca0a929bfcb36faea0638bf991320972cac412d14c56aa9794c047441b671c4"
+    usertoken = ""
+    if "Authorization" in read_data:
+        author = read_data["Authorization"]
+    if "Usertoken" in read_data:
+        usertoken = read_data["Usertoken"]
+    return usertoken, author
+
+def save_authorization(author):
+    sp = Store()
+    read_data = sp.read()
+    read_data["Authorization"] = author
+    sp.write(read_data)
+    
+def save_user_token(user_token):
+    sp = Store()
+    read_data = sp.read()
+    read_data["Authorization"] = user_token
+    sp.write(read_data)

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/task.py

@@ -188,7 +188,7 @@ def executeLocalPython(taskUUID, cmd, param, timeout=3600):
     }
     executeSuccess = False
     command = [sys.executable, cmd, "--run", inputArgs, "--out", outArgs]
-    taskUtils.taskPrint(taskUUID, f"{current_thread().name}=== exec => {command}")
+    taskUtils.taskPrint(taskUUID, f"{current_thread().name}=== exec => {command} params => {json.dumps(param, ensure_ascii=False)}")
     process = None
     try:
         if timeout == 0:

{ryry_cli-5.4 → ryry_cli-6.1}/ryry/taskUtils.py

@@ -9,7 +9,15 @@ import base64
 import calendar, time
 import hashlib
 from ryry import utils, constant
-from pkg_resources import get_distribution
+
+# 获取版本信息的兼容函数
+def get_version():
+    try:
+        from importlib.metadata import version
+        return version("ryry-cli")
+    except ImportError:
+        from importlib_metadata import version
+        return version("ryry-cli")
 
 task_config_file = os.path.join(constant.base_path, f"task_config.txt")
 def taskInfoWithFirstTask():
@@ -155,7 +163,7 @@ def idlingNotify(cnt):
 def onlineNotify():
     device_id = utils.generate_unique_id()
     machine_name = socket.gethostname()
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     notifyWechatRobot({
         "msgtype": "text",
         "text": {
@@ -176,7 +184,7 @@ def restartNotify(msg):
 def offlineNotify():
     device_id = utils.generate_unique_id()
     machine_name = socket.gethostname()
-    ver = get_distribution("ryry-cli").version
+    ver = get_version()
     notifyWechatRobot({
         "msgtype": "text",
         "text": {

{ryry_cli-5.4 → ryry_cli-6.1/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-5.4 → ryry_cli-6.1}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "5.4"
+ryry_version = "6.1"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try: