Fix: Update Dockerfile and requirements.txt to include cairosvg dependency

Dockerfile

@@ -1,40 +1,26 @@
-FROM python:3.9-slim
+FROM python:3.10
 
-WORKDIR /app
+WORKDIR /code
 
-# Install dependencies
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     build-essential \
     python3-dev \
     libfreetype6-dev \
     pkg-config \
     libpng-dev \
+    libcairo2-dev \
+    libffi-dev \
     cmake \
-    git \
     && rm -rf /var/lib/apt/lists/*
 
-# Clone diffvg repository
-RUN git clone https://github.com/BachiLi/diffvg.git && \
-    cd diffvg && \
-    git submodule update --init --recursive && \
-    python setup.py install
+# Install Python dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir cairosvg diffvg
 
-# Install PyTorch and other dependencies
-RUN pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
-RUN pip install transformers pillow svgwrite svgpathtools numpy tqdm scikit-image matplotlib
-RUN pip install fastapi uvicorn
+# Copy application code
+COPY . .
 
-# Copy model files
-COPY . /app/model
-
-# Copy handler files
-COPY handler_template.py /app/
-COPY diffsketcher_handler.py /app/
-COPY api.py /app/
-
-# Set environment variables
-ENV MODEL_ID="jree423/diffsketcher"
-ENV TASK="text-to-image"
-
-# Run the API
-CMD ["python", "api.py"]
+# Set up the API
+CMD ["uvicorn", "api:app", "--host", "0.0.0.0", "--port", "7860"]

requirements.txt

@@ -1,34 +1,18 @@
-torch>=1.8.0,<2.0.0
-torchvision<0.16.0
-diffusers==0.20.2
-transformers<4.30.0
-accelerate
-hydra-core
-omegaconf
-freetype-py
-shapely
-svgutils
-opencv-python
-scikit-image
-matplotlib
-wandb
-beautifulsoup4
-numba
-scipy
-einops
-timm<0.9.0
-fairscale==0.4.13
-safetensors
-datasets
-easydict
-scikit-learn
-pytorch_lightning==2.1.0
-webdataset
-ftfy
-regex
-tqdm
-svgwrite
-svgpathtools
-cssutils
-cairosvg
-pillow<10.0.0
+torch>=2.0.0
+torchvision>=0.15.1
+diffusers>=0.15.1
+transformers>=4.27.4
+accelerate>=0.18.0
+huggingface_hub>=0.14.1
+pillow>=9.5.0
+numpy>=1.24.3
+tqdm>=4.65.0
+fastapi>=0.95.1
+uvicorn>=0.22.0
+python-multipart>=0.0.6
+cairosvg>=2.7.0
+svgwrite>=1.4.3
+svgpathtools>=1.6.0
+opencv-python>=4.7.0.72
+scikit-image>=0.20.0
+matplotlib>=3.7.1