Files
Luigi Pederzani b45d9663ec feat(python): introduce roots support in MCPClient and Server (#751)
* fix(python): expose client capabilities to MCP servers

Add list_roots_callback support to Python connectors to properly
advertise the roots capability during MCP initialization handshake.

Previously, the Python library was not exposing any client capabilities
because the list_roots_callback was not being passed to ClientSession.
This fix ensures the roots capability is always advertised, bringing
the Python library in line with the TypeScript implementation.

Changes:
- Add roots and list_roots_callback params to BaseConnector
- Add get_roots() and set_roots() methods for managing roots
- Pass list_roots_callback to ClientSession in all connectors
- Export Root type from connectors module
- Update unit tests to expect list_roots_callback parameter

Closes MCP-1063

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* feat(python): add roots and list_roots_callback params to connectors

- Add roots and list_roots_callback parameters to StdioConnector,
  HttpConnector, and SandboxConnector constructors
- Add comprehensive unit tests for client capabilities exposure
- Tests verify roots capability, get_roots(), set_roots(), and
  that all callbacks are correctly passed to ClientSession

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* chore: fix import sorting and update API documentation

- Fix import sorting in test_client_capabilities.py (ruff)
- Regenerate API documentation for updated connector classes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* feat(python): add list_roots() method to server Context

Allow MCP servers to request the list of roots from connected clients
via ctx.list_roots(). This follows the same pattern as ctx.sample()
and ctx.elicit() for server-to-client requests.

* feat(python): add roots params to MCPClient and config

- Add roots and list_roots_callback parameters to MCPClient.__init__,
  from_dict(), and from_config_file() methods
- Update create_connector_from_config() to pass roots params to all
  connector types (Stdio, HTTP, Sandbox)
- Allows clients to configure roots at the MCPClient level and have
  them propagate to all sessions

* test(python): add get_client_roots tool to primitive server

Add a tool that demonstrates the roots capability by requesting and
returning the list of roots from the connected client. Used for
integration testing of the roots feature.

* test(python): add integration tests for roots capability

Add comprehensive integration tests for the roots feature:
- test_roots_capability: Verify server can request/receive roots
- test_roots_empty_by_default: Verify empty roots when not provided
- test_roots_with_custom_callback: Verify custom callback precedence
- test_set_roots_updates_server_view: Verify dynamic root updates

* test(python): update unit tests for roots parameters

Update mock assertions in test_client.py to expect the new roots
and list_roots_callback parameters in create_connector_from_config
calls.

* ci(python): add roots to primitive tests and README badge

- Add roots to CI workflow primitive test matrix
- Add roots to PR comment report primitives list
- Add Roots badge to README Primitives row

* feat(docs): enhance MCP client and server documentation for roots feature

- Added `roots` and `list_roots_callback` parameters to MCP client initialization documentation.
- Updated `create_connector_from_config` documentation to include new parameters.
- Introduced `list_roots` method documentation in server context, detailing its usage and return values.
- Improved overall clarity and completeness of API reference for better developer guidance.

* feat(python): add get_client_roots tool to context example

- Introduced a new tool, `get_client_roots`, to the context example, demonstrating how to retrieve and display the list of roots exposed by the client.
- Updated documentation to include the new tool and its functionality, enhancing the example's coverage of context features.

* feat(docs): add roots documentation for client and server

- Introduced new documentation for the `roots` feature, detailing how clients can expose file system roots to MCP servers and how servers can access these roots.
- Added examples for configuring roots in the MCP client and using the `list_roots()` method in the server context.
- Enhanced overall clarity and usability of the documentation to support developers in implementing the roots functionality.

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: pietrozullo <pietro.zullo@gmail.com>
2026-01-12 11:16:09 +01:00

312 lines
12 KiB
Python

"""
Unit tests for the SandboxConnector class.
"""
import os
import sys
from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
import pytest
# Use MagicMock instead of importing from mcp.types
# from mcp.types import CallToolResult, Tool
from mcp_use.client.connectors.sandbox import SandboxConnector, SandboxOptions
from mcp_use.client.middleware.middleware import CallbackClientSession
from mcp_use.client.task_managers import SseConnectionManager
# Mock the sandbox module for tests
class MockCommandHandle:
def __init__(self):
self.exit_code = 0
self.is_completed = True
def kill(self):
pass
class MockSandbox:
def __init__(self, *args, **kwargs):
self.commands = MagicMock()
self.commands.run = MagicMock(return_value=MockCommandHandle())
def get_host(self, port):
return "test-host.sandbox.e2b.dev"
def kill(self):
pass
@pytest.fixture(autouse=True)
def mock_logger():
"""Mock the logger to prevent errors during tests."""
with (
patch("mcp_use.client.connectors.base.logger") as mock_base_logger,
patch("mcp_use.client.connectors.sandbox.logger") as mock_sandbox_logger,
):
# Set level attribute to an integer for comparison in the logger
mock_sandbox_logger.handlers = []
mock_base_logger.handlers = []
yield mock_sandbox_logger
@pytest.fixture
def mock_sandbox_modules():
"""Mock the E2B sandbox modules."""
with (
patch("mcp_use.client.connectors.sandbox.Sandbox", MockSandbox),
patch("mcp_use.client.connectors.sandbox.CommandHandle", MockCommandHandle),
):
yield
@pytest.fixture
def mock_os_environ():
"""Fixture to mock os.environ."""
with patch.dict(os.environ, {"E2B_API_KEY": "test-api-key"}, clear=False):
yield
class TestSandboxConnectorInitialization:
"""Tests for SandboxConnector initialization."""
def test_init_with_api_key(self, mock_sandbox_modules):
"""Test initialization with API key in sandbox options."""
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
assert connector.api_key == "test-api-key"
assert connector.sandbox_template_id == "base"
assert connector.supergateway_cmd_parts == "npx -y supergateway"
assert connector.user_command == "npx"
assert connector.user_args == ["test-command"]
assert not connector._connected
def test_init_with_env_api_key(self, mock_sandbox_modules, mock_os_environ):
"""Test initialization with API key from environment."""
connector = SandboxConnector("npx", ["test-command"])
assert connector.api_key == "test-api-key"
assert connector.sandbox_template_id == "base"
assert connector.user_command == "npx"
assert connector.user_args == ["test-command"]
assert not connector._connected
def test_init_missing_api_key(self, mock_sandbox_modules):
"""Test initialization fails with missing API key."""
with patch.dict(os.environ, {}, clear=True):
with pytest.raises(ValueError, match="E2B API key is required"):
SandboxConnector("npx", ["test-command"])
def test_init_with_custom_options(self, mock_sandbox_modules):
"""Test initialization with custom sandbox options."""
sandbox_options = SandboxOptions(
api_key="test-api-key",
sandbox_template_id="custom-template",
supergateway_command="custom-gateway-command",
)
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
assert connector.api_key == "test-api-key"
assert connector.sandbox_template_id == "custom-template"
assert connector.supergateway_cmd_parts == "custom-gateway-command"
class TestSandboxConnectorConnection:
"""Tests for SandboxConnector connection methods."""
@pytest.mark.asyncio
@patch("mcp_use.client.connectors.sandbox.SseConnectionManager")
@patch("mcp_use.client.connectors.sandbox.ClientSession")
async def test_connect(self, mock_client_session, mock_connection_manager, mock_sandbox_modules):
"""Test connecting to the MCP implementation in sandbox."""
# Setup mocks
mock_manager_instance = Mock(spec=SseConnectionManager)
mock_manager_instance.start = AsyncMock(return_value=("read_stream", "write_stream"))
mock_connection_manager.return_value = mock_manager_instance
mock_client_instance = Mock()
mock_client_instance.__aenter__ = AsyncMock()
mock_client_session.return_value = mock_client_instance
# Mock wait_for_server_response to avoid actual HTTP calls
with patch.object(SandboxConnector, "wait_for_server_response", new_callable=AsyncMock, return_value=True):
# Create connector and connect
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
await connector.connect()
# Verify sandbox creation
assert connector.sandbox is not None
# Verify connection manager creation and start
mock_connection_manager.assert_called_once()
mock_manager_instance.start.assert_called_once()
# Verify client session creation
mock_client_session.assert_called_once_with(
"read_stream",
"write_stream",
sampling_callback=None,
elicitation_callback=None,
list_roots_callback=ANY,
message_handler=ANY,
logging_callback=None,
client_info=ANY,
)
mock_client_instance.__aenter__.assert_called_once()
# Verify state
assert connector._connected is True
assert isinstance(connector.client_session, CallbackClientSession)
assert connector._connection_manager == mock_manager_instance
assert connector.base_url == "https://test-host.sandbox.e2b.dev"
@pytest.mark.asyncio
async def test_connect_already_connected(self, mock_sandbox_modules):
"""Test connecting when already connected."""
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
connector._connected = True
await connector.connect()
# Verify no connection established since already connected
assert connector._connection_manager is None
assert connector.client_session is None
assert connector.sandbox is None
@pytest.mark.asyncio
@patch("mcp_use.client.connectors.sandbox.logger")
@patch("mcp_use.client.connectors.sandbox.Sandbox")
async def test_connect_error(self, mock_sandbox_class, mock_logger, mock_sandbox_modules):
"""Test connection error handling."""
# Setup mocks to raise an exception during sandbox creation
mock_sandbox_instance = MagicMock()
mock_sandbox_instance.get_host.side_effect = Exception("Sandbox creation error")
mock_sandbox_class.return_value = mock_sandbox_instance
# Create connector and attempt to connect
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
# Mock cleanup to avoid errors during exception handling
connector._cleanup_resources = AsyncMock()
# Expect the exception to be re-raised
with pytest.raises(Exception):
await connector.connect()
# Verify resources were cleaned up
connector._cleanup_resources.assert_called_once()
assert connector._connected is False
assert connector.client_session is None
@pytest.mark.asyncio
async def test_disconnect(self, mock_sandbox_modules):
"""Test disconnecting from MCP implementation."""
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
connector._connected = True
# Mock the _cleanup_resources method to replace the actual method
connector._cleanup_resources = AsyncMock()
# Disconnect
await connector.disconnect()
# Verify _cleanup_resources was called
connector._cleanup_resources.assert_called_once()
# Verify state
assert connector._connected is False
class TestSandboxConnectorCleanup:
"""Tests for SandboxConnector cleanup methods."""
@pytest.mark.asyncio
async def test_cleanup_resources(self, mock_sandbox_modules):
"""Test cleanup of all resources."""
# Create connector with resources to clean up
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
# Set up mock resources
process_mock = MagicMock()
process_mock.kill = MagicMock()
connector.process = process_mock
sandbox_mock = MagicMock()
sandbox_mock.kill = MagicMock()
connector.sandbox = sandbox_mock
# Mock super()._cleanup_resources method
with patch(
"mcp_use.client.connectors.base.BaseConnector._cleanup_resources", new_callable=AsyncMock
) as mock_super_cleanup:
# Call cleanup
await connector._cleanup_resources()
# Verify process was terminated
process_mock.kill.assert_called_once()
# Verify sandbox was closed
sandbox_mock.kill.assert_called_once()
# Verify parent cleanup was called
mock_super_cleanup.assert_called_once()
# Verify state changes
assert connector.sandbox is None
assert connector.process is None
assert connector.stdout_lines == []
assert connector.stderr_lines == []
assert connector.base_url is None
@pytest.mark.asyncio
@patch("mcp_use.client.connectors.sandbox.logger")
async def test_cleanup_resources_with_exceptions(self, mock_logger, mock_sandbox_modules):
"""Test cleanup handles exceptions gracefully."""
# Create connector with resources to clean up
sandbox_options = SandboxOptions(api_key="test-api-key")
connector = SandboxConnector("npx", ["test-command"], e2b_options=sandbox_options)
# Set up mock resources that will raise exceptions
process_mock = MagicMock()
process_mock.kill = MagicMock(side_effect=Exception("Process kill error"))
connector.process = process_mock
sandbox_mock = MagicMock()
sandbox_mock.kill = MagicMock(side_effect=Exception("Sandbox kill error"))
connector.sandbox = sandbox_mock
# Configure logger to avoid test errors
mock_logger.warning = MagicMock()
# Mock super()._cleanup_resources method
with patch(
"mcp_use.client.connectors.base.BaseConnector._cleanup_resources", new_callable=AsyncMock
) as mock_super_cleanup:
# Call cleanup
await connector._cleanup_resources()
# Verify process termination was attempted even though it errored
process_mock.kill.assert_called_once()
# Verify sandbox close was attempted even though it errored
sandbox_mock.kill.assert_called_once()
# Verify warnings were logged
assert mock_logger.warning.call_count == 2
# Verify parent cleanup was still called
mock_super_cleanup.assert_called_once()
# Verify state changes
assert connector.sandbox is None
assert connector.process is None
assert connector.stdout_lines == []
assert connector.stderr_lines == []
assert connector.base_url is None