ryry-cli 2.93__tar.gz → 2.94__tar.gz

{ryry-cli-2.93 → ryry_cli-2.94}/PKG-INFO

@@ -1,56 +1,67 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.93
-Summary: ryry tools
-Home-page: https://github.com/dalipenMedia
-Author: dalipen
-Author-email: dalipen01@gmail.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.4
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-ryry Python Tool
-===============================================
-The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
-
-Installation
-------------
-
-The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
-
-##### Installing
-    pip install ryry-cli
-
-##### Uninstalling
-    pip uninstall ryry-cli
-
-Use
-------------
-##### 1. Running
-    $ ryry service start
-start a process to wait for the server to issue tasks. **Please do not close it**
-
-Module Developer
-------------
-    $ ryry widget init
-
-in empty folder, use above command craete a ryry module, structure is like 
-    
-    [widget folder]
-        |-- config.json     //*required, do not change*
-        |-- main.py         //*required, do not change* 
-        |-- run.py
-
-if other person share widget code to you , you can add widget path in your computer to ryry environment
-
-    $ ryry widget add [path_with_widget_code]
-
-you can modify script and h5 file yourself, then publish to ryry sever 
-    
-    $ ryry widget publish
-
-get ryry status
-    $ ryry services status
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.94
+Summary: ryry tools
+Home-page: https://github.com/dalipenMedia
+Author: dalipen
+Author-email: dalipen01@gmail.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.4
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: uuid
+Requires-Dist: Image
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pynvml
+Requires-Dist: requests_toolbelt
+Requires-Dist: fake_useragent
+Requires-Dist: gputil
+Requires-Dist: urlparser
+Requires-Dist: urllib3
+
+ryry Python Tool
+===============================================
+The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
+
+Installation
+------------
+
+The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
+
+##### Installing
+    pip install ryry-cli
+
+##### Uninstalling
+    pip uninstall ryry-cli
+
+Use
+------------
+##### 1. Running
+    $ ryry service start
+start a process to wait for the server to issue tasks. **Please do not close it**
+
+Module Developer
+------------
+    $ ryry widget init
+
+in empty folder, use above command craete a ryry module, structure is like 
+    
+    [widget folder]
+        |-- config.json     //*required, do not change*
+        |-- main.py         //*required, do not change* 
+        |-- run.py
+
+if other person share widget code to you , you can add widget path in your computer to ryry environment
+
+    $ ryry widget add [path_with_widget_code]
+
+you can modify script and h5 file yourself, then publish to ryry sever 
+    
+    $ ryry widget publish
+
+get ryry status
+    $ ryry services status

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/constant.py

@@ -1,10 +1,10 @@
-#!!!!! do not change this file !!!!!
-app_version="2.93"
-app_bulld_anchor="Noh_2025-02-26 15:41:01.007738"
-app_name="ryry-cli"
-import sys, os
-if getattr(sys, 'frozen', False):
-    base_path = sys._MEIPASS
-else:
-    base_path = os.path.dirname(os.path.abspath(__file__))
-
+#!!!!! do not change this file !!!!!
+app_version="2.94"
+app_bulld_anchor="Noh_2025-03-10 19:34:06.015293"
+app_name="ryry-cli"
+import sys, os
+if getattr(sys, 'frozen', False):
+    base_path = sys._MEIPASS
+else:
+    base_path = os.path.dirname(os.path.abspath(__file__))
+

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/main.py

@@ -7,7 +7,7 @@ from ryry import store
 from ryry import utils
 from ryry import taskUtils
 
-ll = 25
+ll = 29
 def scr_str(s):
     return "| " + s + " |"
 def scr_str1(s):
@@ -87,17 +87,19 @@ def widget_status(stdscr, idx):
             maxJust = len(it)
     maxJust += 5
     for it in widget_map:
-        path = ""
-        is_block = False
-        if isinstance(widget_map[it], (dict)):
-            path = widget_map[it]["path"]
-            is_block = widget_map[it]["isBlock"]
-        else:
-            path = map[it]
+        path = widget_map[it]["path"]
+        is_block = widget_map[it]["isBlock"]
+        name = widget_map[it]["name"]
+        version = widget_map[it].get("version", "1.0")
+        max_task_number = widget_map[it].get("max_task_number", 1)
         end_args = ""
         if is_block:
