update: dynamic image url + music + resources

app.py

@@ -1,7 +1,6 @@
 import os
-import tempfile
 
-from fastapi import FastAPI, File, UploadFile
+from fastapi import FastAPI
 from pydantic import BaseModel
 from starlette.responses import JSONResponse
 from supabase import create_client
@@ -38,40 +37,56 @@ class VideoGenerator(BaseModel):
     store_name: str
 
 
-@app.post("/create-video/")
-async def create_video(
-        necklace_image: UploadFile = File(...),
-        necklace_tryon_image: UploadFile = File(...),
-        makeup_image: UploadFile = File(...),
-        clothing_image_1: UploadFile = File(...),
-        clothing_image_2: UploadFile = File(...)
-):
+import requests
+import tempfile
+
+
+def download_image(url):
+    """
+    Download an image from the web and save it as a temporary file.
+    :param url: URL of the image.
+    :return: Path to the temporary file.
+    """
     try:
-        def save_temp_file(file: UploadFile) -> str:
-            temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
-            temp_file.write(file.file.read())
-            return temp_file.name
+        response = requests.get(url, stream=True)
+        response.raise_for_status()
+
+        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png")
+        with open(temp_file.name, 'wb') as f:
+            for chunk in response.iter_content(chunk_size=8192):
+                f.write(chunk)
+        return temp_file.name
+    except Exception as e:
+        print(f"Error downloading image from {url}: {str(e)}")
+        return None
+
 
+@app.post("/create-video/")
+async def create_video(request: VideoGenerator):
+    try:
         temp_files = {
-            'necklace': save_temp_file(necklace_image),
-            'necklace_tryon': save_temp_file(necklace_tryon_image),
-            'makeup': save_temp_file(makeup_image),
-            'clothing1': save_temp_file(clothing_image_1),
-            'clothing2': save_temp_file(clothing_image_2)
+            'necklace': download_image(request.necklace_image),
+            'necklace_tryon': [download_image(url) for url in request.necklace_try_on_output_images],
+            'clothing': [download_image(url) for url in request.clothing_output_images],
+            'makeup': [download_image(url) for url in request.makeup_output_images]
         }
 
+        if any(file is None for files in temp_files.values() for file in
+               (files if isinstance(files, list) else [files])):
+            return JSONResponse(content={"status": "error", "message": "Failed to download all required images."},
+                                status_code=400)
+
         intro_path = f"{RESOURCES_DIR}/intro/ChamundiJewelsMandir_intro.mp4"
         output_path = f"{RESOURCES_DIR}/temp_video/video_{os.urandom(8).hex()}.mp4"
         font_path = f"{RESOURCES_DIR}/fonts/PlayfairDisplay-VariableFont_wght.ttf"
