Fix mcpgateway wrapper

Signed-off-by: Madhav Kandukuri <[email protected]>

Author: madhav165

README.md

@@ -175,6 +175,8 @@ pkill mcpgateway
 export MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN}
 export MCP_SERVER_CATALOG_URLS=http://localhost:4444/servers/1
 python3 -m mcpgateway.wrapper
+# Alternatively with uv
+uv run --directory . -m mcpgateway.wrapper
 ```
 
 See [.env.example](.env.example) for full list of ENV variables you can use to override the configuration.
@@ -241,6 +243,8 @@ export MCP_WRAPPER_LOG_LEVEL=DEBUG  # or OFF to disable logging
 
 # Run the wrapper from the installed module
 python3 -m mcpgateway.wrapper
+# Alternatively with uv
+uv run --directory . -m mcpgateway.wrapper
 ```
 
 **Or using the container image:**
@@ -268,6 +272,8 @@ npx -y supergateway --stdio "uvenv run mcp_server_time -- --local-timezone=Europ
 export MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN}
 export MCP_SERVER_CATALOG_URLS=http://localhost:4444/servers/1
 python3 -m mcpgateway.wrapper
+# Alternatively with uv
+uv run --directory . -m mcpgateway.wrapper
 ```
 
 <details>
@@ -350,6 +356,8 @@ pipx install --include-deps mcp-contextforge-gateway
 MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN} \
 MCP_SERVER_CATALOG_URLS=http://localhost:4444/servers/1 \
 python3 -m mcpgateway.wrapper
+# Alternatively with uv
+uv run --directory . -m mcpgateway.wrapper
 ```
 
 **Claude Desktop JSON** (uses the host Python that pipx injected):
@@ -400,11 +408,9 @@ uv pip install mcp-contextforge-gateway
 # Launch wrapper
 MCP_AUTH_TOKEN=${MCPGATEWAY_BEARER_TOKEN} \
 MCP_SERVER_CATALOG_URLS=http://localhost:4444/servers/1 \
-uv python -m mcpgateway.wrapper # Use this just for testing, as the Client will run the uv command
+uv run --directory . -m mcpgateway.wrapper # Use this just for testing, as the Client will run the uv command
 ```
 
-*(You can swap `uv python` for plain `python` if the venv is active.)*
-
 #### Claude Desktop JSON (runs through **uvenv run**)
 
 ```json

docs/docs/using/clients/cline.md

@@ -34,22 +34,31 @@ To integrate Cline with your MCP Gateway:
 1. **Configure MCP Server**:
    - Open the Cline settings in VS Code.
    - Navigate to the MCP Servers section.
-   - Add a new MCP server with the following configuration:
+   - Add a new MCP server with the following configuration under mcpServers as shown below:
 
      ```json
-     {
-       "name": "MCP Gateway",
-       "url": "http://localhost:4444",
-       "auth": {
-         "type": "basic",
-         "username": "admin",
-         "password": "changeme"
-       }
-     }
+     "mcpServers": {
+         "mcpgateway-wrapper": {
+            "disabled": true,
+            "timeout": 60,
+            "type": "stdio",
+            "command": "uv",
+            "args": [
+            "run",
+            "--directory",
+            "REPLACE_WITH_PATH_TO_REPO",
+            "-m",
+            "mcpgateway.wrapper"
+            ],
+            "env": {
+               "MCP_SERVER_CATALOG_URLS": "http://localhost:4444",
+               "MCP_AUTH_TOKEN": "REPLACE_WITH_MCPGATEWAY_BEARER_TOKEN",
+               "MCP_WRAPPER_LOG_LEVEL": "OFF"
+            }
+         }
+      }
      ```
 
-   - Replace the URL, username, and password with your MCP Gateway's details.
-
 2. **Enable the MCP Server**:
    - Ensure the newly added MCP server is enabled in the Cline settings.
 

mcpgateway/main.py

@@ -78,7 +78,7 @@
     ToolUpdate,
 )
 from mcpgateway.services.completion_service import CompletionService
-from mcpgateway.services.gateway_service import GatewayService
+from mcpgateway.services.gateway_service import GatewayService, GatewayConnectionError
 from mcpgateway.services.logging_service import LoggingService
 from mcpgateway.services.prompt_service import (
     PromptError,
@@ -1506,7 +1506,15 @@ async def register_gateway(
         Created gateway.
     """
     logger.debug(f"User '{user}' requested to register gateway: {gateway}")
-    return await gateway_service.register_gateway(db, gateway)
+    try:
+        return await gateway_service.register_gateway(db, gateway)
+    except Exception as ex:
+        if isinstance(ex, GatewayConnectionError):
+            return JSONResponse(
+                content={"message": "Unable to connect to gateway"},
+                status_code=502
+            )
+
 
 
 @gateway_router.get("/{gateway_id}", response_model=GatewayRead)

mcpgateway/services/gateway_service.py

@@ -232,19 +232,16 @@ async def register_gateway(self, db: Session, gateway: GatewayCreate) -> Gateway
             await self._notify_gateway_added(db_gateway)
 
             return GatewayRead.model_validate(gateway)
+        except* GatewayConnectionError as ve:
+            logger.error("GatewayConnectionError in group: %s", ve.exceptions)
+            raise ve.exceptions[0]
         except* ValueError as ve:
             logger.error("ValueErrors in group: %s", ve.exceptions)
         except* RuntimeError as re:
             logger.error("RuntimeErrors in group: %s", re.exceptions)
         except* BaseException as other:  # catches every other sub-exception
             logger.error("Other grouped errors: %s", other.exceptions)
-        # except IntegrityError as ex:
-        #     logger.error(f"Error adding gateway: {ex}")
-        #     db.rollback()
-        #     raise GatewayError(f"Gateway already exists: {gateway.name}")
-        # except Exception as e:
-        #     db.rollback()
-        #     raise GatewayError(f"Failed to register gateway: {str(e)}")
+            raise Exception(other.exceptions)
 
     async def list_gateways(self, db: Session, include_inactive: bool = False) -> List[GatewayRead]:
         """List all registered gateways.

mcpgateway/wrapper.py

@@ -92,7 +92,9 @@ def _extract_base_url(url: str) -> str:
     parsed = urlparse(url)
     if not parsed.scheme or not parsed.netloc:
         raise ValueError(f"Invalid URL provided: {url}")
-    return f"{parsed.scheme}://{parsed.netloc}"
+
+    before_servers = parsed.path.split('/servers')[0]
+    return f"{parsed.scheme}://{parsed.netloc}{before_servers}"
 
 
 BASE_URL: str = _extract_base_url(SERVER_CATALOG_URLS[0]) if SERVER_CATALOG_URLS else ""

pyproject.toml

@@ -142,10 +142,10 @@ dev = [
 
 # Convenience meta-extras
 all = [
-    "mcpgateway[redis]",
+    "mcp-contextforge-gateway[redis]",
 ]
 dev-all = [
-    "mcpgateway[redis,dev]",
+    "mcp-contextforge-gateway[redis,dev]",
 ]
 
 # --------------------------------------------------------------------