ryry-cli 2.77__tar.gz → 2.79__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. {ryry_cli-2.77 → ryry_cli-2.79}/PKG-INFO +1 -1
  2. ryry_cli-2.79/ryry/constant.py +4 -0
  3. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/ryry_server_socket.py +1 -2
  4. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/utils.py +3 -3
  5. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/PKG-INFO +1 -1
  6. {ryry_cli-2.77 → ryry_cli-2.79}/setup.py +1 -1
  7. ryry_cli-2.77/ryry/constant.py +0 -4
  8. {ryry_cli-2.77 → ryry_cli-2.79}/LICENSE +0 -0
  9. {ryry_cli-2.77 → ryry_cli-2.79}/README.md +0 -0
  10. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/__init__.py +0 -0
  11. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/main.py +0 -0
  12. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/ryry_service.py +0 -0
  13. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/ryry_webapi.py +0 -0
  14. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/ryry_widget.py +0 -0
  15. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/script_template/__init__.py +0 -0
  16. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/script_template/main.py +0 -0
  17. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/script_template/run.py +0 -0
  18. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/server_func.py +0 -0
  19. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/store.py +0 -0
  20. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/task.py +0 -0
  21. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/taskUtils.py +0 -0
  22. {ryry_cli-2.77 → ryry_cli-2.79}/ryry/upload.py +0 -0
  23. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/SOURCES.txt +0 -0
  24. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/dependency_links.txt +0 -0
  25. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/entry_points.txt +0 -0
  26. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/requires.txt +0 -0
  27. {ryry_cli-2.77 → ryry_cli-2.79}/ryry_cli.egg-info/top_level.txt +0 -0
  28. {ryry_cli-2.77 → ryry_cli-2.79}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.77
3
+ Version: 2.79
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -0,0 +1,4 @@
1
+ #!!!!! do not change this file !!!!!
2
+ app_version="2.79"
3
+ app_bulld_anchor="Noh_2024-12-30 11:08:43.067080"
4
+ app_name="ryry-cli"
@@ -196,11 +196,10 @@ class RyryShortConnectThread(Thread):
196
196
  wait_time = min(max_wait_time, wait_time + consecutive_step)
197
197
  consecutive_failures = 0
198
198
 
199
-
200
199
  if calendar.timegm(time.gmtime()) - last_check_time > 600:
201
200
  last_check_time = calendar.timegm(time.gmtime())
202
201
  try:
203
- min_wait_time, max_wait_time, consecutive_step = ryry_webapi.TaskConfig()
202
+ min_wait_time, max_wait_time, consecutive_step = ryry_webapi.ServerTaskConfig()
204
203
  except:
205
204
  pass
206
205
 
@@ -132,7 +132,7 @@ def deviceInfo():
132
132
  cpu_serial = get_cpu_serial()
133
133
  cpu_serial = "" if cpu_serial == None else cpu_serial
134
134
  hostname = get_hostname()
135
- M=1024*1024
135
+ G=1024*1024*1024
136
136
  cpu_freq = "None"
137
137
  try:
138
138
  cpu_freq = psutil.cpu_freq().max / 1000
@@ -145,8 +145,8 @@ def deviceInfo():
145
145
  "max_freq" : f"{cpu_freq} GHz",
146
146
  },
147
147
  "memory": {
148
- "total" : f"{psutil.virtual_memory().total/M} M",
149
- "free" : f"{psutil.virtual_memory().free/M} M"
148
+ "total" : f"{(psutil.virtual_memory().total/G):.1f} G",
149
+ "free" : f"{(psutil.virtual_memory().free/G):.1f} G"
150
150
  },
151
151
  "gpu": {
152
152
  "count" : 0,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.77
3
+ Version: 2.79
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -3,7 +3,7 @@ import os
3
3
  import subprocess
4
4
  import datetime
5
5
 
6
- ryry_version = "2.77"
6
+ ryry_version = "2.79"
7
7
  cur_dir = os.path.dirname(os.path.abspath(__file__))
8
8
  constanspy = os.path.join(cur_dir, "ryry", "constant.py")
9
9
  try:
@@ -1,4 +0,0 @@
1
- #!!!!! do not change this file !!!!!
2
- app_version="2.77"
3
- app_bulld_anchor="Noh_2024-12-27 15:57:32.610725"
4
- app_name="ryry-cli"
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes