Update startup.sh

startup.sh

@@ -1,89 +1,58 @@
 #!/bin/bash
 
+# Exit on any error
+set -e
+
 echo "=== Starting Ollama API Server ==="
 
-# Function to check if Ollama is running
-check_ollama() {
-    curl -s http://localhost:11434/api/version > /dev/null
-    return $?
-}
+# Set Ollama environment variables
+export OLLAMA_HOST=0.0.0.0:11434
+export OLLAMA_MODELS=/app/.ollama/models
+export OLLAMA_HOME=/app/.ollama
+export OLLAMA_ORIGINS="*"
 
-# Function to start Ollama server
-start_ollama() {
-    echo "Starting Ollama server..."
-    su - ollama -c "ollama serve" &
-    OLLAMA_PID=$!
-    echo "Ollama server started with PID: $OLLAMA_PID"
-    
-    # Wait for Ollama to be ready
-    echo "Waiting for Ollama server to be ready..."
-    for i in {1..30}; do
-        if check_ollama; then
-            echo "✅ Ollama server is ready!"
-            break
-        fi
-        echo "⏳ Waiting for Ollama server... ($i/30)"
-        sleep 2
-    done
-    
-    if ! check_ollama; then
-        echo "❌ Ollama server failed to start properly"
-        exit 1
-    fi
-}
+# Create models directory if it doesn't exist
+mkdir -p /app/.ollama/models
 
-# Function to start FastAPI
-start_fastapi() {
-    echo "Starting FastAPI server..."
-    python app.py &
-    FASTAPI_PID=$!
-    echo "FastAPI server started with PID: $FASTAPI_PID"
-}
+# Start Ollama server in the background
+echo "Starting Ollama server..."
+ollama serve &
+OLLAMA_PID=$!
+echo "Ollama server started with PID: $OLLAMA_PID"
 
-# Function to handle shutdown
-cleanup() {
-    echo "Shutting down services..."
-    if [ ! -z "$FASTAPI_PID" ]; then
-        kill $FASTAPI_PID 2>/dev/null
-    fi
-    if [ ! -z "$OLLAMA_PID" ]; then
-        kill $OLLAMA_PID 2>/dev/null
-    fi
-    exit 0
+# Function to check if Ollama is ready
+check_ollama() {
+    curl -s http://localhost:11434/api/tags > /dev/null 2>&1
+    return $?
 }
 
-# Set up signal handlers
-trap cleanup SIGTERM SIGINT
+# Wait for Ollama server to be ready
+echo "Waiting for Ollama server to be ready..."
+MAX_WAIT=60
+WAIT_COUNT=0
 
-# Create necessary directories
-mkdir -p /home/ollama/.ollama/models
-chown -R ollama:ollama /home/ollama/.ollama
+while ! check_ollama; do
+    if [ $WAIT_COUNT -ge $MAX_WAIT ]; then
+        echo "❌ Ollama server failed to start within $MAX_WAIT seconds"
+        kill $OLLAMA_PID 2>/dev/null || true
+        exit 1
+    fi
+    
+    echo "⏳ Waiting for Ollama server... ($((WAIT_COUNT + 1))/$MAX_WAIT)"
+    sleep 1
+    WAIT_COUNT=$((WAIT_COUNT + 1))
+done
 
-# Start Ollama server
-start_ollama
+echo "✅ Ollama server is ready!"
 
-# Start FastAPI server
-start_fastapi
+# Optional: Pull a small model for testing
+echo "Pulling a lightweight model (this may take a few minutes)..."
+ollama pull tinyllama &
 
-# Keep the script running and monitor processes
-echo "🚀 Both services are running!"
-echo "- Ollama server: http://localhost:11434"
-echo "- FastAPI server: http://localhost:7860"
-echo "- API Documentation: http://localhost:7860/docs"
+# Start the main application
+echo "Starting main application..."
+python3 app.py
 
-# Monitor both processes
-while true; do
-    # Check if Ollama is still running
-    if ! kill -0 $OLLAMA_PID 2>/dev/null; then
-        echo "❌ Ollama server stopped unexpectedly"
-        exit 1
-    fi
-    
-    # Check if FastAPI is still running
-    if ! kill -0 $FASTAPI_PID 2>/dev/null; then
-        echo "❌ FastAPI server stopped unexpectedly"
-        exit 1
-    fi
-    
-    sleep 10
-done
+# If we reach here, something went wrong with the main app
+echo "❌ Main application exited unexpectedly"
+kill $OLLAMA_PID 2>/dev/null || true