MatA fix 2.1

Dockerfile

@@ -2,26 +2,25 @@
 # BackgroundFX Pro — Dockerfile (Hardened for Spaces GPU)
 # ===============================
 
+# ===== CHAPTER 1: Base image & user =====
 FROM nvidia/cuda:12.1.1-cudnn8-runtime-ubuntu22.04
 
-# --- Build args (optional pins) ---
+# Optional pins (SAM2 commit etc.)
 ARG SAM2_SHA=__PIN_ME__
-ARG MATANYONE_SHA=v1.0.0
 ARG SAM2_MODEL_ID=facebook/sam2
 ARG SAM2_VARIANT=sam2_hiera_large
-ARG MATANY_REPO_ID=PeiqingYang/MatAnyone
-ARG MATANY_FILENAME=matanyone_v1.0.pth
 
-# --- Non-root user (HF expects uid 1000) ---
+# Create non-root user (HF expects uid 1000)
 RUN useradd -m -u 1000 user
 ENV HOME=/home/user
 ENV PATH=/home/user/.local/bin:$PATH
+WORKDIR /home/user/app
 
+# Pre-create app dir + caches with correct ownership
 RUN mkdir -p /home/user/app/third_party /data/.cache && \
     chown -R user:user /home/user /data
-WORKDIR /home/user/app
 
-# --- System packages ---
+# ===== CHAPTER 2: System packages (root) =====
 USER root
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     git ffmpeg python3 python3-pip python3-venv \
@@ -29,46 +28,36 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libgl1-mesa-glx libglib2.0-0 libsm6 libxext6 libxrender-dev libgomp1 \
  && rm -rf /var/lib/apt/lists/*
 
-# Switch to non-root
-USER user
-
-# --- Python + Torch (cu121) ---
+# ===== CHAPTER 3: Python & core wheels (root) =====
 RUN python3 -m pip install --no-cache-dir --upgrade pip
+# Torch cu121 wheels (pin runtime)
 RUN python3 -m pip install --no-cache-dir --index-url https://download.pytorch.org/whl/cu121 \
     torch==2.3.1 torchvision==0.18.1 torchaudio==2.3.1
 
-# --- App deps ---
+# ===== CHAPTER 4: App deps + MatAnyone (root) =====
 COPY --chown=user requirements.txt ./requirements.txt
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 RUN python3 -m pip install --no-cache-dir mediapipe==0.10.14
+# ✅ Install MatAnyone from main (ships pyproject; importable as a normal package)
+RUN python3 -m pip install --no-cache-dir "git+https://github.com/pq-yang/MatAnyone@main"
 
-# --- Third-party repos ---
-# SAM2
-RUN git clone --depth=1 https://github.com/facebookresearch/segment-anything-2.git third_party/sam2 && \
-    cd third_party/sam2 && \
-    if [ "${SAM2_SHA}" != "__PIN_ME__" ]; then git fetch --depth=1 origin ${SAM2_SHA} && git checkout ${SAM2_SHA}; fi
-RUN cd third_party/sam2 && python3 -m pip install --no-cache-dir -e .
-
-# --- App code last ---
+# ===== CHAPTER 5: App code (user) =====
+USER user
 COPY --chown=user . /home/user/app
 
-# Verify SAM2 after COPY
-RUN echo "=== DEBUG: After COPY (SAM2) ===" && \
-    ls -la third_party/sam2/ && \
-    (ls -la third_party/sam2/configs/sam2/ || echo "SAM2 configs missing")
+# ===== CHAPTER 6: Third-party — SAM2 (editable, after COPY so it won’t be overwritten) =====
+RUN rm -rf third_party/sam2 && \
+    git clone --depth=1 https://github.com/facebookresearch/segment-anything-2.git third_party/sam2 && \
+    cd third_party/sam2 && \
+    if [ "${SAM2_SHA}" != "__PIN_ME__" ]; then git fetch --depth=1 origin ${SAM2_SHA} && git checkout ${SAM2_SHA}; fi && \
+    python3 -m pip install --no-cache-dir -e .
 
-# ✅ MatAnyone AFTER COPY so it persists
-RUN rm -rf third_party/matanyone && \
-    git clone --depth=1 https://github.com/pq-yang/MatAnyone.git third_party/matanyone && \
-    cd third_party/matanyone && \
-    git fetch --tags --depth=1 && \
-    git checkout ${MATANYONE_SHA} && \
-    if [ -f requirements.txt ]; then python3 -m pip install --no-cache-dir -r requirements.txt; fi
-# Sanity check: package folder must exist
-RUN echo "=== DEBUG: MatAnyone package ===" && \
-    ls -la third_party/matanyone/matanyone || (echo "MISSING matanyone package dir!" && exit 2)
+# Optional: quick listing
+RUN echo "=== DEBUG: SAM2 contents ===" && \
+    ls -la third_party/sam2/ | head -n 200 && \
+    (ls -la third_party/sam2/configs/sam2/ || echo "SAM2 configs missing")
 
-# --- Runtime environment ---
+# ===== CHAPTER 7: Runtime environment =====
 ENV PYTHONUNBUFFERED=1 \
     OMP_NUM_THREADS=1 OPENBLAS_NUM_THREADS=1 MKL_NUM_THREADS=1 NUMEXPR_NUM_THREADS=1 \
     TOKENIZERS_PARALLELISM=false \
@@ -76,14 +65,17 @@ ENV PYTHONUNBUFFERED=1 \
     TORCH_HOME=/data/.cache/torch \
     MPLCONFIGDIR=/data/.cache/matplotlib \
     PYTORCH_CUDA_ALLOC_CONF=max_split_size_mb:128 \
-    PYTHONPATH="/home/user/app:/home/user/app/third_party:/home/user/app/third_party/sam2:/home/user/app/third_party/matanyone:${PYTHONPATH}" \
+    PYTHONPATH="/home/user/app:/home/user/app/third_party:/home/user/app/third_party/sam2:${PYTHONPATH}" \
     FFMPEG_BIN=ffmpeg \
     THIRD_PARTY_SAM2_DIR=/home/user/app/third_party/sam2 \
-    THIRD_PARTY_MATANY_DIR=/home/user/app/third_party/matanyone \
-    MATANY_REPO_ID=PeiqingYang/MatAnyone \
-    MATANY_CHECKPOINT="" \
     ENABLE_MATANY=1
 
+# (Keep SAM2 model selection in Space Variables, not here)
+#   SAM2_MODEL_ID=facebook/sam2
+#   SAM2_VARIANT=sam2_hiera_large
+
 EXPOSE 7860
+
+# ===== CHAPTER 8: Healthcheck & CMD =====
 HEALTHCHECK --interval=30s --timeout=5s --retries=5 CMD wget -qO- "http://127.0.0.1:${PORT:-7860}/" || exit 1
 CMD ["python3","-u","app.py"]