Update Dockerfile

Dockerfile

@@ -1,7 +1,7 @@
 # ===============================
-# BackgroundFX Pro — Hardened Dockerfile
+# BackgroundFX Pro — Final Dockerfile
 # CUDA 12.1.1 + PyTorch 2.5.1 (cu121) + Streamlit
-# Optimized for SAM2 + MatAnyone with Audio Support
+# Optimized for SAM2 + MatAnyone + MediaPipe
 # ===============================
 ARG PYTHON_VERSION=3.10
 FROM nvidia/cuda:12.1.1-cudnn8-runtime-ubuntu22.04
@@ -36,7 +36,7 @@ RUN useradd -m -u 1000 user
 ENV HOME=/home/user
 WORKDIR $HOME/app
 
-# ---- System Dependencies ----
+# ---- System Dependencies (Including NumPy/Matplotlib Requirements) ----
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git wget curl ca-certificates \
     python3 python3-pip python3-venv python3-dev \
@@ -44,34 +44,39 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libffi-dev libssl-dev libc6-dev \
     libgl1-mesa-glx libglib2.0-0 libsm6 libxext6 libxrender1 libgomp1 \
     libopus0 libvpx7 libsrtp2-1 libx264-dev libx265-dev libmp3lame-dev \
-    libblas-dev liblapack-dev gfortran && \
-    rm -rf /var/lib/apt/lists/*
+    libblas-dev liblapack-dev gfortran \
+    libfreetype6-dev libpng-dev libjpeg-dev \
+    && rm -rf /var/lib/apt/lists/*
 
-# ---- Install FFmpeg with Full Codec Support ----
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ffmpeg && \
-    ffmpeg -version && \
-    ffmpeg -codecs | grep -E 'ffv1|libx264|libx265|aac|mp3' || echo "Warning: Some FFmpeg codecs missing"
+# ---- Install FFmpeg ----
+RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg \
+    && rm -rf /var/lib/apt/lists/*
 
 # ---- Python Bootstrap ----
 RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel
 
-# ---- Install NumPy ----
+# ---- Install NumPy First (Critical) ----
 RUN python3 -m pip install --no-cache-dir numpy==1.24.4
 
+# ---- Install Matplotlib with System Dependencies ----
+RUN python3 -m pip install --no-cache-dir matplotlib==3.5.0
+
 # ---- Install PyTorch (CUDA 12.1) ----
 RUN python3 -m pip install --no-cache-dir --index-url https://download.pytorch.org/whl/cu121 \
-    torch==2.5.1 torchvision==0.20.1 torchaudio==2.5.1 && \
-    python3 -c "import torch; print('PyTorch:', torch.__version__); print('CUDA available:', torch.cuda.is_available()); print('CUDA version:', torch.version.cuda)"
+    torch==2.5.1 torchvision==0.20.1 torchaudio==2.5.1 \
+    && python3 -c "import torch; print('PyTorch:', torch.__version__); print('CUDA available:', torch.cuda.is_available())"
 
-# ---- Copy Requirements First ----
+# ---- Copy Requirements ----
 COPY requirements.txt .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
+# ---- Install MediaPipe (After NumPy/Matplotlib) ----
+RUN python3 -m pip install --no-cache-dir mediapipe==0.10.11
+
 # ---- Install MatAnyone ----
 RUN echo "Installing MatAnyone..." && \
-    python3 -m pip install --no-cache-dir git+https://github.com/pq-yang/MatAnyone.git && \
-    python3 -c "import matanyone; print('✅ MatAnyone installed:', getattr(matanyone, '__version__', 'unknown'))"
+    python3 -m pip install --no-cache-dir git+https://github.com/pq-yang/MatAnyone.git \
+    && python3 -c "import matanyone; print('✅ MatAnyone installed')"
 
 # ---- Install SAM2 (Editable) ----
 RUN echo "Installing SAM2..." && \
@@ -80,14 +85,12 @@ RUN echo "Installing SAM2..." && \
     python3 -m pip install --no-cache-dir -e .
 
 # ---- Download SAM2 Checkpoints ----
-RUN echo "Downloading SAM2 checkpoints..." && \
-    mkdir -p /home/user/app/checkpoints && \
-    cd /home/user/app/checkpoints && \
-    wget -q --show-progress https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt && \
-    echo "✅ SAM2 checkpoint downloaded"
+RUN mkdir -p /home/user/app/checkpoints && \
+    wget -q --show-progress -O /home/user/app/checkpoints/sam2.1_hiera_large.pt \
+    https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt
 
 # ---- Create Directory Structure ----
-RUN mkdir -p /home/user/app/pipeline /home/user/app/models /home/user/app/checkpoints /home/user/app/storage && \
+RUN mkdir -p /home/user/app/pipeline /home/user/app/models /home/user/app/storage && \
     chown -R user:user /home/user/app && \
     chmod -R 755 /home/user/app
 
@@ -96,26 +99,32 @@ COPY --chown=user:user . .
 
 # ---- Healthcheck ----
 HEALTHCHECK --interval=30s --timeout=8s --retries=3 CMD \
-    python3 -c "import torch, streamlit, numpy; print('torch', torch.__version__, '| cuda', torch.cuda.is_available()); print('streamlit', streamlit.__version__); print('numpy', numpy.__version__); import subprocess; subprocess.run(['ffmpeg', '-version'], check=False)"
+    python3 -c "
+    import numpy; print('NumPy:', numpy.__version__)
+    import matplotlib; print('Matplotlib:', matplotlib.__version__)
+    import torch; print('PyTorch:', torch.__version__)
+    import mediapipe; print('MediaPipe:', mediapipe.__version__)
+    import subprocess; subprocess.run(['ffmpeg', '-version'], check=False)
+    "
 
 # ---- Runtime Startup ----
 USER user
 EXPOSE 7860
-CMD ["sh", "-c", "\
-    echo '===========================================' && \
-    echo '=== BACKGROUNDFX PRO STARTUP ===' && \
-    echo '===========================================' && \
-    echo 'Disk free: $(df -h /home/user/app/storage | tail -1)' && \
-    python3 --version && \
-    pip --version && \
-    ffmpeg -version && \
-    if [ -f streamlit_app.py ]; then \
-        python3 -c 'import streamlit_app; print(\"✅ streamlit_app.py imports OK\")'; \
-    else \
-        echo '❌ ERROR: streamlit_app.py not found!' && exit 1; \
-    fi && \
-    streamlit run --server.port=${PORT} --server.address=0.0.0.0 \
+CMD ["sh", "-c", "
+    echo '==========================================='
+    echo '=== BACKGROUNDFX PRO STARTUP ==='
+    echo '==========================================='
+    echo 'Disk free: $(df -h /home/user/app/storage | tail -1)'
+    python3 --version
+    pip --version
+    ffmpeg -version
+    if [ -f streamlit_app.py ]; then
+        python3 -c 'import streamlit_app; print(\"✅ streamlit_app.py imports OK\")'
+    else
+        echo '❌ ERROR: streamlit_app.py not found!' && exit 1
+    fi
+    exec streamlit run --server.port=${PORT} --server.address=0.0.0.0 \
     --server.maxUploadSize=200 --server.enableCORS=false \
     --server.enableXsrfProtection=false --logger.level=debug \
-    streamlit_app.py \
-"]
+    streamlit_app.py
+    "]