mcp-use 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

mcp_use/connectors/http.py

@@ -7,7 +7,7 @@ through HTTP APIs with SSE or Streamable HTTP for transport.
 
 import httpx
 from mcp import ClientSession
-from mcp.client.session import ElicitationFnT, SamplingFnT
+from mcp.client.session import ElicitationFnT, LoggingFnT, MessageHandlerFnT, SamplingFnT
 
 from ..logging import logger
 from ..task_managers import SseConnectionManager, StreamableHttpConnectionManager
@@ -30,6 +30,8 @@ class HttpConnector(BaseConnector):
         sse_read_timeout: float = 60 * 5,
         sampling_callback: SamplingFnT | None = None,
         elicitation_callback: ElicitationFnT | None = None,
+        message_handler: MessageHandlerFnT | None = None,
+        logging_callback: LoggingFnT | None = None,
     ):
         """Initialize a new HTTP connector.
 
@@ -42,7 +44,12 @@ class HttpConnector(BaseConnector):
             sampling_callback: Optional sampling callback.
             elicitation_callback: Optional elicitation callback.
         """
-        super().__init__(sampling_callback=sampling_callback, elicitation_callback=elicitation_callback)
+        super().__init__(
+            sampling_callback=sampling_callback,
+            elicitation_callback=elicitation_callback,
+            message_handler=message_handler,
+            logging_callback=logging_callback,
+        )
         self.base_url = base_url.rstrip("/")
         self.auth_token = auth_token
         self.headers = headers or {}
@@ -78,6 +85,8 @@ class HttpConnector(BaseConnector):
                 write_stream,
                 sampling_callback=self.sampling_callback,
                 elicitation_callback=self.elicitation_callback,
+                message_handler=self._internal_message_handler,
+                logging_callback=self.logging_callback,
                 client_info=self.client_info,
             )
             await test_client.__aenter__()
@@ -162,6 +171,8 @@ class HttpConnector(BaseConnector):
                         write_stream,
                         sampling_callback=self.sampling_callback,
                         elicitation_callback=self.elicitation_callback,
+                        message_handler=self._internal_message_handler,
+                        logging_callback=self.logging_callback,
                         client_info=self.client_info,
                     )
                     await self.client_session.__aenter__()

mcp_use/connectors/sandbox.py

@@ -12,7 +12,7 @@ import time
 
 import aiohttp
 from mcp import ClientSession
-from mcp.client.session import ElicitationFnT, SamplingFnT
+from mcp.client.session import ElicitationFnT, LoggingFnT, MessageHandlerFnT, SamplingFnT
 
 from ..logging import logger
 from ..task_managers import SseConnectionManager
@@ -20,10 +20,7 @@ from ..task_managers import SseConnectionManager
 # Import E2B SDK components (optional dependency)
 try:
     logger.debug("Attempting to import e2b_code_interpreter...")
-    from e2b_code_interpreter import (
-        CommandHandle,
-        Sandbox,
-    )
+    from e2b_code_interpreter import CommandHandle, Sandbox
 
     logger.debug("Successfully imported e2b_code_interpreter")
 except ImportError as e:
@@ -53,6 +50,8 @@ class SandboxConnector(BaseConnector):
         sse_read_timeout: float = 60 * 5,
         sampling_callback: SamplingFnT | None = None,
         elicitation_callback: ElicitationFnT | None = None,
+        message_handler: MessageHandlerFnT | None = None,
+        logging_callback: LoggingFnT | None = None,
     ):
         """Initialize a new sandbox connector.
 
@@ -67,7 +66,12 @@ class SandboxConnector(BaseConnector):
             sampling_callback: Optional sampling callback.
             elicitation_callback: Optional elicitation callback.
         """
