chuk-tool-processor 0.6.4__py3-none-any.whl → 0.9.7__py3-none-any.whl

chuk_tool_processor/mcp/setup_mcp_http_streamable.py

@@ -17,8 +17,6 @@ It:
 
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Tuple
-
 from chuk_tool_processor.core.processor import ToolProcessor
 from chuk_tool_processor.logging import get_logger
 from chuk_tool_processor.mcp.register_mcp_tools import register_mcp_tools
@@ -32,34 +30,37 @@ logger = get_logger("chuk_tool_processor.mcp.setup_http_streamable")
 # --------------------------------------------------------------------------- #
 async def setup_mcp_http_streamable(
     *,
-    servers: List[Dict[str, str]],
-    server_names: Optional[Dict[int, str]] = None,
+    servers: list[dict[str, str]],
+    server_names: dict[int, str] | None = None,
     connection_timeout: float = 30.0,
     default_timeout: float = 30.0,
-    max_concurrency: Optional[int] = None,
+    initialization_timeout: float = 60.0,
+    max_concurrency: int | None = None,
     enable_caching: bool = True,
     cache_ttl: int = 300,
     enable_rate_limiting: bool = False,
-    global_rate_limit: Optional[int] = None,
-    tool_rate_limits: Optional[Dict[str, tuple]] = None,
-    enable_retries: bool = True,
-    max_retries: int = 3,
+    global_rate_limit: int | None = None,
+    tool_rate_limits: dict[str, tuple] | None = None,
+    enable_retries: bool = True,  # CHANGED: Enabled with OAuth errors excluded
+    max_retries: int = 2,  # Retry non-OAuth errors (OAuth handled at transport level)
     namespace: str = "http",
-) -> Tuple[ToolProcessor, StreamManager]:
+    oauth_refresh_callback: any | None = None,  # NEW: OAuth token refresh callback
+) -> tuple[ToolProcessor, StreamManager]:
     """
     Initialize HTTP Streamable transport MCP + a :class:`ToolProcessor`.
 
     This uses the modern HTTP Streamable transport (spec 2025-03-26) which
     provides better infrastructure compatibility and more flexible response
     handling compared to the deprecated SSE transport.
-    
+
     Call with ``await`` from your async context.
-    
+
     Args:
         servers: List of server configurations with 'name', 'url', and optionally 'api_key' keys
         server_names: Optional mapping of server indices to names
         connection_timeout: Timeout for initial HTTP connection setup
         default_timeout: Default timeout for tool execution
+        initialization_timeout: Timeout for complete initialization (default 60s, increase to 120s+ for slow servers like Notion)
         max_concurrency: Maximum concurrent operations
         enable_caching: Whether to enable response caching
         cache_ttl: Cache time-to-live in seconds
@@ -69,10 +70,11 @@ async def setup_mcp_http_streamable(
         enable_retries: Whether to enable automatic retries
         max_retries: Maximum retry attempts
         namespace: Namespace for registered tools
-        
+        oauth_refresh_callback: Optional async callback to refresh OAuth tokens (NEW)
+
     Returns:
         Tuple of (ToolProcessor, StreamManager)
-        
+
     Example:
         >>> servers = [
         ...     {
@@ -92,12 +94,49 @@ async def setup_mcp_http_streamable(
         server_names=server_names,
         connection_timeout=connection_timeout,
         default_timeout=default_timeout,
+        initialization_timeout=initialization_timeout,
+        oauth_refresh_callback=oauth_refresh_callback,  # NEW: Pass OAuth callback
     )
 
     # 2️⃣  pull the remote tool list and register each one locally
     registered = await register_mcp_tools(stream_manager, namespace=namespace)
 
     # 3️⃣  build a processor instance configured to your taste
+    # IMPORTANT: Retries are enabled but OAuth errors are excluded
+    # OAuth refresh happens at transport level with automatic retry
+
+    # Import RetryConfig to configure OAuth error exclusion
+    from chuk_tool_processor.execution.wrappers.retry import RetryConfig
+
+    # Define OAuth error patterns that should NOT be retried at this level
+    # These will be handled by the transport layer's OAuth refresh mechanism
+    # Based on RFC 6750 (Bearer Token Usage) and MCP OAuth spec
+    oauth_error_patterns = [
+        # RFC 6750 Section 3.1 - Standard Bearer token errors
+        "invalid_token",  # Token expired, revoked, malformed, or invalid
+        "insufficient_scope",  # Request requires higher privileges (403 Forbidden)
+        # OAuth 2.1 token refresh errors
+        "invalid_grant",  # Refresh token errors
+        # MCP spec - OAuth validation failures (401 Unauthorized)
+        "oauth validation",
+        "unauthorized",
+        # Common OAuth error descriptions
+        "expired token",
+        "token expired",
+        "authentication failed",
+        "invalid access token",
+    ]
+
+    # Create retry config that skips OAuth errors
+    retry_config = (
+        RetryConfig(
+            max_retries=max_retries,
+            skip_retry_on_error_substrings=oauth_error_patterns,
+        )
+        if enable_retries
+        else None
+    )
+
     processor = ToolProcessor(
         default_timeout=default_timeout,
         max_concurrency=max_concurrency,
@@ -108,12 +147,13 @@ async def setup_mcp_http_streamable(
         tool_rate_limits=tool_rate_limits,
         enable_retries=enable_retries,
         max_retries=max_retries,
+        retry_config=retry_config,  # NEW: Pass OAuth-aware retry config
     )
 
-    logger.info(
-        "MCP (HTTP Streamable) initialised - %s tool%s registered into namespace '%s'",
+    logger.debug(
+        "MCP (HTTP Streamable) initialised - %d tool%s registered into namespace '%s'",
         len(registered),
         "" if len(registered) == 1 else "s",
         namespace,
     )
-    return processor, stream_manager
+    return processor, stream_manager

chuk_tool_processor/mcp/setup_mcp_sse.py

@@ -13,8 +13,6 @@ It:
 
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Tuple
-
 from chuk_tool_processor.core.processor import ToolProcessor
 from chuk_tool_processor.logging import get_logger
 from chuk_tool_processor.mcp.register_mcp_tools import register_mcp_tools
@@ -28,30 +26,33 @@ logger = get_logger("chuk_tool_processor.mcp.setup_sse")
 # --------------------------------------------------------------------------- #
 async def setup_mcp_sse(  # noqa: C901 - long but just a config facade
     *,
-    servers: List[Dict[str, str]],
-    server_names: Optional[Dict[int, str]] = None,
+    servers: list[dict[str, str]],
+    server_names: dict[int, str] | None = None,
     connection_timeout: float = 30.0,  # 🔧 INCREASED DEFAULT: was 10.0
-    default_timeout: float = 30.0,     # 🔧 INCREASED DEFAULT: was 10.0
-    max_concurrency: Optional[int] = None,
+    default_timeout: float = 30.0,  # 🔧 INCREASED DEFAULT: was 10.0
+    initialization_timeout: float = 60.0,
+    max_concurrency: int | None = None,
     enable_caching: bool = True,
     cache_ttl: int = 300,
     enable_rate_limiting: bool = False,
-    global_rate_limit: Optional[int] = None,
-    tool_rate_limits: Optional[Dict[str, tuple]] = None,
-    enable_retries: bool = True,
-    max_retries: int = 3,
+    global_rate_limit: int | None = None,
+    tool_rate_limits: dict[str, tuple] | None = None,
+    enable_retries: bool = True,  # CHANGED: Enabled with OAuth errors excluded
+    max_retries: int = 2,  # Retry non-OAuth errors (OAuth handled at transport level)
     namespace: str = "sse",
-) -> Tuple[ToolProcessor, StreamManager]:
+    oauth_refresh_callback: any | None = None,  # NEW: OAuth token refresh callback
+) -> tuple[ToolProcessor, StreamManager]:
     """
     Initialise SSE-transport MCP + a :class:`ToolProcessor`.
 
     Call with ``await`` from your async context.
