add: font, transition list

app.py

@@ -95,7 +95,7 @@ class VideoGenerator(BaseModel):
     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"
+    font_path: str = "PlayfairDisplay-VariableFont.ttf"
     image_display_duration: float = 2.5
     fps: int = 30
     necklace_title: str = "Necklace Try-On"
@@ -105,6 +105,7 @@ class VideoGenerator(BaseModel):
     nto_image_title: str = "Necklace Try-On"
     nto_cto_image_title: str = "Clothing Try-On"
     makeup_image_title: str = "Makeup Try-On"
+    transition_duration: float = 0.5
 
 
 @app.post("/createvideo/")
@@ -190,7 +191,7 @@ async def create_video(request: VideoGenerator):
 
 class EachNecklaceVideoGeneratorRequest(BaseModel):
     intro_video_path: str = "JewelMirror_intro.mp4"
-    font_path: str = "PlayfairDisplay-VariableFont_wght.ttf"
+    font_path: str = "PlayfairDisplay-VariableFont.ttf"
     background_audio_path: str = "TraditionalIndianVlogMusic.mp3"
     image_display_duration: float = 2.5
     fps: int = 10
@@ -207,6 +208,9 @@ class EachNecklaceVideoGeneratorRequest(BaseModel):
     address: str = "123, ABC Street, XYZ City"
     phone_numbers: str = "1234567890"
     logo_url: str = "https://lvuhhlrkcuexzqtsbqyu.supabase.co/storage/v1/object/public/MagicMirror/FullImages/default.png"
+    transition_duration: float = 0.5
+    transition_type: str = "None"
+    direction: str = "left"
 
 
 @app.post("/createcombinedvideo/")
@@ -267,7 +271,10 @@ async def create_combined_video(request: EachNecklaceVideoGeneratorRequest):
             outro_title=request.outro_title,
             address=request.address,
             phone_numbers=request.phone_numbers,
-            logo_image=temp_files['logo']
+            logo_image=temp_files['logo'],
+            transition_duration=request.transition_duration,
+            transition_type=request.transition_type,
+            direction=request.direction
 
         )
         logger.info("Creating video...")
@@ -310,8 +317,16 @@ async def create_combined_video(request: EachNecklaceVideoGeneratorRequest):
         return JSONResponse(content={"status": "error", "message": str(e)}, status_code=500)
 
 
+@app.get("/transition_list")
+async def get_transitions():
+    response = {
+        "transitions": ["crossfadein", "slidein", "crossfaidout", "slideout"]
+    }
+    return JSONResponse(content=response, status_code=200)
+
+
 @app.get("/resources")
-async def get_infromation():
+async def get_information():
     logger.info("Getting resources information")
     music = os.listdir(RESOURCES_DIR + "/audio")
     fonts = os.listdir(RESOURCES_DIR + "/fonts")

resources/fonts/Cinzel-VariableFont.ttf

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

resources/fonts/Lora-VariableFont.ttf

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

resources/fonts/MerriweatherSans-VariableFont.ttf

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

resources/fonts/Quicksand-VariableFont.ttf

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

resources/fonts/Roboto-Medium.ttf

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

src/components/each_necklace_video_gen.py

@@ -10,6 +10,7 @@ from moviepy.audio.io.AudioFileClip import AudioFileClip
 from moviepy.video.VideoClip import ImageClip, ColorClip, TextClip
 from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip
 from moviepy.video.compositing.concatenate import concatenate_videoclips
+from moviepy.video.compositing.transitions import slide_in, crossfadein, make_loopable, crossfadeout, slide_out
 from moviepy.video.fx.all import resize
 from moviepy.video.io.VideoFileClip import VideoFileClip
 
@@ -21,7 +22,7 @@ class EachVideoCreator:
                  nto_cto_outputs=None, makeup_outputs=None, font_path=None, output_path=None,
                  audio_path=None, image_display_duration=2.5, box_color=(131, 42, 48), box_opacity=0.8,
                  font_size=28, text_color="white", fps=1, outro_title=None, logo_image=None, address=None,
-                 phone_numbers=None):
+                 phone_numbers=None, transition_duration=0.5, transition_type='crossfade', direction='left'):
         self.intro_video_path = intro_video_path
         self.necklace_images = necklace_image if necklace_image else []
         self.nto_outputs = nto_outputs if nto_outputs else []
