Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
feat: default to `False` for `mcp_read_from_config` (#2691)
Sarah Woodersf95d7d9f72af
diff --git a/letta/server/rest_api/routers/v1/tools.py b/letta/server/rest_api/routers/v1/tools.pyindex 61ebced9d..3f74165ae 100644--- a/letta/server/rest_api/routers/v1/tools.py+++ b/letta/server/rest_api/routers/v1/tools.py@@ -486,7 +486,8 @@ async def add_mcp_server_to_config(if isinstance(request, StdioServerConfig):mapped_request = MCPServer(server_name=request.server_name, server_type=request.type, stdio_config=request)# don't allow stdio servers- raise HTTPException(status_code=400, detail="StdioServerConfig is not supported")+ if tool_settings.mcp_disable_stdio: # protected server+ raise HTTPException(status_code=400, detail="StdioServerConfig is not supported")elif isinstance(request, SSEServerConfig):mapped_request = MCPServer(server_name=request.server_name, server_type=request.type, server_url=request.server_url)# TODO: add HTTP streaming@@ -515,4 +516,8 @@ async def delete_mcp_server_from_config(# log to DBactor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)mcp_server_id = await server.mcp_manager.get_mcp_server_id_by_name(mcp_server_name, actor)- return server.mcp_manager.delete_mcp_server_by_id(mcp_server_id, actor=actor)+ await server.mcp_manager.delete_mcp_server_by_id(mcp_server_id, actor=actor)++ # TODO: don't do this in the future (just return MCPServer)+ all_servers = await server.mcp_manager.list_mcp_servers(actor=actor)+ return [server.to_config() for server in all_servers]diff --git a/letta/services/mcp/stdio_client.py b/letta/services/mcp/stdio_client.pyindex 60cce3f77..166ee06c1 100644--- a/letta/services/mcp/stdio_client.py+++ b/letta/services/mcp/stdio_client.py@@ -11,7 +11,11 @@ logger = get_logger(__name__)# TODO: Get rid of Async prefix on this class name once we deprecate old sync codeclass AsyncStdioMCPClient(AsyncBaseMCPClient):async def _initialize_connection(self, server_config: StdioServerConfig) -> None:- server_params = StdioServerParameters(command=server_config.command, args=server_config.args)++ args = [arg.split() for arg in server_config.args]+ # flatten+ args = [arg for sublist in args for arg in sublist]+ server_params = StdioServerParameters(command=server_config.command, args=args)stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))self.stdio, self.write = stdio_transportself.session = await self.exit_stack.enter_async_context(ClientSession(self.stdio, self.write))diff --git a/letta/services/mcp_manager.py b/letta/services/mcp_manager.pyindex a66f536f2..680340412 100644--- a/letta/services/mcp_manager.py+++ b/letta/services/mcp_manager.py@@ -220,12 +220,12 @@ class MCPManager:# mcp_server.delete(session, actor=actor) # Re-raise other database-related errors@enforce_types- def delete_mcp_server_by_id(self, mcp_server_id: str, actor: PydanticUser) -> None:+ async def delete_mcp_server_by_id(self, mcp_server_id: str, actor: PydanticUser) -> None:"""Delete a tool by its ID."""- with db_registry.session() as session:+ async with db_registry.async_session() as session:try:- mcp_server = MCPServerModel.read(db_session=session, identifier=mcp_server_id, actor=actor)- mcp_server.hard_delete(db_session=session, actor=actor)+ mcp_server = await MCPServerModel.read_async(db_session=session, identifier=mcp_server_id, actor=actor)+ await mcp_server.hard_delete_async(db_session=session, actor=actor)except NoResultFound:raise ValueError(f"MCP server with id {mcp_server_id} not found.")diff --git a/letta/settings.py b/letta/settings.pyindex 6d7e05b2b..55f1cac5e 100644--- a/letta/settings.py+++ b/letta/settings.py@@ -28,7 +28,8 @@ class ToolSettings(BaseSettings):mcp_connect_to_server_timeout: float = 30.0mcp_list_tools_timeout: float = 30.0mcp_execute_tool_timeout: float = 60.0- mcp_read_from_config: bool = True # if False, will throw if attempting to read/write from file+ mcp_read_from_config: bool = False # if False, will throw if attempting to read/write from file+ mcp_disable_stdio: bool = Falseclass SummarizerSettings(BaseSettings):diff --git a/tests/test_managers.py b/tests/test_managers.pyindex 12acdce51..1e17bceaf 100644--- a/tests/test_managers.py+++ b/tests/test_managers.py@@ -6479,8 +6479,8 @@ async def test_create_mcp_server(server, default_user, event_loop):assert created_server.server_type == server_config.type# Test with a valid SSEServerConfig- mcp_server_name = "github_composio"- server_url = "https://mcp.composio.dev/composio/server/3c44733b-75ae-4ba8-9a68-7153265fadd8"+ mcp_server_name = "devin"+ server_url = "https://mcp.deepwiki.com/sse"sse_mcp_config = SSEServerConfig(server_name=mcp_server_name, server_url=server_url)mcp_sse_server = MCPServer(server_name=mcp_server_name, server_type=MCPServerType.SSE, server_url=server_url)created_server = await server.mcp_manager.create_or_update_mcp_server(mcp_sse_server, actor=default_user)@@ -6498,8 +6498,8 @@ async def test_create_mcp_server(server, default_user, event_loop):print(tools)# call a tool from the sse server- tool_name = "GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER"- tool_args = {"owner": "letta-ai", "repo": "letta"}+ tool_name = "ask_question"+ tool_args = {"repoName": "letta-ai/letta", "question": "What is the primary programming language of this repository?"}result = await server.mcp_manager.execute_mcp_server_tool(created_server.server_name, tool_name=tool_name, tool_args=tool_args, actor=default_user)