Two warnings pending

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

Author: madhav165

mcpgateway/admin.py

@@ -444,6 +444,7 @@ async def admin_ui(
     roots = [root.model_dump(by_alias=True) for root in await root_service.list_roots()]
     root_path = settings.app_root_path
     response = request.app.state.templates.TemplateResponse(
+        request,
         "admin.html",
         {
             "request": request,

mcpgateway/cache/session_registry.py

@@ -95,7 +95,6 @@ def __init__(
 
             self._redis = Redis.from_url(redis_url)
             self._pubsub = self._redis.pubsub()
-            self._pubsub.subscribe("mcp_session_events")
 
         elif self._backend == "database":
             if not SQLALCHEMY_AVAILABLE:
@@ -152,6 +151,9 @@ async def initialize(self) -> None:
             self._cleanup_task = asyncio.create_task(self._db_cleanup_task())
             logger.info("Database cleanup task started")
 
+        elif self._backend == "redis":
+            await self._pubsub.subscribe("mcp_session_events")
+
         elif self._backend == "none":
             # Nothing to initialize for none backend
             pass
@@ -179,8 +181,8 @@ async def shutdown(self) -> None:
         # Close Redis connections
         if self._backend == "redis":
             try:
-                self._pubsub.close()
-                self._redis.close()
+                await self._pubsub.aclose()
+                await self._redis.aclose()
             except Exception as e:
                 logger.error(f"Error closing Redis connection: {e}")
 

mcpgateway/federation/discovery.py

@@ -363,7 +363,7 @@ async def _get_gateway_info(self, url: str) -> ServerCapabilities:
         if result.get("protocol_version") != PROTOCOL_VERSION:
             raise ValueError(f"Unsupported protocol version: {result.get('protocol_version')}")
 
-        return ServerCapabilities.parse_obj(result["capabilities"])
+        return ServerCapabilities.model_validate(result["capabilities"])
 
     async def _exchange_peers(self) -> None:
         """Exchange peer lists with known gateways."""

mcpgateway/federation/manager.py

@@ -234,7 +234,7 @@ async def get_gateway_tools(self, db: Session, gateway_id: str) -> List[Tool]:
         try:
             # Get tool list
             tools = await self.forward_request(gateway, "tools/list")
-            return [Tool.parse_obj(t) for t in tools]
+            return [Tool.model_validate(t) for t in tools]
 
         except Exception as e:
             raise FederationError(f"Failed to get tools from {gateway.name}: {str(e)}")
@@ -259,7 +259,7 @@ async def get_gateway_resources(self, db: Session, gateway_id: str) -> List[Reso
         try:
             # Get resource list
             resources = await self.forward_request(gateway, "resources/list")
-            return [Resource.parse_obj(r) for r in resources]
+            return [Resource.model_validate(r) for r in resources]
 
         except Exception as e:
             raise FederationError(f"Failed to get resources from {gateway.name}: {str(e)}")
@@ -284,7 +284,7 @@ async def get_gateway_prompts(self, db: Session, gateway_id: str) -> List[Prompt
         try:
             # Get prompt list
             prompts = await self.forward_request(gateway, "prompts/list")
-            return [Prompt.parse_obj(p) for p in prompts]
+            return [Prompt.model_validate(p) for p in prompts]
 
         except Exception as e:
             raise FederationError(f"Failed to get prompts from {gateway.name}: {str(e)}")
@@ -422,7 +422,7 @@ async def _initialize_gateway(self, url: str) -> ServerCapabilities:
                 headers=self._get_auth_headers(),
             )
             response.raise_for_status()
-            result = InitializeResult.parse_obj(response.json())
+            result = InitializeResult.model_validate(response.json())
 
             # Verify protocol version
             if result.protocol_version != PROTOCOL_VERSION:

mcpgateway/handlers/sampling.py

@@ -71,7 +71,7 @@ async def create_message(self, db: Session, request: Dict[str, Any]) -> CreateMe
             # Extract request parameters
             messages = request.get("messages", [])
             max_tokens = request.get("maxTokens")
-            model_prefs = ModelPreferences.parse_obj(request.get("modelPreferences", {}))
+            model_prefs = ModelPreferences.model_validate(request.get("modelPreferences", {}))
             include_context = request.get("includeContext", "none")
             request.get("metadata", {})
 

mcpgateway/services/tool_service.py

@@ -434,7 +434,7 @@ async def invoke_tool(self, db: Session, name: str, arguments: Dict[str, Any]) -
                     response = await self._http_client.get(final_url, params=payload, headers=headers)
                 else:
                     response = await self._http_client.request(method, final_url, json=payload, headers=headers)
-                response.raise_for_status()
+                await response.raise_for_status()
 
                 # Handle 204 No Content responses that have no body
                 if response.status_code == 204:

mcpgateway/translate.py

@@ -382,6 +382,11 @@ async def pump_sse_to_stdio():
 
         await asyncio.gather(read_stdout(), pump_sse_to_stdio())
 
+def start_stdio(cmd, port, log_level, cors):
+    return asyncio.run(_run_stdio_to_sse(cmd, port, log_level, cors))
+
+def start_sse(url, bearer, log_level):
+    return asyncio.run(_run_sse_to_stdio(url, bearer, log_level))
 
 def main(argv: Optional[Sequence[str]] | None = None) -> None:  # entry-point
     args = _parse_args(argv or sys.argv[1:])
@@ -391,9 +396,9 @@ def main(argv: Optional[Sequence[str]] | None = None) -> None:  # entry-point
     )
     try:
         if args.stdio:
-            asyncio.run(_run_stdio_to_sse(args.stdio, args.port, args.logLevel, args.cors))
+            return start_stdio(args.stdio, args.port, args.logLevel, args.cors)
         elif args.sse:
-            asyncio.run(_run_sse_to_stdio(args.sse, args.oauth2Bearer, args.logLevel))
+            return start_sse(args.sse, args.oauth2Bearer, args.logLevel)
     except KeyboardInterrupt:
         print("")  # restore shell prompt
         sys.exit(0)

mcpgateway/version.py

@@ -402,7 +402,7 @@ async def version_endpoint(
     if partial:
         # Return partial HTML fragment for HTMX embedding
         templates = Jinja2Templates(directory=str(settings.templates_dir))
-        return templates.TemplateResponse("version_info_partial.html", {"request": request, "payload": payload})
+        return templates.TemplateResponse(request, "version_info_partial.html", {"request": request, "payload": payload})
     wants_html = fmt == "html" or "text/html" in request.headers.get("accept", "")
     if wants_html:
         return HTMLResponse(_render_html(payload))

pyproject.toml

@@ -312,7 +312,7 @@ addopts = "-ra -q --cov=mcpgateway"
 testpaths = [ "tests",]
 asyncio_mode = "auto"
 filterwarnings = [
-  "ignore:Passing 'msg' argument to .*\\.cancel\\(\\) is deprecated:DeprecationWarning",
+  "ignore:Passing 'msg' argument to .*\\.cancel\\(\\) is deprecated:DeprecationWarning", # From 3rd party libraries
 ]
 
 # ── fawltydeps ─────────────────────────────────────────────────────

tests/conftest.py

@@ -20,6 +20,7 @@
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
+from mcpgateway import translate
 
 
 @pytest.fixture(scope="session")
@@ -96,3 +97,13 @@ def mock_websocket():
     mock.receive_json = AsyncMock()
     mock.close = AsyncMock()
     return mock
+
+# @pytest.fixture(scope="session", autouse=True)
+# def _patch_stdio_first():
+#     """
+#     Runs once, *before* the test session collects other modules,
+#     so no rogue coroutine can be created.
+#     """
+#     import mcpgateway.translate as translate
+#     translate._run_stdio_to_sse = AsyncMock(return_value=None)
+#     translate._run_sse_to_stdio = AsyncMock(return_value=None)