Update app.py

app.py

@@ -99,7 +99,7 @@ def _calculate_new_dimensions_wan(pil_image, mod_val, calculation_max_area,
     return new_h, new_w
 
 
-def upload_image_to_r2(video_file, account_id, access_key, secret_key, bucket_name):
+def upload_video_to_r2(video_file, account_id, access_key, secret_key, bucket_name):
     with calculateDuration("Upload video"):
         connectionUrl = f"https://{account_id}.r2.cloudflarestorage.com"
         s3 = boto3.client(
@@ -130,11 +130,25 @@ def handle_image_upload_for_dims_wan(uploaded_pil_image, current_h_val, current_
         gr.Warning("Error attempting to calculate new dimensions")
         return gr.update(value=DEFAULT_H_SLIDER_VALUE), gr.update(value=DEFAULT_W_SLIDER_VALUE)
 
-def get_duration(input_image, prompt, height, width, 
-                   negative_prompt, duration_seconds,
-                   guidance_scale, steps,
-                   seed, randomize_seed, 
-                   progress):
+def get_duration(
+    image_url, 
+    prompt, 
+    height, 
+    width, 
+    negative_prompt,
+    duration_seconds,
+    guidance_scale, 
+    steps,
+    seed, 
+    randomize_seed, 
+    upload_to_r2, 
+    account_id, 
+    access_key, 
+    secret_key, 
+    bucket,
+    progress=gr.Progress(track_tqdm=True)
+):
+    # 保持逻辑不变
     if steps > 4 and duration_seconds > 2:
         return 90
     elif steps > 4 or duration_seconds > 2:
@@ -142,6 +156,7 @@ def get_duration(input_image, prompt, height, width,
     else:
         return 60
 
+
 @spaces.GPU(duration=get_duration)
 def generate_video(image_url, 
                    prompt, 
@@ -215,7 +230,7 @@ with gr.Blocks() as demo:
                     height_input = gr.Slider(minimum=SLIDER_MIN_H, maximum=SLIDER_MAX_H, step=MOD_VALUE, value=DEFAULT_H_SLIDER_VALUE, label=f"Output Height (multiple of {MOD_VALUE})")
                     width_input = gr.Slider(minimum=SLIDER_MIN_W, maximum=SLIDER_MAX_W, step=MOD_VALUE, value=DEFAULT_W_SLIDER_VALUE, label=f"Output Width (multiple of {MOD_VALUE})")
                 steps_slider = gr.Slider(minimum=1, maximum=30, step=1, value=4, label="Inference Steps") 
-                guidance_scale_input = gr.Slider(minimum=0.0, maximum=20.0, step=0.5, value=1.0, label="Guidance Scale", visible=False)
+                guidance_scale_input = gr.Slider(minimum=0.0, maximum=20.0, step=0.5, value=1.0, label="Guidance Scale", visible=True)
             
             with gr.Accordion("R2 Settings", open=False):
                 upload_to_r2 = gr.Checkbox(label="Upload to R2", value=False)