Update modules/app.py

modules/app.py

@@ -2,7 +2,7 @@ from fastapi import FastAPI, HTTPException, Request, Depends
 from fastapi.staticfiles import StaticFiles
 from pytubefix import YouTube
 from pytubefix.exceptions import PytubeFixError
-from moviepy.editor import VideoFileClip, concatenate_videoclips, CompositeVideoClip, AudioFileClip, ImageClip
+import ffmpeg
 from pydantic import BaseModel, HttpUrl
 from typing import List
 import requests
@@ -61,73 +61,75 @@ class AudioImageInput(BaseModel):
 class VideosInput(BaseModel):
     video_urls: List[HttpUrl]
 
-def download_file(url: str, suffix: str):
-    response = requests.get(url)
-    if response.status_code != 200:
-        raise HTTPException(status_code=400, detail=f"Failed to download file from {url}")
-    with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as temp_file:
-        temp_file.write(response.content)
-        return temp_file.name
+async def download_file(url: str, suffix: str):
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            if response.status != 200:
+                raise HTTPException(status_code=400, detail=f"Failed to download file from {url}")
+            with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as temp_file:
+                temp_file.write(await response.read())
+                return temp_file.name
 
-@app.post("/add_audio_to_image")
+@app.post("/add_audio_to_image/")
 async def add_audio_to_image(input_data: AudioImageInput):
     # Download image and audio files
-    temp_image_path = download_file(str(input_data.image_url), ".png")
-    temp_audio_path = download_file(str(input_data.audio_url), ".mp3")
-
-    # Create a video from the image
-    image_clip = ImageClip(temp_image_path).set_duration(5)  # 5 seconds duration
-    image_clip = image_clip.set_fps(24)  # Set fps to 24
+    temp_image_path = await download_file(str(input_data.image_url), ".png")
+    temp_audio_path = await download_file(str(input_data.audio_url), ".mp3")
 
-    # Load the audio
-    audio_clip = AudioFileClip(temp_audio_path)
-
-    # Set the audio of the video clip
-    video_with_audio = image_clip.set_audio(audio_clip)
-
-    # Generate a unique filename
+    # Generate a unique filename for the output
     output_filename = f"{uuid.uuid4()}.mp4"
     output_path = os.path.join(OUTPUT_DIR, output_filename)
 
-    # Write the result to a file
-    video_with_audio.write_videofile(output_path, codec="libx264", audio_codec="aac")
-
-    # Clean up temporary files
-    os.unlink(temp_image_path)
-    os.unlink(temp_audio_path)
+    try:
+        # Use ffmpeg to create a video from the image and add audio
+        (
+            ffmpeg
+            .input(temp_image_path, loop=1, t=5)  # Loop the image for 5 seconds
+            .input(temp_audio_path)
+            .output(output_path, vcodec='libx264', acodec='aac', pix_fmt='yuv420p', shortest=None)
+            .overwrite_output()
+            .run(capture_stdout=True, capture_stderr=True)
+        )
+    except ffmpeg.Error as e:
+        raise HTTPException(status_code=500, detail=f"An error occurred while processing the files: {e.stderr.decode()}")
+    finally:
+        # Clean up temporary files
+        os.unlink(temp_image_path)
+        os.unlink(temp_audio_path)
 
     # Return the URL path to the output file
     return f"/output/{output_filename}"
 
-@app.post("/concatenate_videos")
+@app.post("/concatenate_videos/")
 async def concatenate_videos(input_data: VideosInput):
     temp_video_paths = []
 
     # Download videos to temporary files
     for video_url in input_data.video_urls:
-        temp_video_paths.append(download_file(str(video_url), ".mp4"))
-
-    # Load video clips
-    video_clips = []
-    for path in temp_video_paths:
-        clip = VideoFileClip(path)
-        if not clip.fps:
-            clip = clip.set_fps(24)  # Set fps to 24 if not defined
-        video_clips.append(clip)
-
-    # Concatenate video clips
-    final_clip = concatenate_videoclips(video_clips)
+        temp_video_paths.append(await download_file(str(video_url), ".mp4"))
 
-    # Generate a unique filename
+    # Generate a unique filename for the output
     output_filename = f"{uuid.uuid4()}.mp4"
     output_path = os.path.join(OUTPUT_DIR, output_filename)
 
-    # Write the result to a file
-    final_clip.write_videofile(output_path, codec="libx264", audio_codec="aac")
-
-    # Clean up temporary files
-    for path in temp_video_paths:
-        os.unlink(path)
+    try:
+        # Prepare input files for concatenation
+        input_files = [ffmpeg.input(path) for path in temp_video_paths]
+        
+        # Concatenate videos
+        (
+            ffmpeg
+            .concat(*input_files)
+            .output(output_path, vcodec='libx264', acodec='aac')
+            .overwrite_output()
+            .run(capture_stdout=True, capture_stderr=True)
+        )
+    except ffmpeg.Error as e:
+        raise HTTPException(status_code=500, detail=f"An error occurred while concatenating the videos: {e.stderr.decode()}")
+    finally:
+        # Clean up temporary files
+        for path in temp_video_paths:
+            os.unlink(path)
 
     # Return the URL path to the output file
     return f"/output/{output_filename}"