Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
chore: consolidate enum definitions (#2919)
cthomasd921854a3fa4
diff --git a/letta/orm/block_history.py b/letta/orm/block_history.pyindex de1b0c5dd..208281242 100644--- a/letta/orm/block_history.py+++ b/letta/orm/block_history.py@@ -4,9 +4,9 @@ from typing import Optionalfrom sqlalchemy import JSON, BigInteger, ForeignKey, Index, Integer, String, Textfrom sqlalchemy.orm import Mapped, mapped_column-from letta.orm.enums import ActorTypefrom letta.orm.mixins import OrganizationMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBase+from letta.schemas.enums import ActorTypeclass BlockHistory(OrganizationMixin, SqlalchemyBase):diff --git a/letta/orm/enums.py b/letta/orm/enums.pyindex 1bb549a1c..c885780bc 100644--- a/letta/orm/enums.py+++ b/letta/orm/enums.py@@ -1,3 +1,9 @@+"""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@@ -14,28 +20,3 @@ class ToolType(str, Enum):EXTERNAL_LANGCHAIN = "external_langchain"# TODO is "external" the right name here? Since as of now, MCP is local / doesn't support remote?EXTERNAL_MCP = "external_mcp"---class JobType(str, Enum):- JOB = "job"- RUN = "run"- BATCH = "batch"---class ToolSourceType(str, Enum):- """Defines what a tool was derived from"""-- python = "python"- json = "json"---class ActorType(str, Enum):- LETTA_USER = "letta_user"- LETTA_AGENT = "letta_agent"- LETTA_SYSTEM = "letta_system"---class MCPServerType(str, Enum):- SSE = "sse"- STDIO = "stdio"- STREAMABLE_HTTP = "streamable_http"diff --git a/letta/orm/job.py b/letta/orm/job.pyindex 6bb27a9fc..5e2e14ccf 100644--- a/letta/orm/job.py+++ b/letta/orm/job.py@@ -4,10 +4,9 @@ from typing import TYPE_CHECKING, List, Optionalfrom sqlalchemy import JSON, Index, Stringfrom sqlalchemy.orm import Mapped, mapped_column, relationship-from letta.orm.enums import JobTypefrom letta.orm.mixins import UserMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBase-from letta.schemas.enums import JobStatus+from letta.schemas.enums import JobStatus, JobTypefrom letta.schemas.job import Job as PydanticJobfrom letta.schemas.job import LettaRequestConfigdiff --git a/letta/orm/mcp_server.py b/letta/orm/mcp_server.pyindex 578c54e63..dd16485b1 100644--- a/letta/orm/mcp_server.py+++ b/letta/orm/mcp_server.py@@ -7,9 +7,9 @@ from letta.functions.mcp_client.types import StdioServerConfigfrom letta.orm.custom_columns import MCPStdioServerConfigColumn# TODO everything in functions should live in this model-from letta.orm.enums import MCPServerTypefrom letta.orm.mixins import OrganizationMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBase+from letta.schemas.enums import MCPServerTypefrom letta.schemas.mcp import MCPServerif TYPE_CHECKING:diff --git a/letta/orm/tool.py b/letta/orm/tool.pyindex 6dbce85c9..3a70ca466 100644--- a/letta/orm/tool.py+++ b/letta/orm/tool.py@@ -4,9 +4,10 @@ from 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 ToolSourceType, ToolType+from letta.orm.enums import ToolTypefrom letta.orm.mixins import OrganizationMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBase+from letta.schemas.enums import ToolSourceTypefrom letta.schemas.tool import Tool as PydanticToolif TYPE_CHECKING:diff --git a/letta/schemas/enums.py b/letta/schemas/enums.pyindex c303d4793..1794a37a3 100644--- a/letta/schemas/enums.py+++ b/letta/schemas/enums.py@@ -94,3 +94,43 @@ class FileProcessingStatus(str, Enum):EMBEDDING = "embedding"COMPLETED = "completed"ERROR = "error"+++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"+ EXTERNAL_LANGCHAIN = "external_langchain"+ # TODO is "external" the right name here? Since as of now, MCP is local / doesn't support remote?+ EXTERNAL_MCP = "external_mcp"+++class JobType(str, Enum):+ JOB = "job"+ RUN = "run"+ BATCH = "batch"+++class ToolSourceType(str, Enum):+ """Defines what a tool was derived from"""++ python = "python"+ json = "json"+++class ActorType(str, Enum):+ LETTA_USER = "letta_user"+ LETTA_AGENT = "letta_agent"+ LETTA_SYSTEM = "letta_system"+++class MCPServerType(str, Enum):+ SSE = "sse"+ STDIO = "stdio"+ STREAMABLE_HTTP = "streamable_http"diff --git a/letta/schemas/job.py b/letta/schemas/job.pyindex 4f2b09c44..fadde6840 100644--- a/letta/schemas/job.py+++ b/letta/schemas/job.py@@ -4,8 +4,7 @@ from typing import List, Optionalfrom pydantic import BaseModel, Fieldfrom letta.constants import DEFAULT_MESSAGE_TOOL, DEFAULT_MESSAGE_TOOL_KWARG-from letta.orm.enums import JobType-from letta.schemas.enums import JobStatus+from letta.schemas.enums import JobStatus, JobTypefrom letta.schemas.letta_base import OrmMetadataBasefrom letta.schemas.letta_message import MessageTypediff --git a/letta/schemas/run.py b/letta/schemas/run.pyindex acbcccb56..11e05839b 100644--- a/letta/schemas/run.py+++ b/letta/schemas/run.py@@ -2,7 +2,7 @@ from typing import Optionalfrom pydantic import Field-from letta.orm.enums import JobType+from letta.schemas.enums import JobTypefrom letta.schemas.job import Job, JobBase, LettaRequestConfigdiff --git a/letta/server/rest_api/routers/v1/runs.py b/letta/server/rest_api/routers/v1/runs.pyindex 5974bc285..ae1c0f593 100644--- a/letta/server/rest_api/routers/v1/runs.py+++ b/letta/server/rest_api/routers/v1/runs.py@@ -3,9 +3,8 @@ from typing import Annotated, List, Optionalfrom fastapi import APIRouter, Depends, Header, HTTPException, Queryfrom pydantic import Field-from letta.orm.enums import JobTypefrom letta.orm.errors import NoResultFound-from letta.schemas.enums import JobStatus, MessageRole+from letta.schemas.enums import JobStatus, JobType, MessageRolefrom letta.schemas.letta_message import LettaMessageUnionfrom letta.schemas.openai.chat_completion_response import UsageStatisticsfrom letta.schemas.run import Rundiff --git a/letta/services/block_manager.py b/letta/services/block_manager.pyindex 12156cd45..820158050 100644--- a/letta/services/block_manager.py+++ b/letta/services/block_manager.py@@ -7,12 +7,12 @@ from sqlalchemy.orm import Sessionfrom letta.log import get_loggerfrom letta.orm.block import Block as BlockModelfrom letta.orm.block_history import BlockHistory-from letta.orm.enums import ActorTypefrom letta.orm.errors import NoResultFoundfrom letta.otel.tracing import trace_methodfrom letta.schemas.agent import AgentState as PydanticAgentStatefrom letta.schemas.block import Block as PydanticBlockfrom letta.schemas.block import BlockUpdate+from letta.schemas.enums import ActorTypefrom letta.schemas.user import User as PydanticUserfrom letta.server.db import db_registryfrom letta.utils import enforce_typesdiff --git a/letta/services/job_manager.py b/letta/services/job_manager.pyindex c7201fc51..52d9498f3 100644--- a/letta/services/job_manager.py+++ b/letta/services/job_manager.py@@ -7,7 +7,6 @@ from sqlalchemy.orm import Sessionfrom letta.helpers.datetime_helpers import get_utc_timefrom letta.log import get_logger-from letta.orm.enums import JobTypefrom letta.orm.errors import NoResultFoundfrom letta.orm.job import Job as JobModelfrom letta.orm.job_messages import JobMessage@@ -16,7 +15,7 @@ from letta.orm.sqlalchemy_base import AccessTypefrom letta.orm.step import Stepfrom letta.orm.step import Step as StepModelfrom letta.otel.tracing import trace_method-from letta.schemas.enums import JobStatus, MessageRole+from letta.schemas.enums import JobStatus, JobType, MessageRolefrom letta.schemas.job import BatchJob as PydanticBatchJobfrom letta.schemas.job import Job as PydanticJobfrom letta.schemas.job import JobUpdate, LettaRequestConfigdiff --git a/tests/integration_test_sleeptime_agent.py b/tests/integration_test_sleeptime_agent.pyindex db0a50b94..4bb5c20e1 100644--- a/tests/integration_test_sleeptime_agent.py+++ b/tests/integration_test_sleeptime_agent.py@@ -7,11 +7,10 @@ from letta.config import LettaConfigfrom letta.constants import DEFAULT_HUMANfrom letta.groups.sleeptime_multi_agent_v2 import SleeptimeMultiAgentV2from letta.orm import Provider, ProviderTrace, Step-from letta.orm.enums import JobTypefrom letta.orm.errors import NoResultFoundfrom letta.schemas.agent import CreateAgentfrom letta.schemas.block import CreateBlock-from letta.schemas.enums import JobStatus, ToolRuleType+from letta.schemas.enums import JobStatus, JobType, ToolRuleTypefrom letta.schemas.group import GroupUpdate, ManagerType, SleeptimeManagerUpdatefrom letta.schemas.message import MessageCreatefrom letta.schemas.run import Rundiff --git a/tests/test_managers.py b/tests/test_managers.pyindex cb972432b..d3375f8af 100644--- a/tests/test_managers.py+++ b/tests/test_managers.py@@ -46,7 +46,7 @@ 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 ActorType, JobType, ToolType+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 +54,7 @@ from letta.schemas.agent import AgentStepState, 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 AgentStepStatus, FileProcessingStatus, JobStatus, MessageRole, ProviderType+from letta.schemas.enums import ActorType, AgentStepStatus, FileProcessingStatus, JobStatus, JobType, MessageRole, ProviderTypefrom letta.schemas.environment_variables import SandboxEnvironmentVariableCreate, SandboxEnvironmentVariableUpdatefrom letta.schemas.file import FileMetadata as PydanticFileMetadatafrom letta.schemas.identity import IdentityCreate, IdentityProperty, IdentityPropertyType, IdentityType, IdentityUpdate, IdentityUpsert