Refactor Dockerfile and start.sh for improved clarity and functionality

Dockerfile

@@ -1,20 +1,18 @@
 FROM ollama/ollama:latest
 
-# Install Python and dependencies
+# Install Python + pip
 RUN apt-get update && apt-get install -y \
     python3 \
     python3-pip \
-    python3-venv \
-    curl \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-# Create virtual environment (safer)
+# Setup Python environment
 RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
-# Copy requirements and install
+# Copy and install requirements
 COPY requirements.txt .
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 
@@ -26,5 +24,8 @@ RUN chmod +x start.sh
 
 EXPOSE 7860
 
-# Use our start script
+# IMPORTANT: Override Ollama's default entrypoint
+ENTRYPOINT []
+
+# Run our start script
 CMD ["./start.sh"]

start.sh

@@ -1,29 +1,34 @@
 #!/bin/bash
 
 echo "=== [HF Space] Starting Ollama + FastAPI ==="
+echo "Time: $(date)"
 
-# Start Ollama in background (official image already has it)
-echo "Starting Ollama server..."
+export OLLAMA_HOST=0.0.0.0
+export OMP_NUM_THREADS=4
+
+echo "Starting Ollama server in background..."
 ollama serve &
-sleep 5
+OLLAMA_PID=$!
 
-# Wait for Ollama
-echo "Waiting for Ollama..."
-for i in {1..40}; do
-    if curl -s http://127.0.0.1:11434/api/tags >/dev/null; then
-        echo "✅ Ollama ready!"
+echo "Waiting for Ollama to be ready..."
+for i in {1..60}; do
+    if curl -s http://127.0.0.1:11434/api/tags >/dev/null 2>&1; then
+        echo "✅ Ollama is ready!"
         break
     fi
     sleep 3
+    if [ $i -eq 20 ]; then
+        echo "Still waiting for Ollama..."
+    fi
 done
 
 # Pull model (only first time)
 if ! ollama list | grep -q "tinyllama"; then
-    echo "📥 Pulling tinyllama... (this can take 2-5 mins on first build)"
+    echo "📥 Downloading tinyllama model... (this may take 3-8 minutes)"
     ollama pull tinyllama
 else
-    echo "✅ tinyllama already available"
+    echo "✅ tinyllama model already downloaded"
 fi
 
-echo "🚀 Starting FastAPI..."
+echo "🚀 Starting FastAPI server on port ${PORT:-7860}..."
 uvicorn app:app --host 0.0.0.0 --port ${PORT:-7860} --workers 2