Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
chore: deprecate orm enum file (#3724)
cthomas28da31344261
diff --git a/alembic/versions/e20573fe9b86_add_tool_types.py b/alembic/versions/e20573fe9b86_add_tool_types.pyindex deff43689..3ec946853 100644--- a/alembic/versions/e20573fe9b86_add_tool_types.py+++ b/alembic/versions/e20573fe9b86_add_tool_types.py@@ -13,7 +13,7 @@ from sqlalchemy.dialects import postgresqlfrom alembic import opfrom letta.constants import BASE_MEMORY_TOOLS, BASE_TOOLS-from letta.orm.enums import ToolType+from letta.schemas.enums import ToolTypefrom letta.settings import settings# revision identifiers, used by Alembic.diff --git a/alembic/versions/f895232c144a_backfill_composio_tools.py b/alembic/versions/f895232c144a_backfill_composio_tools.pyindex defc23672..15432ffe0 100644--- a/alembic/versions/f895232c144a_backfill_composio_tools.py+++ b/alembic/versions/f895232c144a_backfill_composio_tools.py@@ -9,7 +9,7 @@ Create Date: 2025-01-16 14:21:33.764332from typing import Sequence, Unionfrom alembic import op-from letta.orm.enums import ToolType+from letta.schemas.enums import ToolTypefrom letta.settings import settings# revision identifiers, used by Alembic.diff --git a/letta/agent.py b/letta/agent.pyindex 3cfaec5a3..ead504e12 100644--- a/letta/agent.py+++ b/letta/agent.py@@ -41,12 +41,11 @@ from letta.local_llm.utils import num_tokens_from_functions, num_tokens_from_mesfrom letta.log import get_loggerfrom letta.memory import summarize_messagesfrom letta.orm import User-from letta.orm.enums import ToolTypefrom letta.otel.tracing import log_event, trace_methodfrom letta.schemas.agent import AgentState, AgentStepResponse, UpdateAgent, get_prompt_template_for_agent_typefrom letta.schemas.block import BlockUpdatefrom letta.schemas.embedding_config import EmbeddingConfig-from letta.schemas.enums import MessageRole, ProviderType+from letta.schemas.enums import MessageRole, ProviderType, ToolTypefrom letta.schemas.letta_message_content import ImageContent, TextContentfrom letta.schemas.memory import ContextWindowOverview, Memoryfrom letta.schemas.message import Message, MessageCreate, ToolReturndiff --git a/letta/agents/letta_agent.py b/letta/agents/letta_agent.pyindex b5a4eac82..4a7bef96f 100644--- a/letta/agents/letta_agent.py+++ b/letta/agents/letta_agent.py@@ -30,12 +30,11 @@ from letta.llm_api.llm_client import LLMClientfrom letta.llm_api.llm_client_base import LLMClientBasefrom letta.local_llm.constants import INNER_THOUGHTS_KWARGfrom letta.log import get_logger-from letta.orm.enums import ToolTypefrom letta.otel.context import get_ctx_attributesfrom letta.otel.metric_registry import MetricRegistryfrom letta.otel.tracing import log_event, trace_method, tracerfrom letta.schemas.agent import AgentState, UpdateAgent-from letta.schemas.enums import JobStatus, MessageRole, ProviderType+from letta.schemas.enums import JobStatus, MessageRole, ProviderType, ToolTypefrom letta.schemas.letta_message import MessageTypefrom letta.schemas.letta_message_content import OmittedReasoningContent, ReasoningContent, RedactedReasoningContent, TextContentfrom letta.schemas.letta_response import LettaResponsediff --git a/letta/agents/letta_agent_batch.py b/letta/agents/letta_agent_batch.pyindex 52ed9334f..5d1e6b172 100644--- a/letta/agents/letta_agent_batch.py+++ b/letta/agents/letta_agent_batch.py@@ -16,10 +16,9 @@ from letta.jobs.types import RequestStatusUpdateInfo, StepStatusUpdateInfofrom letta.llm_api.llm_client import LLMClientfrom letta.local_llm.constants import INNER_THOUGHTS_KWARGfrom letta.log import get_logger-from letta.orm.enums import ToolTypefrom letta.otel.tracing import log_event, trace_methodfrom letta.schemas.agent import AgentState-from letta.schemas.enums import AgentStepStatus, JobStatus, MessageStreamStatus, ProviderType, SandboxType+from letta.schemas.enums import AgentStepStatus, JobStatus, MessageStreamStatus, ProviderType, SandboxType, ToolTypefrom letta.schemas.job import JobUpdatefrom letta.schemas.letta_message import LegacyLettaMessage, LettaMessagefrom letta.schemas.letta_message_content import OmittedReasoningContent, ReasoningContent, RedactedReasoningContent, TextContentdiff --git a/letta/agents/voice_agent.py b/letta/agents/voice_agent.pyindex a75e7e8d9..69ce91502 100644--- a/letta/agents/voice_agent.py+++ b/letta/agents/voice_agent.py@@ -13,9 +13,8 @@ from letta.helpers.datetime_helpers import get_utc_timefrom letta.helpers.tool_execution_helper import add_pre_execution_message, enable_strict_mode, remove_request_heartbeatfrom letta.interfaces.openai_chat_completions_streaming_interface import OpenAIChatCompletionsStreamingInterfacefrom letta.log import get_logger-from letta.orm.enums import ToolTypefrom letta.schemas.agent import AgentState, AgentType-from letta.schemas.enums import MessageRole+from letta.schemas.enums import MessageRole, ToolTypefrom letta.schemas.letta_response import LettaResponsefrom letta.schemas.message import Message, MessageCreatefrom letta.schemas.openai.chat_completion_request import (diff --git a/letta/agents/voice_sleeptime_agent.py b/letta/agents/voice_sleeptime_agent.pyindex 359c49cd9..f2b3b4266 100644--- a/letta/agents/voice_sleeptime_agent.py+++ b/letta/agents/voice_sleeptime_agent.py@@ -3,11 +3,10 @@ from typing import AsyncGenerator, List, Optional, Tuple, Unionfrom letta.agents.helpers import _create_letta_response, serialize_message_historyfrom letta.agents.letta_agent import LettaAgentfrom letta.constants import DEFAULT_MAX_STEPS-from letta.orm.enums import ToolTypefrom letta.otel.tracing import trace_methodfrom letta.schemas.agent import AgentStatefrom letta.schemas.block import BlockUpdate-from letta.schemas.enums import MessageStreamStatus+from letta.schemas.enums import MessageStreamStatus, ToolTypefrom letta.schemas.letta_message import LegacyLettaMessage, LettaMessage, MessageTypefrom letta.schemas.letta_response import LettaResponsefrom letta.schemas.message import MessageCreatediff --git a/letta/groups/supervisor_multi_agent.py b/letta/groups/supervisor_multi_agent.pyindex ba8f6261a..35b5bf98e 100644--- a/letta/groups/supervisor_multi_agent.py+++ b/letta/groups/supervisor_multi_agent.py@@ -7,7 +7,7 @@ from letta.functions.functions import parse_source_codefrom letta.functions.schema_generator import generate_schemafrom letta.interface import AgentInterfacefrom letta.orm import User-from letta.orm.enums import ToolType+from letta.schemas.enums import ToolTypefrom letta.schemas.letta_message_content import TextContentfrom letta.schemas.message import MessageCreatefrom letta.schemas.tool import Tooldiff --git a/letta/orm/enums.py b/letta/orm/enums.pydeleted file mode 100644index 81bfb5159..000000000--- a/letta/orm/enums.py+++ /dev/null@@ -1,21 +0,0 @@-"""Compatibility module for enums that were moved to address circular imports.--This module maintains the old enum definitions for backwards compatibility,-especially for pickled objects that reference the old import paths.-"""--from enum import Enum---class ToolType(str, Enum):- CUSTOM = "custom"- LETTA_CORE = "letta_core"- LETTA_MEMORY_CORE = "letta_memory_core"- LETTA_MULTI_AGENT_CORE = "letta_multi_agent_core"- LETTA_SLEEPTIME_CORE = "letta_sleeptime_core"- LETTA_VOICE_SLEEPTIME_CORE = "letta_voice_sleeptime_core"- LETTA_BUILTIN = "letta_builtin"- LETTA_FILES_CORE = "letta_files_core"- EXTERNAL_COMPOSIO = "external_composio"- # TODO is "external" the right name here? Since as of now, MCP is local / doesn't support remote?- EXTERNAL_MCP = "external_mcp"diff --git a/letta/orm/tool.py b/letta/orm/tool.pyindex 3a70ca466..ebe4dcbc9 100644--- a/letta/orm/tool.py+++ b/letta/orm/tool.py@@ -3,11 +3,11 @@ from typing import TYPE_CHECKING, List, Optionalfrom sqlalchemy import JSON, Index, String, UniqueConstraintfrom sqlalchemy.orm import Mapped, mapped_column, relationship-# TODO everything in functions should live in this model-from letta.orm.enums import ToolTypefrom letta.orm.mixins import OrganizationMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBase-from letta.schemas.enums import ToolSourceType++# TODO everything in functions should live in this model+from letta.schemas.enums import ToolSourceType, ToolTypefrom letta.schemas.tool import Tool as PydanticToolif TYPE_CHECKING:diff --git a/letta/schemas/tool.py b/letta/schemas/tool.pyindex c2964e637..cb12a4e7b 100644--- a/letta/schemas/tool.py+++ b/letta/schemas/tool.py@@ -22,7 +22,7 @@ from letta.functions.schema_generator import (generate_tool_schema_for_mcp,)from letta.log import get_logger-from letta.orm.enums import ToolType+from letta.schemas.enums import ToolTypefrom letta.schemas.letta_base import LettaBasefrom letta.schemas.pip_requirement import PipRequirementdiff --git a/letta/services/agent_manager.py b/letta/services/agent_manager.pyindex fdb8171cc..6c0be6742 100644--- a/letta/services/agent_manager.py+++ b/letta/services/agent_manager.py@@ -35,7 +35,6 @@ from letta.orm import Source as SourceModelfrom letta.orm import SourcePassage, SourcesAgentsfrom letta.orm import Tool as ToolModelfrom letta.orm import ToolsAgents-from letta.orm.enums import ToolTypefrom letta.orm.errors import NoResultFoundfrom letta.orm.sandbox_config import AgentEnvironmentVariablefrom letta.orm.sandbox_config import AgentEnvironmentVariable as AgentEnvironmentVariableModel@@ -47,7 +46,7 @@ from letta.schemas.block import DEFAULT_BLOCKSfrom letta.schemas.block import Block as PydanticBlockfrom letta.schemas.block import BlockUpdatefrom letta.schemas.embedding_config import EmbeddingConfig-from letta.schemas.enums import ProviderType+from letta.schemas.enums import ProviderType, ToolTypefrom letta.schemas.file import FileMetadata as PydanticFileMetadatafrom letta.schemas.group import Group as PydanticGroupfrom letta.schemas.group import ManagerTypediff --git a/letta/services/tool_executor/tool_execution_manager.py b/letta/services/tool_executor/tool_execution_manager.pyindex eca264a94..b06b3569d 100644--- a/letta/services/tool_executor/tool_execution_manager.py+++ b/letta/services/tool_executor/tool_execution_manager.py@@ -4,11 +4,11 @@ from typing import Any, Dict, Optional, Typefrom letta.constants import FUNCTION_RETURN_VALUE_TRUNCATEDfrom letta.helpers.datetime_helpers import AsyncTimerfrom letta.log import get_logger-from letta.orm.enums import ToolTypefrom letta.otel.context import get_ctx_attributesfrom letta.otel.metric_registry import MetricRegistryfrom letta.otel.tracing import trace_methodfrom letta.schemas.agent import AgentState+from letta.schemas.enums import ToolTypefrom letta.schemas.sandbox_config import SandboxConfigfrom letta.schemas.tool import Toolfrom letta.schemas.tool_execution_result import ToolExecutionResultdiff --git a/letta/services/tool_manager.py b/letta/services/tool_manager.pyindex 43bf244b4..123d2a25d 100644--- a/letta/services/tool_manager.py+++ b/letta/services/tool_manager.py@@ -22,12 +22,12 @@ from letta.constants import (from letta.errors import LettaToolNameConflictErrorfrom letta.functions.functions import derive_openai_json_schema, load_function_setfrom letta.log import get_logger-from letta.orm.enums import ToolType# TODO: Remove this once we translate all of these to the ORMfrom letta.orm.errors import NoResultFoundfrom letta.orm.tool import Tool as ToolModelfrom letta.otel.tracing import trace_method+from letta.schemas.enums import ToolTypefrom letta.schemas.tool import Tool as PydanticToolfrom letta.schemas.tool import ToolCreate, ToolUpdatefrom letta.schemas.user import User as PydanticUserdiff --git a/tests/test_agent_serialization.py b/tests/test_agent_serialization.pyindex cc090752b..d0ccc36f4 100644--- a/tests/test_agent_serialization.py+++ b/tests/test_agent_serialization.py@@ -15,11 +15,10 @@ from rich.syntax import Syntaxfrom letta.config import LettaConfigfrom letta.orm import Base-from letta.orm.enums import ToolTypefrom letta.schemas.agent import AgentState, CreateAgentfrom letta.schemas.block import Block, CreateBlockfrom letta.schemas.embedding_config import EmbeddingConfig-from letta.schemas.enums import MessageRole+from letta.schemas.enums import MessageRole, ToolTypefrom letta.schemas.llm_config import LLMConfigfrom letta.schemas.message import MessageCreatefrom letta.schemas.organization import Organizationdiff --git a/tests/test_managers.py b/tests/test_managers.pyindex 3e177e27f..9417d53bc 100644--- a/tests/test_managers.py+++ b/tests/test_managers.py@@ -46,7 +46,6 @@ from letta.helpers.datetime_helpers import AsyncTimerfrom letta.jobs.types import ItemUpdateInfo, RequestStatusUpdateInfo, StepStatusUpdateInfofrom letta.orm import Base, Blockfrom letta.orm.block_history import BlockHistory-from letta.orm.enums import ToolTypefrom letta.orm.errors import NoResultFound, UniqueConstraintViolationErrorfrom letta.orm.file import FileContent as FileContentModelfrom letta.orm.file import FileMetadata as FileMetadataModel@@ -54,7 +53,17 @@ from letta.schemas.agent import CreateAgent, UpdateAgentfrom letta.schemas.block import Block as PydanticBlockfrom letta.schemas.block import BlockUpdate, CreateBlockfrom letta.schemas.embedding_config import EmbeddingConfig-from letta.schemas.enums import ActorType, AgentStepStatus, FileProcessingStatus, JobStatus, JobType, MessageRole, ProviderType, SandboxType+from letta.schemas.enums import (+ ActorType,+ AgentStepStatus,+ FileProcessingStatus,+ JobStatus,+ JobType,+ MessageRole,+ ProviderType,+ SandboxType,+ ToolType,+)from letta.schemas.environment_variables import SandboxEnvironmentVariableCreate, SandboxEnvironmentVariableUpdatefrom letta.schemas.file import FileMetadatafrom letta.schemas.file import FileMetadata as PydanticFileMetadata@@ -841,7 +850,7 @@ async def test_upsert_base_tools_excludes_local_only_in_production(server: SyncSasync def test_upsert_multi_agent_tools_only(server: SyncServer, default_user, set_letta_environment, event_loop):"""Test that upserting only multi-agent tools respects production filtering."""- from letta.orm.enums import ToolType+ from letta.schemas.enums import ToolType# Upsert only multi-agent toolstools = await server.tool_manager.upsert_base_tools_async(actor=default_user, allowed_types={ToolType.LETTA_MULTI_AGENT_CORE})diff --git a/tests/test_sources.py b/tests/test_sources.pyindex 6343957a9..7fadb91e5 100644--- a/tests/test_sources.py+++ b/tests/test_sources.py@@ -13,8 +13,7 @@ from letta_client import MessageCreate as ClientMessageCreatefrom letta_client.types import AgentStatefrom letta.constants import DEFAULT_ORG_ID, FILES_TOOLS-from letta.orm.enums import ToolType-from letta.schemas.enums import FileProcessingStatus+from letta.schemas.enums import FileProcessingStatus, ToolTypefrom letta.schemas.message import MessageCreatefrom letta.schemas.user import Userfrom letta.settings import settings