@@ -45,6 +46,9 @@ class EachVideoCreator:
         self.logo_image = logo_image
         self.address = address
         self.phone_numbers = phone_numbers
+        self.transition_duration = transition_duration
+        self.transition_type = transition_type
+        self.direction = direction
 
     def create_necklace_clips(self, necklace_image, index, label):
         if not necklace_image:
@@ -117,6 +121,25 @@ class EachVideoCreator:
 
         return final_clip
 
+    def apply_slideout_transition(self, clip, direction='left'):
+        if direction == 'left':
+            return slide_in(clip, duration=self.transition_duration, side='right')
+        return slide_in(clip, duration=self.transition_duration, side='left')
+
+    def apply_slidein_transition(self, clip, direction='left'):
+        if direction == 'left':
+            return slide_out(clip, duration=self.transition_duration, side='right')
+        return slide_out(clip, duration=self.transition_duration, side='left')
+
+    def apply_loopable_transition(self, clip):
+        return make_loopable(clip, duration=self.transition_duration)
+
+    def apply_crossfadein_transition(self, clip):
+        return crossfadein(clip, self.transition_duration)
+
+    def apply_crossfadeout_transition(self, clip):
+        return crossfadeout(clip, self.transition_duration)
+
     def create_final_video(self):
         try:
             print("Starting video creation...")
@@ -179,7 +202,27 @@ class EachVideoCreator:
 
             final_clips = []
             for clip in clips:
-                final_clips.append(clip.set_duration(self.image_display_duration))
+                clip = clip.set_duration(self.image_display_duration)
+                try:
+
+                    if self.transition_type == 'crossfadein':
+                        clip_with_transition = self.apply_crossfadein_transition(clip)
+                    elif self.transition_type == 'crossfadeout':
+                        clip_with_transition = self.apply_crossfadeout_transition(clip)
+                    elif self.transition_type == 'slideout':
+                        clip_with_transition = self.apply_slideout_transition(clip, self.direction)
+                    elif self.transition_type == 'slidein':
+                        clip_with_transition = self.apply_slidein_transition(clip, self.direction)
+                    elif self.transition_type == 'loop':
+                        clip_with_transition = self.apply_loopable_transition(clip)
+                    else:
+                        clip_with_transition = clip
+
+                    final_clips.append(clip_with_transition)
+
+                except Exception as e:
+                    print(f"Error applying transition: {e}")
+                    final_clips.append(clip)
             clips = final_clips
 
             if not clips:
@@ -189,7 +232,6 @@ class EachVideoCreator:
             print(f"Total clips to concatenate: {len(clips)}")
             final_video = concatenate_videoclips(clips, method="compose")
 
-            # Step 4: Add Background Audio
             if self.audio_path and os.path.exists(self.audio_path):
                 print(f"Adding background audio from path: {self.audio_path}")
                 try:
@@ -200,7 +242,6 @@ class EachVideoCreator:
             else:
                 print("Skipping background audio: Path not provided or invalid.")
 
-            # Step 5: Export Final Video
             print("Rendering final video...")
             final_video.write_videofile(
                 self.output_video_path,

src/components/imgs_video.py

@@ -25,7 +25,7 @@
 #             "nto_cto_images_dir": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/02_medium_long_haram/nto_cto_output",
 #             "makeup_images_dir": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/02_medium_long_haram/makeup",
 #             "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",
+#             "font_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/font/PlayfairDisplay-VariableFont.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/TraditionalIndianVlogMusic.mp3",
 #             "transition_duration": 1.0,

src/components/main.py

@@ -17,7 +17,7 @@
 #             "intro_video_url": "",
 #             "outro_video_url": "",
 #             "output_video_path": f"/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/output/{self.current_date}_jewelmirror_cjm.mp4",
-#             "font_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/font/PlayfairDisplay-VariableFont_wght.ttf",
+#             "font_path": "/home/ishwor/Desktop/TCP/Virtual_Makeup/images_to_video/resourcesssss/font/PlayfairDisplay-VariableFont.ttf",
 #             "audio_url": "",
 #             "transition_duration": 1.0,
 #             "image_display_duration": 2.5,

video_73a69e732a48e5e2TEMP_MPY_wvf_snd.mp4

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