Resolve merge conflict in README.md

Dockerfile

@@ -0,0 +1,23 @@
+FROM python:3.9-slim
+
+WORKDIR /app
+
+# Install system dependencies including libGL
+RUN apt-get update && apt-get install -y \
+    libgl1 \
+    libglib2.0-0 \
+    libsm6 \
+    libxext6 \
+    libxrender-dev \
+    libgomp1 \
+    && rm -rf /var/lib/apt/lists/*
+
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+EXPOSE 7860
+
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860"]

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 title: Clothing Attribute Detection
 emoji: "👕"
@@ -8,3 +9,15 @@ sdk_version: "latest"
 app_file: "Dockerfile"
 pinned: false
 ---
+=======
+---
+title: Clothing Attribute Detection
+emoji: "👕"
+colorFrom: "blue"
+colorTo: "green"
+sdk: "docker"
+sdk_version: "latest"
+app_file: "Dockerfile"
+pinned: false
+---
+>>>>>>> cb600bb7c71123c0b5b011b69e8b5345b1468115

app/models/attribute_extractor.py

@@ -4,6 +4,12 @@ from PIL import Image
 import re
 import asyncio
 from typing import Dict, Any
+import os 
+
+# Set custom cache directory writable in Spaces environment
+os.environ["TRANSFORMERS_CACHE"] = "/tmp/.cache"
+os.environ["HF_HOME"] = "/tmp/.cache"
+
 
 class AttributeExtractor:
     def __init__(self):

app/models/clothing_detector.py

@@ -6,6 +6,11 @@ from PIL import Image
 import numpy as np
 from typing import List, Dict, Any
 import asyncio
+import os 
+
+# Set custom cache directory writable in Spaces environment
+os.environ["TRANSFORMERS_CACHE"] = "/tmp/.cache"
+os.environ["HF_HOME"] = "/tmp/.cache"
 
 class ClothingDetector:
     def __init__(self):

app/models/color_analyzer.py

@@ -5,6 +5,12 @@ from sklearn.cluster import KMeans
 from typing import Dict, List, Any
 import asyncio
 import webcolors
+import os 
+
+# Set custom cache directory writable in Spaces environment
+os.environ["TRANSFORMERS_CACHE"] = "/tmp/.cache"
+os.environ["HF_HOME"] = "/tmp/.cache"
+
 
 class ColorAnalyzer:
     def __init__(self):