Update app.py

app.py

@@ -239,14 +239,7 @@ pipeline = XoraVideoPipeline(
     vae=vae,
 ).to(device)
 
-# State 변수들의 초기화 수정
-txt2vid_current_height = gr.State(value=320)
-txt2vid_current_width = gr.State(value=512)
-txt2vid_current_num_frames = gr.State(value=257)
 
-img2vid_current_height = gr.State(value=320)
-img2vid_current_width = gr.State(value=512)
-img2vid_current_num_frames = gr.State(value=257)
 
 # Preset options for resolution and frame configuration
 # Convert frames to seconds assuming 25 FPS
@@ -279,16 +272,18 @@ preset_options = [
 ]
 
 def preset_changed(preset):
-    selected = next(item for item in preset_options if item["label"] == preset)
+    selected = next((item for item in preset_options if item["label"] == preset), None)
+    if selected is None:
+        raise gr.Error("Invalid preset selected")
     return [
-        selected["height"],
-        selected["width"],
-        selected["num_frames"],
+        gr.State(value=selected["height"]),
+        gr.State(value=selected["width"]),
+        gr.State(value=selected["num_frames"]),
         gr.update(visible=False),
         gr.update(visible=False),
         gr.update(visible=False),
-    ]    
-
+    ]
+    
 def generate_video_from_text(
     prompt,
     enhance_prompt_toggle,
@@ -849,6 +844,16 @@ def cleanup():
         
 # Gradio Interface Definition
 with gr.Blocks(theme="Yntec/HaleyCH_Theme_Orange") as iface:
+
+# State 변수들의 초기화 수정
+txt2vid_current_height = gr.State(value=320)
+txt2vid_current_width = gr.State(value=512)
+txt2vid_current_num_frames = gr.State(value=257)
+
+img2vid_current_height = gr.State(value=320)
+img2vid_current_width = gr.State(value=512)
+img2vid_current_num_frames = gr.State(value=257)
+    
     with gr.Tabs():
         # Text to Video Tab
         with gr.TabItem("텍스트로 비디오 만들기"):
@@ -1052,192 +1057,171 @@ with gr.Blocks(theme="Yntec/HaleyCH_Theme_Orange") as iface:
                                 merged_video_output = gr.Video(label="통합 영상")
 
 
-
-    
-# Event handlers
-    # Text to Video Tab handlers
-    txt2vid_preset.change(
-        fn=preset_changed,
-        inputs=[txt2vid_preset],
-        outputs=[
-            txt2vid_current_height,
-            txt2vid_current_width,
-            txt2vid_current_num_frames,
-            *txt2vid_advanced[3:]
-        ]
-    )
-
-    txt2vid_enhance_toggle.change(
-        fn=update_prompt_t2v,
-        inputs=[txt2vid_prompt, txt2vid_enhance_toggle],
-        outputs=txt2vid_prompt
-    )
-# Event handlers 수정
-    # Text to Video Tab handlers
-    txt2vid_generate.click(
-        fn=generate_video_from_text,
-        inputs=[
-            txt2vid_prompt,  # 텍스트 입력
-            txt2vid_enhance_toggle,  # 프롬프트 개선 토글
-            txt2vid_negative_prompt,  # 네거티브 프롬프트
-            txt2vid_frame_rate,  # 프레임 레이트
-            *txt2vid_advanced[:3],  # seed, inference_steps, guidance_scale
-            txt2vid_current_height,  # height
-            txt2vid_current_width,  # width
-            txt2vid_current_num_frames,  # num_frames
-        ],
-        outputs=txt2vid_output,
-        api_name="generate_text_to_video"
-    )
-
-    # Image to Video Tab handlers
-    img2vid_generate.click(
-        fn=generate_video_from_image,
-        inputs=[
-            img2vid_image,  # 입력 이미지
-            img2vid_prompt,  # 텍스트 입력
-            img2vid_enhance_toggle,  # 프롬프트 개선 토글
-            img2vid_negative_prompt,  # 네거티브 프롬프트
-            img2vid_frame_rate,  # 프레임 레이트
-            *img2vid_advanced[:3],  # seed, inference_steps, guidance_scale
-            img2vid_current_height,  # height
-            img2vid_current_width,  # width
-            img2vid_current_num_frames,  # num_frames
-        ],
-        outputs=img2vid_output,
-        api_name="generate_image_to_video"
-    )
-
-
-    img2vid_enhance_toggle.change(
-        fn=update_prompt_i2v,
-        inputs=[img2vid_prompt, img2vid_enhance_toggle],
-        outputs=img2vid_prompt
-    )
-
-    img2vid_preset.change(
-        fn=preset_changed,
-        inputs=[img2vid_preset],
-        outputs=[
-            img2vid_current_height,
-            img2vid_current_width,
-            img2vid_current_num_frames,
-            *img2vid_advanced[3:]
-        ]
-    )
-
-    
-    img2vid_generate.click(
-        fn=generate_video_from_image,
-        inputs=[
-            img2vid_image,
-            img2vid_prompt,
-            img2vid_enhance_toggle,
-            img2vid_negative_prompt,
-            img2vid_frame_rate,
-            *img2vid_advanced[:3],
-            img2vid_current_height,
-            img2vid_current_width,
-            img2vid_current_num_frames,
-        ],
-        outputs=img2vid_output,
-        concurrency_limit=1,
-        concurrency_id="generate_video",
-        queue=True,
-    )
-
-    # Scenario Tab handlers
-    # 스크립트 생성 버튼 핸들러
-    generate_script_btn.click(
-        fn=generate_script,
-        inputs=[script_topic],
-        outputs=[scenario_input]
-    )
-
-    # 시나리오 분석 버튼 핸들러
-    analyze_btn.click(
-        fn=analyze_scenario,
-        inputs=[scenario_input],
-        outputs=[
-            section1_prompt, section2_prompt, section3_prompt,
-            section4_prompt, section5_prompt
-        ]
-    )
-
-    # 섹션별 프롬프트 재생성 핸들러
-    section1_regenerate.click(
-        fn=lambda x: generate_single_section_prompt(x, 1),
-        inputs=[scenario_input],
-        outputs=section1_prompt
-    )
-
-    section2_regenerate.click(
-        fn=lambda x: generate_single_section_prompt(x, 2),
-        inputs=[scenario_input],
-        outputs=section2_prompt
-    )
-
-    section3_regenerate.click(
-        fn=lambda x: generate_single_section_prompt(x, 3),
-        inputs=[scenario_input],
-        outputs=section3_prompt
-    )
-
-    section4_regenerate.click(
-        fn=lambda x: generate_single_section_prompt(x, 4),
-        inputs=[scenario_input],
-        outputs=section4_prompt
-    )
-
-    section5_regenerate.click(
-        fn=lambda x: generate_single_section_prompt(x, 5),
-        inputs=[scenario_input],
-        outputs=section5_prompt
-    )
-
-    # 섹션별 비디오 생성 핸들러
-    section1_generate.click(
-        fn=lambda p, pr: generate_section_video(p, pr, 1),
-        inputs=[section1_prompt, scenario_preset],
-        outputs=section1_video
-    )
-
-    section2_generate.click(
-        fn=lambda p, pr: generate_section_video(p, pr, 2),
-        inputs=[section2_prompt, scenario_preset],
-        outputs=section2_video
-    )
-
-    section3_generate.click(
-        fn=lambda p, pr: generate_section_video(p, pr, 3),
-        inputs=[section3_prompt, scenario_preset],
-        outputs=section3_video
-    )
-
-    section4_generate.click(
-        fn=lambda p, pr: generate_section_video(p, pr, 4),
-        inputs=[section4_prompt, scenario_preset],
-        outputs=section4_video
-    )
-
-    section5_generate.click(
-        fn=lambda p, pr: generate_section_video(p, pr, 5),
-        inputs=[section5_prompt, scenario_preset],
-        outputs=section5_video
-    )
-
-    # 통합 영상 생성 핸들러
-    merge_videos_btn.click(
-        fn=merge_section_videos,
-        inputs=[
-            section1_video,
-            section2_video,
-            section3_video,
-            section4_video,
-            section5_video
-        ],
-        outputs=merged_video_output
-    )
+# Text to Video Tab handlers
+     txt2vid_preset.change(
+          fn=preset_changed,
+          inputs=[txt2vid_preset],
+          outputs=[
+               txt2vid_current_height,
+               txt2vid_current_width,
+               txt2vid_current_num_frames,
+               txt2vid_advanced[3],  # height_slider
+               txt2vid_advanced[4],  # width_slider
+               txt2vid_advanced[5],  # num_frames_slider
+          ]
+     )
+
+     txt2vid_enhance_toggle.change(
+          fn=update_prompt_t2v,
+          inputs=[txt2vid_prompt, txt2vid_enhance_toggle],
+          outputs=txt2vid_prompt
+     )
+
+     txt2vid_generate.click(
+          fn=generate_video_from_text,
+          inputs=[
+               txt2vid_prompt,
+               txt2vid_enhance_toggle,
+               txt2vid_negative_prompt,
+               txt2vid_frame_rate,
+               txt2vid_advanced[0],  # seed
+               txt2vid_advanced[1],  # inference_steps
+               txt2vid_advanced[2],  # guidance_scale
+               txt2vid_current_height,
+               txt2vid_current_width,
+               txt2vid_current_num_frames,
+          ],
+          outputs=txt2vid_output,
+     )
+
+     # Image to Video Tab handlers
+     img2vid_preset.change(
+          fn=preset_changed,
+          inputs=[img2vid_preset],
+          outputs=[
+               img2vid_current_height,
+               img2vid_current_width,
+               img2vid_current_num_frames,
+               img2vid_advanced[3],  # height_slider
+               img2vid_advanced[4],  # width_slider
+               img2vid_advanced[5],  # num_frames_slider
+          ]
+     )
+
+     img2vid_enhance_toggle.change(
+          fn=update_prompt_i2v,
+          inputs=[img2vid_prompt, img2vid_enhance_toggle],
+          outputs=img2vid_prompt
+     )
+
+     img2vid_generate.click(
+          fn=generate_video_from_image,
+          inputs=[
+               img2vid_image,
+               img2vid_prompt,
+               img2vid_enhance_toggle,
+               img2vid_negative_prompt,
+               img2vid_frame_rate,
+               img2vid_advanced[0],  # seed
+               img2vid_advanced[1],  # inference_steps
+               img2vid_advanced[2],  # guidance_scale
+               img2vid_current_height,
+               img2vid_current_width,
+               img2vid_current_num_frames,
+          ],
+          outputs=img2vid_output,
+     )
+
+     # Scenario Tab handlers
+     generate_script_btn.click(
+          fn=generate_script,
+          inputs=[script_topic],
+          outputs=[scenario_input]
+     )
+
+     analyze_btn.click(
+          fn=analyze_scenario,
+          inputs=[scenario_input],
+          outputs=[
+               section1_prompt, section2_prompt, section3_prompt,
+               section4_prompt, section5_prompt
+          ]
+     )
+
+     # 섹션별 프롬프트 재생성 핸들러
+     section1_regenerate.click(
+          fn=lambda x: generate_single_section_prompt(x, 1),
+          inputs=[scenario_input],
+          outputs=section1_prompt
+     )
+
+     section2_regenerate.click(
+          fn=lambda x: generate_single_section_prompt(x, 2),
+          inputs=[scenario_input],
+          outputs=section2_prompt
+     )
+
+     section3_regenerate.click(
+          fn=lambda x: generate_single_section_prompt(x, 3),
+          inputs=[scenario_input],
+          outputs=section3_prompt
+     )
+
+     section4_regenerate.click(
+          fn=lambda x: generate_single_section_prompt(x, 4),
+          inputs=[scenario_input],
+          outputs=section4_prompt
+     )
+
+     section5_regenerate.click(
+          fn=lambda x: generate_single_section_prompt(x, 5),
+          inputs=[scenario_input],
+          outputs=section5_prompt
+     )
+
+     # 섹션별 비디오 생성 핸들러
+     section1_generate.click(
+          fn=lambda p, pr: generate_section_video(p, pr, 1),
+          inputs=[section1_prompt, scenario_preset],
+          outputs=section1_video
+     )
+
+     section2_generate.click(
+          fn=lambda p, pr: generate_section_video(p, pr, 2),
+          inputs=[section2_prompt, scenario_preset],
+          outputs=section2_video
+     )
+
+     section3_generate.click(
+          fn=lambda p, pr: generate_section_video(p, pr, 3),
+          inputs=[section3_prompt, scenario_preset],
+          outputs=section3_video
+     )
+
+     section4_generate.click(
+          fn=lambda p, pr: generate_section_video(p, pr, 4),
+          inputs=[section4_prompt, scenario_preset],
+          outputs=section4_video
+     )
+
+     section5_generate.click(
+          fn=lambda p, pr: generate_section_video(p, pr, 5),
+          inputs=[section5_prompt, scenario_preset],
+          outputs=section5_video
+     )
+
+     # 통합 영상 생성 핸들러
+     merge_videos_btn.click(
+          fn=merge_section_videos,
+          inputs=[
+               section1_video,
+               section2_video,
+               section3_video,
+               section4_video,
+               section5_video
+          ],
+          outputs=merged_video_output
+     )
     
 if __name__ == "__main__":
     iface.queue(max_size=64, default_concurrency_limit=1, api_open=False).launch(