-        super().__init__(sampling_callback=sampling_callback, elicitation_callback=elicitation_callback)
+        super().__init__(
+            sampling_callback=sampling_callback,
+            elicitation_callback=elicitation_callback,
+            message_handler=message_handler,
+            logging_callback=logging_callback,
+        )
         if Sandbox is None:
             raise ImportError(
                 "E2B SDK (e2b-code-interpreter) not found. Please install it with "
@@ -227,6 +231,8 @@ class SandboxConnector(BaseConnector):
                 write_stream,
                 sampling_callback=self.sampling_callback,
                 elicitation_callback=self.elicitation_callback,
+                message_handler=self._internal_message_handler,
+                logging_callback=self.logging_callback,
                 client_info=self.client_info,
             )
             await self.client_session.__aenter__()

mcp_use/connectors/stdio.py

@@ -8,7 +8,7 @@ through the standard input/output streams.
 import sys
 
 from mcp import ClientSession, StdioServerParameters
-from mcp.client.session import ElicitationFnT, SamplingFnT
+from mcp.client.session import ElicitationFnT, LoggingFnT, MessageHandlerFnT, SamplingFnT
 
 from ..logging import logger
 from ..task_managers import StdioConnectionManager
@@ -31,6 +31,8 @@ class StdioConnector(BaseConnector):
         errlog=sys.stderr,
         sampling_callback: SamplingFnT | None = None,
         elicitation_callback: ElicitationFnT | None = None,
+        message_handler: MessageHandlerFnT | None = None,
+        logging_callback: LoggingFnT | None = None,
     ):
         """Initialize a new stdio connector.
 
@@ -42,7 +44,12 @@ class StdioConnector(BaseConnector):
             sampling_callback: Optional callback to sample the client.
             elicitation_callback: Optional callback to elicit the client.
         """
-        super().__init__(sampling_callback=sampling_callback, elicitation_callback=elicitation_callback)
+        super().__init__(
+            sampling_callback=sampling_callback,
+            elicitation_callback=elicitation_callback,
+            message_handler=message_handler,
+            logging_callback=logging_callback,
+        )
         self.command = command
         self.args = args or []  # Ensure args is never None
         self.env = env
@@ -69,6 +76,8 @@ class StdioConnector(BaseConnector):
                 write_stream,
                 sampling_callback=self.sampling_callback,
                 elicitation_callback=self.elicitation_callback,
+                message_handler=self._internal_message_handler,
+                logging_callback=self.logging_callback,
                 client_info=self.client_info,
             )
             await self.client_session.__aenter__()

mcp_use/errors/__init__.py

@@ -0,0 +1 @@
+

mcp_use/errors/error_formatting.py

@@ -0,0 +1,29 @@
+import traceback
+
+from ..logging import logger
+
+retryable_exceptions = (TimeoutError, ConnectionError)  # We can add more exceptions here
+
+
+def format_error(error: Exception, **context) -> dict:
+    """
+    Formats an exception into a structured format that can be understood by LLMs.
+
+    Args:
+        error: The exception to format.
+        **context: Additional context to include in the formatted error.
+
+    Returns:
+        A dictionary containing the formatted error.
+    """
+    formatted_context = {
+        "error": type(error).__name__,
+        "details": str(error),
+        "isRetryable": isinstance(error, retryable_exceptions),
+        "stack": traceback.format_exc(),
+        "code": getattr(error, "code", "UNKNOWN"),
+    }
+    formatted_context.update(context)
+
+    logger.error(f"Structured error: {formatted_context}")  # For observability (maybe remove later)
+    return formatted_context

mcp_use/managers/__init__.py

@@ -6,16 +6,14 @@ from .tools import (
     ListServersTool,
     MCPServerTool,
     SearchToolsTool,
-    UseToolFromServerTool,
 )
 
 __all__ = [
     "ServerManager",
-    "ListServersTool",
+    "MCPServerTool",
     "ConnectServerTool",
-    "GetActiveServerTool",
     "DisconnectServerTool",
+    "GetActiveServerTool",
+    "ListServersTool",
     "SearchToolsTool",
-    "MCPServerTool",
-    "UseToolFromServerTool",
 ]

mcp_use/managers/server_manager.py

@@ -4,14 +4,7 @@ from mcp_use.client import MCPClient
 from mcp_use.logging import logger
 
 from ..adapters.base import BaseAdapter
