Update app.py

app.py

@@ -264,75 +264,86 @@ def generate_video(image, prompt):
             status_data = query_response.json()
             status = status_data.get('status')
 
-if status == 'Success':
-    file_id = status_data.get('file_id')
-    if not file_id:
-        return "Failed to get file ID"
+            if status == 'Success':
+                file_id = status_data.get('file_id')
+                if not file_id:
+                    return "Failed to get file ID"
 
-    retrieve_url = "https://api.minimaxi.chat/v1/files/retrieve"
-    params = {'file_id': file_id}
-    
-    file_response = requests.get(
-        retrieve_url,
-        headers={'authorization': f'Bearer {API_KEY}'},
-        params=params
-    )
-    
-    if not file_response.ok:
-        return "Failed to retrieve video file"
-
-    try:
-        file_data = file_response.json()
-        download_url = file_data.get('file', {}).get('download_url')
-        if not download_url:
-            return "Failed to get download URL"
-
-        result_info = {
-            "timestamp": datetime.now().strftime("%Y%m%d_%H%M%S"),
-            "input_image": image_url,
-            "output_video_url": download_url,
-            "prompt": prompt
-        }
-        logger.info(f"Video generation result: {json.dumps(result_info, indent=2)}")
-
-        video_response = requests.get(download_url)
-        if not video_response.ok:
-            return "Failed to download video"
-
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        output_path = os.path.join(temp_dir, f"output_{timestamp}.mp4")
-        
-        with open(output_path, 'wb') as f:
-            f.write(video_response.content)
-
-        final_path = add_watermark(output_path)
-        
-        # 오디오 처리 추가
-        try:
-            final_path_with_audio = video_to_audio(
-                final_path,
-                prompt=prompt,
-                negative_prompt="music",
-                seed=-1,
-                num_steps=25,
-                cfg_strength=4.5,
-                duration=8
-            )
-            
-            # 임시 파일 정리
-            if output_path != final_path:
-                os.remove(output_path)
-            if final_path != final_path_with_audio:
-                os.remove(final_path)
+                retrieve_url = "https://api.minimaxi.chat/v1/files/retrieve"
+                params = {'file_id': file_id}
                 
-            return final_path_with_audio
-        except Exception as e:
-            logger.error(f"Error in audio processing: {str(e)}")
-            return final_path  # 오디오 처리 실패 시 워터마크만 된 비디오 반환
+                file_response = requests.get(
+                    retrieve_url,
+                    headers={'authorization': f'Bearer {API_KEY}'},
+                    params=params
+                )
+                
+                if not file_response.ok:
+                    return "Failed to retrieve video file"
+
+                try:
+                    file_data = file_response.json()
+                    download_url = file_data.get('file', {}).get('download_url')
+                    if not download_url:
+                        return "Failed to get download URL"
+
+                    result_info = {
+                        "timestamp": datetime.now().strftime("%Y%m%d_%H%M%S"),
+                        "input_image": image_url,
+                        "output_video_url": download_url,
+                        "prompt": prompt
+                    }
+                    logger.info(f"Video generation result: {json.dumps(result_info, indent=2)}")
+
+                    video_response = requests.get(download_url)
+                    if not video_response.ok:
+                        return "Failed to download video"
+
+                    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+                    output_path = os.path.join(temp_dir, f"output_{timestamp}.mp4")
+                    
+                    with open(output_path, 'wb') as f:
+                        f.write(video_response.content)
+
+                    final_path = add_watermark(output_path)
+                    
+                    # 오디오 처리 추가
+                    try:
+                        final_path_with_audio = video_to_audio(
+                            final_path,
+                            prompt=prompt,
+                            negative_prompt="music",
+                            seed=-1,
+                            num_steps=25,
+                            cfg_strength=4.5,
+                            duration=8
+                        )
+                        
+                        # 임시 파일 정리
+                        if output_path != final_path:
+                            os.remove(output_path)
+                        if final_path != final_path_with_audio:
+                            os.remove(final_path)
+                            
+                        return final_path_with_audio
+                    except Exception as e:
+                        logger.error(f"Error in audio processing: {str(e)}")
+                        return final_path  # 오디오 처리 실패 시 워터마크만 된 비디오 반환
+
+                except Exception as e:
+                    logger.error(f"Error processing video file: {str(e)}")
+                    return "Error processing video file"
+
+            elif status == 'Fail':
+                return "Video generation failed"
+
+            attempt += 1
+
+        return "Timeout waiting for video generation"
 
     except Exception as e:
-        logger.error(f"Error processing video file: {str(e)}")
-        return "Error processing video file"
+        logger.error(f"Error in video generation: {str(e)}")
+        return f"Error in video generation process: {str(e)}"
 
 css = """
 footer {display: none}