ryry-cli 1.1__tar.gz → 1.3__tar.gz

{ryry_cli-1.1/ryry_cli.egg-info → ryry_cli-1.3}/PKG-INFO

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

ryry_cli-1.3/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="1.3"
+app_bulld_number=13
+app_bulld_anchor="Noh_2024-05-22 22:20:15.426640"
+app_name="ryry-cli"

{ryry_cli-1.1 → ryry_cli-1.3}/ryry/ryry_webapi.py

@@ -17,7 +17,7 @@ def _aigc_post(func, params, files={}, timeout=10):
         s.headers.update({'Usertoken':"0cce7cfe3629e16ee9b3ea8563305d3a15c524804da1861db07c2c867d79da63"})
         if len(files) <= 0:
             s.headers.update({'Content-Type':'application/json'})
-        res = s.post(url=f"https://api.dalipen.com/{func}", json=params, files=files, timeout=timeout, verify=False)
+        res = s.post(url=f"https://api.dalipen.com/{func}", data=params, files=files, timeout=timeout, verify=False)
         if res.status_code == 200:
             result_data = json.loads(res.content)
             res.close()
@@ -166,7 +166,6 @@ def TaskNotify(taskUUID, status, msg, dataStr, failSaveNotify=True):
         return False
     return r3
   
-retryLastTaskNotify()
 def TaskUpdateProgress(taskUUID, progress, dataStr):
     # req = aigc_ext_pb2.TaskUpdateReq()
     # req.taskUUID = taskUUID

{ryry_cli-1.1 → ryry_cli-1.3}/ryry/ryry_widget.py

@@ -129,7 +129,7 @@ def setWidgetData(root, widgetid):
     data = GetWidgetConfig(root)
     data["widget_id"] = widgetid
     data["name"] = "Demo"
-    data["version"] = "1.1"
+    data["version"] = "1.3"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]

{ryry_cli-1.1 → ryry_cli-1.3}/ryry/upload.py

@@ -95,45 +95,10 @@ def upload(src, taskUUID, timeout=300):
     needDeleteSrc, newSrc = transcode(src)
     addtionExif(newSrc, taskUUID)
     file_name = Path(newSrc).name
-    ossurl, content_type = ryry_webapi.GetOssUrl(os.path.splitext(file_name)[-1][1:])
-    if len(ossurl) == 0:
-        raise Exception(f"oss server is not avalid, msg = {content_type}")
+    ossurl = ryry_webapi.upload(newSrc, os.path.splitext(file_name)[-1][1:])
+    ossurl = additionalUrl(newSrc, ossurl)
+    if needDeleteSrc:
+        os.remove(newSrc)
+    return ossurl
 
-    headers = dict()
-    headers['Content-Type'] = content_type
-    requests.adapters.DEFAULT_RETRIES = 3
-    s = requests.session()
-    s.keep_alive = False
-    res = s.put(ossurl, data=open(newSrc, 'rb').read(), headers=headers, timeout=timeout)
-    s.close()
-    if res.status_code == 200:
-        ossurl = additionalUrl(newSrc, ossurl)
-        if needDeleteSrc:
-            os.remove(newSrc)
-        return ossurl
-    else:
-        raise Exception(f"upload file fail! res = {res}")
-
-def uploadWidget(src, widgetid, timeout=300):
-    from ryry import ryry_webapi
-    import requests
-    ossurl, content_type = ryry_webapi.GetWidgetOssUrl(widgetid)
-    if len(ossurl) == 0:
-        raise Exception("oss server is not avalid")
-    
-    headers = dict()
-    headers['Content-Type'] = content_type
-    requests.adapters.DEFAULT_RETRIES = 3
-    s = requests.session()
-    s.keep_alive = False
-    res = s.put(ossurl, data=open(src, 'rb').read(), headers=headers, timeout=timeout)
-    s.close()
-    if res.status_code == 200:
-        ossurl = additionalUrl(src, ossurl)
-        checkid = ryry_webapi.WidgetUploadEnd(ossurl)
-        if checkid > 0:
-            return ossurl, checkid
-        else:
-            raise Exception("check fail!")
-    else:
-        raise Exception(f"upload file fail! res = {res}")
+upload("C:\\Users\\123\\Desktop\\1.png", None)

{ryry_cli-1.1 → ryry_cli-1.3/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-1.1 → ryry_cli-1.3}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "1.1"
+ryry_version = "1.3"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
 except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
-app_version="1.1"
+app_version="1.3"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"

ryry_cli-1.1/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="1.1"
-app_bulld_number=11
-app_bulld_anchor="Noh_2024-05-21 20:21:06.277897"
-app_name="ryry-cli"