fix: minor fixes

Author: pmannion2

api.py

@@ -118,11 +118,29 @@ def get_chroma_client():
         # Check if external Chroma server is specified
         if CHROMA_HOST:
             logger.info(f"Connecting to external Chroma at {CHROMA_HOST}:{CHROMA_PORT}")
-            client = chromadb.HttpClient(
-                host=CHROMA_HOST,
-                port=int(CHROMA_PORT) if CHROMA_PORT else 8000,
-                settings=Settings(anonymized_telemetry=False),
-            )
+
+            # Use different client init based on whether we're using persistent mode
+            if USE_PERSISTENT_CHROMA:
+                logger.info("Using persistent HTTP client mode")
+                client = chromadb.HttpClient(
+                    host=CHROMA_HOST,
+                    port=int(CHROMA_PORT) if CHROMA_PORT else 8000,
+                    tenant="default_tenant",
+                    settings=Settings(
+                        anonymized_telemetry=False,
+                        allow_reset=True,
+                    ),
+                )
+            else:
+                # Standard HTTP client
+                client = chromadb.HttpClient(
+                    host=CHROMA_HOST,
+                    port=int(CHROMA_PORT) if CHROMA_PORT else 8000,
+                    tenant="default_tenant",
+                    settings=Settings(
+                        anonymized_telemetry=False,
+                    ),
+                )
         else:
             # Use local persistent Chroma
             logger.info(f"Using local Chroma with persistence at {PERSIST_DIRECTORY}")
@@ -131,7 +149,8 @@ def get_chroma_client():
             )
 
         # Test connection works
-        client.heartbeat()
+        heartbeat = client.heartbeat()
+        logger.info(f"Chroma connection successful. Heartbeat: {heartbeat}")
         return client
     except Exception as e:
         logger.error(f"Failed to connect to Chroma: {e}")
@@ -203,7 +222,11 @@ async def verify_dependencies():
 
     # Check Chroma connection
     try:
-        count = collection.count()
+        collection = get_collection()
+        if collection:
+            count = collection.count()
+        else:
+            errors.append("Could not connect to Chroma collection")
     except Exception as e:
         errors.append(f"Chroma connection error: {str(e)}")
 
@@ -235,9 +258,12 @@ async def root():
 @app.get("/health")
 async def health_check(deps: None = Depends(verify_dependencies)):
     """Health check endpoint that verifies all dependencies are working."""
+    collection = get_collection()
+    doc_count = collection.count() if collection else 0
+
     return {
         "status": "healthy",
-        "chroma": {"connected": True, "documents": collection.count()},
+        "chroma": {"connected": collection is not None, "documents": doc_count},
         "openai": {"configured": bool(openai_api_key) or MOCK_EMBEDDINGS},
         "mock_mode": MOCK_EMBEDDINGS,
     }
