Update app.py

app.py

@@ -49,6 +49,16 @@ class VideoGenerationConfig:
     enable_model_cpu_offload: bool = True
     enable_vae_slicing: bool = True
     enable_vae_tiling: bool = True
+    
+    @property
+    def max_duration(self):
+        """최대 허용 duration (초)"""
+        return self.max_frames / self.fixed_fps
+    
+    @property
+    def min_duration(self):
+        """최소 허용 duration (초)"""
+        return self.min_frames / self.fixed_fps
 
 config = VideoGenerationConfig()
 MAX_SEED = np.iinfo(np.int32).max
@@ -230,19 +240,33 @@ class VideoGenerator:
         if len(prompt) > 500:
             return False, "⚠️ Prompt is too long (max 500 characters)"
         
-        if duration < self.config.min_frames / self.config.fixed_fps:
-            return False, f"⏱️ Duration too short (min {self.config.min_frames/self.config.fixed_fps:.1f}s)"
+        # 정확한 duration 범위 체크
+        min_duration = self.config.min_duration
+        max_duration = self.config.max_duration
         
-        if duration > self.config.max_frames / self.config.fixed_fps:
-            return False, f"⏱️ Duration too long (max {self.config.max_frames/self.config.fixed_fps:.1f}s)"
+        if duration < min_duration:
+            return False, f"⏱️ Duration too short (min {min_duration:.1f}s)"
+        
+        if duration > max_duration:
+            return False, f"⏱️ Duration too long (max {max_duration:.1f}s)"
+        
+        # Zero GPU 환경에서는 더 보수적인 제한 적용
+        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"
         
         # GPU 메모리 체크
         if torch.cuda.is_available():
-            free_memory = torch.cuda.get_device_properties(0).total_memory - torch.cuda.memory_allocated()
-            required_memory = (height * width * 3 * 8 * duration * config.fixed_fps) / (1024**3)  # 대략적인 추정
-            if free_memory < required_memory * 2:  # 2배 여유 확보
-                clear_gpu_memory()
-                return False, "⚠️ Not enough GPU memory. Try smaller dimensions or shorter duration."
+            try:
+                free_memory = torch.cuda.get_device_properties(0).total_memory - torch.cuda.memory_allocated()
+                required_memory = (height * width * 3 * 8 * duration * self.config.fixed_fps) / (1024**3)
+                if free_memory < required_memory * 2:
+                    clear_gpu_memory()
+                    return False, "⚠️ Not enough GPU memory. Try smaller dimensions or shorter duration."
+            except:
+                pass  # GPU 체크 실패시 계속 진행
         
         return True, None
     
@@ -273,25 +297,36 @@ def handle_image_upload(image):
 
 def get_duration(input_image, prompt, height, width, negative_prompt, 
                 duration_seconds, guidance_scale, steps, seed, randomize_seed, progress):
-    # GPU 사용량에 따라 동적으로 duration 조정
+    # Zero GPU 환경에서는 더 보수적인 시간 할당
     base_duration = 60
-    if steps > 4:
+    
+    # 단계별 추가 시간
+    if steps > 8:
+        base_duration += 30
+    elif steps > 4:
         base_duration += 15
+    
+    # Duration별 추가 시간
     if duration_seconds > 2:
-        base_duration += 15
+        base_duration += 20
+    elif duration_seconds > 1.5:
+        base_duration += 10
     
-    # 해상도에 따른 추가 시간
+    # 해상도별 추가 시간
     pixels = height * width
-    if pixels > 500000:
+    if pixels > 400000:  # 약 640x640
         base_duration += 20
+    elif pixels > 250000:  # 약 512x512  
+        base_duration += 10
     
-    return min(base_duration, 120)  # 최대 120초
+    # Zero GPU 환경에서는 최대 90초로 제한
+    return min(base_duration, 90)
 
 @spaces.GPU(duration=get_duration)
 @measure_time
 def generate_video(input_image, prompt, height, width, 
                    negative_prompt=config.default_negative_prompt, 
-                   duration_seconds=2, guidance_scale=1, steps=4,
+                   duration_seconds=1.5, guidance_scale=1, steps=4,
                    seed=42, randomize_seed=False, 
                    progress=gr.Progress(track_tqdm=True)):
     