-from .tools import (
-    ConnectServerTool,
-    DisconnectServerTool,
-    GetActiveServerTool,
-    ListServersTool,
-    SearchToolsTool,
-    UseToolFromServerTool,
-)
+from .tools import ConnectServerTool, DisconnectServerTool, GetActiveServerTool, ListServersTool, SearchToolsTool
 
 
 class ServerManager:
@@ -73,12 +66,21 @@ class ServerManager:
             except Exception as e:
                 logger.error(f"Error prefetching tools for server '{server_name}': {e}")
 
-    @property
-    def tools(self) -> list[BaseTool]:
-        """Get all server management tools.
+    def get_active_server_tools(self) -> list[BaseTool]:
+        """Get tools from the currently active server.
+
+        Returns:
+            List of tools from the active server, or empty list if no server is active
+        """
+        if self.active_server and self.active_server in self._server_tools:
+            return self._server_tools[self.active_server]
+        return []
+
+    def get_management_tools(self) -> list[BaseTool]:
+        """Get the server management tools.
 
         Returns:
-            list of LangChain tools for server management
+            List of server management tools
         """
         return [
             ListServersTool(self),
@@ -86,5 +88,36 @@ class ServerManager:
             GetActiveServerTool(self),
             DisconnectServerTool(self),
             SearchToolsTool(self),
-            UseToolFromServerTool(self),
         ]
+
+    def has_tool_changes(self, current_tool_names: set[str]) -> bool:
+        """Check if the available tools have changed.
+
+        Args:
+            current_tool_names: Set of currently known tool names
+
+        Returns:
+            True if tools have changed, False otherwise
+        """
+        new_tool_names = {tool.name for tool in self.tools}
+        return new_tool_names != current_tool_names
+
+    @property
+    def tools(self) -> list[BaseTool]:
+        """Get all server management tools and tools from the active server.
+
+        Returns:
+            list of LangChain tools for server management plus tools from active server
+        """
+        management_tools = self.get_management_tools()
+
+        # Add tools from the active server if available
+        if self.active_server and self.active_server in self._server_tools:
+            server_tools = self._server_tools[self.active_server]
+            logger.debug(f"Including {len(server_tools)} tools from active server '{self.active_server}'")
+            logger.debug(f"Server tools: {[tool.name for tool in server_tools]}")
+            return management_tools + server_tools
+        else:
+            logger.debug("No active server - returning only management tools")
+
+        return management_tools

mcp_use/managers/tools/__init__.py

@@ -4,14 +4,12 @@ from .disconnect_server import DisconnectServerTool
 from .get_active_server import GetActiveServerTool
 from .list_servers_tool import ListServersTool
 from .search_tools import SearchToolsTool
-from .use_tool import UseToolFromServerTool
 
 __all__ = [
     "MCPServerTool",
-    "ListServersTool",
     "ConnectServerTool",
-    "GetActiveServerTool",
     "DisconnectServerTool",
+    "GetActiveServerTool",
+    "ListServersTool",
     "SearchToolsTool",
-    "UseToolFromServerTool",
 ]

mcp_use/managers/tools/connect_server.py

@@ -2,6 +2,7 @@ from typing import ClassVar
 
 from pydantic import BaseModel, Field
 
+from mcp_use.errors.error_formatting import format_error
 from mcp_use.logging import logger
 
 from .base_tool import MCPServerTool
@@ -62,7 +63,7 @@ class ConnectServerTool(MCPServerTool):
 
         except Exception as e:
             logger.error(f"Error connecting to server '{server_name}': {e}")
-            return f"Failed to connect to server '{server_name}': {str(e)}"
+            return format_error(e, server_name=server_name)
 
     def _run(self, server_name: str) -> str:
         """Synchronous version that raises a NotImplementedError - use _arun instead."""

mcp_use/managers/tools/disconnect_server.py

@@ -2,6 +2,7 @@ from typing import ClassVar
 
 from pydantic import BaseModel
 
+from mcp_use.errors.error_formatting import format_error
 from mcp_use.logging import logger
 
 from .base_tool import MCPServerTool
@@ -36,7 +37,7 @@ class DisconnectServerTool(MCPServerTool):
             return f"Successfully disconnected from MCP server '{server_name}'."
         except Exception as e:
             logger.error(f"Error disconnecting from server '{server_name}': {e}")
-            return f"Failed to disconnect from server '{server_name}': {str(e)}"
+            return format_error(e, server_name=server_name)
 
     async def _arun(self, **kwargs) -> str:
         """Async implementation of _run."""

mcp_use/managers/tools/list_servers_tool.py

@@ -2,6 +2,7 @@ from typing import ClassVar
 
 from pydantic import BaseModel
 
+from mcp_use.errors.error_formatting import format_error
 from mcp_use.logging import logger
 
 from .base_tool import MCPServerTool
@@ -44,6 +45,7 @@ class ListServersTool(MCPServerTool):
                     result += f"   {tool_count} tools available for this server\n"
             except Exception as e:
                 logger.error(f"Unexpected error listing tools for server '{server_name}': {e}")
+                return format_error(e, server=server_name, operation="list_tools")
 
         return result
 

mcp_use/session.py

@@ -5,8 +5,12 @@ This module provides a session manager for MCP connections,
 which handles authentication, initialization, and tool discovery.
 """
 