@@ -379,6 +405,14 @@ async def agent_query(
         logger.info(f"Mock mode overridden to: {use_mock}")
 
     try:
+        # Get the collection
+        collection = get_collection()
+        if collection is None:
+            raise HTTPException(
+                status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+                detail="Vector database is not available. Please check Chroma connection.",
+            )
+
         # Extract any filter from context
         where_filter = {}
         if req.filter_type:
@@ -512,6 +546,14 @@ async def get_stats():
     logger.info("Stats request received")
 
     try:
+        # Get the collection
+        collection = get_collection()
+        if collection is None:
+            raise HTTPException(
+                status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+                detail="Vector database is not available. Please check Chroma connection.",
+            )
+
         # Get count of documents in the collection
         try:
             count = collection.count()

chroma_index/chroma.sqlite3

@@ -1,21 +1,21 @@
-version: "3.8"
-
 services:
   # Chroma Vector Database
   chroma:
     image: chromadb/chroma:latest
     volumes:
-      - ./chroma_index:/chroma/chroma
+      - ./chroma_index:/chroma/chroma/data
     environment:
-      - ALLOW_RESET=true
-      - ANONYMIZED_TELEMETRY=false
+      - ALLOW_RESET=True
+      - ANONYMIZED_TELEMETRY=False
+      - CHROMA_SERVER_HOST=0.0.0.0
+      - CHROMA_SERVER_HTTP_PORT=8000
+    ports:
+      - "8000:8000"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8000/api/v1/heartbeat"]
-      interval: 10s
+      interval: 1s
       timeout: 5s
-      retries: 5
-    ports:
-      - "8000:8000" # Map to default port so host apps can connect
+      retries: 10
     networks:
       - ignition-network
 

docker-compose.local.yml

@@ -0,0 +1,69 @@
+#!/bin/bash
+# Script to run a complete demo of the Ignition RAG with Cursor integration
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+# Print header
+echo -e "${BLUE}==================================================${NC}"
+echo -e "${BLUE}           Ignition RAG Cursor Demo              ${NC}"
+echo -e "${BLUE}==================================================${NC}"
+
+# Check if Docker is running
+if ! docker info > /dev/null 2>&1; then
+  echo -e "${RED}Error: Docker is not running. Please start Docker and try again.${NC}"
+  exit 1
+fi
+
+# Check if UV is installed
+if ! command -v uv &> /dev/null; then
+  echo -e "${YELLOW}Warning: UV is not installed. Using regular Python instead.${NC}"
+  USE_UV=false
+else
+  USE_UV=true
+fi
+
+# 1. Start the Chroma and API services
+echo -e "${YELLOW}Starting Chroma and API services...${NC}"
+./run_local.sh &
+
+# Wait for services to start
+echo -e "${YELLOW}Waiting for services to start...${NC}"
+sleep 10  # Give some time for services to initialize
+
+# 2. Run the sample indexer to populate the database
+echo -e "${YELLOW}Populating the database with sample data...${NC}"
+if [ "$USE_UV" = true ]; then
+  uv run python sample_indexer.py
+else
+  python sample_indexer.py
+fi
+
+# 3. Install the Cursor extension
+echo -e "${YELLOW}Installing the Cursor extension...${NC}"
+./install_cursor_extension.sh
+
+# 4. Show instructions
+echo -e "${GREEN}==================================================${NC}"
+echo -e "${GREEN}  Ignition RAG Cursor Demo is ready!              ${NC}"
+echo -e "${GREEN}==================================================${NC}"
+echo -e ""
+echo -e "${BLUE}What's running:${NC}"
+echo -e "1. Chroma database at ${BLUE}http://localhost:8000${NC}"
+echo -e "2. RAG API service at ${BLUE}http://localhost:8001${NC}"
+echo -e "3. Cursor extension has been installed to ${BLUE}~/.cursor/extensions/ignition-rag/${NC}"
+echo -e ""
+echo -e "${BLUE}Try these sample queries in Cursor:${NC}"
+echo -e "- How is the Tank1Level tag configured?"
+echo -e "- What is the pump status component?"
+echo -e "- How do I set up a tank level indicator in Ignition?"
+echo -e "- Explain the pump control view"
+echo -e ""
+echo -e "${YELLOW}Press Ctrl+C to stop all services${NC}"
+
+# Wait for user to press Ctrl+C
+wait 

run_cursor_demo.sh

@@ -32,6 +32,22 @@ else
   USE_UV=true
 fi
 
+# Check for and kill any processes using port 8001
+if lsof -Pi :$API_PORT -sTCP:LISTEN -t >/dev/null ; then
+  echo -e "${YELLOW}Port $API_PORT is already in use. Attempting to kill the process...${NC}"
+  lsof -Pi :$API_PORT -sTCP:LISTEN -t | xargs kill -9
+  sleep 1
+fi
+
+# Stop and remove existing Chroma containers to avoid conflicts
+echo -e "${YELLOW}Cleaning up any existing Chroma containers...${NC}"
+docker-compose -f $DOCKER_COMPOSE_FILE down
+docker rm -f $(docker ps -a -q --filter "name=chroma") 2>/dev/null || true
+
+# Create the index directory if it doesn't exist
+mkdir -p ./chroma_index
+chmod -R 777 ./chroma_index
+
 # Start Chroma DB with Docker
 echo -e "${YELLOW}Starting Chroma database...${NC}"
 docker-compose -f $DOCKER_COMPOSE_FILE up -d chroma
@@ -40,7 +56,7 @@ docker-compose -f $DOCKER_COMPOSE_FILE up -d chroma
 echo -e "${YELLOW}Waiting for Chroma to be ready...${NC}"
 attempt=0
 max_attempts=30
-until docker-compose -f $DOCKER_COMPOSE_FILE exec chroma curl -s http://localhost:8000/api/v1/heartbeat > /dev/null; do
+until docker-compose -f $DOCKER_COMPOSE_FILE exec -T chroma curl -s http://localhost:8000/api/v1/heartbeat > /dev/null; do
   attempt=$((attempt+1))
   if [ $attempt -gt $max_attempts ]; then
     echo -e "${RED}Error: Chroma failed to start properly.${NC}"
@@ -51,12 +67,23 @@ until docker-compose -f $DOCKER_COMPOSE_FILE exec chroma curl -s http://localhos
   echo -n "."
   sleep 1
 done
-echo -e "\n${GREEN}Chroma is ready!${NC}"
+
+# Wait a bit longer for tenant creation
+echo -e "${YELLOW}Waiting for tenant initialization (5 seconds)...${NC}"
+sleep 5
+
+echo -e "${GREEN}Chroma is ready!${NC}"
+
+# Create default tenant
+echo -e "${YELLOW}Creating default tenant...${NC}"
+curl -s -X POST http://localhost:8000/api/v1/tenants -H "Content-Type: application/json" -d '{"name":"default_tenant"}' > /dev/null
+echo -e "${GREEN}Default tenant created or already exists${NC}"
 
 # Set environment variables for the API
 export MOCK_EMBEDDINGS=$USE_MOCK
 export CHROMA_HOST=localhost
 export CHROMA_PORT=8000
+export USE_PERSISTENT_CHROMA=true
 
 # Start the API service
 echo -e "${YELLOW}Starting API service on port $API_PORT...${NC}"