Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
feat: Add metadata to MCP tools (#1325)
Matthew Zhoud653fbcb8928
diff --git a/letta/server/rest_api/routers/v1/tools.py b/letta/server/rest_api/routers/v1/tools.pyindex b4423027c..b302a569b 100644--- a/letta/server/rest_api/routers/v1/tools.py+++ b/letta/server/rest_api/routers/v1/tools.py@@ -398,7 +398,7 @@ def add_mcp_tool()tool_create = ToolCreate.from_mcp(mcp_server_name=mcp_server_name, mcp_tool=mcp_tool)- return server.tool_manager.create_or_update_mcp_tool(tool_create=tool_create, actor=actor)+ return server.tool_manager.create_or_update_mcp_tool(tool_create=tool_create, mcp_server_name=mcp_server_name, actor=actor)@router.put("/mcp/servers", response_model=List[Union[StdioServerConfig, SSEServerConfig]], operation_id="add_mcp_server")diff --git a/letta/services/tool_manager.py b/letta/services/tool_manager.pyindex e5eb1d2f8..2b6e5a28c 100644--- a/letta/services/tool_manager.py+++ b/letta/services/tool_manager.py@@ -2,7 +2,7 @@ import importlibimport warningsfrom typing import List, Optional-from letta.constants import BASE_FUNCTION_RETURN_CHAR_LIMIT, BASE_MEMORY_TOOLS, BASE_TOOLS, MULTI_AGENT_TOOLS+from letta.constants import BASE_FUNCTION_RETURN_CHAR_LIMIT, BASE_MEMORY_TOOLS, BASE_TOOLS, MCP_TOOL_TAG_NAME_PREFIX, MULTI_AGENT_TOOLSfrom letta.functions.functions import derive_openai_json_schema, load_function_setfrom letta.log import get_loggerfrom letta.orm.enums import ToolType@@ -57,9 +57,13 @@ class ToolManager:return tool@enforce_types- def create_or_update_mcp_tool(self, tool_create: ToolCreate, actor: PydanticUser) -> PydanticTool:+ def create_or_update_mcp_tool(self, tool_create: ToolCreate, mcp_server_name: str, actor: PydanticUser) -> PydanticTool:+ metadata = {MCP_TOOL_TAG_NAME_PREFIX: {"server_name": mcp_server_name}}return self.create_or_update_tool(- PydanticTool(tool_type=ToolType.EXTERNAL_MCP, name=tool_create.json_schema["name"], **tool_create.model_dump()), actor+ PydanticTool(+ tool_type=ToolType.EXTERNAL_MCP, name=tool_create.json_schema["name"], metadata_=metadata, **tool_create.model_dump()+ ),+ actor,)@enforce_typesdiff --git a/tests/test_managers.py b/tests/test_managers.pyindex e8da8406d..6bd11b18a 100644--- a/tests/test_managers.py+++ b/tests/test_managers.py@@ -8,9 +8,10 @@ from openai.types.chat.chat_completion_message_tool_call import Function as Openfrom sqlalchemy.exc import IntegrityErrorfrom letta.config import LettaConfig-from letta.constants import BASE_MEMORY_TOOLS, BASE_TOOLS, LETTA_TOOL_EXECUTION_DIR, MULTI_AGENT_TOOLS+from letta.constants import BASE_MEMORY_TOOLS, BASE_TOOLS, LETTA_TOOL_EXECUTION_DIR, MCP_TOOL_TAG_NAME_PREFIX, MULTI_AGENT_TOOLSfrom letta.embeddings import embedding_modelfrom letta.functions.functions import derive_openai_json_schema, parse_source_code+from letta.functions.mcp_client.types import MCPToolfrom letta.orm import Basefrom letta.orm.enums import JobType, ToolTypefrom letta.orm.errors import NoResultFound, UniqueConstraintViolationError@@ -167,6 +168,30 @@ def composio_github_star_tool(server, default_user):yield tool+def mcp_tool(server, default_user):+ mcp_tool = MCPTool(+ name="weather_lookup",+ description="Fetches the current weather for a given location.",+ inputSchema={+ "type": "object",+ "properties": {+ "location": {"type": "string", "description": "The name of the city or location."},+ "units": {+ "type": "string",+ "enum": ["metric", "imperial"],+ "description": "The unit system for temperature (metric or imperial).",+ },+ },+ "required": ["location"],+ },+ )+ mcp_server_name = "test"+ tool_create = ToolCreate.from_mcp(mcp_server_name=mcp_server_name, mcp_tool=mcp_tool)+ tool = server.tool_manager.create_or_update_mcp_tool(tool_create=tool_create, mcp_server_name=mcp_server_name, actor=default_user)+ yield tool++@pytest.fixturedef default_job(server: SyncServer, default_user):"""Fixture to create and return a default job."""@@ -1817,6 +1842,14 @@ def test_create_composio_tool(server: SyncServer, composio_github_star_tool, defassert composio_github_star_tool.tool_type == ToolType.EXTERNAL_COMPOSIO+def test_create_mcp_tool(server: SyncServer, mcp_tool, default_user, default_organization):+ # Assertions to ensure the created tool matches the expected values+ assert mcp_tool.created_by_id == default_user.id+ assert mcp_tool.organization_id == default_organization.id+ assert mcp_tool.tool_type == ToolType.EXTERNAL_MCP+ assert mcp_tool.metadata_[MCP_TOOL_TAG_NAME_PREFIX]["server_name"] == "test"++@pytest.mark.skipif(USING_SQLITE, reason="Test not applicable when using SQLite.")def test_create_tool_duplicate_name(server: SyncServer, print_tool, default_user, default_organization):data = print_tool.model_dump(exclude=["id"])