🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
refactor: unify the stdio&sse configuration of mcp server (#2009)
koch30923e7d2f57458b
diff --git a/camel/toolkits/mcp_toolkit.py b/camel/toolkits/mcp_toolkit.pyindex 4b7d48d4f..ba7905b9d 100644--- a/camel/toolkits/mcp_toolkit.py+++ b/camel/toolkits/mcp_toolkit.py@@ -25,11 +25,12 @@ from typing import (Optional,Set,Union,+ cast,)from urllib.parse import urlparseif TYPE_CHECKING:- from mcp import ListToolsResult, Tool+ from mcp import ClientSession, ListToolsResult, Toolfrom camel.logger import get_loggerfrom camel.toolkits import BaseToolkit, FunctionTool@@ -69,7 +70,6 @@ class _MCPServer(BaseToolkit):headers: Optional[Dict[str, str]] = None,):from mcp import Tool- from mcp.client.session import ClientSessionsuper().__init__(timeout=timeout)@@ -331,6 +331,10 @@ class _MCPServer(BaseToolkit):for mcp_tool in self._mcp_tools]+ @property+ def session(self) -> Optional["ClientSession"]:+ return self._session+class MCPToolkit(BaseToolkit):r"""MCPToolkit provides a unified interface for managing multiple@@ -359,7 +363,7 @@ class MCPToolkit(BaseToolkit):.. code-block:: json{- "mcpWebServers": {+ "mcpServers": {"protected-server": {"url": "https://example.com/mcp","timeout": 30,@@ -388,7 +392,7 @@ class MCPToolkit(BaseToolkit):"Servers from both sources will be combined.")- self.servers = servers or []+ self.servers: List[_MCPServer] = servers or []if config_path:self.servers.extend(self._load_servers_from_config(config_path))@@ -420,7 +424,6 @@ class MCPToolkit(BaseToolkit):all_servers = []- # Process local MCP serversmcp_servers = data.get("mcpServers", {})if not isinstance(mcp_servers, dict):logger.warning("'mcpServers' is not a dictionary, skipping...")@@ -433,47 +436,21 @@ class MCPToolkit(BaseToolkit):)continue- if "command" not in cfg:+ if "command" not in cfg and "url" not in cfg:logger.warning(- f"Missing required 'command' field for server '{name}'"+ f"Missing required 'command' or 'url' field for server "+ f"'{name}'")continueserver = _MCPServer(- command_or_url=cfg["command"],+ command_or_url=cast(str, cfg.get("command") or cfg.get("url")),args=cfg.get("args", []),env={**os.environ, **cfg.get("env", {})},timeout=cfg.get("timeout", None),)all_servers.append(server)- # Process remote MCP web servers- mcp_web_servers = data.get("mcpWebServers", {})- if not isinstance(mcp_web_servers, dict):- logger.warning("'mcpWebServers' is not a dictionary, skipping...")- mcp_web_servers = {}-- for name, cfg in mcp_web_servers.items():- if not isinstance(cfg, dict):- logger.warning(- f"Configuration for web server '{name}' must"- "be a dictionary"- )- continue-- if "url" not in cfg:- logger.warning(- f"Missing required 'url' field for web server '{name}'"- )- continue-- server = _MCPServer(- command_or_url=cfg["url"],- timeout=cfg.get("timeout", None),- headers=cfg.get("headers", {}),- )- all_servers.append(server)-return all_serversasync def connect(self):diff --git a/test/toolkits/test_mcp_toolkit.py b/test/toolkits/test_mcp_toolkit.pyindex 20ce8d005..63e020b89 100644--- a/test/toolkits/test_mcp_toolkit.py+++ b/test/toolkits/test_mcp_toolkit.py@@ -34,7 +34,7 @@ class Test_MCPServer:assert server.args == []assert server.env == {}assert server._mcp_tools == []- assert server._session is None+ assert server.session is Noneassert server._is_connected is False# Test with custom parameters@@ -48,7 +48,7 @@ class Test_MCPServer:assert server.args == ["--arg1", "--arg2"]assert server.env == {"ENV_VAR": "value"}assert server._mcp_tools == []- assert server._session is None+ assert server.session is Noneassert server._is_connected is False@pytest.mark.asyncio@@ -368,7 +368,7 @@ class Test_MCPServer:assert result == serverassert server._is_connected is Trueassert server._mcp_tools == ["tool1", "tool2"]- assert server._session is not None+ assert server.session is not None# Verify mocks were called correctlymock_sse_client.assert_called_once_with(@@ -429,7 +429,7 @@ class Test_MCPServer:# Verify resultsassert server._is_connected is False- assert server._session is None+ assert server.session is Noneserver._exit_stack.aclose.assert_called_once()# Test disconnecting when not connected@@ -505,9 +505,9 @@ class TestMCPToolkit:"command": "test-command","args": ["--arg1"],"env": {"TEST_ENV": "value"},- }- },- "mcpWebServers": {"server2": {"url": "https://test.com/sse"}},+ },+ "server2": {"url": "https://test.com/sse"},+ }}config_path.write_text(json.dumps(config_data))@@ -543,7 +543,7 @@ class TestMCPToolkit:mock_logger.reset_mock()# Missing url field- config_data = {"mcpWebServers": {"server1": {"timeout": 30}}}+ config_data = {"mcpServers": {"server1": {"timeout": 30}}}config_path.write_text(json.dumps(config_data))servers = mcp_toolkit._load_servers_from_config(@@ -573,21 +573,6 @@ class TestMCPToolkit:"'mcpServers' is not a dictionary, skipping...")- mock_logger.reset_mock()-- # mcpWebServers is not a dictionary- config_data = {"mcpWebServers": "not a dictionary"}- config_path.write_text(json.dumps(config_data))-- servers = mcp_toolkit._load_servers_from_config(- str(config_path)- )- # Should return an empty list and log a warning- assert servers == []- mock_logger.warning.assert_called_with(- "'mcpWebServers' is not a dictionary, skipping..."- )-@pytest.mark.asyncioasync def test_connection(self):r"""Test connection context manager."""