Aaaa

app.py

@@ -8,68 +8,13 @@ import time
 import gradio as gr
 import requests
 
-from pathlib import Path
-from datetime import datetime, timedelta
-
 import dashscope
-# from dashscope.utils.oss_utils import check_and_upload_local
+from dashscope.utils.oss_utils import check_and_upload_local
 
 DASHSCOPE_API_KEY = os.getenv("DASHSCOPE_API_KEY")
 dashscope.api_key = DASHSCOPE_API_KEY
 
 
-
-def get_upload_policy(api_key, model_name):
-    """获取文件上传凭证"""
-    url = "https://dashscope.aliyuncs.com/api/v1/uploads"
-    headers = {
-        "Authorization": f"Bearer {api_key}",
-        "Content-Type": "application/json"
-    }
-    params = {
-        "action": "getPolicy",
-        "model": model_name
-    }
-    
-    response = requests.get(url, headers=headers, params=params)
-    if response.status_code != 200:
-        raise Exception(f"Failed to get upload policy: {response.text}")
-    
-    return response.json()['data']
-
-def upload_file_to_oss(policy_data, file_path):
-    """将文件上传到临时存储OSS"""
-    file_name = Path(file_path).name
-    key = f"{policy_data['upload_dir']}/{file_name}"
-    
-    with open(file_path, 'rb') as file:
-        files = {
-            'OSSAccessKeyId': (None, policy_data['oss_access_key_id']),
-            'Signature': (None, policy_data['signature']),
-            'policy': (None, policy_data['policy']),
-            'x-oss-object-acl': (None, policy_data['x_oss_object_acl']),
-            'x-oss-forbid-overwrite': (None, policy_data['x_oss_forbid_overwrite']),
-            'key': (None, key),
-            'success_action_status': (None, '200'),
-            'file': (file_name, file)
-        }
-        
-        response = requests.post(policy_data['upload_host'], files=files)
-        if response.status_code != 200:
-            raise Exception(f"Failed to upload file: {response.text}")
-    
-    return f"oss://{key}"
-
-def upload_file_and_get_url(api_key, model_name, file_path):
-    """上传文件并获取URL"""
-    # 1. 获取上传凭证，上传凭证接口有限流，超出限流将导致请求失败
-    policy_data = get_upload_policy(api_key, model_name) 
-    # 2. 上传文件到OSS
-    oss_url = upload_file_to_oss(policy_data, file_path)
-    
-    return oss_url
-
-
 class WanAnimateApp:
     def __init__(self, url, get_url):
         self.url = url
@@ -83,8 +28,8 @@ class WanAnimateApp:
         model,
     ):
         # Upload files to OSS if needed and get URLs
-        image_url = upload_file_and_get_url(DASHSCOPE_API_KEY, model_id, ref_img)
-        video_url = upload_file_and_get_url(DASHSCOPE_API_KEY, model_id, video)
+        _, image_url = check_and_upload_local(model_id, ref_img, DASHSCOPE_API_KEY)
+        _, video_url = check_and_upload_local(model_id, video, DASHSCOPE_API_KEY)
 
         # Prepare the request payload
         payload = {
@@ -109,7 +54,7 @@ class WanAnimateApp:
         
         # Make the initial API request
         url = self.url
-        response = requests.post(url, json=payload, headers=headers, timeout=60)
+        response = requests.post(url, json=payload, headers=headers)
         
         # Check if request was successful
         if response.status_code != 200:
@@ -129,7 +74,7 @@ class WanAnimateApp:
         }
         
         while True:
-            response = requests.get(get_url, headers=headers, timeout=60)
+            response = requests.get(get_url, headers=headers)
             if response.status_code != 200:
                 raise Exception(f"Failed to get task status: {response.status_code}: {response.text}")
             
@@ -141,16 +86,16 @@ class WanAnimateApp:
                 # Task completed successfully, return video URL
                 video_url = result["output"]["results"]["video_url"]
                 return video_url, "SUCCEEDED"
-            elif task_status == "PENDING" or task_status == "RUNNING":
-                # Task is still running, wait and retry
-                time.sleep(10)  # Wait 10 seconds before polling again
-            else:
-                # Task failed or unknown, raise an exception with error message
+            elif task_status == "FAILED":
+                # Task failed, raise an exception with error message
                 error_msg = result.get("output", {}).get("message", "Unknown error")
                 code_msg = result.get("output", {}).get("code", "Unknown code")
                 print(f"\n\nTask failed: {error_msg} Code: {code_msg} TaskId: {task_id}\n\n")
                 return None, f"Task failed: {error_msg} Code: {code_msg} TaskId: {task_id}"
                 # raise Exception(f"Task failed: {error_msg} TaskId: {task_id}")
+            else:
+                # Task is still running, wait and retry
+                time.sleep(5)  # Wait 5 seconds before polling again
 
 def start_app():
     import argparse