Update app.py

app.py

@@ -34,12 +34,12 @@ class VideoGenerationConfig:
     lora_filename: str = "Wan21_CausVid_14B_T2V_lora_rank32.safetensors"
     mod_value: int = 32
     default_height: int = 512
-    default_width: int = 896
+    default_width: int = 512  # Zero GPU 환경을 위해 기본값 수정
     max_area: float = 480.0 * 832.0
     slider_min_h: int = 128
-    slider_max_h: int = 896
+    slider_max_h: int = 832  # Zero GPU 환경을 위해 수정
     slider_min_w: int = 128
-    slider_max_w: int = 896
+    slider_max_w: int = 832  # Zero GPU 환경을 위해 수정
     fixed_fps: int = 24
     min_frames: int = 8
     max_frames: int = 81
@@ -163,7 +163,10 @@ class ModelManager:
                 self._pipe.fuse_lora()
                 
                 # GPU 최적화 설정
-                if config.enable_model_cpu_offload:
+                if hasattr(spaces, 'GPU'):  # Zero GPU 환경
+                    self._pipe.enable_model_cpu_offload()
+                    logger.info("CPU offload enabled for Zero GPU")
+                elif config.enable_model_cpu_offload:
                     self._pipe.enable_model_cpu_offload()
                 else:
                     self._pipe.to("cuda")
@@ -216,16 +219,29 @@ class VideoGenerator:
             return self.config.default_height, self.config.default_width
         
         aspect_ratio = orig_h / orig_w
