chuk-tool-processor 0.2__py3-none-any.whl → 0.3__py3-none-any.whl

chuk_tool_processor/mcp/mcp_tool.py

@@ -36,9 +36,11 @@ class MCPTool:
         servers: Optional[List[str]] = None,
         server_names: Optional[Dict[int, str]] = None,
         namespace: str = "stdio",
+        default_timeout: Optional[float] = None,  # Add default timeout support
     ) -> None:
         self.tool_name = tool_name
         self._sm: Optional[StreamManager] = stream_manager
+        self.default_timeout = default_timeout or 30.0  # Default to 30s if not specified
 
         # Boot-strap parameters (only needed if _sm is None)
         self._cfg_file = cfg_file
@@ -78,21 +80,56 @@ class MCPTool:
         return self._sm  # type: ignore[return-value]
 
     # ------------------------------------------------------------------ #
-    async def execute(self, **kwargs: Any) -> Any:
+    async def execute(self, timeout: Optional[float] = None, **kwargs: Any) -> Any:
         """
-        Forward the call to the remote MCP tool.
+        Forward the call to the remote MCP tool with timeout support.
+
+        Args:
+            timeout: Optional timeout for this specific call. If not provided,
+                    uses the instance's default_timeout.
+            **kwargs: Arguments to pass to the MCP tool.
+
+        Returns:
+            The result from the MCP tool call.
 
         Raises
         ------
         RuntimeError
             If the server returns an error payload.
+        asyncio.TimeoutError
+            If the call times out.
         """
         sm = await self._ensure_stream_manager()
-        result = await sm.call_tool(tool_name=self.tool_name, arguments=kwargs)
+        
+        # Use provided timeout, fall back to instance default, then global default
+        effective_timeout = timeout if timeout is not None else self.default_timeout
+        
+        logger.debug("Calling MCP tool '%s' with timeout: %ss", self.tool_name, effective_timeout)
+        
+        try:
+            # Pass timeout directly to StreamManager instead of wrapping with wait_for
+            result = await sm.call_tool(
+                tool_name=self.tool_name, 
+                arguments=kwargs,
+                timeout=effective_timeout
+            )
+            
+            if result.get("isError"):
+                err = result.get("error", "Unknown error")
+                logger.error("Remote MCP error from '%s': %s", self.tool_name, err)
+                raise RuntimeError(err)
+
+            return result.get("content")
+            
+        except asyncio.TimeoutError:
+            logger.warning("MCP tool '%s' timed out after %ss", self.tool_name, effective_timeout)
+            raise
+        except Exception as e:
+            logger.error("Error calling MCP tool '%s': %s", self.tool_name, e)
+            raise
 
-        if result.get("isError"):
-            err = result.get("error", "Unknown error")
-            logger.error("Remote MCP error from '%s': %s", self.tool_name, err)
-            raise RuntimeError(err)
-
-        return result.get("content")
+    # ------------------------------------------------------------------ #
+    # Legacy method name support
+    async def _aexecute(self, timeout: Optional[float] = None, **kwargs: Any) -> Any:
+        """Legacy alias for execute() method."""
+        return await self.execute(timeout=timeout, **kwargs)

chuk_tool_processor/mcp/setup_mcp_sse.py

@@ -14,6 +14,7 @@ Utility that wires up:
 
 from __future__ import annotations
 
+import os
 from typing import Dict, List, Optional, Tuple
 
 from chuk_tool_processor.core.processor import ToolProcessor
