feat: enhance Docker setup and error handling for containers, update requirements, and add MCP proxy configuration

Author: Acuspeedster

.github/workflows/test-mcp-server.yml

@@ -44,17 +44,30 @@ jobs:
           echo "Checking Docker container status..."
           docker ps
           
-          # Check if API container exists before getting logs
-          if docker ps | grep -q api; then
-            echo "API container is running, checking logs:"
-            docker logs $(docker ps -q --filter name=api)
-          else
+          # Check if all containers are running
+          if ! docker ps | grep -q api; then
             echo "ERROR: API container is not running!"
-            echo "Checking docker-compose logs for errors:"
-            docker compose logs
+            echo "Building container logs:"
+            docker-compose logs --tail=100 api
+            exit 1
+          fi
+          
+          if ! docker ps | grep -q mcp-server; then
+            echo "ERROR: MCP server container is not running!"
+            docker-compose logs --tail=100 mcp-server
             exit 1
           fi
           
+          if ! docker ps | grep -q mcp-proxy; then
+            echo "ERROR: MCP proxy container is not running!"
+            docker-compose logs --tail=100 mcp-proxy
+            exit 1
+          fi
+          
+          echo "All required containers are running."
+          echo "API container logs:"
+          docker logs $(docker ps -q --filter name=api)
+          
           echo "Waiting 30 more seconds for services to stabilize..."
           sleep 30
 

Dockerfile

@@ -12,13 +12,14 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 # Set working directory
 WORKDIR /app
 
-# Copy requirements and install dependencies
+# Install pip dependencies first for better caching
 COPY requirements.txt .
-# Remove the "|| echo" part to fail if packages aren't installed
-RUN pip install --no-cache-dir -r requirements.txt
 
-# Install MCP packages explicitly
-RUN pip install mcp-python mcp-proxy fastapi uvicorn
+# Install packages step by step to debug any issues
+RUN pip install --no-cache-dir -U pip && \
+    pip install --no-cache-dir openai && \
+    pip install --no-cache-dir cmcp mcp-python mcp-proxy && \
+    pip install --no-cache-dir -r requirements.txt
 
 # Copy application code
 COPY . .

docker-compose.yml

@@ -7,10 +7,10 @@ services:
       - "8000:8000"
     environment:
       - LLM_API_KEY=${LLM_API_KEY}
-      - LLM_API_BASE=${LLM_API_BASE:-http://localhost:8080/v1}
-      - LLM_MODEL=${LLM_MODEL:-Qwen2.5-Coder-3B-Instruct}
-      - LLM_EMBED_MODEL=${LLM_EMBED_MODEL:-gte-Qwen2-1.5B-instruct}
-      - LLM_EMBED_SIZE=${LLM_EMBED_SIZE:-1536}
+      - LLM_API_BASE=${LLM_API_BASE:-https://coder.gaia.domains/v1}
+      - LLM_MODEL=${LLM_MODEL:-Qwen2.5-Coder-32B-Instruct-Q5_K_M}
+      - LLM_EMBED_MODEL=${LLM_EMBED_MODEL:-nomic-embed}
+      - LLM_EMBED_SIZE=${LLM_EMBED_SIZE:-768}
       - QDRANT_HOST=qdrant
       - QDRANT_PORT=6333
     depends_on:
@@ -20,10 +20,10 @@ services:
     build: .
     environment:
       - LLM_API_KEY=${LLM_API_KEY}
-      - LLM_API_BASE=${LLM_API_BASE:-http://localhost:8080/v1}
-      - LLM_MODEL=${LLM_MODEL:-Qwen2.5-Coder-3B-Instruct}
-      - LLM_EMBED_MODEL=${LLM_EMBED_MODEL:-gte-Qwen2-1.5B-instruct}
-      - LLM_EMBED_SIZE=${LLM_EMBED_SIZE:-1536}
+      - LLM_API_BASE=${LLM_API_BASE:-https://coder.gaia.domains/v1}
+      - LLM_MODEL=${LLM_MODEL:-Qwen2.5-Coder-32B-Instruct-Q5_K_M}
+      - LLM_EMBED_MODEL=${LLM_EMBED_MODEL:-nomic-embed}
+      - LLM_EMBED_SIZE=${LLM_EMBED_SIZE:-768}
       - QDRANT_HOST=qdrant
       - QDRANT_PORT=6333
     depends_on:

mcp-proxy-config.js renamed to mcp-proxy-config.json

@@ -5,4 +5,6 @@ python-dotenv>=1.0.0
 requests>=2.28.2
 qdrant-client>=1.3.0
 mcp-python>=0.1.0
-mcp-proxy>=0.1.0
+mcp-proxy>=0.1.0
+cmcp>=0.1.0
+openai>=1.0.0