+from datetime import timedelta
 from typing import Any
 
+from mcp.types import CallToolResult, GetPromptResult, Prompt, ReadResourceResult, Resource, Tool
+from pydantic import AnyUrl
+
 from .connectors.base import BaseConnector
 
 
@@ -82,3 +86,69 @@ class MCPSession:
             True if the connector is connected, False otherwise.
         """
         return self.connector.is_connected
+
+    # Convenience methods for MCP operations
+    async def call_tool(
+        self, name: str, arguments: dict[str, Any], read_timeout_seconds: timedelta | None = None
+    ) -> CallToolResult:
+        """Call an MCP tool.
+
+        Args:
+            name: The name of the tool to call.
+            arguments: The arguments to pass to the tool.
+            read_timeout_seconds: Optional timeout for the tool call.
+
+        Returns:
+            The result of the tool call.
+
+        Raises:
+            RuntimeError: If the connection is lost and cannot be reestablished.
+        """
+        return await self.connector.call_tool(name, arguments, read_timeout_seconds)
+
+    async def list_tools(self) -> list[Tool]:
+        """List all available tools from the MCP server.
+
+        Returns:
+            List of available tools.
+        """
+        return await self.connector.list_tools()
+
+    async def list_resources(self) -> list[Resource]:
+        """List all available resources from the MCP server.
+
+        Returns:
+            List of available resources.
+        """
+        return await self.connector.list_resources()
+
+    async def read_resource(self, uri: AnyUrl) -> ReadResourceResult:
+        """Read a resource by URI.
+
+        Args:
+            uri: The URI of the resource to read.
+
+        Returns:
+            The resource content.
+        """
+        return await self.connector.read_resource(uri)
+
+    async def list_prompts(self) -> list[Prompt]:
+        """List all available prompts from the MCP server.
+
+        Returns:
+            List of available prompts.
+        """
+        return await self.connector.list_prompts()
+
+    async def get_prompt(self, name: str, arguments: dict[str, Any] | None = None) -> GetPromptResult:
+        """Get a prompt by name.
+
+        Args:
+            name: The name of the prompt to get.
+            arguments: Optional arguments for the prompt.
+
+        Returns:
+            The prompt result with messages.
+        """
+        return await self.connector.get_prompt(name, arguments)

mcp_use/telemetry/telemetry.py

@@ -11,10 +11,7 @@ from posthog import Posthog
 from scarf import ScarfEventLogger
 
 from mcp_use.logging import MCP_USE_DEBUG
-from mcp_use.telemetry.events import (
-    BaseTelemetryEvent,
-    MCPAgentExecutionEvent,
-)
+from mcp_use.telemetry.events import BaseTelemetryEvent, MCPAgentExecutionEvent
 from mcp_use.telemetry.utils import get_package_version
 from mcp_use.utils import singleton