Update Dockerfile

Dockerfile

@@ -1,7 +1,7 @@
 # ===============================
-# Hugging Face Space — Hardened Dockerfile
+# BackgroundFX Pro — Hardened Dockerfile
 # CUDA 12.1.1 + PyTorch 2.5.1 (cu121) + Streamlit
-# SAM2 from source; MatAnyone via pip (repo)
+# Optimized for SAM2 + MatAnyone with Audio Support
 # ===============================
 ARG PYTHON_VERSION=3.10
 ARG BUILD_TS
@@ -25,10 +25,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
     STREAMLIT_SERVER_PORT=7860 \
     STREAMLIT_SERVER_HEADLESS=true \
     STREAMLIT_BROWSER_GATHER_USAGE_STATS=false \
-    PYTHONPATH=/home/user/app:/home/user/app/third_party:/home/user/app/third_party/sam2 \
+    PYTHONPATH=/home/user/app:/home/user/app/pipeline:/home/user/app/models \
     FFMPEG_BIN=ffmpeg \
-    THIRD_PARTY_SAM2_DIR=/home/user/app/third_party/sam2 \
-    ENABLE_MATANY=1 \
     SAM2_DEVICE=cuda \
     MATANY_DEVICE=cuda \
     TF_CPP_MIN_LOG_LEVEL=2 \
@@ -46,15 +44,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential gcc g++ pkg-config \
     libffi-dev libssl-dev libc6-dev \
     libgl1-mesa-glx libglib2.0-0 libsm6 libxext6 libxrender1 libgomp1 \
-    libopus0 libvpx7 libsrtp2-1 && \
+    libopus0 libvpx7 libsrtp2-1 libx264-dev libx265-dev libmp3lame-dev && \
     rm -rf /var/lib/apt/lists/*
 
-# ---- Install FFmpeg with Codecs ----
+# ---- Install FFmpeg with Full Codec Support ----
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ffmpeg libx264-dev libvpx-dev && \
-    rm -rf /var/lib/apt/lists/* && \
+    ffmpeg && \
     ffmpeg -version && \
-    ffmpeg -codecs | grep ffv1 || (echo "Warning: FFmpeg ffv1 codec missing!")
+    ffmpeg -codecs | grep -E 'ffv1|libx264|libx265|aac|mp3' || echo "Warning: Some FFmpeg codecs missing"
 
 # ---- Python Bootstrap ----
 RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel
@@ -62,37 +59,27 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel
 # ---- 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 - <<'PY'
+    python3 -c "
 import torch
-print("PyTorch:", torch.__version__)
-print("CUDA available:", torch.cuda.is_available())
-print("torch.version.cuda:", getattr(torch.version, "cuda", None))
-PY
+print('PyTorch:', torch.__version__)
+print('CUDA available:', torch.cuda.is_available())
+print('CUDA version:', torch.version.cuda)
+"
 
-# ---- Copy and Install Requirements ----
-ENV BUILD_TS_ENV=${BUILD_TS}
-COPY --chown=user:user requirements.txt ./
-RUN python3 -m pip install --no-cache-dir -r requirements.txt && \
-    python3 - <<'PY'
-import sys, annotated_types, pydantic, pydantic_core
-print("Python:", sys.version.split()[0])
-print("annotated_types:", annotated_types.__version__)
-print("pydantic:", pydantic.__version__, "| pydantic-core:", pydantic_core.__version__)
-PY
+# ---- Copy Requirements First ----
+COPY requirements.txt .
+RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
 # ---- Install MatAnyone ----
 RUN echo "Installing MatAnyone..." && \
-    (python3 -m pip install --no-cache-dir -v git+https://github.com/pq-yang/MatAnyone@main#egg=matanyone || \
-     python3 -m pip install --no-cache-dir -v git+https://github.com/pq-yang/MatAnyone@0.1.0#egg=matanyone) && \
-    python3 - <<'PY'
-import matanyone
-print("✅ MatAnyone import OK:", getattr(matanyone, "__version__", "unknown"))
-PY
+    python3 -m pip install --no-cache-dir git+https://github.com/pq-yang/MatAnyone@main && \
+    python3 -c "import matanyone; print('✅ MatAnyone installed:', getattr(matanyone, '__version__', 'unknown'))"
 
 # ---- Install SAM2 (Editable) ----
 RUN echo "Installing SAM2..." && \
     git clone --depth=1 https://github.com/facebookresearch/segment-anything-2.git third_party/sam2 && \
-    cd third_party/sam2 && python3 -m pip install --no-cache-dir -e .
+    cd third_party/sam2 && \
+    python3 -m pip install --no-cache-dir -e .
 
 # ---- Download SAM2 Checkpoints ----
 RUN echo "Downloading SAM2 checkpoints..." && \
@@ -101,46 +88,42 @@ RUN echo "Downloading SAM2 checkpoints..." && \
     wget -q --show-progress https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt && \
     echo "✅ SAM2 checkpoint downloaded"
 
-# ---- Download SAM2 Config ----
-RUN echo "Attempting to download SAM2 configs..." && \
-    mkdir -p /home/user/app/configs/sam2.1 && \
-    cd /home/user/app/configs/sam2.1 && \
-    (wget --timeout=30 --tries=2 -q https://raw.githubusercontent.com/facebookresearch/segment-anything-2/main/configs/sam2.1/sam2.1_hiera_l.yaml && \
-     echo "✅ SAM2 config downloaded") || \
-    echo "⚠️ Config download failed - app will use Hugging Face fallback"
+# ---- Create Directory Structure ----
+RUN mkdir -p /home/user/app/pipeline /home/user/app/models /home/user/app/checkpoints /home/user/app/storage && \
+    chown -R user:user /home/user/app && \
+    chmod -R 755 /home/user/app
 
-# ---- Copy App Code ----
+# ---- Copy Application Code ----
 COPY --chown=user:user . .
 
-# ---- Create Writable Directories ----
-# ---- Create Writable Directories ----
-RUN mkdir -p /home/user/app/checkpoints /home/user/app/.hf /home/user/app/.torch /home/user/app/storage && \
-    chown -R user:user /home/user/app && \
-    chmod -R 755 /home/user/app && \
-    find /home/user/app -type d -exec chmod 755 {} \; && \
-    find /home/user/app -type f -exec chmod 644 {} \;
-
 # ---- Healthcheck ----
 HEALTHCHECK --interval=30s --timeout=8s --retries=3 CMD \
-    python3 -c "import torch, streamlit, app; print('torch', torch.__version__, '| cuda', torch.cuda.is_available(), '| streamlit', streamlit.__version__); import subprocess; subprocess.run(['ffmpeg', '-version'])"
+    python3 -c "
+import torch, streamlit
+print('torch', torch.__version__, '| cuda', torch.cuda.is_available())
+print('streamlit', streamlit.__version__)
+import subprocess
+subprocess.run(['ffmpeg', '-version'], check=False)
+"
 
 # ---- Runtime Startup ----
 USER user
 EXPOSE 7860
 CMD ["sh", "-c", "\
     echo '===========================================' && \
-    echo '=== STREAMLIT CONTAINER STARTUP ===' && \
+    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 -B -c 'import streamlit; print(\"✅ Streamlit:\", streamlit.__version__)'; \
-        python3 -B -c 'import streamlit_app; print(\"✅ streamlit_app.py imports OK\")'; \
+        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 --server.maxUploadSize=200 --server.enableCORS=false --server.enableXsrfProtection=false --logger.level=debug streamlit_app.py \
+    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 \
 "]
-