chuk-tool-processor 0.6.9__py3-none-any.whl → 0.6.11__py3-none-any.whl

chuk_tool_processor/mcp/transport/sse_transport.py

@@ -2,12 +2,8 @@
 """
 SSE transport for MCP communication.
 
-Implements Server-Sent Events transport with two-step async pattern:
-1. POST messages to /messages endpoint
-2. Receive responses via SSE stream
-
-Note: This transport is deprecated in favor of HTTP Streamable (spec 2025-03-26)
-but remains supported for backward compatibility.
+FIXED: Removed problematic gateway connectivity test that was causing 401 errors.
+The SSE endpoint works perfectly, so we don't need to test the base URL.
 """
 from __future__ import annotations
 
@@ -29,26 +25,16 @@ class SSETransport(MCPBaseTransport):
     """
     SSE transport implementing the MCP protocol over Server-Sent Events.
     
-    This transport uses a dual-connection approach:
-    - SSE stream for receiving responses
-    - HTTP POST for sending requests
+    FIXED: Uses SSE endpoint directly without problematic connectivity tests.
     """
 
     def __init__(self, url: str, api_key: Optional[str] = None, 
                  headers: Optional[Dict[str, str]] = None,
                  connection_timeout: float = 30.0, 
-                 default_timeout: float = 30.0,
+                 default_timeout: float = 60.0,
                  enable_metrics: bool = True):
         """
         Initialize SSE transport.
-        
-        Args:
-            url: Base URL for the MCP server
-            api_key: Optional API key for authentication
-            headers: Optional custom headers
-            connection_timeout: Timeout for initial connection setup
-            default_timeout: Default timeout for operations
-            enable_metrics: Whether to track performance metrics
         """
         self.url = url.rstrip('/')
         self.api_key = api_key
@@ -58,10 +44,6 @@ class SSETransport(MCPBaseTransport):
         self.enable_metrics = enable_metrics
         
         logger.debug("SSE Transport initialized with URL: %s", self.url)
-        if self.api_key:
-            logger.debug("API key configured for authentication")
-        if self.configured_headers:
-            logger.debug("Custom headers configured: %s", list(self.configured_headers.keys()))
         
         # Connection state
         self.session_id = None
@@ -78,7 +60,12 @@ class SSETransport(MCPBaseTransport):
         self.sse_response = None
         self.sse_stream_context = None
         
-        # Performance metrics (consistent with other transports)
+        # Health monitoring
+        self._last_successful_ping = None
+        self._consecutive_failures = 0
+        self._max_consecutive_failures = 3
+        
+        # Performance metrics
         self._metrics = {
             "total_calls": 0,
             "successful_calls": 0,
@@ -92,11 +79,7 @@ class SSETransport(MCPBaseTransport):
         }
 
     def _construct_sse_url(self, base_url: str) -> str:
-        """
-        Construct the SSE endpoint URL from the base URL.
-        
-        Smart detection to avoid double-appending /sse if already present.
-        """
+        """Construct the SSE endpoint URL from the base URL."""
         base_url = base_url.rstrip('/')
         
         if base_url.endswith('/sse'):
@@ -109,20 +92,34 @@ class SSETransport(MCPBaseTransport):
 
     def _get_headers(self) -> Dict[str, str]:
         """Get headers with authentication and custom headers."""
-        headers = {}
+        headers = {
+            'User-Agent': 'chuk-tool-processor/1.0.0',
+            'Accept': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+        }
         
         # Add configured headers first
         if self.configured_headers:
             headers.update(self.configured_headers)
         
-        # Add API key as Bearer token if provided (overrides Authorization header)
+        # Add API key as Bearer token if provided
         if self.api_key:
             headers['Authorization'] = f'Bearer {self.api_key}'
         
         return headers
 
+    async def _test_gateway_connectivity(self) -> bool:
+        """
+        Skip connectivity test - we know the SSE endpoint works.
+        
+        FIXED: The diagnostic proves SSE endpoint works perfectly.
+        No need to test base URL that causes 401 errors.
+        """
+        logger.debug("Skipping gateway connectivity test - using direct SSE connection")
+        return True
+
     async def initialize(self) -> bool:
-        """Initialize SSE connection and perform MCP handshake."""
+        """Initialize SSE connection."""
         if self._initialized:
             logger.warning("Transport already initialized")
             return True
@@ -132,9 +129,22 @@ class SSETransport(MCPBaseTransport):
         try:
             logger.debug("Initializing SSE transport...")
             
-            # Create HTTP clients with appropriate timeouts
-            self.stream_client = httpx.AsyncClient(timeout=self.connection_timeout)
-            self.send_client = httpx.AsyncClient(timeout=self.default_timeout)
+            # FIXED: Skip problematic connectivity test
+            if not await self._test_gateway_connectivity():
+                logger.error("Gateway connectivity test failed")
+                return False
+            
+            # Create HTTP clients
+            self.stream_client = httpx.AsyncClient(
+                timeout=httpx.Timeout(self.connection_timeout),
+                follow_redirects=True,
+                limits=httpx.Limits(max_connections=10, max_keepalive_connections=5)
+            )
+            self.send_client = httpx.AsyncClient(
+                timeout=httpx.Timeout(self.default_timeout),
+                follow_redirects=True,
+                limits=httpx.Limits(max_connections=10, max_keepalive_connections=5)
+            )
             
             # Connect to SSE stream
             sse_url = self._construct_sse_url(self.url)