-            end_args = " [X]"
-        real_stdsrc(idx, 0, scr_str(f'{f"{it}{end_args}".ljust(maxJust)} {path}'.ljust(ll*3-2)))
+            end_args = "[X]"
+        real_stdsrc(idx, 0, scr_str(f'{f"[{name} {version}]{it}{end_args} @ {max_task_number} ".ljust(maxJust)}'.ljust(ll*3-2)))
+        idx+=1
+        real_stdsrc(idx, 0, scr_str(f'          {path}'.ljust(ll*3-2)))
+        idx+=1
+        real_stdsrc(idx, 0, scr_str(f' '.ljust(ll*3-2)))
         idx+=1
     return idx
 
@@ -293,4 +295,4 @@ def main():
         status()
 
 if __name__ == '__main__':
-    main()
+    status()

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/ryry_server_socket.py

@@ -22,6 +22,7 @@ class RyryTaskExecutor(Thread):
     is_running = False
     task_queue = None
     ttt = 0
+    widgetPower = {}
     
     def appendTask(self, data, callback):
         self.cur_counter+=1
@@ -35,6 +36,24 @@ class RyryTaskExecutor(Thread):
     def idlePower(self):
         return self.max_counter - self.cur_counter
     
+    def widgetHasPower(self, cur_widget_id):
+        if cur_widget_id in self.widgetPower:
+            return self.widgetPower[cur_widget_id]["cur"] < self.widgetPower[cur_widget_id]["max"]
+        return True#widget找不到的话就当作可以接
+        
+    def addWidgetPower(self, widget_id, max_task_number):
+        if widget_id not in self.widgetPower:
+            self.widgetPower[widget_id] = {
+            }
+        self.widgetPower[widget_id]["max"] = max_task_number
+        self.widgetPower[widget_id]["cur"] = 1
+        
+    def delWidgetPower(self, widget_id):
+        if widget_id not in self.widgetPower:
+            self.widgetPower[widget_id] = {
+            }
+        self.widgetPower[widget_id]["cur"] = self.widgetPower[widget_id]["cur"] - 1
+    
     def isWorking(self):
         return self.cur_counter > 0
     
@@ -45,15 +64,23 @@ class RyryTaskExecutor(Thread):
         self.max_counter = store.get_multithread()
         self.is_running = True
         self.THEADING_LIST = []
+        self.widgetPower = {}
         self.start()
 
     def taskRunning(self):
+        print(f"      - {current_thread().name} waiting")
         while self.is_running:
             try:
                 data, callback = self.task_queue.get()
                 if data is None: 
                     break
                 try:
+                    data_config = json.loads(data["config"])
+                    widget_id = data_config["widget_id"]
+                    max_task_number = data_config.get("max_task_number", 0)
+                    if max_task_number <= 0:
+                        max_task_number = task.maxTaskNumberWithWidget(widget_id)
+                    
                     taskUUID = data["taskUUID"]
                     domain = ""
                     params_tmp = json.loads(data["data"])
@@ -64,12 +91,14 @@ class RyryTaskExecutor(Thread):
                         timeout = data["timeout"]
                     taskUtils.taskPrint(taskUUID, f"{current_thread().name} === receive task : {taskUUID}")
                     _appendTask(taskUUID, domain)
+                    self.addWidgetPower(widget_id, max_task_number)
                     is_ok, msg, result = task.runTask(data, timeout)
                     if is_ok == False:
                         taskUtils.notifyTaskFail(taskUUID, msg)
                     self.cur_counter-=1
                     callback(taskUUID, is_ok, msg, result)
                     _removeTask(taskUUID)
+                    self.delWidgetPower(widget_id)
                 except Exception as e:
                     taskUtils.taskPrint(taskUUID, f"{current_thread().name} === task exception : {e}")
                     taskUtils.notifyScriptError(taskUUID)
@@ -180,7 +209,17 @@ class RyryShortConnectThread(Thread):
                 if self.executor.idlePower() == 0:
                     time.sleep(1)
                     continue
-                datas = ryry_webapi.GetTask()
+                
+                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)
+                    else:
+                        if self.executor.widgetHasPower(it):
+                            widget_list.append(it)
+                datas = ryry_webapi.GetTask(widget_list)
                 for it in datas:
                     self.executor.appendTask(it, self.taskCallback)
                     

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/ryry_service.py

@@ -80,7 +80,7 @@ class ryryService:
         #3: service step
         while (os.path.exists(stop_file) == False):
             time.sleep(10)
-        print("prepare stop")
+        print("Prepare stop")
         with open(stop_thread_file, 'w') as f:
             f.write("")
         for t in self.THEADING_LIST:
@@ -95,7 +95,7 @@ class ryryService:
         if os.path.exists(stop_file):
             os.remove(stop_file)
         taskUtils.offlineNotify()
