update: docker image magic

Dockerfile

@@ -1,23 +1,28 @@
+# Use the official Python 3.9 slim image as the base
 FROM python:3.9-slim
 
+# Set the working directory inside the container
 WORKDIR /app
 
-# Give write permissions to the app directory
-RUN chmod 777 /app
-
 # Install dependencies including ffmpeg and imagemagick
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     ffmpeg \
-    imagemagick libmagickwand-dev --no-install-recommends \
-    && pecl install imagick \
-    && docker-php-ext-enable imagick \
+    imagemagick \
+    libmagickwand-dev \
     && rm -rf /var/lib/apt/lists/*
 
+# Copy the requirements file into the container
 COPY requirements.txt ./
 
+# Install Python dependencies from the requirements file
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy all files from the current directory to the container
+# Copy all application files into the container
 COPY . .
 
+# Set permissions and run as a non-root user for security
+RUN chown -R nobody:nogroup /app && chmod 755 /app
+USER nobody
+
+# Command to run the application using Uvicorn
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]

app.py

@@ -2,6 +2,7 @@ import os
 import tempfile
 
 from fastapi import FastAPI, File, UploadFile
+from pydantic import BaseModel
 from starlette.responses import JSONResponse
 from supabase import create_client
 
@@ -29,6 +30,14 @@ 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
+
+
 @app.post("/create-video/")
 async def create_video(
         necklace_image: UploadFile = File(...),

src/components/vidgen.py

@@ -14,12 +14,13 @@ from moviepy.video.io.VideoFileClip import VideoFileClip
 
 
 class VideoCreator:
-    def __init__(self, intro_video_path, necklace_image, nto_image1, nto_cto_1, nto_cto_2, makeup_1, font_path,
+    def __init__(self, intro_video_path, necklace_image, nto_outputs: list, nto_cto_outputs: list, makeup_outputs: list,
+                 font_path,
                  output_path, audio_path):
         self.intro_video_path = intro_video_path
-        self.nto_images_dir = [nto_image1]
-        self.nto_cto_images_dir = [nto_cto_1, nto_cto_2]
-        self.makeup_images_dir = [makeup_1]
+        self.nto_images_dir = nto_outputs
+        self.nto_cto_images_dir = nto_cto_outputs
+        self.makeup_images_dir = [makeup_outputs]
         self.output_video_path = output_path
         self.font_path = font_path
         self.necklace_image = necklace_image