@@ -158,13 +168,21 @@ class SSETransport(MCPBaseTransport):
                 name="sse_stream_processor"
             )
             
-            # Wait for session discovery with timeout
+            # Wait for session discovery
             logger.debug("Waiting for session discovery...")
-            session_timeout = 5.0  # 5 seconds max for session discovery
+            session_timeout = 10.0
             session_start = time.time()
             
             while not self.message_url and (time.time() - session_start) < session_timeout:
                 await asyncio.sleep(0.1)
+                
+                # Check if SSE task died
+                if self.sse_task.done():
+                    exception = self.sse_task.exception()
+                    if exception:
+                        logger.error(f"SSE task died during session discovery: {exception}")
+                        await self._cleanup()
+                        return False
             
             if not self.message_url:
                 logger.error("Failed to discover session endpoint within %.1fs", session_timeout)
@@ -174,7 +192,7 @@ class SSETransport(MCPBaseTransport):
             if self.enable_metrics:
                 self._metrics["session_discoveries"] += 1
             
-            logger.debug("Session endpoint discovered: %s", self.session_id)
+            logger.debug("Session endpoint discovered: %s", self.message_url)
             
             # Perform MCP initialization handshake
             try:
@@ -185,7 +203,7 @@ class SSETransport(MCPBaseTransport):
                         "name": "chuk-tool-processor",
                         "version": "1.0.0"
                     }
-                })
+                }, timeout=self.default_timeout)
                 
                 if 'error' in init_response:
                     logger.error("MCP initialize failed: %s", init_response['error'])
@@ -196,6 +214,7 @@ class SSETransport(MCPBaseTransport):
                 await self._send_notification("notifications/initialized")
                 
                 self._initialized = True
+                self._last_successful_ping = time.time()
                 
                 if self.enable_metrics:
                     init_time = time.time() - start_time
@@ -215,33 +234,60 @@ class SSETransport(MCPBaseTransport):
             return False
 
     async def _process_sse_stream(self):
-        """Process the persistent SSE stream for responses and session discovery."""
+        """Process the SSE stream for responses and session discovery."""
         try:
             logger.debug("Starting SSE stream processing...")
             
+            current_event = None
+            
             async for line in self.sse_response.aiter_lines():
                 line = line.strip()
                 if not line:
                     continue
                 
+                # Handle event type declarations
+                if line.startswith('event:'):
+                    current_event = line.split(':', 1)[1].strip()
+                    logger.debug("SSE event type: %s", current_event)
+                    continue
+                
                 # Handle session endpoint discovery
-                if not self.message_url and line.startswith('data:') and '/messages/' in line:
-                    endpoint_path = line.split(':', 1)[1].strip()
-                    self.message_url = f"{self.url}{endpoint_path}"
+                if not self.message_url and line.startswith('data:'):
+                    data_part = line.split(':', 1)[1].strip()
                     
-                    # Extract session ID if present
-                    if 'session_id=' in endpoint_path:
-                        self.session_id = endpoint_path.split('session_id=')[1].split('&')[0]
+                    # NEW FORMAT: event: endpoint + data: https://...
+                    if current_event == "endpoint" and data_part.startswith('http'):
+                        self.message_url = data_part
+                        
+                        # Extract session ID from URL if present
+                        if 'session_id=' in data_part:
+                            self.session_id = data_part.split('session_id=')[1].split('&')[0]
+                        else:
+                            self.session_id = str(uuid.uuid4())
+                        
+                        logger.debug("Session endpoint discovered via event format: %s", self.message_url)
+                        continue
                     
-                    logger.debug("Session endpoint discovered: %s", self.session_id)
-                    continue
+                    # OLD FORMAT: data: /messages/... (backwards compatibility)
+                    elif '/messages/' in data_part:
+                        endpoint_path = data_part
+                        self.message_url = f"{self.url}{endpoint_path}"
+                        
+                        # Extract session ID if present
+                        if 'session_id=' in endpoint_path:
+                            self.session_id = endpoint_path.split('session_id=')[1].split('&')[0]
+                        else:
+                            self.session_id = str(uuid.uuid4())
+                        
+                        logger.debug("Session endpoint discovered via old format: %s", self.message_url)
+                        continue
                 
                 # Handle JSON-RPC responses
                 if line.startswith('data:'):
                     data_part = line.split(':', 1)[1].strip()
                     
                     # Skip keepalive pings and empty data
-                    if not data_part or data_part.startswith('ping'):
+                    if not data_part or data_part.startswith('ping') or data_part in ('{}', '[]'):
                         continue
                     
                     try:
@@ -265,6 +311,7 @@ class SSETransport(MCPBaseTransport):
             if self.enable_metrics:
                 self._metrics["stream_errors"] += 1
             logger.error("SSE stream processing error: %s", e)
+            self._consecutive_failures += 1
 
     async def _send_request(self, method: str, params: Dict[str, Any] = None, 
                            timeout: Optional[float] = None) -> Dict[str, Any]:
@@ -301,20 +348,25 @@ class SSETransport(MCPBaseTransport):
                 # Async response - wait for result via SSE
                 request_timeout = timeout or self.default_timeout
                 result = await asyncio.wait_for(future, timeout=request_timeout)
+                self._consecutive_failures = 0  # Reset on success
                 return result
             elif response.status_code == 200:
                 # Immediate response
                 self.pending_requests.pop(request_id, None)
+                self._consecutive_failures = 0  # Reset on success
                 return response.json()
             else:
                 self.pending_requests.pop(request_id, None)
+                self._consecutive_failures += 1
                 raise RuntimeError(f"HTTP request failed with status: {response.status_code}")
                 
         except asyncio.TimeoutError:
             self.pending_requests.pop(request_id, None)
+            self._consecutive_failures += 1
             raise
         except Exception:
             self.pending_requests.pop(request_id, None)
+            self._consecutive_failures += 1
             raise
 
     async def _send_notification(self, method: str, params: Dict[str, Any] = None):
@@ -350,21 +402,43 @@ class SSETransport(MCPBaseTransport):
         start_time = time.time()
         try:
             # Use tools/list as a lightweight ping since not all servers support ping
-            response = await self._send_request("tools/list", {}, timeout=5.0)
+            response = await self._send_request("tools/list", {}, timeout=10.0)
+            
+            success = 'error' not in response
+            
+            if success:
+                self._last_successful_ping = time.time()
+                self._consecutive_failures = 0
             
             if self.enable_metrics:
                 ping_time = time.time() - start_time
                 self._metrics["last_ping_time"] = ping_time
-                logger.debug("SSE ping completed in %.3fs", ping_time)
+                logger.debug("SSE ping completed in %.3fs: %s", ping_time, success)
             
-            return 'error' not in response
+            return success
         except Exception as e:
             logger.debug("SSE ping failed: %s", e)
+            self._consecutive_failures += 1
             return False
 
     def is_connected(self) -> bool:
         """Check if the transport is connected and ready."""
-        return self._initialized and self.session_id is not None
+        if not self._initialized or not self.session_id:
+            return False
+        
+        # Check if we've had too many consecutive failures
+        if self._consecutive_failures >= self._max_consecutive_failures:
+            logger.warning(f"Connection marked unhealthy after {self._consecutive_failures} failures")
+            return False
+        
+        # Check if SSE task is still running
+        if self.sse_task and self.sse_task.done():
+            exception = self.sse_task.exception()
+            if exception:
+                logger.warning(f"SSE task died: {exception}")
+                return False
+        
+        return True
 
     async def get_tools(self) -> List[Dict[str, Any]]:
         """Get list of available tools from the server."""
@@ -403,7 +477,7 @@ class SSETransport(MCPBaseTransport):
 
         start_time = time.time()
         if self.enable_metrics:
-            self._metrics["total_calls"] += 1  # FIXED: INCREMENT FIRST
+            self._metrics["total_calls"] += 1
 
         try:
             logger.debug("Calling tool '%s' with arguments: %s", tool_name, arguments)
@@ -461,7 +535,6 @@ class SSETransport(MCPBaseTransport):
             self._metrics["failed_calls"] += 1
             
         self._metrics["total_time"] += response_time
-        # FIXED: Only calculate average if we have total calls
         if self._metrics["total_calls"] > 0:
             self._metrics["avg_response_time"] = (
                 self._metrics["total_time"] / self._metrics["total_calls"]
@@ -553,9 +626,6 @@ class SSETransport(MCPBaseTransport):
         self.stream_client = None
         self.send_client = None
 
-    # ------------------------------------------------------------------ #
-    #  Metrics and monitoring (consistent with other transports)        #
-    # ------------------------------------------------------------------ #
     def get_metrics(self) -> Dict[str, Any]:
         """Get performance and connection metrics."""
         return self._metrics.copy()
@@ -574,21 +644,15 @@ class SSETransport(MCPBaseTransport):
             "stream_errors": 0
         }
 
-    # ------------------------------------------------------------------ #
-    #  Backward compatibility                                            #
-    # ------------------------------------------------------------------ #
     def get_streams(self) -> List[tuple]:
         """SSE transport doesn't expose raw streams."""
         return []
 
-    # ------------------------------------------------------------------ #
-    #  Context manager support (now uses base class with fixed error)   #
-    # ------------------------------------------------------------------ #
     async def __aenter__(self):
         """Context manager entry."""
         success = await self.initialize()
         if not success:
-            raise RuntimeError("Failed to initialize SSETransport")  # FIXED: message
+            raise RuntimeError("Failed to initialize SSETransport")
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):