@@ -302,6 +337,10 @@ def generate_video(input_image, prompt, height, width,
     try:
         progress(0.1, desc="🔍 Validating inputs...")
         
+        # Zero GPU 환경에서 추가 검증
+        if hasattr(spaces, 'GPU'):
+            logger.info(f"Zero GPU environment detected. Duration: {duration_seconds}s, Resolution: {height}x{width}")
+        
         # 입력 검증
         is_valid, error_msg = video_generator.validate_inputs(
             input_image, prompt, height, width, duration_seconds, steps
@@ -315,8 +354,15 @@ def generate_video(input_image, prompt, height, width,
         progress(0.2, desc="🎯 Preparing image...")
         target_h = max(config.mod_value, (int(height) // config.mod_value) * config.mod_value)
         target_w = max(config.mod_value, (int(width) // config.mod_value) * config.mod_value)
-        num_frames = np.clip(int(round(duration_seconds * config.fixed_fps)), 
-                            config.min_frames, config.max_frames)
+        
+        # 프레임 수 계산 (Zero GPU 환경에서 추가 제한)
+        max_allowed_frames = int(2.5 * config.fixed_fps) if hasattr(spaces, 'GPU') else config.max_frames
+        num_frames = min(
+            int(round(duration_seconds * config.fixed_fps)),
+            max_allowed_frames
+        )
+        num_frames = np.clip(num_frames, config.min_frames, max_allowed_frames)
+        
         current_seed = random.randint(0, MAX_SEED) if randomize_seed else int(seed)
         
         # 이미지 리사이즈 (메모리 효율적)
@@ -357,6 +403,7 @@ def generate_video(input_image, prompt, height, width,
         export_to_video(output_frames_list, video_path, fps=config.fixed_fps)
         
         progress(1.0, desc="✨ Complete!")
+        logger.info(f"Video generated successfully: {num_frames} frames, {target_h}x{target_w}")
         return video_path, current_seed
         
     except Exception as e:
@@ -544,11 +591,12 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
         # GPU 메모리 경고
         gr.HTML("""
         <div class="warning-box">
-            <strong>💡 Performance Tips:</strong>
+            <strong>💡 Zero GPU Performance Tips:</strong>
             <ul style="margin: 5px 0; padding-left: 20px;">
-                <li>Start with lower resolution (512x512) for testing</li>
-                <li>Keep duration under 2 seconds for stable generation</li>
-                <li>Use 4-8 steps for optimal speed/quality balance</li>
+                <li>Maximum duration: 2.5 seconds (limited by Zero GPU)</li>
+                <li>Recommended resolution: 512x512 for stable generation</li>
+                <li>Use 4-6 steps for optimal speed/quality balance</li>
+                <li>Wait between generations to avoid queue errors</li>
             </ul>
         </div>
         """)
@@ -572,11 +620,11 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
                     )
                     
                     duration_input = gr.Slider(
-                        minimum=round(config.min_frames/config.fixed_fps, 1),
-                        maximum=round(config.max_frames/config.fixed_fps, 1),
+                        minimum=round(config.min_duration, 1),
+                        maximum=2.5 if hasattr(spaces, 'GPU') else round(config.max_duration, 1),  # Zero GPU 환경 제한
                         step=0.1,
-                        value=2,
-                        label="⏱️ Video Duration (seconds)",
+                        value=1.5,  # 안전한 기본값
+                        label="⏱️ Video Duration (seconds) - Limited to 2.5s in Zero GPU",
                         elem_classes="slider-container"
                     )
                 
@@ -699,4 +747,4 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
     )
 
 if __name__ == "__main__":
-    demo.queue(max_size=2).launch()  # 큐 크기 제한으로 메모리 관리
+    demo.queue(max_size=1).launch()  # 큐 크기 제한으로 메모리 관리