Update main.py

main.py

@@ -3,12 +3,13 @@ from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel, HttpUrl
 from typing import List
 import os
-import subprocess
+import asyncio
 import uuid
-import requests
+import aiohttp
 import re
 from urllib.parse import urlparse
 import shutil
+import aiofiles
 
 # Create FastAPI app
 app = FastAPI()
@@ -29,8 +30,8 @@ def extract_google_drive_id(url):
     match = re.search(pattern, str(url))
     return match.group(1) if match else None
 
-def download_file(url, local_path):
-    """Download a file from URL to local path"""
+async def download_file(url, local_path):
+    """Download a file from URL to local path asynchronously"""
     try:
         # Handle Google Drive URLs
         if "drive.google.com" in str(url):
@@ -38,30 +39,34 @@ def download_file(url, local_path):
             if file_id:
                 url = f"https://drive.google.com/uc?export=download&id={file_id}"
         
-        response = requests.get(str(url), stream=True)
-        response.raise_for_status()
-        
-        with open(local_path, 'wb') as f:
-            for chunk in response.iter_content(chunk_size=8192):
-                f.write(chunk)
+        async with aiohttp.ClientSession() as session:
+            async with session.get(str(url)) as response:
+                response.raise_for_status()
+                
+                async with aiofiles.open(local_path, 'wb') as f:
+                    while True:
+                        chunk = await response.content.read(8192)
+                        if not chunk:
+                            break
+                        await f.write(chunk)
         return True
     except Exception as e:
         print(f"Error downloading {url}: {str(e)}")
         return False
 
-def create_slideshow(image_paths, audio_path, output_path, duration):
-    """Generate slideshow from images and audio using ffmpeg"""
+async def create_slideshow(image_paths, audio_path, output_path, duration):
+    """Generate slideshow from images and audio using ffmpeg asynchronously"""
     # Create temporary file list for ffmpeg concat
     concat_file = "temp_concat.txt"
     
-    with open(concat_file, "w") as f:
+    async with aiofiles.open(concat_file, "w") as f:
         for img in image_paths:
-            f.write(f"file '{img}'\n")
-            f.write(f"duration {duration}\n")
+            await f.write(f"file '{img}'\n")
+            await f.write(f"duration {duration}\n")
         
         # Add the last image again without duration (required by ffmpeg)
         if image_paths:
-            f.write(f"file '{image_paths[-1]}'\n")
+            await f.write(f"file '{image_paths[-1]}'\n")
     
     # Run ffmpeg command to create slideshow with audio
     cmd = [
@@ -79,11 +84,22 @@ def create_slideshow(image_paths, audio_path, output_path, duration):
     ]
     
     try:
-        subprocess.run(cmd, check=True, capture_output=True)
-        os.remove(concat_file)
+        process = await asyncio.create_subprocess_exec(
+            *cmd, 
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+        
+        if os.path.exists(concat_file):
+            os.remove(concat_file)
+            
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            return False
         return True
-    except subprocess.CalledProcessError as e:
-        print(f"FFmpeg error: {e.stderr.decode()}")
+    except Exception as e:
+        print(f"FFmpeg error: {str(e)}")
         if os.path.exists(concat_file):
             os.remove(concat_file)
         return False
@@ -102,23 +118,32 @@ async def make_slideshow(request: SlideshowRequest):
     try:
         # Download images
         image_paths = []
+        download_tasks = []
+        
         for i, url in enumerate(request.image_urls):
             image_path = os.path.join(request_dir, f"image_{i:03d}.png")
-            if download_file(url, image_path):
-                image_paths.append(image_path)
-            else:
-                raise HTTPException(status_code=400, detail=f"Failed to download image: {url}")
+            image_paths.append(image_path)
+            download_tasks.append(download_file(url, image_path))
         
         # Download audio
         audio_path = os.path.join(request_dir, "audio.mp3")
-        if not download_file(request.audio_url, audio_path):
+        download_tasks.append(download_file(request.audio_url, audio_path))
+        
+        # Wait for all downloads to complete
+        results = await asyncio.gather(*download_tasks)
+        
+        # Check if all downloads were successful
+        if not all(results[:-1]):  # All image downloads
+            raise HTTPException(status_code=400, detail="Failed to download one or more images")
+        
+        if not results[-1]:  # Audio download
             raise HTTPException(status_code=400, detail=f"Failed to download audio: {request.audio_url}")
         
         # Output video path
         output_path = os.path.join(request_dir, "slideshow.mp4")
         
         # Generate slideshow
-        if not create_slideshow(image_paths, audio_path, output_path, request.duration):
+        if not await create_slideshow(image_paths, audio_path, output_path, request.duration):
             raise HTTPException(status_code=500, detail="Failed to create slideshow")
         
         # Return URL to the video