Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
feat: Exclude archival tools on new agent creation (#3072)
Matthew Zhou9cf2f2d86b36
diff --git a/letta/constants.py b/letta/constants.pyindex 9f73524f2..58fc1fff4 100644--- a/letta/constants.py+++ b/letta/constants.py@@ -83,6 +83,7 @@ SEND_MESSAGE_TOOL_NAME = "send_message"# Base tools that cannot be edited, as they access agent state directly# Note that we don't include "conversation_search_date" for nowBASE_TOOLS = [SEND_MESSAGE_TOOL_NAME, "conversation_search", "archival_memory_insert", "archival_memory_search"]+DEPRECATED_BASE_TOOLS = ["archival_memory_insert", "archival_memory_search"]# Base memory tools CAN be edited, and are added by default by the serverBASE_MEMORY_TOOLS = ["core_memory_append", "core_memory_replace"]# New v2 collection of the base memory tools (effecitvely same as sleeptime set), to pair with memgpt_v2 promptdiff --git a/letta/schemas/agent.py b/letta/schemas/agent.pyindex 5c08f4b7e..dc38eead9 100644--- a/letta/schemas/agent.py+++ b/letta/schemas/agent.py@@ -152,9 +152,7 @@ class CreateAgent(BaseModel, validate_assignment=True): #initial_message_sequence: Optional[List[MessageCreate]] = Field(None, description="The initial set of messages to put in the agent's in-context memory.")- include_base_tools: bool = Field(- True, description="If true, attaches the Letta core tools (e.g. archival_memory and core_memory related functions)."- )+ include_base_tools: bool = Field(True, description="If true, attaches the Letta core tools (e.g. core_memory related functions).")include_multi_agent_tools: bool = Field(False, description="If true, attaches the Letta multi-agent tools (e.g. sending a message to another agent).")diff --git a/letta/services/agent_manager.py b/letta/services/agent_manager.pyindex 29d641fee..8cbe44ee7 100644--- a/letta/services/agent_manager.py+++ b/letta/services/agent_manager.py@@ -16,6 +16,7 @@ from letta.constants import (BASE_VOICE_SLEEPTIME_CHAT_TOOLS,BASE_VOICE_SLEEPTIME_TOOLS,DEFAULT_TIMEZONE,+ DEPRECATED_BASE_TOOLS,FILES_TOOLS,MULTI_AGENT_TOOLS,)@@ -77,6 +78,7 @@ from letta.services.helpers.agent_manager_helper import (build_agent_passage_query,build_passage_query,build_source_passage_query,+ calculate_base_tools,check_supports_structured_output,compile_system_message,derive_system_message,@@ -261,13 +263,13 @@ class AgentManager:elif agent_create.enable_sleeptime:tool_names |= set(BASE_SLEEPTIME_CHAT_TOOLS)elif agent_create.agent_type == AgentType.memgpt_v2_agent:- tool_names |= set(BASE_TOOLS + BASE_MEMORY_TOOLS_V2)+ tool_names |= calculate_base_tools(is_v2=True)elif agent_create.agent_type == AgentType.react_agent:pass # no default toolselif agent_create.agent_type == AgentType.workflow_agent:pass # no default toolselse:- tool_names |= set(BASE_TOOLS + BASE_MEMORY_TOOLS)+ tool_names |= calculate_base_tools(is_v2=False)if agent_create.include_multi_agent_tools:tool_names |= set(MULTI_AGENT_TOOLS)@@ -428,16 +430,19 @@ class AgentManager:elif agent_create.enable_sleeptime:tool_names |= set(BASE_SLEEPTIME_CHAT_TOOLS)elif agent_create.agent_type == AgentType.memgpt_v2_agent:- tool_names |= set(BASE_TOOLS + BASE_MEMORY_TOOLS_V2)+ tool_names |= calculate_base_tools(is_v2=True)elif agent_create.agent_type == AgentType.react_agent:pass # no default toolselif agent_create.agent_type == AgentType.workflow_agent:pass # no default toolselse:- tool_names |= set(BASE_TOOLS + BASE_MEMORY_TOOLS)+ tool_names |= calculate_base_tools(is_v2=False)if agent_create.include_multi_agent_tools:tool_names |= set(MULTI_AGENT_TOOLS)+ # take out the deprecated tool names+ tool_names.difference_update(set(DEPRECATED_BASE_TOOLS))+supplied_ids = set(agent_create.tool_ids or [])source_ids = agent_create.source_ids or []diff --git a/letta/services/helpers/agent_manager_helper.py b/letta/services/helpers/agent_manager_helper.pyindex f0fae52b7..3842ad3c9 100644--- a/letta/services/helpers/agent_manager_helper.py+++ b/letta/services/helpers/agent_manager_helper.py@@ -1,12 +1,20 @@from datetime import datetime-from typing import List, Literal, Optional+from typing import List, Literal, Optional, Setimport numpy as npfrom sqlalchemy import Select, and_, asc, desc, func, literal, nulls_last, or_, select, union_allfrom sqlalchemy.sql.expression import existsfrom letta import system-from letta.constants import IN_CONTEXT_MEMORY_KEYWORD, MAX_EMBEDDING_DIM, STRUCTURED_OUTPUT_MODELS+from letta.constants import (+ BASE_MEMORY_TOOLS,+ BASE_MEMORY_TOOLS_V2,+ BASE_TOOLS,+ DEPRECATED_BASE_TOOLS,+ IN_CONTEXT_MEMORY_KEYWORD,+ MAX_EMBEDDING_DIM,+ STRUCTURED_OUTPUT_MODELS,+)from letta.embeddings import embedding_modelfrom letta.helpers import ToolRulesSolverfrom letta.helpers.datetime_helpers import format_datetime, get_local_time, get_local_time_fast@@ -1038,3 +1046,10 @@ def build_agent_passage_query(query = query.order_by(AgentPassage.created_at.desc(), AgentPassage.id.asc())return query+++def calculate_base_tools(is_v2: bool) -> Set[str]:+ if is_v2:+ return (set(BASE_TOOLS) - set(DEPRECATED_BASE_TOOLS)) | set(BASE_MEMORY_TOOLS_V2)+ else:+ return (set(BASE_TOOLS) - set(DEPRECATED_BASE_TOOLS)) | set(BASE_MEMORY_TOOLS)diff --git a/tests/test_managers.py b/tests/test_managers.pyindex 7c53a9df9..4ba3c0530 100644--- a/tests/test_managers.py+++ b/tests/test_managers.py@@ -86,6 +86,7 @@ from letta.schemas.user import UserUpdatefrom letta.server.db import db_registryfrom letta.server.server import SyncServerfrom letta.services.block_manager import BlockManager+from letta.services.helpers.agent_manager_helper import calculate_base_toolsfrom letta.settings import tool_settingsfrom tests.helpers.utils import comprehensive_agent_checks, validate_context_window_overviewfrom tests.utils import random_string@@ -716,6 +717,35 @@ async def test_create_get_list_agent(server: SyncServer, comprehensive_test_agenassert len(list_agents) == 0+async def test_create_agent_include_base_tools(server: SyncServer, default_user, event_loop):+ """Test agent creation with include_default_source=True"""+ # Upsert base tools+ server.tool_manager.upsert_base_tools(actor=default_user)++ memory_blocks = [CreateBlock(label="human", value="TestUser"), CreateBlock(label="persona", value="I am a test assistant")]++ create_agent_request = CreateAgent(+ name="test_default_source_agent",+ system="test system",+ memory_blocks=memory_blocks,+ llm_config=LLMConfig.default_config("gpt-4o-mini"),+ embedding_config=EmbeddingConfig.default_config(provider="openai"),+ include_base_tools=True,+ )++ # Create the agent+ created_agent = await server.agent_manager.create_agent_async(+ create_agent_request,+ actor=default_user,+ )++ # Assert the tools exist+ tool_names = [t.name for t in created_agent.tools]+ expected_tools = calculate_base_tools(is_v2=False)+ assert sorted(tool_names) == sorted(expected_tools)++@pytest.mark.asyncioasync def test_create_agent_with_default_source(server: SyncServer, default_user, print_tool, default_block, event_loop):"""Test agent creation with include_default_source=True"""