-    
+
     Args:
         servers: List of server configurations with 'name' and 'url' keys
         server_names: Optional mapping of server indices to names
         connection_timeout: Timeout for initial SSE connection setup
         default_timeout: Default timeout for tool execution
+        initialization_timeout: Timeout for complete initialization (default 60s, increase for slow servers)
         max_concurrency: Maximum concurrent operations
         enable_caching: Whether to enable response caching
         cache_ttl: Cache time-to-live in seconds
@@ -61,7 +62,8 @@ async def setup_mcp_sse(  # noqa: C901 - long but just a config facade
         enable_retries: Whether to enable automatic retries
         max_retries: Maximum retry attempts
         namespace: Namespace for registered tools
-        
+        oauth_refresh_callback: Optional async callback to refresh OAuth tokens (NEW)
+
     Returns:
         Tuple of (ToolProcessor, StreamManager)
     """
@@ -70,13 +72,50 @@ async def setup_mcp_sse(  # noqa: C901 - long but just a config facade
         servers=servers,
         server_names=server_names,
         connection_timeout=connection_timeout,  # 🔧 ADD THIS LINE
-        default_timeout=default_timeout,        # 🔧 ADD THIS LINE
+        default_timeout=default_timeout,  # 🔧 ADD THIS LINE
+        initialization_timeout=initialization_timeout,
+        oauth_refresh_callback=oauth_refresh_callback,  # NEW: Pass OAuth callback
     )
 
     # 2️⃣  pull the remote tool list and register each one locally
     registered = await register_mcp_tools(stream_manager, namespace=namespace)
 
     # 3️⃣  build a processor instance configured to your taste
+    # IMPORTANT: Retries are enabled but OAuth errors are excluded
+    # OAuth refresh happens at transport level with automatic retry
+
+    # Import RetryConfig to configure OAuth error exclusion
+    from chuk_tool_processor.execution.wrappers.retry import RetryConfig
+
+    # Define OAuth error patterns that should NOT be retried at this level
+    # These will be handled by the transport layer's OAuth refresh mechanism
+    # Based on RFC 6750 (Bearer Token Usage) and MCP OAuth spec
+    oauth_error_patterns = [
+        # RFC 6750 Section 3.1 - Standard Bearer token errors
+        "invalid_token",  # Token expired, revoked, malformed, or invalid
+        "insufficient_scope",  # Request requires higher privileges (403 Forbidden)
+        # OAuth 2.1 token refresh errors
+        "invalid_grant",  # Refresh token errors
+        # MCP spec - OAuth validation failures (401 Unauthorized)
+        "oauth validation",
+        "unauthorized",
+        # Common OAuth error descriptions
+        "expired token",
+        "token expired",
+        "authentication failed",
+        "invalid access token",
+    ]
+
+    # Create retry config that skips OAuth errors
+    retry_config = (
+        RetryConfig(
+            max_retries=max_retries,
+            skip_retry_on_error_substrings=oauth_error_patterns,
+        )
+        if enable_retries
+        else None
+    )
+
     processor = ToolProcessor(
         default_timeout=default_timeout,
         max_concurrency=max_concurrency,
@@ -87,12 +126,13 @@ async def setup_mcp_sse(  # noqa: C901 - long but just a config facade
         tool_rate_limits=tool_rate_limits,
         enable_retries=enable_retries,
         max_retries=max_retries,
+        retry_config=retry_config,  # NEW: Pass OAuth-aware retry config
     )
 
-    logger.info(
-        "MCP (SSE) initialised - %s tool%s registered into namespace '%s'",
+    logger.debug(
+        "MCP (SSE) initialised - %d tool%s registered into namespace '%s'",
         len(registered),
         "" if len(registered) == 1 else "s",
         namespace,
     )
-    return processor, stream_manager
+    return processor, stream_manager

chuk_tool_processor/mcp/setup_mcp_stdio.py

@@ -13,8 +13,6 @@ It:
 
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Tuple
-
 from chuk_tool_processor.core.processor import ToolProcessor
 from chuk_tool_processor.logging import get_logger
 from chuk_tool_processor.mcp.register_mcp_tools import register_mcp_tools
@@ -29,19 +27,20 @@ logger = get_logger("chuk_tool_processor.mcp.setup_stdio")
 async def setup_mcp_stdio(  # noqa: C901 - long but just a config facade
     *,
     config_file: str,
-    servers: List[str],
-    server_names: Optional[Dict[int, str]] = None,
+    servers: list[str],
+    server_names: dict[int, str] | None = None,
     default_timeout: float = 10.0,
-    max_concurrency: Optional[int] = None,
+    initialization_timeout: float = 60.0,
+    max_concurrency: int | None = None,
     enable_caching: bool = True,
     cache_ttl: int = 300,
     enable_rate_limiting: bool = False,
-    global_rate_limit: Optional[int] = None,
-    tool_rate_limits: Optional[Dict[str, tuple]] = None,
+    global_rate_limit: int | None = None,
+    tool_rate_limits: dict[str, tuple] | None = None,
     enable_retries: bool = True,
     max_retries: int = 3,
     namespace: str = "mcp",
-) -> Tuple[ToolProcessor, StreamManager]:
+) -> tuple[ToolProcessor, StreamManager]:
     """
     Initialise stdio-transport MCP + a :class:`ToolProcessor`.
 
@@ -55,6 +54,7 @@ async def setup_mcp_stdio(  # noqa: C901 - long but just a config facade
         server_names=server_names,
         transport_type="stdio",
         default_timeout=default_timeout,  # 🔧 ADD THIS LINE
+        initialization_timeout=initialization_timeout,
     )
 
     # 2️⃣  pull the remote tool list and register each one locally
@@ -73,10 +73,10 @@ async def setup_mcp_stdio(  # noqa: C901 - long but just a config facade
         max_retries=max_retries,
     )
 
-    logger.info(
-        "MCP (stdio) initialised - %s tool%s registered into namespace '%s'",
+    logger.debug(
+        "MCP (stdio) initialised - %d tool%s registered into namespace '%s'",
         len(registered),
         "" if len(registered) == 1 else "s",
         namespace,
     )
-    return processor, stream_manager
+    return processor, stream_manager