fix

: fix dockerfile

Author: dheerajoruganty

Dockerfile

@@ -26,9 +26,11 @@ WORKDIR /app
 # Copy the entire project context into the container
 COPY . /app/
 
-# Install Python dependencies for the MCP Registry using uv
-# The server dependencies will be installed by start_all_servers.sh at runtime
-RUN cd /app && uv pip install --system --requirement pyproject.toml
+# Create the shared virtual environment that start_all_servers.sh will use
+RUN uv venv /app/.venv --python 3.12
+
+# Install Python dependencies from pyproject.toml INTO the shared venv
+RUN . /app/.venv/bin/activate && uv pip install --no-cache-dir /app
 
 # Generate self-signed SSL certificate for Nginx
 # Create directories for SSL certs

pyproject.toml

@@ -9,11 +9,16 @@ dependencies = [
     "itsdangerous>=2.2.0",
     "jinja2>=3.1.6",
     "mcp>=1.6.0",
+    "pydantic>=2.11.3",
+    "httpx>=0.27.0",
     "python-dotenv>=1.1.0",
     "python-multipart>=0.0.20",
     "uvicorn[standard]>=0.34.2",
     "faiss-cpu>=1.7.4",
     "sentence-transformers>=2.2.2",
+    "websockets>=15.0.1",
+    "scikit-learn>=1.3.0",
+    "torch>=1.6.0"
 ]
 
 [tool.setuptools]

servers/mcpgw/server.py

@@ -127,6 +127,13 @@ async def load_faiss_data_for_mcpgw():
 
 # --- FAISS and Sentence Transformer Integration for mcpgw --- END
 
+# --- Pydantic Models for Credentials and Parameters ---
+
+class Credentials(BaseModel):
+    """Credentials for authentication with the registry API."""
+    username: str = Field(..., description="Username for registry authentication")
+    password: str = Field(..., description="Password for registry authentication")
+
 
 async def _ensure_authenticated(credentials: Credentials):
     """Ensures an active session cookie exists, attempts login if not."""
@@ -221,12 +228,6 @@ def parse_arguments():
 
 # --- Pydantic Models for Credentials and Parameters ---
 
-class Credentials(BaseModel):
-    """Credentials for authentication with the registry API."""
-    username: str = Field(..., description="Username for registry authentication")
-    password: str = Field(..., description="Password for registry authentication")
-
-
 # Pydantic classes for ServicePathParams and RegisterServiceParams have been removed
 # as they are no longer needed. The parameters are now directly defined in the functions.
 

start_all_servers.sh

@@ -20,6 +20,16 @@ if [ ! -d "$LOGS_DIR" ]; then
     mkdir -p "$LOGS_DIR"
 fi
 
+# The virtual environment is now created and populated by the Dockerfile.
+# We just need to ensure SCRIPT_DIR points to /app if this script is not run from /app
+# Assuming SCRIPT_DIR will be /app based on WORKDIR and entrypoint execution context
+
+# Activate the pre-built virtual environment
+echo "Activating the pre-built virtual environment at $SCRIPT_DIR/.venv..."
+source "$SCRIPT_DIR/.venv/bin/activate"
+
+# Dependency installation is now handled by the Dockerfile.
+
 # Find all subdirectories in the servers directory
 subdirs=$(find "$SERVERS_DIR" -mindepth 1 -maxdepth 1 -type d | sort)
 
@@ -39,23 +49,11 @@ for subdir in $subdirs; do
     # Move into the subdirectory
     cd "$subdir" || continue
 
-    echo "Setting up Python environment..."
-    # Create a Python virtual environment using uv
-    uv venv --python 3.12
-    
-    # Activate the virtual environment
-    source .venv/bin/activate
-    
-    echo "Installing requirements in $(pwd)..."
-    # Install requirements from pyproject.toml
-    if [ -f "pyproject.toml" ]; then
-        uv pip install --requirement pyproject.toml >> "$log_file" 2>&1
-    else
-        echo "Warning: pyproject.toml not found in $subdir" | tee -a "$log_file"
-    fi
+    # Python environment setup is now global, so no local venv creation/activation needed here
 
     echo "Starting server on port $port (logs in $log_file)..."
     # Start the server in the background with the current port and redirect output to log file
+    # uv run will use the globally activated venv
     uv run python server.py --port $port >> "$log_file" 2>&1 &
 
     # Store the process ID for potential cleanup later
@@ -65,8 +63,7 @@ for subdir in $subdirs; do
     # Save PID to a file for easy management
     echo "$server_pid" > "$pid_file"
 
-    # Deactivate the virtual environment
-    deactivate
+    # No local deactivation needed
 
     # Return to the original directory
     cd "$SCRIPT_DIR"
@@ -77,6 +74,11 @@ for subdir in $subdirs; do
     echo "-----------------------------------"
 done
 
+# Deactivate the global virtual environment
+echo "Deactivating the global virtual environment."
+deactivate
+
 echo "All servers have been started. Logs are available in the $LOGS_DIR directory."
+echo "The shared virtual environment at $SCRIPT_DIR/.venv was used."
 echo "To stop all servers, use: kill \$(cat $LOGS_DIR/*.pid)"
 echo "To view logs in real-time for a specific server, use: tail -f $LOGS_DIR/server_name_port.log"