@@ -47,7 +48,26 @@ async def setup_mcp_sse(  # noqa: C901 – long, but just a config wrapper
     and return a ready-to-go :class:`ToolProcessor`.
 
     Everything is **async-native** – call with ``await``.
+    
+    NEW: Automatically detects and adds bearer token from MCP_BEARER_TOKEN
+    environment variable if not explicitly provided in server config.
     """
+    
+    # NEW: Auto-detect and add bearer token to servers if available
+    bearer_token = os.getenv("MCP_BEARER_TOKEN")
+    if bearer_token:
+        logger.info("Found MCP_BEARER_TOKEN environment variable, adding to server configs")
+        
+        # Add api_key to servers that don't already have it
+        enhanced_servers = []
+        for server in servers:
+            enhanced_server = dict(server)  # Make a copy
+            if "api_key" not in enhanced_server and bearer_token:
+                enhanced_server["api_key"] = bearer_token
+                logger.info("Added bearer token to server: %s", enhanced_server.get("name", "unnamed"))
+            enhanced_servers.append(enhanced_server)
+        servers = enhanced_servers
+    
     # 1️⃣  connect to the remote MCP servers
     stream_manager = await StreamManager.create_with_sse(
         servers=servers,
@@ -76,4 +96,4 @@ async def setup_mcp_sse(  # noqa: C901 – long, but just a config wrapper
         "" if len(registered) == 1 else "s",
         namespace,
     )
-    return processor, stream_manager
+    return processor, stream_manager

chuk_tool_processor/mcp/stream_manager.py

@@ -265,7 +265,20 @@ class StreamManager:
         tool_name: str,
         arguments: Dict[str, Any],
         server_name: Optional[str] = None,
+        timeout: Optional[float] = None,  # Add timeout parameter
     ) -> Dict[str, Any]:
+        """
+        Call a tool on the appropriate server with timeout support.
+        
+        Args:
+            tool_name: Name of the tool to call
+            arguments: Arguments to pass to the tool
+            server_name: Optional server name (auto-detected if not provided)
+            timeout: Optional timeout for the call
+            
+        Returns:
+            Dictionary containing the tool result or error
+        """
         server_name = server_name or self.get_server_for_tool(tool_name)
         if not server_name or server_name not in self.transports:
             # wording kept exactly for unit-test expectation
@@ -273,8 +286,27 @@ class StreamManager:
                 "isError": True,
                 "error": f"No server found for tool: {tool_name}",
             }
-        return await self.transports[server_name].call_tool(tool_name, arguments)
-
+        
+        transport = self.transports[server_name]
+        
+        # Apply timeout if specified
+        if timeout is not None:
+            logger.debug("Calling tool '%s' with %ss timeout", tool_name, timeout)
+            try:
+                return await asyncio.wait_for(
+                    transport.call_tool(tool_name, arguments),
+                    timeout=timeout
+                )
+            except asyncio.TimeoutError:
+                logger.warning("Tool '%s' timed out after %ss", tool_name, timeout)
+                return {
+                    "isError": True,
+                    "error": f"Tool call timed out after {timeout}s",
+                }
+        else:
+            # No timeout specified, call directly
+            return await transport.call_tool(tool_name, arguments)
+        
     # ------------------------------------------------------------------ #
     #  shutdown                                                          #
     # ------------------------------------------------------------------ #

chuk_tool_processor/mcp/transport/sse_transport.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import json
+import os
 from typing import Any, Dict, List, Optional
 
 import httpx
@@ -49,6 +50,13 @@ class SSETransport(MCPBaseTransport):
     def __init__(self, url: str, api_key: Optional[str] = None) -> None:
         self.base_url = url.rstrip("/")
         self.api_key = api_key
+        
+        # NEW: Auto-detect bearer token from environment if not provided
+        if not self.api_key:
+            bearer_token = os.getenv("MCP_BEARER_TOKEN")
+            if bearer_token:
+                self.api_key = bearer_token
+                print(f"🔑 Using bearer token from MCP_BEARER_TOKEN environment variable")
 
         # httpx client (None until initialise)
         self._client: httpx.AsyncClient | None = None
@@ -75,7 +83,12 @@ class SSETransport(MCPBaseTransport):
 
         headers = {}
         if self.api_key:
-            headers["authorization"] = self.api_key
+            # NEW: Handle both "Bearer token" and just "token" formats
+            if self.api_key.startswith("Bearer "):
+                headers["Authorization"] = self.api_key
+            else:
+                headers["Authorization"] = f"Bearer {self.api_key}"
+            print(f"🔑 Added Authorization header to httpx client")
 
         self._client = httpx.AsyncClient(
             headers=headers,
@@ -223,6 +236,11 @@ class SSETransport(MCPBaseTransport):
                         
                         if event_type == "endpoint":
                             # Got the endpoint URL for messages - construct full URL
+                            # NEW: Handle URLs that need trailing slash fix
+                            if "/messages?" in data and "/messages/?" not in data:
+                                data = data.replace("/messages?", "/messages/?", 1)
+                                print(f"🔧 Fixed URL redirect: added trailing slash")
+                            
                             self._message_url = f"{self.base_url}{data}"
                             
                             # Extract session_id if present

{chuk_tool_processor-0.2.dist-info → chuk_tool_processor-0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chuk-tool-processor
-Version: 0.2
+Version: 0.3
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{chuk_tool_processor-0.2.dist-info → chuk_tool_processor-0.3.dist-info}/RECORD

@@ -17,14 +17,14 @@ chuk_tool_processor/logging/formatter.py,sha256=RhlV6NqBYRBOtytDY49c9Y1J4l02ZjNX
 chuk_tool_processor/logging/helpers.py,sha256=c1mS1sb_rh4bKG0hisyvT7l7cirQfXPSyWeBqmqALRw,5941
 chuk_tool_processor/logging/metrics.py,sha256=s59Au8q0eqGGtJMDqmJBZhbJHh4BWGE1CzT0iI8lRS8,3624
 chuk_tool_processor/mcp/__init__.py,sha256=vR9HHxLpXlKTIIwJJRr3QTmZegcdedR1YKyb46j6FIM,689
-chuk_tool_processor/mcp/mcp_tool.py,sha256=BcFsW0iVXUpE0o-h3u2hYX-88EmfV80nMUoZPyZs_IY,3242
+chuk_tool_processor/mcp/mcp_tool.py,sha256=a7WnBiu8DaSuZ8RI0Ums4M5A7v46RvijlqZa0020wWg,4922
 chuk_tool_processor/mcp/register_mcp_tools.py,sha256=0q73gafC1d0ei_gqNidcUeY7NUg13UZdjhVOKEFcD5o,3642
-chuk_tool_processor/mcp/setup_mcp_sse.py,sha256=FmXyOG9DuH2pzr1TLTFRFLlW23YkFG8rzSdpybtPCJg,2865
+chuk_tool_processor/mcp/setup_mcp_sse.py,sha256=T0V27azQy06yc-RSc5uzEKyhbyAXFT-7O3pIn4k10HQ,3769
 chuk_tool_processor/mcp/setup_mcp_stdio.py,sha256=P9qSgmxoNQbsOlGp83DlLLpN9BsG__MhlRsxFplNP3M,2753
-chuk_tool_processor/mcp/stream_manager.py,sha256=mrmlG54P_xLbDYz_rBjdu-OPMnbi916dgyJg7BrIbjM,12798
+chuk_tool_processor/mcp/stream_manager.py,sha256=cRnGiuX2A4vHLP91XxFyNKp9Qbv41ImiqMS9F3UlUoA,14030
 chuk_tool_processor/mcp/transport/__init__.py,sha256=7QQqeSKVKv0N9GcyJuYF0R4FDZeooii5RjggvFFg5GY,296
 chuk_tool_processor/mcp/transport/base_transport.py,sha256=1E29LjWw5vLQrPUDF_9TJt63P5dxAAN7n6E_KiZbGUY,3427
-chuk_tool_processor/mcp/transport/sse_transport.py,sha256=AkEs02ef11dLbBju6mYIZwdMF6zm0tcME_I8LEVSmrQ,16710
+chuk_tool_processor/mcp/transport/sse_transport.py,sha256=RC_m1relMkr5gQCUbH1z9JB2raZHj2MIEIq9Qyfpw0Y,17696
 chuk_tool_processor/mcp/transport/stdio_transport.py,sha256=lFXL7p8ca4z_J0RBL8UCHrQ1UH7C2-LbC0tZhpya4V4,7763
 chuk_tool_processor/models/__init__.py,sha256=TC__rdVa0lQsmJHM_hbLDPRgToa_pQT_UxRcPZk6iVw,40
 chuk_tool_processor/models/execution_strategy.py,sha256=UVW35YIeMY2B3mpIKZD2rAkyOPayI6ckOOUALyf0YiQ,2115
@@ -52,7 +52,7 @@ chuk_tool_processor/registry/providers/__init__.py,sha256=eigwG_So11j7WbDGSWaKd3
 chuk_tool_processor/registry/providers/memory.py,sha256=LlpPUU9E7S8Se6Q3VyKxLwpNm82SvmP8GLUmI8MkHxQ,5188
 chuk_tool_processor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chuk_tool_processor/utils/validation.py,sha256=fiTSsHq7zx-kyd755GaFCvPCa-EVasSpg0A1liNHkxU,4138
-chuk_tool_processor-0.2.dist-info/METADATA,sha256=BF2f_DLVJk59zAMransa5Ca3wH5alCzPih6xFsNkscc,10163
-chuk_tool_processor-0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-chuk_tool_processor-0.2.dist-info/top_level.txt,sha256=7lTsnuRx4cOW4U2sNJWNxl4ZTt_J1ndkjTbj3pHPY5M,20
-chuk_tool_processor-0.2.dist-info/RECORD,,
+chuk_tool_processor-0.3.dist-info/METADATA,sha256=9D_wk8oZqFKWnxdjMTcqB9K2bIa0QrBk7Ep_kxqBZZ0,10163
+chuk_tool_processor-0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+chuk_tool_processor-0.3.dist-info/top_level.txt,sha256=7lTsnuRx4cOW4U2sNJWNxl4ZTt_J1ndkjTbj3pHPY5M,20
+chuk_tool_processor-0.3.dist-info/RECORD,,