chore(mcp): apply review fixes from PR #112

- Fix spurious whitespace in runtime.py f-strings and dict values
- Replace broken server.settings.host/port doctests with server.server_config.*
- Simplify getattr(_transport_security) to direct attribute access
- Update stale "Fast MCP server" docstring and class Examples indentation
- Update scaffold template to mcp==2.0.0b1 and mcp-types==2.0.0b1
- Remove unused ErrorData import in test_client_reconnect.py
- Remove dead plugin._session_id = None test setup
- Rename http_client_instance to http_client

Signed-off-by: Frederico Araujo <frederico.araujo@ibm.com>

Author: araujof

cpex/framework/external/mcp/client.py

@@ -375,9 +375,9 @@ def _tls_httpx_client_factory(
 
         for attempt in range(max_retries):
             try:
-                http_client_instance = _tls_httpx_client_factory()
+                http_client = _tls_httpx_client_factory()
                 streamable_client = streamable_http_client(
-                    uri, http_client=http_client_instance, terminate_on_close=True
+                    uri, http_client=http_client, terminate_on_close=True
                 )
                 http_transport = await self._exit_stack.enter_async_context(streamable_client)
                 self._http, self._write = http_transport

cpex/framework/external/mcp/server/runtime.py

@@ -15,14 +15,14 @@
 - Implements all plugin hook tools (get_plugin_configs, tool_pre_invoke, etc.)
 
 Examples:
-    Create an SSL-capable FastMCP server:
+    Create an SSL-capable MCPServer:
 
     >>> from cpex.framework.models import MCPServerConfig
     >>> config = MCPServerConfig(host="localhost", port=8000)
     >>> server = SSLCapableMCPServer(server_config=config, name="TestServer")
-    >>> server.settings.host
+    >>> server.server_config.host
     'localhost'
-    >>> server.settings.port
+    >>> server.server_config.port
     8000
 
     Check SSL configuration returns empty dict when TLS is not configured:
@@ -49,9 +49,9 @@
     >>> from cpex.framework.models import MCPServerConfig
     >>> config = MCPServerConfig(host="0.0.0.0", port=8080)
     >>> server = SSLCapableMCPServer(server_config=config, name="SettingsTest")
-    >>> server.settings.host
+    >>> server.server_config.host
     '0.0.0.0'
-    >>> server.settings.port
+    >>> server.server_config.port
     8080
 """
 
@@ -189,19 +189,19 @@ class SSLCapableMCPServer(MCPServer):
     """MCPServer with SSL/TLS support using MCPServerConfig.
 
     Examples:
-    Create an SSL-capable MCPServer:
+        Create an SSL-capable MCPServer:
 
         >>> from cpex.framework.models import MCPServerConfig
         >>> config = MCPServerConfig(host="127.0.0.1", port=8000)
         >>> server = SSLCapableMCPServer(server_config=config, name="TestServer")
-        >>> server.settings.host
+        >>> server.server_config.host
         '127.0.0.1'
-        >>> server.settings.port
+        >>> server.server_config.port
         8000
     """
 
     def __init__(self, server_config: MCPServerConfig, *args, **kwargs):
-        """Initialize an SSL capable Fast MCP server.
+        """Initialize an SSL capable MCPServer.
 
         Args:
             server_config: the MCP server configuration including mTLS information.
@@ -363,10 +363,10 @@ async def metrics_disabled():
         # Create a minimal Starlette app with only the health endpoint
         health_app = Starlette(routes=routes)
 
-        logger.info(f"Starting HTTP health check server on {            self.server_config.host}:{health_port}")
+        logger.info(f"Starting HTTP health check server on {self.server_config.host}:{health_port}")
         config = uvicorn.Config(
             app=health_app,
-            host=            self.server_config.host,
+            host=self.server_config.host,
             port=health_port,
             log_level="warning",  # Reduce noise from health checks
         )
@@ -382,12 +382,12 @@ async def run_streamable_http_async(self) -> None:
             >>> from cpex.framework.models import MCPServerConfig
             >>> config = MCPServerConfig(host="0.0.0.0", port=9000)
             >>> server = SSLCapableMCPServer(server_config=config, name="HTTPServer")
-            >>> server.settings.host
+            >>> server.server_config.host
             '0.0.0.0'
-            >>> server.settings.port
+            >>> server.server_config.port
             9000
         """
-        starlette_app = self.streamable_http_app(transport_security=getattr(self, '_transport_security', None))
+        starlette_app = self.streamable_http_app(transport_security=self._transport_security)
 
         # Add health check endpoint to main app
         # Third-Party
@@ -440,8 +440,8 @@ async def metrics_disabled():
         ssl_config = self._get_ssl_config()
         config_kwargs = {
             "app": starlette_app,
-            "host":             self.server_config.host,
-            "port":             self.server_config.port,
+            "host": self.server_config.host,
+            "port": self.server_config.port,
             "log_level": self.settings.log_level.lower(),
         }
         config_kwargs.update(ssl_config)
@@ -452,13 +452,13 @@ async def metrics_disabled():
             config_kwargs["uds"] = self.server_config.uds
             logger.info(f"Starting plugin server on unix socket {self.server_config.uds}")
         else:
-            logger.info(f"Starting plugin server on {            self.server_config.host}:{            self.server_config.port}")
+            logger.info(f"Starting plugin server on {self.server_config.host}:{self.server_config.port}")
         config = uvicorn.Config(**config_kwargs)  # type: ignore[arg-type]
         server = uvicorn.Server(config)
 
         # If SSL is enabled, start a separate HTTP health check server
         if ssl_config and not self.server_config.uds:
-            health_port =             self.server_config.port + 1000  # Use port+1000 for health checks
+            health_port = self.server_config.port + 1000  # Use port+1000 for health checks
             logger.info(f"SSL enabled - starting separate HTTP health check on port {health_port}")
             # Run both servers concurrently
             await asyncio.gather(server.serve(), self._start_health_check_server(health_port))

cpex/templates/external/{{cookiecutter.plugin_slug}}/pyproject.toml

@@ -44,7 +44,8 @@ authors = [
 ]
 
 dependencies = [
-    "mcp>=1.16.0",
+    "mcp==2.0.0b1",
+    "mcp-types==2.0.0b1",
     "mcp-contextforge-gateway",
 ]
 

tests/unit/cpex/framework/external/mcp/test_client_coverage.py

@@ -682,7 +682,6 @@ async def test_shutdown_cleans_stdio_state_even_when_proto_is_http(self):
         plugin._stdio_stop.set = MagicMock()
         plugin._stdio_ready = MagicMock()
         plugin._exit_stack = None
-        plugin._session_id = None
 
         await plugin.shutdown()
         assert plugin._stdio_task is None

tests/unit/cpex/framework/external/mcp/test_client_reconnect.py

@@ -210,7 +210,6 @@ async def test_invoke_hook_reconnects_on_mcp_error(self, mock_http_plugin_config
         plugin._session = mock_session
 
         from mcp import MCPError
-        from mcp_types import ErrorData
 
         call_count = 0