-        audio_path = f"{RESOURCES_DIR}/audio/background.mp3"
+        audio_path = f"{RESOURCES_DIR}/audio/TraditionalIndianVlogMusic.mp3"
 
         video_creator = VideoCreator(
             intro_video_path=intro_path,
             necklace_image=temp_files['necklace'],
-            nto_image1=temp_files['necklace_tryon'],
-            nto_cto_1=temp_files['clothing1'],
-            nto_cto_2=temp_files['clothing2'],
-            makeup_1=temp_files['makeup'],
+            nto_outputs=temp_files['necklace_tryon'],
+            nto_cto_outputs=temp_files['clothing'],
+            makeup_outputs=temp_files['makeup'],
             font_path=font_path,
             output_path=output_path,
             audio_path=audio_path
@@ -80,23 +95,37 @@ async def create_video(
         # Generate video
         video_creator.create_final_video()
 
-        # Clean up temp files
-        for temp_file in temp_files.values():
-            if os.path.exists(temp_file):
-                os.unlink(temp_file)
-
+        # Upload to Supabase
         url = upload_to_supabase(video_path=output_path)
-        response = {"status": "success",
-                    "message": "Video created successfully",
-                    "public_url": url
-                    }
-        os.remove(output_path)
+        response = {
+            "status": "success",
+            "message": "Video created successfully",
+            "public_url": url
+        }
+
+        for files in temp_files.values():
+            if isinstance(files, list):
+                for file in files:
+                    if os.path.exists(file):
+                        os.unlink(file)
+            elif os.path.exists(files):
+                os.unlink(files)
 
+        os.remove(output_path)
         return JSONResponse(content=response, status_code=200)
 
     except Exception as e:
-        return JSONResponse(content={"status": "error", "message": "Please try again", "error": str(e)},
-                            status_code=500)
+        raise e
+
+
+@app.get("/resources")
+async def get_infromation():
+    music = os.listdir(RESOURCES_DIR + "/audio")
+    fonts = os.listdir(RESOURCES_DIR + "/fonts")
+    intro = os.listdir(RESOURCES_DIR + "/intro")
+
+    json = {"music": music, "fonts": fonts, "intro": intro}
+    return JSONResponse(content=json, status_code=200)
 
 
 if __name__ == "__main__":

resources/audio/TraditionalIndianVlogMusic.mp3

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b290e209d37cdcff0dfeda53d4c7b6fcda1d286f924c47ad68d82ae433b296e2
+size 3133367

src/components/imgs_video.py

@@ -27,7 +27,7 @@
 #             "output_video_path": f"/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/02_medium_long_haram/output/{self.current_date}_jewelmirror_cjm.mp4",
 #             "font_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/font/PlayfairDisplay-VariableFont_wght.ttf",
 #             "necklace_image": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/01_lean_short_necklace/necklace_image/KAR2201CR001.png",
-#             "audio_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/audio/Traditional Indian Vlog Music.mp3",
+#             "audio_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/audio/TraditionalIndianVlogMusic.mp3",
 #             "transition_duration": 1.0,
 #             "image_display_duration": 2.5,
 #             "text_color": "white",

src/components/vidgen.py

@@ -12,27 +12,31 @@ from moviepy.video.compositing.concatenate import concatenate_videoclips
 from moviepy.video.fx.all import resize
 from moviepy.video.io.VideoFileClip import VideoFileClip
 
+from resourcesssss.vid_gen import transition_duration
+
 
 class VideoCreator:
     def __init__(self, intro_video_path, necklace_image, nto_outputs: list, nto_cto_outputs: list, makeup_outputs: list,
                  font_path,
-                 output_path, audio_path):
+                 output_path, audio_path, image_display_duration=2.5, box_color: tuple = (131, 42, 48), box_opacity=0.8,
+                 font_size=28, necklace_display_duration=2.0, text_color="white", fps=1):
         self.intro_video_path = intro_video_path
         self.nto_images_dir = nto_outputs
         self.nto_cto_images_dir = nto_cto_outputs
-        self.makeup_images_dir = [makeup_outputs]
+        self.makeup_images_dir = makeup_outputs
         self.output_video_path = output_path
         self.font_path = font_path
         self.necklace_image = necklace_image
         self.audio_path = audio_path
-        self.transition_duration = 1.0
-        self.image_display_duration = 2.5
-        self.text_color = 'white'
-        self.box_color = (131, 42, 48)
-        self.box_opacity = 0.8
-        self.font_size = 28
-        self.category_font_size = 70
-        self.necklace_display_duration = 2.0
+        self.transition_duration = transition_duration
+        self.image_display_duration = image_display_duration
+        self.text_color = text_color
+        self.box_color = box_color
+        self.box_opacity = box_opacity
+        self.font_size = font_size
+        self.category_font_size = font_size
+        self.necklace_display_duration = necklace_display_duration
+        self.fps = fps
 
     def create_necklace_clips(self, necklace_image_path, backgrounds=None):
         if backgrounds is None:
@@ -84,6 +88,7 @@ class VideoCreator:
         # Create background box
         w, h = 1080, 120 if is_category else 80
         box = ColorClip((w, h), col=self.box_color, duration=duration)
+        print("box_opacity", self.box_opacity)
         box = box.set_opacity(self.box_opacity)
 
         # Create text using TextClip with method='label' instead of default
@@ -127,6 +132,7 @@ class VideoCreator:
 
     def process_images_in_directory(self, directory, font_path, duration, category_name):
         clips = []
+        print(directory)
 
         for image_file in sorted(directory):
             if image_file.lower().endswith((".png", ".jpg", ".jpeg", ".webp")):
@@ -186,7 +192,7 @@ class VideoCreator:
         print("Rendering final temp_video...")
         final_video.write_videofile(
             self.output_video_path,
-            fps=1,
+            fps=self.fps,
             codec="libx264",
             audio_codec="aac",
             bitrate="8000k",