-        print("ryryService has ended!")
+        print("Service has ended!")
         utils.check_restart()
         sys.stdout.close()
 

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/ryry_webapi.py

@@ -48,17 +48,9 @@ def ServerTaskConfig():
     consecutive_step = r3["step"]
     return min_wait_time, max_wait_time, consecutive_step
 
-def GetTask():
-    widget_map = []
-    map = store.widgetMap()
-    for it in map:
-        if isinstance(map[it], (dict)):
-            if map[it]["isBlock"] == False:
-                widget_map.append(it)
-        else:
-            widget_map.append(it)
+def GetTask(widget_list):
     req = {
-        "widget_map": json.dumps(widget_map),
+        "widget_map": json.dumps(widget_list),
         "limit": 1,
         "extend": store.extend()
     }

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/ryry_widget.py

@@ -87,6 +87,7 @@ def setWidgetData(root, widgetid):
     data["widget_id"] = widgetid
     data["name"] = "Demo"
     data["version"] = "1.0"
+    data["max_task_number"] = 1
     data["cmd"] = os.path.join(root, "main.py")
     with open(os.path.join(root, "config.json"), 'w') as f:
         json.dump(data, f)
@@ -144,11 +145,11 @@ def addWidgetToEnv(name_or_root, mute=False):
         return
     data = GetWidgetConfig(root)
     widget_id = data["widget_id"]
-    name = ""
-    if "name" in data:
-        name = data["name"]
+    name = data["name"]
+    version = data["version"]
+    max_task_number = data["max_task_number"]
     mainPythonPath = os.path.join(root, "main.py")
-    store.insertWidget(widget_id, name, mainPythonPath)
+    store.insertWidget(widget_id, name, version, max_task_number, mainPythonPath)
     if mute == False:
         print(f"add {widget_id.ljust(len(widget_id)+4)} {mainPythonPath}")
 

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/store.py

@@ -53,7 +53,7 @@ def widgetMap():
     else:
         return {}
     
-def insertWidget(widget_id, name, path):
+def insertWidget(widget_id, name, version, max_task_number, path):
     sp = Store()
     read_data = sp.read()
     if "widgets" not in read_data:
@@ -65,7 +65,9 @@ def insertWidget(widget_id, name, path):
         widgetsMap[widget_id] = {
             "isBlock": False,
             "path" : path,
-            "name" : name
+            "name" : name,
+            "version" : version,
+            "max_task_number" : max_task_number
         }
     for k in list(widgetsMap.keys()):
         if isinstance(widgetsMap[k], (dict)):

{ryry-cli-2.93 → ryry_cli-2.94}/ryry/taskUtils.py

@@ -240,41 +240,41 @@ def notifyCounterIfNeed():
             }
         })
         
-        import subprocess, platform
-        #darwin Command Line cannot create pyplot gui because not application with gui
-        if platform.system() != 'Darwin':
-            try:
-                import matplotlib.pyplot as plt
-                plt.figure(figsize=(8,3))
-                plt.rcParams.update({
-                    'font.size': 7
-                })
-                plt.bar(t_l, s_l, color='g', label='success')
-                plt.bar(t_l, f_l, bottom=s_l, color='r', label='fail')
-                plt.title(f'[{socket.gethostname()}] [{yesterday}] success/fail={s_cnt}/{f_cnt}')
-                plt.xlabel('time')
-                plt.xticks(ticks=t_l,rotation=45)
-                plt.ylabel('count')
-                plt.subplots_adjust(bottom=0.25)
-                plt.legend()
-                fff = os.path.join(constant.base_path, "plt.png")
-                plt.savefig(fff)
-                with open(fff, "rb") as f:
-                    encode_string = str(base64.b64encode(f.read()), encoding='utf-8')
-                md5 = hashlib.md5()
-                md5.update(base64.b64decode(encode_string))
-                hash = md5.hexdigest()
-                notifyWechatRobot({
-                    "msgtype": "image",
-                    "image": {
-                        "base64": encode_string,
-                        "md5": hash
-                    }
-                })
-                os.remove(fff)
-                os.remove(task_counter_file)
-            except:
-                pass
+        # import subprocess, platform
+        # #darwin Command Line cannot create pyplot gui because not application with gui
+        # if platform.system() != 'Darwin':
+        #     try:
+        #         import matplotlib.pyplot as plt
+        #         plt.figure(figsize=(8,3))
+        #         plt.rcParams.update({
+        #             'font.size': 7
+        #         })
+        #         plt.bar(t_l, s_l, color='g', label='success')
+        #         plt.bar(t_l, f_l, bottom=s_l, color='r', label='fail')
+        #         plt.title(f'[{socket.gethostname()}] [{yesterday}] success/fail={s_cnt}/{f_cnt}')
+        #         plt.xlabel('time')
+        #         plt.xticks(ticks=t_l,rotation=45)
+        #         plt.ylabel('count')
+        #         plt.subplots_adjust(bottom=0.25)
+        #         plt.legend()
+        #         fff = os.path.join(constant.base_path, "plt.png")
+        #         plt.savefig(fff)
+        #         with open(fff, "rb") as f:
+        #             encode_string = str(base64.b64encode(f.read()), encoding='utf-8')
+        #         md5 = hashlib.md5()
+        #         md5.update(base64.b64decode(encode_string))
+        #         hash = md5.hexdigest()
+        #         notifyWechatRobot({
+        #             "msgtype": "image",
+        #             "image": {
+        #                 "base64": encode_string,
+        #                 "md5": hash
+        #             }
+        #         })
+        #         os.remove(fff)
+        #         os.remove(task_counter_file)
+        #     except:
+        #         pass
 
 def saveCounter(taskUUID, duration, isSuccess):
     try:

{ryry-cli-2.93 → ryry_cli-2.94}/ryry_cli.egg-info/PKG-INFO

@@ -1,56 +1,67 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.93
-Summary: ryry tools
-Home-page: https://github.com/dalipenMedia
-Author: dalipen
-Author-email: dalipen01@gmail.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.4
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-ryry Python Tool
-===============================================
-The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
-
-Installation
-------------
-
-The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
-
-##### Installing
-    pip install ryry-cli
-
-##### Uninstalling
-    pip uninstall ryry-cli
-
-Use
-------------
-##### 1. Running
-    $ ryry service start
-start a process to wait for the server to issue tasks. **Please do not close it**
-
-Module Developer
-------------
-    $ ryry widget init
-
-in empty folder, use above command craete a ryry module, structure is like 
-    
-    [widget folder]
-        |-- config.json     //*required, do not change*
-        |-- main.py         //*required, do not change* 
-        |-- run.py
-
-if other person share widget code to you , you can add widget path in your computer to ryry environment
-
-    $ ryry widget add [path_with_widget_code]
-
-you can modify script and h5 file yourself, then publish to ryry sever 
-    
-    $ ryry widget publish
-
-get ryry status
-    $ ryry services status
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.94
+Summary: ryry tools
+Home-page: https://github.com/dalipenMedia
+Author: dalipen
+Author-email: dalipen01@gmail.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.4
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: uuid
+Requires-Dist: Image
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pynvml
+Requires-Dist: requests_toolbelt
+Requires-Dist: fake_useragent
+Requires-Dist: gputil
+Requires-Dist: urlparser
+Requires-Dist: urllib3
+
+ryry Python Tool
+===============================================
+The ryry Python Tool is a official tool, you can use it to **Register** device to ryry server, other person can use **ryry Application** assign tasks to you for implementation
+
+Installation
+------------
+
+The ryry requires [Python](http://www.python.org/download) 3.10.6 or later.
+
+##### Installing
+    pip install ryry-cli
+
+##### Uninstalling
+    pip uninstall ryry-cli
+
+Use
+------------
+##### 1. Running
+    $ ryry service start
+start a process to wait for the server to issue tasks. **Please do not close it**
+
+Module Developer
+------------
+    $ ryry widget init
+
+in empty folder, use above command craete a ryry module, structure is like 
+    
+    [widget folder]
+        |-- config.json     //*required, do not change*
+        |-- main.py         //*required, do not change* 
+        |-- run.py
+
+if other person share widget code to you , you can add widget path in your computer to ryry environment
+
+    $ ryry widget add [path_with_widget_code]
+
+you can modify script and h5 file yourself, then publish to ryry sever 
+    
+    $ ryry widget publish
+
+get ryry status
+    $ ryry services status

{ryry-cli-2.93 → ryry_cli-2.94}/ryry_cli.egg-info/requires.txt

@@ -5,7 +5,6 @@ pillow
 psutil
 pynvml
 requests_toolbelt
-matplotlib
 fake_useragent
 gputil
 urlparser

{ryry-cli-2.93 → ryry_cli-2.94}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{ryry-cli-2.93 → ryry_cli-2.94}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.93"
+ryry_version = "2.94"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -65,7 +65,6 @@ setuptools.setup(
         'psutil',
         'pynvml',
         'requests_toolbelt',
-        'matplotlib',
         'fake_useragent',
         'gputil',
         'urlparser',