ryry-cli 6.2__tar.gz → 6.7__tar.gz

{ryry_cli-6.2/ryry_cli.egg-info → ryry_cli-6.7}/PKG-INFO

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

{ryry_cli-6.2 → ryry_cli-6.7}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="6.2"
-app_bulld_anchor="Noh_2025-11-13 17:02:50.471374"
+app_version="6.7"
+app_bulld_anchor="Noh_2025-11-13 20:55:56.827377"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-6.2 → ryry_cli-6.7}/ryry/ryry_server_socket.py

@@ -239,15 +239,15 @@ class RyryShortConnectThread(Thread):
                     time.sleep(1)
                     continue
                 
-                widget_list = []
+                widget_list = {}
                 map = store.widgetMap()
                 for it in map:
                     if isinstance(map[it], (dict)):
                         if map[it]["isBlock"] == False and self.executor.widgetHasPower(it):
-                            widget_list.append(it)
+                            widget_list[it] = map[it]["version"]
                     else:
                         if self.executor.widgetHasPower(it):
-                            widget_list.append(it)
+                            widget_list[it] = map[it]["version"]
                 datas = ryry_webapi.GetTask(widget_list)
                 for it in datas:
                     self.executor.appendTask(it, self.taskCallback)

{ryry_cli-6.2 → ryry_cli-6.7}/ryry/ryry_webapi.py

@@ -9,12 +9,12 @@ from urllib.parse import urlparse, urlunparse
 
 from ryry import store, utils, taskUtils, constant, task
 
-user_token, author = store.get_token_and_authorization()
+g_user_token, g_author = store.get_token_and_authorization()
 def _domain_post(func, params, files={}, timeout=10, domain="api.dalipen.com"):
     headers = {
         'Connection': 'close',
-        'Usertoken': user_token,
-        'Authorization': f"Bearer {author}"
+        'Usertoken': g_user_token,
+        'Authorization': f"Bearer {g_author}"
     }
     url = f"https://{domain}/{func}"
     try:
@@ -44,10 +44,27 @@ def _aigc_post(func, params, files={}, timeout=10):
         return status, msg, data
     return _domain_post(func, params, files, timeout, "aigc.zjtemplate.com")
 
+def checkLicense():
+    req = { }
+    r1, r2, r3 = _aigc_post("aigc/task/checkLicense", req)
+    if r1 != 0:
+        raise Exception(f"check license fail!, reason={r2}")
+    return r3
+
 def set_authorization(author):
     store.save_authorization(author)
+    global g_user_token, g_author
+    g_user_token, g_author = store.get_token_and_authorization()
+    if checkLicense():
+        print("✅ license check success")
+    else:
+        print("❌ license check failed")
 def set_user_token(user_token):
     store.save_user_token(user_token)
+    if checkLicense():
+        print("✅ license check success")
+    else:
+        print("❌ license check failed")
 #======================================== Task Function ==============================
 def ServerTaskConfig():
     r1, r2, r3 = _aigc_post("aigc/task/config", {})
@@ -95,6 +112,7 @@ def GetTask(widget_list):
         "limit": 1,
         "extend": store.extend()
     }
+    print("====== request gettask: ", req)
     r1, r2, r3 = _aigc_post("aigc/task/getTask", req)
     if r1 != 0:
         return []

{ryry_cli-6.2 → ryry_cli-6.7}/ryry/ryry_widget.py

@@ -440,6 +440,7 @@ def UpdateWidgetFromPypi():
                         #update
                         widgetReInstall(py_package, package_url, local_path)
                         widgetUpdateNotify(py_package, local_version, remote_version)
+                        store.updateWidgetVersion(it, remote_version)
                         
                         # 如果daemon之前在运行且应该启动，则重启
                         if daemon_manager_instance and daemon_status.get("running", False):
@@ -502,4 +503,5 @@ def installWidget(name):
         addWidgetToEnv(name, True)
         print(f"成功安装 {name} {remote_version}")
     else:
-        print(f"本地已是最新版本 {remote_version}")
+        print(f"本地已是最新版本 {remote_version}")
+    

{ryry_cli-6.2 → ryry_cli-6.7}/ryry/store.py

@@ -134,6 +134,15 @@ def enableWidget(widget_id):
         unblock_one(widget_id)
     sp.write(read_data)
     
+def updateWidgetVersion(widget_id, version):
+    sp = Store()
+    read_data = sp.read()
+    if "widgets" not in read_data or not isinstance(read_data["widgets"], dict):
+        read_data["widgets"] = {}
+    widgetsMap = read_data["widgets"]
+    if widget_id in widgetsMap:
+        widgetsMap[widget_id]["version"] = version
+    sp.write(read_data)
 #============================== device id ================================
 
 def writeDeviceInfo(data):
@@ -155,7 +164,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 6.2":
+            elif read_data["extend"].get("app", "") == "ryry-cli 6.7":
                 _genExtend()
         else:
             _genExtend()
@@ -230,4 +239,6 @@ def save_user_token(user_token):
     sp = Store()
     read_data = sp.read()
     read_data["Authorization"] = user_token
-    sp.write(read_data)
+    sp.write(read_data)
+    
+        

{ryry_cli-6.2 → ryry_cli-6.7/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-6.2 → ryry_cli-6.7}/setup.py

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