Update main.py

main.py

@@ -62,16 +62,34 @@ async def add_audio_to_image(request: Request):
 
         # Call the modal API with the request data and download the output file
         data = await request.json()
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f"{MODAL_BASE_URL}/add_audio_to_image", json=data) as response:
-                if response.status != 200:
-                    raise HTTPException(status_code=500, detail="Failed to process request")
-                output_data = await response.read()
-                async with aiofiles.open(output_path, "wb") as f:
-                    await f.write(output_data)
+        image_url = data.get("image_url")
+        audio_url = data.get("audio_url")
+
+        if not image_url or not audio_url:
+            raise HTTPException(status_code=400, detail="Missing image_url or audio_url in request")
+
+        image_file = await download_file(image_url, ".jpg")
+        audio_file = await download_file(audio_url, ".mp3")
+
+        # Run ffmpeg command
+        ffmpeg_cmd = f"ffmpeg -loop 1 -i {image_file} -i {audio_file} -c:v libx264 -tune stillimage -c:a aac -b:a 192k -shortest -pix_fmt yuv420p {output_path}"
+        process = await asyncio.create_subprocess_shell(
+            ffmpeg_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            raise HTTPException(status_code=500, detail=f"FFmpeg failed: {stderr.decode()}")
+
+        # Clean up temporary files
+        os.remove(image_file)
+        os.remove(audio_file)
 
         # Return the URL path to the output file
-        return f"https://sxqib-api.hf.space/output/{output_filename}"
+        return f"/output/{output_filename}"
     except Exception as e:
         print(f"An error occurred: {str(e)}")
         print(traceback.format_exc())
@@ -86,16 +104,34 @@ async def add_audio_to_video(request: Request):
 
         # Call the modal API with the request data and download the output file
         data = await request.json()
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f"{MODAL_BASE_URL}/add_audio_to_video", json=data) as response:
-                if response.status != 200:
-                    raise HTTPException(status_code=500, detail="Failed to process request")
-                output_data = await response.read()
-                async with aiofiles.open(output_path, "wb") as f:
-                    await f.write(output_data)
+        video_url = data.get("video_url")
+        audio_url = data.get("audio_url")
+
+        if not video_url or not audio_url:
+            raise HTTPException(status_code=400, detail="Missing video_url or audio_url in request")
+
+        video_file = await download_file(video_url, ".mp4")
+        audio_file = await download_file(audio_url, ".mp3")
+
+        # Run ffmpeg command
+        ffmpeg_cmd = f"ffmpeg -i {video_file} -i {audio_file} -c:v copy -c:a aac -shortest {output_path}"
+        process = await asyncio.create_subprocess_shell(
+            ffmpeg_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            raise HTTPException(status_code=500, detail=f"FFmpeg failed: {stderr.decode()}")
+
+        # Clean up temporary files
+        os.remove(video_file)
+        os.remove(audio_file)
 
         # Return the URL path to the output file
-        return f"https://sxqib-api.hf.space/output/{output_filename}"
+        return f"/output/{output_filename}"
     except Exception as e:
         print(f"An error occurred: {str(e)}")
         print(traceback.format_exc())
@@ -110,16 +146,43 @@ async def concatenate_videos(request: Request):
 
         # Call the modal API with the request data and download the output file
         data = await request.json()
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f"{MODAL_BASE_URL}/concatenate_videos", json=data) as response:
-                if response.status != 200:
-                    raise HTTPException(status_code=500, detail="Failed to process request")
-                output_data = await response.read()
-                async with aiofiles.open(output_path, "wb") as f:
-                    await f.write(output_data)
+        video_urls = data.get("video_urls")
+
+        if not video_urls or not isinstance(video_urls, list):
+            raise HTTPException(status_code=400, detail="Invalid video_urls in request. Must be a list of URLs.")
+
+        # Download the video files
+        video_files = []
+        for i, url in enumerate(video_urls):
+            video_file = await download_file(url, f"_{i}.mp4")
+            video_files.append(video_file)
+
+        # Create a temporary file with the list of input files
+        concat_list_path = os.path.join(OUTPUT_DIR, "concat_list.txt")
+        with open(concat_list_path, "w") as f:
+            for file in video_files:
+                f.write(f"file '{file}'\n")
+
+        # Run ffmpeg command
+        ffmpeg_cmd = f"ffmpeg -f concat -safe 0 -i {concat_list_path} -c copy {output_path}"
+        process = await asyncio.create_subprocess_shell(
+            ffmpeg_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            raise HTTPException(status_code=500, detail=f"FFmpeg failed: {stderr.decode()}")
+
+        # Clean up temporary files
+        for file in video_files:
+            os.remove(file)
+        os.remove(concat_list_path)
 
         # Return the URL path to the output file
-        return f"https://sxqib-api.hf.space/output/{output_filename}"
+        return f"/output/{output_filename}"
 
     except Exception as e:
         print(f"An error occurred: {str(e)}")
@@ -135,16 +198,43 @@ async def concatenate_audio(request: Request):
 
         # Call the modal API with the request data and download the output file
         data = await request.json()
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f"{MODAL_BASE_URL}/concatenate_audio", json=data) as response:
-                if response.status != 200:
-                    raise HTTPException(status_code=500, detail="Failed to process request")
-                output_data = await response.read()
-                async with aiofiles.open(output_path, "wb") as f:
-                    await f.write(output_data)
+        audio_urls = data.get("audio_urls")
+
+        if not audio_urls or not isinstance(audio_urls, list):
+            raise HTTPException(status_code=400, detail="Invalid audio_urls in request. Must be a list of URLs.")
+
+        # Download the audio files
+        audio_files = []
+        for i, url in enumerate(audio_urls):
+            audio_file = await download_file(url, f"_{i}.mp3")
+            audio_files.append(audio_file)
+
+        # Create a temporary file with the list of input files
+        concat_list_path = os.path.join(AUDIO_DIR, "concat_list.txt")
+        with open(concat_list_path, "w") as f:
+            for file in audio_files:
+                f.write(f"file '{file}'\n")
+
+        # Run ffmpeg command
+        ffmpeg_cmd = f"ffmpeg -f concat -safe 0 -i {concat_list_path} -c copy {output_path}"
+        process = await asyncio.create_subprocess_shell(
+            ffmpeg_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            raise HTTPException(status_code=500, detail=f"FFmpeg failed: {stderr.decode()}")
+
+        # Clean up temporary files
+        for file in audio_files:
+            os.remove(file)
+        os.remove(concat_list_path)
 
         # Return the URL path to the output file
-        return f"https://sxqib-api.hf.space/audio_files/{output_filename}"
+        return f"/audio/{output_filename}"
 
     except Exception as e:
         print(f"An error occurred: {str(e)}")
@@ -158,18 +248,50 @@ async def make_video(request: Request):
         output_filename = f"{uuid.uuid4()}.mp4"
         output_path = os.path.join(OUTPUT_DIR, output_filename)
 
-        # Call the modal API with the request data and download the output file
         data = await request.json()
-        async with aiohttp.ClientSession() as session:
-            async with session.post(f"{MODAL_BASE_URL}/make_video", json=data) as response:
-                if response.status != 200:
-                    raise HTTPException(status_code=500, detail="Failed to process request")
-                output_data = await response.read()
-                async with aiofiles.open(output_path, "wb") as f:
-                    await f.write(output_data)
+        image_urls = data.get("image_urls")
+        audio_url = data.get("audio_url")
+        duration = data.get("duration", 5)  # Default duration of 5 seconds per image
+
+        if not image_urls or not isinstance(image_urls, list) or not audio_url:
+            raise HTTPException(status_code=400, detail="Invalid image_urls or audio_url in request.")
+
+        # Download audio file
+        audio_file = await download_file(audio_url, ".mp3")
+
+        # Download image files and create a temporary file with the list of input files
+        image_files = []
+        concat_list_path = os.path.join(OUTPUT_DIR, "concat_list.txt")
+        with open(concat_list_path, "w") as f:
+            for i, url in enumerate(image_urls):
+                image_file = await download_file(url, f"_{i}.jpg")
+                image_files.append(image_file)
+                f.write(f"file '{image_file}'\nduration {duration}\n")  # Set duration for each image
+
+            # Add the last image again to ensure the audio doesn't cut off abruptly
+            f.write(f"file '{image_files[-1]}'\n")
+
+        # Run ffmpeg command to create video from images and add audio
+        ffmpeg_cmd = f"ffmpeg -f concat -safe 0 -i {concat_list_path} -i {audio_file} -c:v libx264 -pix_fmt yuv420p -c:a aac -shortest {output_path}"
+        process = await asyncio.create_subprocess_shell(
+            ffmpeg_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            print(f"FFmpeg error: {stderr.decode()}")
+            raise HTTPException(status_code=500, detail=f"FFmpeg failed: {stderr.decode()}")
+
+        # Clean up temporary files
+        for file in image_files:
+            os.remove(file)
+        os.remove(audio_file)
+        os.remove(concat_list_path)
 
         # Return the URL path to the output file
-        return f"https://sxqib-api.hf.space/output/{output_filename}"
+        return f"/output/{output_filename}"
 
     except Exception as e:
         print(f"An error occurred: {str(e)}")