minor fixes

app.py

@@ -1,5 +1,7 @@
 import os
+import tempfile
 
+import requests
 from fastapi import FastAPI
 from pydantic import BaseModel
 from starlette.responses import JSONResponse
@@ -29,18 +31,6 @@ def upload_to_supabase(video_path, bucket_name="JewelmirrorVideoGeneration"):
         return None
 
 
-class VideoGenerator(BaseModel):
-    necklace_image: str
-    necklace_try_on_output_images: list[str]
-    clothing_output_images: list[str]
-    makeup_output_images: list[str]
-    store_name: str
-
-
-import requests
-import tempfile
-
-
 def download_image(url):
     """
     Download an image from the web and save it as a temporary file.
@@ -61,6 +51,25 @@ def download_image(url):
         return None
 
 
+class VideoGenerator(BaseModel):
+    necklace_image: str
+    necklace_try_on_output_images: list[str]
+    clothing_output_images: list[str]
+    makeup_output_images: list[str]
+    intro_video_path: str = "JewelMirror_intro.mp4"
+    background_audio_path: str = "TraditionalIndianVlogMusic.mp3"
+    font_path: str = "PlayfairDisplay-VariableFont_wght.ttf"
+    image_display_duration: float = 2.5
+    fps: int = 30
+    necklace_title: str = "Necklace Try-On"
+    clothing_title: str = "Clothing Try-On"
+    makeup_title: str = "Makeup Try-On"
+    necklace_image_title: str = "Necklace Preview"
+    nto_image_title: str = "Necklace Try-On"
+    nto_cto_image_title: str = "Clothing Try-On"
+    makeup_image_title: str = "Makeup Try-On"
+
+
 @app.post("/create-video/")
 async def create_video(request: VideoGenerator):
     try:
@@ -76,10 +85,10 @@ async def create_video(request: VideoGenerator):
             return JSONResponse(content={"status": "error", "message": "Failed to download all required images."},
                                 status_code=400)
 
-        intro_path = f"{RESOURCES_DIR}/intro/ChamundiJewelsMandir_intro.mp4"
+        intro_path = f"{RESOURCES_DIR}/intro/{request.intro_video_path}"
         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/TraditionalIndianVlogMusic.mp3"
+        font_path = f"{RESOURCES_DIR}/fonts/{request.font_path}"
+        audio_path = f"{RESOURCES_DIR}/audio/{request.background_audio_path}"
 
         video_creator = VideoCreator(
             intro_video_path=intro_path,
@@ -89,7 +98,14 @@ async def create_video(request: VideoGenerator):
             makeup_outputs=temp_files['makeup'],
             font_path=font_path,
             output_path=output_path,
-            audio_path=audio_path
+            audio_path=audio_path,
+            image_display_duration=request.image_display_duration,
+            fps=request.fps,
+            necklace_image_title=request.necklace_image_title,
+            nto_image_title=request.nto_image_title,
+            nto_cto_image_title=request.nto_cto_image_title,
+            makeup_image_title=request.makeup_image_title
+
         )
 
         # Generate video

src/components/vidgen.py

@@ -3,7 +3,6 @@ project @ images_to_video
 created @ 2024-12-12
 author  @ github.com/ishworrsubedii
 """
-import os
 
 from moviepy.audio.io.AudioFileClip import AudioFileClip
 from moviepy.video.VideoClip import ImageClip, ColorClip, TextClip
@@ -12,14 +11,14 @@ 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, 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):
+                 font_size=28, necklace_display_duration=2.0, text_color="white", fps=1,
+                 necklace_image_title="Necklace Preview", nto_image_title="Necklace Try-On",
+                 nto_cto_image_title="Clothing Try-On", makeup_image_title="Makeup Try-On"):
         self.intro_video_path = intro_video_path
         self.nto_images_dir = nto_outputs
         self.nto_cto_images_dir = nto_cto_outputs
@@ -28,7 +27,6 @@ class VideoCreator:
         self.font_path = font_path
         self.necklace_image = necklace_image
         self.audio_path = audio_path
-        self.transition_duration = transition_duration
         self.image_display_duration = image_display_duration
         self.text_color = text_color
         self.box_color = box_color
@@ -37,6 +35,10 @@ class VideoCreator:
         self.category_font_size = font_size
         self.necklace_display_duration = necklace_display_duration
         self.fps = fps
+        self.necklace_image_title = necklace_image_title
+        self.makeup_image_title = makeup_image_title
+        self.nto_image_title = necklace_image_title
+        self.nto_cto_image_title = nto_cto_image_title
 
     def create_necklace_clips(self, necklace_image_path, backgrounds=None):
         if backgrounds is None:
@@ -58,13 +60,27 @@ class VideoCreator:
         # Create a clip for each background color
         for bg_color in backgrounds:
             # Create background
+            # bg_clip = ColorClip((1080, 1080), col=bg_color)
+            # bg_clip = bg_clip.set_duration(self.image_display_duration)
+            #
+            # # Create necklace clip
+            # necklace = ImageClip(necklace_image_path)
+            # w, h = necklace.size
+            # new_size = (w * 0.5, h * 0.15)
             bg_clip = ColorClip((1080, 1080), col=bg_color)
             bg_clip = bg_clip.set_duration(self.image_display_duration)
 
             # Create necklace clip
             necklace = ImageClip(necklace_image_path)
             w, h = necklace.size
-            new_size = (w * 0.15, h * 0.15)
+
+            # Calculate the scaling factor based on the desired width of 1080
+            scaling_factor = 1080 / w
+
+            # Calculate the new size to maintain the aspect ratio, then reduce it by 20%
+            new_size = (1080, int(h * scaling_factor))
+            new_size = (int(new_size[0] * 0.6), int(new_size[1] * 0.6))
+
             necklace = resize(necklace, (new_size))  # Adjust size as needed
             necklace = necklace.set_duration(self.image_display_duration)
 
@@ -130,7 +146,7 @@ class VideoCreator:
 
         return final_clip
 
-    def process_images_in_directory(self, directory, font_path, duration, category_name):
+    def process_images_in_directory(self, directory, duration, text):
         clips = []
         print(directory)
 
@@ -138,7 +154,6 @@ class VideoCreator:
             if image_file.lower().endswith((".png", ".jpg", ".jpeg", ".webp")):
                 print(f"Processing image: {image_file}")
                 # image_path = os.path.join(directory, image_file)
-                text = os.path.splitext(image_file)[0].replace('_', ' ').title()
                 clip = self.create_image_clip(image_file, text, duration)
                 clips.append(clip)
 
@@ -155,11 +170,11 @@ class VideoCreator:
 
         # Process images with categories
         nto_image_clips = self.process_images_in_directory(
-            self.nto_images_dir, self.font_path, self.image_display_duration, "Necklace Try-On")
+            self.nto_images_dir, self.image_display_duration, self.nto_image_title)
         nto_cto_image_clips = self.process_images_in_directory(
-            self.nto_cto_images_dir, self.font_path, self.image_display_duration, "Clothing Try-On")
+            self.nto_cto_images_dir, self.image_display_duration, self.nto_cto_image_title)
         makeup_image_clips = self.process_images_in_directory(
-            self.makeup_images_dir, self.font_path, self.image_display_duration, "Makeup Try-On")
+            self.makeup_images_dir, self.image_display_duration, self.makeup_image_title)
 
         # Combine all clips
         all_clips = [intro_clip]