fix: add model name as suffix for video gen output

app.py

@@ -13,7 +13,6 @@ from supabase import create_client
 
 from src.components.each_necklace_video_gen import EachVideoCreator
 from src.components.product_page_nto_cto_gen import ProductPageImageGeneration
-from src.components.vidgen import VideoCreator
 from src.utils.logs import logger
 
 supabase_url = os.getenv('SUPABASE_URL')
@@ -36,11 +35,10 @@ RESOURCES_DIR = "/app/resources"
 
 os.makedirs(RESOURCES_DIR, exist_ok=True)
 TEMP_VIDEO_DIR = f"{RESOURCES_DIR}/temp_video"
-
 os.environ['MOVIEPY_TEMP_DIR'] = '/tmp/moviepy'
 
 
-def upload_to_supabase(video_path, bucket_name="JewelmirrorVideoGeneration"):
+def upload_to_supabase(video_path, bucket_name="JewelmirrorVideoGeneration", model_name="MOD"):
     logger.info(f"Uploading video to Supabase: {video_path}")
 
     try:
@@ -48,7 +46,7 @@ def upload_to_supabase(video_path, bucket_name="JewelmirrorVideoGeneration"):
             raise FileNotFoundError(f"Video file not found: {video_path}")
 
         content_type = mimetypes.guess_type(video_path)[0] or 'video/mp4'
-        file_name = os.path.basename(video_path)
+        file_name = f"{os.path.basename(video_path)}-{model_name}"
 
         options = {
             "content-type": content_type,
@@ -101,104 +99,105 @@ 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.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"
-    transition_duration: float = 0.5
-
-
-@app.post("/createvideo/")
-async def create_video(request: VideoGenerator):
-    logger.info(f"Creating video with request: {request.dict()}")
-    start_time = time.time()
-    try:
-        logger.info("Downloading images...")
-        temp_files = {
-            '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]
-        }
-        file_download_time = time.time() - start_time
-
-        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/{request.intro_video_path}"
-        output_path = f"{TEMP_VIDEO_DIR}/video_{os.urandom(8).hex()}.mp4"
-        font_path = f"{RESOURCES_DIR}/fonts/{request.font_path}"
-        audio_path = f"{RESOURCES_DIR}/audio/{request.background_audio_path}"
-        logger.info(f"Creating video with paths: {intro_path}, {output_path}, {font_path}, {audio_path}")
-
-        video_creator = VideoCreator(
-            intro_video_path=intro_path,
-            necklace_image=temp_files['necklace'],
-            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,
-            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,
-        )
-        logger.info("Creating video...")
-
-        video_creator.create_final_video()
-        video_creation_time = time.time() - start_time - file_download_time
-
-        url = upload_to_supabase(video_path=output_path)
-        logger.info(f"Video created successfully: {url}")
-        supabase_upload_time = time.time() - start_time - file_download_time - video_creation_time
-        logger.info(f"Video uploaded to Supabase: {url}")
-
-        response = {
-            "status": "success",
-            "message": "Video created successfully.",
-            "video_url": url,
-            "timings": {
-                "file_download_time": file_download_time,
-                "video_creation_time": video_creation_time,
-                "supabase_upload_time": supabase_upload_time
-            }
-        }
-        logger.info(f"Response: {response}")
-
-        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)
-        logger.info("Files cleaned up successfully.")
-        return JSONResponse(content=response, status_code=200)
-
-    except Exception as e:
-        logger.error(f"Error creating video: {str(e)}")
-        return JSONResponse(content={"status": "error", "message": str(e)}, status_code=500)
+#
+# 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.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"
+#     transition_duration: float = 0.5
+#
+#
+# @app.post("/createvideo/")
+# async def create_video(request: VideoGenerator):
+#     logger.info(f"Creating video with request: {request.dict()}")
+#     start_time = time.time()
+#     try:
+#         logger.info("Downloading images...")
+#         temp_files = {
+#             '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]
+#         }
+#         file_download_time = time.time() - start_time
+#
+#         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/{request.intro_video_path}"
+#         output_path = f"{TEMP_VIDEO_DIR}/video_{os.urandom(8).hex()}.mp4"
+#         font_path = f"{RESOURCES_DIR}/fonts/{request.font_path}"
+#         audio_path = f"{RESOURCES_DIR}/audio/{request.background_audio_path}"
+#         logger.info(f"Creating video with paths: {intro_path}, {output_path}, {font_path}, {audio_path}")
+#
+#         video_creator = VideoCreator(
+#             intro_video_path=intro_path,
+#             necklace_image=temp_files['necklace'],
+#             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,
+#             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,
+#         )
+#         logger.info("Creating video...")
+#
+#         video_creator.create_final_video()
+#         video_creation_time = time.time() - start_time - file_download_time
+#
+#         url = upload_to_supabase(video_path=output_path)
+#         logger.info(f"Video created successfully: {url}")
+#         supabase_upload_time = time.time() - start_time - file_download_time - video_creation_time
+#         logger.info(f"Video uploaded to Supabase: {url}")
+#
+#         response = {
+#             "status": "success",
+#             "message": "Video created successfully.",
+#             "video_url": url,
+#             "timings": {
+#                 "file_download_time": file_download_time,
+#                 "video_creation_time": video_creation_time,
+#                 "supabase_upload_time": supabase_upload_time
+#             }
+#         }
+#         logger.info(f"Response: {response}")
+#
+#         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)
+#         logger.info("Files cleaned up successfully.")
+#         return JSONResponse(content=response, status_code=200)
+#
+#     except Exception as e:
+#         logger.error(f"Error creating video: {str(e)}")
+#         return JSONResponse(content={"status": "error", "message": str(e)}, status_code=500)
 
 
 class EachNecklaceVideoGeneratorRequest(BaseModel):
@@ -265,6 +264,7 @@ async def create_combined_video(request: EachNecklaceVideoGeneratorRequest):
         font_path = f"{RESOURCES_DIR}/fonts/{request.font_path}"
         audio_path = f"{RESOURCES_DIR}/audio/{request.background_audio_path}"
         outro_path = f"{RESOURCES_DIR}/outro/{request.outro_video_path}"
+        model_name = request.necklace_try_on_output_images[0][0].split("/")[-1].split(".")[0].split("-")[1]
 
         video_creator = EachVideoCreator(
             intro_video_path=intro_path,
@@ -298,7 +298,7 @@ async def create_combined_video(request: EachNecklaceVideoGeneratorRequest):
         video_creation_time = time.time() - start_time - file_download_time
         logger.info("Video created successfully.")
 
-        url = upload_to_supabase(video_path=output_path)
+        url = upload_to_supabase(video_path=output_path, model_name=model_name)
         supabase_upload_time = time.time() - start_time - file_download_time - video_creation_time
         logger.info(f"Video uploaded to Supabase: {url}")