ryry-cli 1.4__tar.gz → 1.6__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-1.4/ryry_cli.egg-info → ryry_cli-1.6}/PKG-INFO +1 -1
  2. ryry_cli-1.6/ryry/constant.py +5 -0
  3. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/ryry_webapi.py +9 -5
  4. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/ryry_widget.py +1 -1
  5. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/server_func.py +1 -5
  6. {ryry_cli-1.4 → ryry_cli-1.6/ryry_cli.egg-info}/PKG-INFO +1 -1
  7. {ryry_cli-1.4 → ryry_cli-1.6}/setup.py +2 -2
  8. ryry_cli-1.4/ryry/constant.py +0 -5
  9. {ryry_cli-1.4 → ryry_cli-1.6}/LICENSE +0 -0
  10. {ryry_cli-1.4 → ryry_cli-1.6}/README.md +0 -0
  11. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/__init__.py +0 -0
  12. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/main.py +0 -0
  13. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/ryry_server_socket.py +0 -0
  14. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/ryry_service.py +0 -0
  15. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/script_template/__init__.py +0 -0
  16. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/script_template/main.py +0 -0
  17. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/script_template/run.py +0 -0
  18. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/store.py +0 -0
  19. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/task.py +0 -0
  20. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/taskUtils.py +0 -0
  21. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/upload.py +0 -0
  22. {ryry_cli-1.4 → ryry_cli-1.6}/ryry/utils.py +0 -0
  23. {ryry_cli-1.4 → ryry_cli-1.6}/ryry_cli.egg-info/SOURCES.txt +0 -0
  24. {ryry_cli-1.4 → ryry_cli-1.6}/ryry_cli.egg-info/dependency_links.txt +0 -0
  25. {ryry_cli-1.4 → ryry_cli-1.6}/ryry_cli.egg-info/entry_points.txt +0 -0
  26. {ryry_cli-1.4 → ryry_cli-1.6}/ryry_cli.egg-info/requires.txt +0 -0
  27. {ryry_cli-1.4 → ryry_cli-1.6}/ryry_cli.egg-info/top_level.txt +0 -0
  28. {ryry_cli-1.4 → ryry_cli-1.6}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 1.4
3
+ Version: 1.6
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -0,0 +1,5 @@
1
+ #!!!!! do not change this file !!!!!
2
+ app_version="1.6"
3
+ app_bulld_number=16
4
+ app_bulld_anchor="Noh_2024-05-23 19:10:47.271632"
5
+ app_name="ryry-cli"
@@ -17,7 +17,9 @@ def _aigc_post(func, params, files={}, timeout=10):
17
17
  s.headers.update({'Usertoken':"0cce7cfe3629e16ee9b3ea8563305d3a15c524804da1861db07c2c867d79da63"})
18
18
  if len(files) <= 0:
19
19
  s.headers.update({'Content-Type':'application/json'})
20
- res = s.post(url=f"https://api.dalipen.com/{func}", data=params, files=files, timeout=timeout, verify=False)
20
+ res = s.post(url=f"https://api.dalipen.com/{func}", json=params, timeout=timeout, verify=False)
21
+ else:
22
+ res = s.post(url=f"https://api.dalipen.com/{func}", data=params, files=files, timeout=timeout, verify=False)
21
23
  if res.status_code == 200:
22
24
  result_data = json.loads(res.content)
23
25
  res.close()
@@ -242,9 +244,11 @@ def checkTask(checkUUID):
242
244
  r1, r2, r3 = _aigc_post("aigc/task/checkTask", req)
243
245
  if r1 != 0:
244
246
  return False, False, "server fail"
245
- if r3["status"] < 3:
247
+ if r3["status"] < 2:
246
248
  return False, False, ""
247
- elif r3["status"] == 3:
249
+ elif r3["status"] == 2:
248
250
  return True, True, json.loads(r3["task_result"])
249
- elif r3["status"] == 4:
250
- return True, False, r3["fail_reason"]
251
+ elif r3["status"] == 3:
252
+ return True, False, r3["fail_reason"]
253
+
254
+ checkTask("4d889820-f85c-4824-885e-5c659cc280f9")
@@ -129,7 +129,7 @@ def setWidgetData(root, widgetid):
129
129
  data = GetWidgetConfig(root)
130
130
  data["widget_id"] = widgetid
131
131
  data["name"] = "Demo"
132
- data["version"] = "1.4"
132
+ data["version"] = "1.6"
133
133
  data["device_keys"] = [
134
134
  utils.generate_unique_id()
135
135
  ]
@@ -67,8 +67,4 @@ class Task:
67
67
  for t in self.thread_data.keys():
68
68
  result.append(self.thread_data[t]["result"])
69
69
  return result
70
-
71
-
72
- results = Task("Demo", [{
73
- "func": "你好"
74
- }], "").call()
70
+
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 1.4
3
+ Version: 1.6
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 = "1.4"
6
+ ryry_version = "1.6"
7
7
  ryry_build_number = int(ryry_version.replace(".",""))
8
8
  cur_dir = os.path.dirname(os.path.abspath(__file__))
9
9
  constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
24
24
  except:
25
25
  with open(constanspy, 'w') as f:
26
26
  f.write(f'''#!!!!! do not change this file !!!!!
27
- app_version="1.4"
27
+ app_version="1.6"
28
28
  app_bulld_number=1
29
29
  app_bulld_anchor=""
30
30
  app_name="ryry-cli"
@@ -1,5 +0,0 @@
1
- #!!!!! do not change this file !!!!!
2
- app_version="1.4"
3
- app_bulld_number=14
4
- app_bulld_anchor="Noh_2024-05-22 22:20:42.686145"
5
- 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