ryry-cli 2.57__tar.gz → 2.59__tar.gz

{ryry_cli-2.57/ryry_cli.egg-info → ryry-cli-2.59}/PKG-INFO

@@ -1,70 +1,56 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.57
-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: matplotlib
-Requires-Dist: fake_useragent
-Requires-Dist: piexif
-Requires-Dist: gputil
-Requires-Dist: urlparser
-Requires-Dist: python-crontab
-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
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.59
+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

ryry-cli-2.59/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.59"
+app_bulld_anchor="Noh_2024-09-23 17:45:28.815580"
+app_name="ryry-cli"

{ryry_cli-2.57 → ryry-cli-2.59}/ryry/ryry_widget.py

@@ -320,6 +320,8 @@ def widgetReInstall(name, url, local_path):
                 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)
+        except Exception as ex:
+            print(ex)
         finally:
             if os.path.exists(download_file):
                 os.remove(download_file)
@@ -333,9 +335,9 @@ def UpdateWidgetFromPypi():
             path = _map[it]["path"]
         else:
             path = _map[it]
-        path = os.path.dirname(path)
-        if is_block == False and os.path.exists(path):
-            data = GetWidgetConfig(path)
+        local_path = os.path.dirname(path)
+        if is_block == False and os.path.exists(local_path):
+            data = GetWidgetConfig(local_path)
             if "name" in data and len(data["name"]) > 0:
                 try:
                     py_package = data["name"]

{ryry_cli-2.57 → ryry-cli-2.59}/ryry/server_func.py

@@ -46,6 +46,7 @@ class TaskThread(Thread):
             if cmd:
                 self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
                 self.params["task_id"] = self.checkUUID
+                taskUtils.appendTaskAndDomain(self.checkUUID, self.param["domain"])
                 executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
                 if executeSuccess and result_obj["status"] == 0:
                     self.call_back(self.idx, result_obj["result"])

{ryry_cli-2.57 → ryry-cli-2.59}/ryry/taskUtils.py

@@ -26,7 +26,19 @@ def taskDomainWithUUID(taskUUID):
         if taskUUID in task_config:
             return task_config[taskUUID]["domain"]
     return ""
-
+def appendTaskAndDomain(taskUUID, subDomain):
+    task_config = {}
+    if os.path.exists(task_config_file):
+        with open(task_config_file, 'r') as f:
+            task_config = json.load(f)
+    task_config[taskUUID] = {
+        "pts": calendar.timegm(time.gmtime()),
+        "domain": subDomain
+    }
+    task_config["last_task_pts"] = task_config[taskUUID]["pts"]
+    with open(task_config_file, 'w') as f:
+        json.dump(task_config, f)
+    
 WECHAT_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=f40c5fb0-2734-48b0-a2d0-0faedf7dd2e4"
 def uploadFile2Wechat(filepath):
     real_robot_url = WECHAT_URL

{ryry_cli-2.57 → ryry-cli-2.59}/ryry/upload.py

@@ -261,6 +261,3 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
     except Exception as e:
         print(f"downloadDir fail: {e}")
     return None
-
-# url = upload("D:\\0505.mp4", "111", 300)
-# download("http://w.hs1921.com/skin/wywk/images/img_weixin.jpg", "C:\\Users\\123\\Downloads\\test")

{ryry_cli-2.57 → ryry-cli-2.59/ryry_cli.egg-info}/PKG-INFO

@@ -1,70 +1,56 @@
-Metadata-Version: 2.1
-Name: ryry-cli
-Version: 2.57
-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: matplotlib
-Requires-Dist: fake_useragent
-Requires-Dist: piexif
-Requires-Dist: gputil
-Requires-Dist: urlparser
-Requires-Dist: python-crontab
-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
+Metadata-Version: 2.1
+Name: ryry-cli
+Version: 2.59
+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

{ryry_cli-2.57 → ryry-cli-2.59}/setup.cfg

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

{ryry_cli-2.57 → ryry-cli-2.59}/setup.py

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

ryry_cli-2.57/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.57"
-app_bulld_anchor="Noh_2024-09-14 17:24:55.827020"
-app_name="ryry-cli"