Return 502 from admin endpoint too

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

Author: madhav165

mcpgateway/admin.py

@@ -48,7 +48,7 @@
     ToolRead,
     ToolUpdate,
 )
-from mcpgateway.services.gateway_service import GatewayService
+from mcpgateway.services.gateway_service import GatewayService, GatewayConnectionError
 from mcpgateway.services.prompt_service import PromptService
 from mcpgateway.services.resource_service import ResourceService
 from mcpgateway.services.root_service import RootService
@@ -762,10 +762,13 @@ async def admin_add_gateway(request: Request, db: Session = Depends(get_db), use
         auth_header_key=form.get("auth_header_key", ""),
         auth_header_value=form.get("auth_header_value", ""),
     )
-    await gateway_service.register_gateway(db, gateway)
-
     root_path = request.scope.get("root_path", "")
-    return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
+    try:
+        await gateway_service.register_gateway(db, gateway)
+        return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
+    except Exception as ex:
+        if isinstance(ex, GatewayConnectionError):
+            return RedirectResponse(f"{root_path}/admin#gateways", status_code=502)
 
 
 @admin_router.post("/gateways/{gateway_id}/edit")

mcpgateway/main.py

@@ -28,7 +28,6 @@
 import asyncio
 import json
 import logging
-import os
 from contextlib import asynccontextmanager
 from typing import Any, AsyncIterator, Dict, List, Optional, Union
 
@@ -78,7 +77,7 @@
     ToolUpdate,
 )
 from mcpgateway.services.completion_service import CompletionService
-from mcpgateway.services.gateway_service import GatewayService, GatewayConnectionError
+from mcpgateway.services.gateway_service import GatewayConnectionError, GatewayService
 from mcpgateway.services.logging_service import LoggingService
 from mcpgateway.services.prompt_service import (
     PromptError,
@@ -1510,11 +1509,7 @@ async def register_gateway(
         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
-            )
-
+            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

@@ -123,7 +123,11 @@ def __init__(self):
             self._redis_client = None
 
     async def initialize(self) -> None:
-        """Initialize the service and start health check if this instance is the leader."""
+        """Initialize the service and start health check if this instance is the leader.
+
+        Raises:
+            ConnectionError: When redis ping fails
+        """
         logger.info("Initializing gateway service")
 
         if self._redis_client:
@@ -166,6 +170,7 @@ async def register_gateway(self, db: Session, gateway: GatewayCreate) -> Gateway
 
         Raises:
             GatewayNameConflictError: If gateway name already exists
+            []: When ExceptionGroup found
         """
         try:
             # Check for name conflicts (both active and inactive)
@@ -232,16 +237,18 @@ 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* GatewayConnectionError as ge:
+            logger.error("GatewayConnectionError in group: %s", ge.exceptions)
+            raise ge.exceptions[0]
         except* ValueError as ve:
             logger.error("ValueErrors in group: %s", ve.exceptions)
+            raise ve.exceptions[0]
         except* RuntimeError as re:
             logger.error("RuntimeErrors in group: %s", re.exceptions)
+            raise re.exceptions[0]
         except* BaseException as other:  # catches every other sub-exception
             logger.error("Other grouped errors: %s", other.exceptions)
-            raise Exception(other.exceptions)
+            raise other.exceptions[0]
 
     async def list_gateways(self, db: Session, include_inactive: bool = False) -> List[GatewayRead]:
         """List all registered gateways.

mcpgateway/wrapper.py

@@ -93,7 +93,7 @@ def _extract_base_url(url: str) -> str:
     if not parsed.scheme or not parsed.netloc:
         raise ValueError(f"Invalid URL provided: {url}")
 
-    before_servers = parsed.path.split('/servers')[0]
+    before_servers = parsed.path.split("/servers")[0]
     return f"{parsed.scheme}://{parsed.netloc}{before_servers}"
 
 
@@ -159,10 +159,6 @@ async def get_tools_from_mcp_server(catalog_urls: List[str]) -> List[str]:
 
     Returns:
         List[str]: A list of tool ID strings extracted from the server catalog.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     server_ids = [url.split("/")[-1] for url in catalog_urls]
     url = f"{BASE_URL}/servers/"
@@ -184,10 +180,6 @@ async def tools_metadata(tool_ids: List[str]) -> List[Dict[str, Any]]:
 
     Returns:
         List[Dict[str, Any]]: A list of metadata dictionaries for each tool.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     if not tool_ids:
         return []
@@ -209,10 +201,6 @@ async def get_prompts_from_mcp_server(catalog_urls: List[str]) -> List[str]:
 
     Returns:
         List[str]: A list of prompt ID strings.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     server_ids = [url.split("/")[-1] for url in catalog_urls]
     url = f"{BASE_URL}/servers/"
@@ -234,10 +222,6 @@ async def prompts_metadata(prompt_ids: List[str]) -> List[Dict[str, Any]]:
 
     Returns:
         List[Dict[str, Any]]: A list of metadata dictionaries for each prompt.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     if not prompt_ids:
         return []
@@ -258,10 +242,6 @@ async def get_resources_from_mcp_server(catalog_urls: List[str]) -> List[str]:
 
     Returns:
         List[str]: A list of resource ID strings.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     server_ids = [url.split("/")[-1] for url in catalog_urls]
     url = f"{BASE_URL}/servers/"
@@ -283,10 +263,6 @@ async def resources_metadata(resource_ids: List[str]) -> List[Dict[str, Any]]:
 
     Returns:
         List[Dict[str, Any]]: A list of metadata dictionaries for each resource.
-
-    Raises:
-        httpx.RequestError: If a network problem occurs.
-        httpx.HTTPStatusError: If the server returns a 4xx or 5xx response.
     """
     if not resource_ids:
         return []