-        calc_h = round(np.sqrt(self.config.max_area * aspect_ratio))
-        calc_w = round(np.sqrt(self.config.max_area / aspect_ratio))
+        
+        # Zero GPU 환경에서는 더 작은 max_area 사용
+        if hasattr(spaces, 'GPU'):
+            max_area = 640.0 * 640.0  # 409,600 pixels
+        else:
+            max_area = self.config.max_area
+        
+        calc_h = round(np.sqrt(max_area * aspect_ratio))
+        calc_w = round(np.sqrt(max_area / aspect_ratio))
         
         calc_h = max(self.config.mod_value, (calc_h // self.config.mod_value) * self.config.mod_value)
         calc_w = max(self.config.mod_value, (calc_w // self.config.mod_value) * self.config.mod_value)
         
-        new_h = int(np.clip(calc_h, self.config.slider_min_h, 
-                           (self.config.slider_max_h // self.config.mod_value) * self.config.mod_value))
-        new_w = int(np.clip(calc_w, self.config.slider_min_w, 
-                           (self.config.slider_max_w // self.config.mod_value) * self.config.mod_value))
+        # Zero GPU 환경에서 추가 제한
+        if hasattr(spaces, 'GPU'):
+            max_dim = 832
+            new_h = int(np.clip(calc_h, self.config.slider_min_h, min(max_dim, self.config.slider_max_h)))
+            new_w = int(np.clip(calc_w, self.config.slider_min_w, min(max_dim, self.config.slider_max_w)))
+        else:
+            new_h = int(np.clip(calc_h, self.config.slider_min_h, 
+                               (self.config.slider_max_h // self.config.mod_value) * self.config.mod_value))
+            new_w = int(np.clip(calc_w, self.config.slider_min_w, 
+                               (self.config.slider_max_w // self.config.mod_value) * self.config.mod_value))
         
         return new_h, new_w
     
@@ -254,8 +270,12 @@ class VideoGenerator:
         if hasattr(spaces, 'GPU'):  # Spaces 환경 체크
             if duration > 2.5:  # Zero GPU에서는 2.5초로 제한
                 return False, "⏱️ In Zero GPU environment, duration is limited to 2.5s for stability"
-            if height > 640 or width > 640:  # 해상도도 제한
-                return False, "📐 In Zero GPU environment, resolution is limited to 640x640"
+            # 픽셀 수 기반 제한 (640x640 = 409,600 픽셀)
+            max_pixels = 640 * 640
+            if height * width > max_pixels:
+                return False, f"📐 In Zero GPU environment, total pixels limited to {max_pixels:,} (e.g., 640×640, 512×832)"
+            if height > 832 or width > 832:  # 한 변의 최대 길이
+                return False, "📐 In Zero GPU environment, maximum dimension is 832 pixels"
         
         # GPU 메모리 체크
         if torch.cuda.is_available():
@@ -312,11 +332,11 @@ def get_duration(input_image, prompt, height, width, negative_prompt,
     elif duration_seconds > 1.5:
         base_duration += 10
     
-    # 해상도별 추가 시간
+    # 해상도별 추가 시간 (픽셀 수 기반)
     pixels = height * width
-    if pixels > 400000:  # 약 640x640
+    if pixels > 400000:  # 640x640 근처
         base_duration += 20
-    elif pixels > 250000:  # 약 512x512  
+    elif pixels > 250000:  # 512x512 근처
         base_duration += 10
     
     # Zero GPU 환경에서는 최대 90초로 제한
@@ -339,7 +359,7 @@ def generate_video(input_image, prompt, height, width,
         
         # Zero GPU 환경에서 추가 검증
         if hasattr(spaces, 'GPU'):
-            logger.info(f"Zero GPU environment detected. Duration: {duration_seconds}s, Resolution: {height}x{width}")
+            logger.info(f"Zero GPU environment detected. Duration: {duration_seconds}s, Resolution: {height}x{width}, Pixels: {height*width:,}")
         
         # 입력 검증
         is_valid, error_msg = video_generator.validate_inputs(
@@ -584,7 +604,7 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
         <div class="header">
             <h1>🎬 AI Video Magic Studio</h1>
             <p>Transform your images into captivating videos with Wan 2.1 + CausVid LoRA</p>
-            <div class="gpu-status">🖥️ GPU Optimized</div>
+            <div class="gpu-status">🖥️ Zero GPU Optimized</div>
         </div>
         """)
         
@@ -594,7 +614,8 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
             <strong>💡 Zero GPU Performance Tips:</strong>
             <ul style="margin: 5px 0; padding-left: 20px;">
                 <li>Maximum duration: 2.5 seconds (limited by Zero GPU)</li>
-                <li>Recommended resolution: 512x512 for stable generation</li>
+                <li>Maximum total pixels: 409,600 (e.g., 640×640, 512×832, 448×896)</li>
+                <li>Maximum single dimension: 832 pixels</li>
                 <li>Use 4-6 steps for optimal speed/quality balance</li>
                 <li>Wait between generations to avoid queue errors</li>
             </ul>
@@ -654,14 +675,14 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
                             maximum=config.slider_max_h,
                             step=config.mod_value,
                             value=config.default_height,
-                            label="📏 Height (lower = more stable)"
+                            label="📏 Height (max 832px in Zero GPU)"
                         )
                         width_slider = gr.Slider(
                             minimum=config.slider_min_w,
                             maximum=config.slider_max_w,
                             step=config.mod_value,
                             value=config.default_width,
-                            label="📐 Width (lower = more stable)"
+                            label="📐 Width (max 832px in Zero GPU)"
                         )
                     
                     steps_slider = gr.Slider(
@@ -705,7 +726,7 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
         gr.Examples(
             examples=[
                 ["peng.png", "a penguin playfully dancing in the snow, Antarctica", 512, 512],
-                ["forg.jpg", "the frog jumps around", 448, 448],
+                ["forg.jpg", "the frog jumps around", 576, 320],  # 16:9 aspect ratio within limits
             ],
             inputs=[input_image, prompt_input, height_slider, width_slider],
             outputs=[video_output, seed],
@@ -747,4 +768,4 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
     )
 
 if __name__ == "__main__":
-    demo.queue(max_size=1).launch()  # 큐 크기 제한으로 메모리 관리
+    demo.queue(max_size=1, concurrency_count=1).launch()  # 더 엄격한 동시성 제어