Upload 3 files

Dockerfile

@@ -0,0 +1,45 @@
+# Use an official Python runtime as the base image
+FROM python:3.11-slim
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies (curl for Ollama, git for pip)
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Ollama
+RUN curl -fsSL https://ollama.com/install.sh | sh
+
+########################################################
+# Pull llama3 model during build to avoid runtime delays
+RUN ollama serve & \
+    until curl -s http://localhost:11434 > /dev/null; do \
+        echo 'Waiting for Ollama...'; sleep 1; \
+    done && \
+    ollama pull llama3 && \
+    ollama list > /app/models.txt && \
+    cat /app/models.txt
+########################################################
+
+
+# Copy requirements file first (optimization for caching)
+COPY requirements.txt .
+
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy only necessary application files (exclude .env)
+COPY app.py .
+
+# Expose the port Hugging Face Spaces expects
+EXPOSE 7860
+
+# Set environment variables for Ollama
+ENV OLLAMA_HOST=0.0.0.0
+ENV OLLAMA_PORT=11434
+
+# Start Ollama and run Streamlit
+CMD bash -c "ollama serve & until curl -s http://localhost:11434 > /dev/null; do echo 'Waiting for Ollama...'; sleep 1; done && streamlit run app.py --server.port 7860 --server.address 0.0.0.0"

app.py

@@ -7,7 +7,7 @@ from atomic_agents.agents.base_agent import BaseAgent, BaseAgentConfig, BaseAgen
 from dotenv import load_dotenv
 import asyncio
 
-# Load environment variables
+# Load environment variables (optional if using Hugging Face Secrets)
 load_dotenv()
 
 # Initialize Streamlit app
@@ -20,23 +20,18 @@ def setup_client(provider):
         from openai import AsyncOpenAI
         api_key = os.getenv("OPENAI_API_KEY")
         if not api_key:
-            st.error("OPENAI_API_KEY not set in environment variables.")
-            return None, None, None
+            st.warning("OpenAI provider unavailable: OPENAI_API_KEY not set. Falling back to Ollama.")
+            return setup_client("ollama")  # Fallback to Ollama
         client = instructor.from_openai(AsyncOpenAI(api_key=api_key))
         model = "gpt-4o-mini"
         display_model = "OpenAI (gpt-4o-mini)"
     elif provider == "ollama":
         from openai import AsyncOpenAI as OllamaClient
-        try:
-            client = instructor.from_openai(
-                OllamaClient(base_url="http://localhost:11434/v1", api_key="ollama"),
-                mode=instructor.Mode.JSON
-            )
-            model = "llama-3.2-1b-instruct-q8_0"  # Use the local name after pulling
-            display_model = "Ollama (Llama 3.2 1B)"
-        except Exception as e:
-            st.error(f"Failed to connect to Ollama: {str(e)}. Ensure Ollama is running and the model is pulled.")
-            return None, None, None
+        client = instructor.from_openai(
+            OllamaClient(base_url="http://localhost:11434/v1", api_key="ollama"), mode=instructor.Mode.JSON
+        )
+        model = "llama3"
+        display_model = "Ollama (llama3)"
     else:
         st.error(f"Unsupported provider: {provider}")
         return None, None, None
@@ -55,7 +50,7 @@ system_prompt_generator = SystemPromptGenerator(
 )
 
 # Provider selection
-providers_list = ["openai", "ollama"]
+providers_list = ["ollama", "openai"]  # Prioritize Ollama since it’s guaranteed to work
 selected_provider = st.selectbox("Choose a provider:", providers_list, key="provider_select")
 
 # Set up client and agent based on the selected provider