Update Dockerfile and entrypoint script with compatible package versions and proper environment setup

Dockerfile

@@ -1,176 +1,72 @@
-FROM continuumio/miniconda3:latest
+FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
-# Force rebuild timestamp: 2024-12-05 21:25
-LABEL MAINTAINER="jmanhype"
-LABEL Description="Test dockerfile for Hugging Face Space"
+# Prevent interactive prompts during package installation
+ENV DEBIAN_FRONTEND=noninteractive
 
-SHELL ["/bin/bash", "--login", "-c"]
-
-# Install essential packages first
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
-    wget \
+    python3.10 \
+    python3.10-dev \
+    python3-pip \
     git \
-    ffmpeg \
-    libsm6 \
-    libxext6 \
-    ninja-build \
+    wget \
     build-essential \
     g++ \
-    cmake \
     && rm -rf /var/lib/apt/lists/*
 
-# Set up a new user named "user" with user ID 1000
-RUN useradd -m -u 1000 user
-
-# Set home to the user's home directory
-ENV HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH
-
-# Create the directory structure and set permissions
-RUN mkdir -p /home/user/app/scripts/gradio && \
-    chown -R user:user /home/user/app
-
-# Switch to the "user" user
+# Create a non-root user
+RUN useradd -m -s /bin/bash user
 USER user
-
-# Set the working directory to the user's home directory
-WORKDIR $HOME/app
-
-# Configure git for the user
-RUN git config --global user.email "[email protected]" && \
-    git config --global user.name "jmanhype"
-
-# Clean and clone the repository
-RUN rm -rf * .* || true && \
-    git clone https://github.com/TMElyralab/MuseV.git . && \
-    ls -la scripts/gradio/app_gradio_space.py && \
-    echo "=== Repository contents ===" && \
-    ls -la scripts/gradio/
-
-# Create and configure conda environment
-RUN conda create -n musev python=3.10 -y && \
-    echo "conda activate musev" >> ~/.bashrc
-
-# Install setuptools first with a specific version
-RUN conda run -n musev pip install --no-cache-dir setuptools==65.5.1
-
-# Install numpy 1.x first to ensure compatibility
-RUN conda run -n musev pip install --no-cache-dir "numpy<2.0.0"
-
-# Install core dependencies first
-RUN conda run -n musev pip install --no-cache-dir \
-    torch \
-    torchvision \
-    torchaudio \
-    transformers==4.33.1 \
-    accelerate==0.22.0 \
-    gradio>=4.0.0 \
-    spaces \
-    ninja==1.11.1 \
-    bitsandbytes==0.41.1 \
-    xformers==0.0.21 \
-    omegaconf \
-    einops \
-    imageio==2.31.1 \
-    pandas \
-    matplotlib \
-    pynvml==11.5.0 \
-    moviepy==1.0.3 \
-    scikit-learn \
-    librosa==0.10.1 \
-    ffmpeg-python \
-    easydict \
-    mediapipe==0.10.3 \
-    insightface==0.7.3 \
-    opencv-python \
-    Pillow \
-    protobuf==3.20.3 \
-    PyYAML \
-    scipy \
-    tqdm \
-    albumentations==1.3.1 \
-    opencv-contrib-python==4.8.0.76 \
-    imageio-ffmpeg==0.4.8 \
-    pytorch-lightning==2.0.8 \
-    timm==0.9.12 \
-    safetensors==0.3.3 \
-    pycocotools \
-    kornia==0.7.0 \
-    open_clip_torch==2.20.0 \
-    torchmetrics==1.1.1 \
-    invisible-watermark==0.1.5 \
-    ftfy==6.1.1 \
-    loguru==0.6.0 \
-    markupsafe==2.0.1 \
-    cuid
-
-# Install MMCM dependencies first
-RUN conda run -n musev pip install --no-cache-dir basicsr && \
-    conda run -n musev pip install --no-cache-dir -U openmim && \
-    conda run -n musev mim install mmengine && \
-    conda run -n musev mim install "mmcv>=2.0.1" && \
-    conda run -n musev mim install "mmdet>=3.1.0" && \
-    conda run -n musev mim install "mmpose>=1.1.0"
-
-# Install git dependencies incrementally
-# First install diffusers from PyPI to get dependencies right
-RUN conda run -n musev pip install --no-cache-dir "diffusers==0.21.4"
-# Then install the custom version
-RUN cd /tmp && \
-    git clone https://github.com/TMElyralab/diffusers.git && \
-    cd diffusers && \
-    git checkout main && \
-    conda run -n musev pip install -e .
-
-RUN conda run -n musev pip install --no-cache-dir git+https://github.com/tencent-ailab/IP-Adapter.git@main
-RUN conda run -n musev pip install --no-cache-dir git+https://github.com/openai/CLIP.git@main
-RUN conda run -n musev pip install --no-cache-dir git+https://github.com/TMElyralab/controlnet_aux.git@tme
-
-# Now install MMCM after its dependencies are installed
-RUN git clone https://github.com/TMElyralab/MMCM.git /tmp/mmcm && \
-    cd /tmp/mmcm && \
-    git checkout setup && \
-    conda run -n musev pip install -e .
-
-# Create entrypoint script
-RUN printf '#!/bin/bash\n\
-echo "entrypoint.sh"\n\
-whoami\n\
-which python\n\
-\n\
-# Set up Python path\n\
-export PYTHONPATH=${PYTHONPATH}:/home/user/app:/home/user/app/MMCM:/home/user/app/diffusers/src:/home/user/app/controlnet_aux/src\n\
-echo "pythonpath" $PYTHONPATH\n\
-\n\
-# Activate conda environment\n\
-source /opt/conda/etc/profile.d/conda.sh\n\
-conda activate musev\n\
-\n\
-# Print Python version and location\n\
-which python\n\
-python --version\n\
-\n\
-# Run the app\n\
-cd /home/user/app\n\
-python scripts/gradio/app_gradio_space.py\n' > $HOME/app/scripts/gradio/entrypoint.sh
-
-# Make the script executable
-RUN chmod +x $HOME/app/scripts/gradio/entrypoint.sh && \
-    cat $HOME/app/scripts/gradio/entrypoint.sh
-
-# Set up Python path
-ENV PYTHONPATH=$PYTHONPATH:$HOME/app:$HOME/app/MMCM:$HOME/app/diffusers/src:$HOME/app/controlnet_aux/src
-
-# Verify final setup
-RUN echo "=== Final directory structure ===" && \
-    ls -la scripts/gradio/ && \
-    echo "=== Python path ===" && \
-    echo $PYTHONPATH && \
-    echo "=== Entrypoint script location ===" && \
-    ls -la $HOME/app/scripts/gradio/entrypoint.sh
-
-EXPOSE 7860
-
-# Set working directory to app root
-WORKDIR $HOME/app
-CMD ["./scripts/gradio/entrypoint.sh"]
+WORKDIR /home/user
+
+# Set up Python environment
+ENV PATH="/home/user/.local/bin:${PATH}"
+RUN python3.10 -m pip install --user --no-cache-dir --upgrade pip
+
+# Install conda
+RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
+    bash miniconda.sh -b -p /home/user/.conda && \
+    rm miniconda.sh
+ENV PATH="/home/user/.conda/bin:${PATH}"
+
+# Create and activate conda environment
+RUN conda create -n musev python=3.10 -y
+SHELL ["conda", "run", "-n", "musev", "/bin/bash", "-c"]
+
+# Install specific versions of key packages
+RUN pip install --no-cache-dir \
+    setuptools==65.5.1 \
+    huggingface_hub==0.14.1 \
+    transformers==4.30.2 \
+    accelerate==0.20.3
+
+# Clone repositories
+RUN cd /home/user && \
+    git clone https://github.com/jmanhype/MMCM.git && \
+    git clone https://github.com/jmanhype/diffusers.git -b main && \
+    git clone https://github.com/patrickvonplaten/controlnet_aux.git
+
+# Install dependencies
+RUN pip install --no-cache-dir openmim && \
+    cd /home/user/MMCM && pip install --no-cache-dir -e . && \
+    cd /home/user/diffusers && pip install --no-cache-dir -e . && \
+    cd /home/user/controlnet_aux && pip install --no-cache-dir -e .
+
+# Clone and set up app
+RUN cd /home/user && \
+    git clone https://github.com/jmanhype/MuseV.git app
+
+# Install remaining requirements
+COPY requirements.txt /home/user/
+RUN pip install --no-cache-dir -r /home/user/requirements.txt
+
+# Set up entrypoint
+COPY scripts/gradio/entrypoint.sh /home/user/
+RUN chmod +x /home/user/entrypoint.sh
+
+# Set environment variables
+ENV PYTHONPATH=/home/user/app:/home/user/app/MMCM:/home/user/app/diffusers/src:/home/user/app/controlnet_aux/src
+
+# Set working directory and entrypoint
+WORKDIR /home/user/app
+ENTRYPOINT ["/home/user/entrypoint.sh"]

scripts/gradio/entrypoint.sh

@@ -2,19 +2,21 @@
 
 echo "entrypoint.sh"
 whoami
-which python
 
-# Set up Python path
-export PYTHONPATH=${PYTHONPATH}:/home/user/app/MuseV:/home/user/app/MuseV/MMCM:/home/user/app/MuseV/diffusers/src:/home/user/app/MuseV/controlnet_aux/src
-echo "pythonpath" $PYTHONPATH
+# Print Python location
+which python
+echo "pythonpath :$PYTHONPATH"
 
 # Activate conda environment
-source /opt/conda/etc/profile.d/conda.sh
 conda activate musev
 
 # Print Python version and location
 which python
 python --version
 
+# Install any pending dependencies
+pip install --no-cache-dir -U openmim
+
 # Run the app
-python app_gradio_space.py
+cd /home/user/app
+python scripts/gradio/app_gradio_space.py