Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
chore: cleanup database detection
Andy Li905a9dd4bb39
diff --git a/alembic/env.py b/alembic/env.pyindex a566f92c0..dac40ea43 100644--- a/alembic/env.py+++ b/alembic/env.py@@ -6,7 +6,7 @@ from sqlalchemy import engine_from_config, poolfrom alembic import contextfrom letta.config import LettaConfigfrom letta.orm import Base-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsletta_config = LettaConfig.load()@@ -14,7 +14,7 @@ letta_config = LettaConfig.load()# access to the values within the .ini file in use.config = context.config-if settings.letta_pg_uri_no_default:+if settings.database_engine is DatabaseChoice.POSTGRES:config.set_main_option("sqlalchemy.url", settings.letta_pg_uri)print("Using database: ", settings.letta_pg_uri)else:diff --git a/letta/orm/message.py b/letta/orm/message.pyindex ba3acd82c..100e8bffc 100644--- a/letta/orm/message.py+++ b/letta/orm/message.py@@ -11,7 +11,7 @@ from letta.schemas.letta_message_content import MessageContentfrom letta.schemas.letta_message_content import TextContent as PydanticTextContentfrom letta.schemas.message import Message as PydanticMessagefrom letta.schemas.message import ToolReturn-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsclass Message(SqlalchemyBase, OrganizationMixin, AgentMixin):@@ -92,7 +92,7 @@ class Message(SqlalchemyBase, OrganizationMixin, AgentMixin):@event.listens_for(Session, "before_flush")def set_sequence_id_for_sqlite_bulk(session, flush_context, instances):# Handle bulk inserts for SQLite- if not settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.SQLITE:# Find all new Message objects that need sequence IDsnew_messages = [obj for obj in session.new if isinstance(obj, Message) and obj.sequence_id is None]@@ -165,8 +165,7 @@ def set_sequence_id_for_sqlite_bulk(session, flush_context, instances):@event.listens_for(Message, "before_insert")def set_sequence_id_for_sqlite(mapper, connection, target):- # TODO: Kind of hacky, used to detect if we are using sqlite or not- if not settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.SQLITE:# For SQLite, we need to generate sequence_id manually# Use a database-level atomic operation to avoid race conditionsdiff --git a/letta/orm/passage.py b/letta/orm/passage.pyindex 868f8a67d..1a6c48a28 100644--- a/letta/orm/passage.py+++ b/letta/orm/passage.py@@ -9,7 +9,7 @@ from letta.orm.custom_columns import CommonVector, EmbeddingConfigColumnfrom letta.orm.mixins import AgentMixin, FileMixin, OrganizationMixin, SourceMixinfrom letta.orm.sqlalchemy_base import SqlalchemyBasefrom letta.schemas.passage import Passage as PydanticPassage-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsconfig = LettaConfig()@@ -29,7 +29,7 @@ class BasePassage(SqlalchemyBase, OrganizationMixin):metadata_: Mapped[dict] = mapped_column(JSON, doc="Additional metadata")# Vector embedding field based on database type- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:from pgvector.sqlalchemy import Vectorembedding = mapped_column(Vector(MAX_EMBEDDING_DIM))@@ -56,7 +56,7 @@ class SourcePassage(BasePassage, FileMixin, SourceMixin):@declared_attrdef __table_args__(cls):# TODO (cliandy): investigate if this is necessary, may be for SQLite compatability or do we need to add as well?- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:return (Index("source_passages_org_idx", "organization_id"),Index("source_passages_created_at_id_idx", "created_at", "id"),@@ -81,7 +81,7 @@ class AgentPassage(BasePassage, AgentMixin):@declared_attrdef __table_args__(cls):- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:return (Index("agent_passages_org_idx", "organization_id"),Index("ix_agent_passages_org_agent", "organization_id", "agent_id"),diff --git a/letta/orm/sqlalchemy_base.py b/letta/orm/sqlalchemy_base.pyindex d1a79eb6c..3c60ab25f 100644--- a/letta/orm/sqlalchemy_base.py+++ b/letta/orm/sqlalchemy_base.py@@ -15,6 +15,7 @@ from letta.log import get_loggerfrom letta.orm.base import Base, CommonSqlalchemyMetaMixinsfrom letta.orm.errors import DatabaseTimeoutError, ForeignKeyConstraintViolationError, NoResultFound, UniqueConstraintViolationErrorfrom letta.orm.sqlite_functions import adapt_array+from letta.settings import DatabaseChoiceif TYPE_CHECKING:from pydantic import BaseModel@@ -395,7 +396,7 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):from letta.settings import settings- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL with pgvectorquery = query.order_by(cls.embedding.cosine_distance(query_embedding).asc())else:diff --git a/letta/server/db.py b/letta/server/db.pyindex 089b94a6e..30e6a7239 100644--- a/letta/server/db.py+++ b/letta/server/db.py@@ -14,7 +14,7 @@ from sqlalchemy.orm import sessionmakerfrom letta.config import LettaConfigfrom letta.log import get_loggerfrom letta.otel.tracing import trace_method-from letta.settings import settings+from letta.settings import DatabaseChoice, settingslogger = get_logger(__name__)@@ -90,7 +90,7 @@ class DatabaseRegistry:return# Postgres engine- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:self.logger.info("Creating postgres engine")self.config.recall_storage_type = "postgres"self.config.recall_storage_uri = settings.letta_pg_uri_no_default@@ -128,7 +128,7 @@ class DatabaseRegistry:if self._initialized.get("async") and not force:return- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:self.logger.info("Creating async postgres engine")# Create async engine - convert URI to async formatdiff --git a/letta/server/server.py b/letta/server/server.pyindex 1afeccaf9..3ebe2db6d 100644--- a/letta/server/server.py+++ b/letta/server/server.py@@ -104,7 +104,7 @@ from letta.services.telemetry_manager import TelemetryManagerfrom letta.services.tool_executor.tool_execution_manager import ToolExecutionManagerfrom letta.services.tool_manager import ToolManagerfrom letta.services.user_manager import UserManager-from letta.settings import model_settings, settings, tool_settings+from letta.settings import DatabaseChoice, model_settings, settings, tool_settingsfrom letta.streaming_interface import AgentChunkStreamingInterfacefrom letta.utils import get_friendly_error_msg, get_persona_text, make_key@@ -196,7 +196,7 @@ class SyncServer(Server):# Initialize the metadata storeconfig = LettaConfig.load()- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:config.recall_storage_type = "postgres"config.recall_storage_uri = settings.letta_pg_uri_no_defaultconfig.archival_storage_type = "postgres"diff --git a/letta/services/agent_manager.py b/letta/services/agent_manager.pyindex 87bc7d973..0b872a979 100644--- a/letta/services/agent_manager.py+++ b/letta/services/agent_manager.py@@ -91,7 +91,7 @@ from letta.services.message_manager import MessageManagerfrom letta.services.passage_manager import PassageManagerfrom letta.services.source_manager import SourceManagerfrom letta.services.tool_manager import ToolManager-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsfrom letta.utils import enforce_types, united_difflogger = get_logger(__name__)@@ -2732,7 +2732,7 @@ class AgentManager:)if query_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL: Use ILIKE for case-insensitive searchquery = query.filter(AgentsTags.tag.ilike(f"%{query_text}%"))else:@@ -2773,7 +2773,7 @@ class AgentManager:)if query_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL: Use ILIKE for case-insensitive searchquery = query.where(AgentsTags.tag.ilike(f"%{query_text}%"))else:diff --git a/letta/services/helpers/agent_manager_helper.py b/letta/services/helpers/agent_manager_helper.pyindex 62b85657d..3d7a1ef61 100644--- a/letta/services/helpers/agent_manager_helper.py+++ b/letta/services/helpers/agent_manager_helper.py@@ -37,7 +37,7 @@ from letta.schemas.memory import Memoryfrom letta.schemas.message import Message, MessageCreatefrom letta.schemas.tool_rule import ToolRulefrom letta.schemas.user import User-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsfrom letta.system import get_initial_boot_messages, get_login_event, package_function_response@@ -552,7 +552,7 @@ async def _apply_pagination_async(if result:after_sort_value, after_id = result# SQLite does not support as granular timestamping, so we need to round the timestamp- if not settings.letta_pg_uri_no_default and isinstance(after_sort_value, datetime):+ if settings.database_engine is DatabaseChoice.SQLITE and isinstance(after_sort_value, datetime):after_sort_value = after_sort_value.strftime("%Y-%m-%d %H:%M:%S")query = query.where(_cursor_filter(sort_column, AgentModel.id, after_sort_value, after_id, forward=ascending, nulls_last=sort_nulls_last)@@ -563,7 +563,7 @@ async def _apply_pagination_async(if result:before_sort_value, before_id = result# SQLite does not support as granular timestamping, so we need to round the timestamp- if not settings.letta_pg_uri_no_default and isinstance(before_sort_value, datetime):+ if settings.database_engine is DatabaseChoice.SQLITE and isinstance(before_sort_value, datetime):before_sort_value = before_sort_value.strftime("%Y-%m-%d %H:%M:%S")query = query.where(_cursor_filter(sort_column, AgentModel.id, before_sort_value, before_id, forward=not ascending, nulls_last=sort_nulls_last)@@ -655,7 +655,7 @@ def _apply_filters(query = query.where(AgentModel.name == name)# Apply a case-insensitive partial match for the agent's name.if query_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL: Use ILIKE for case-insensitive searchquery = query.where(AgentModel.name.ilike(f"%{query_text}%"))else:@@ -801,7 +801,7 @@ def build_passage_query(# Vector searchif embedded_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL with pgvectormain_query = main_query.order_by(combined_query.c.embedding.cosine_distance(embedded_text).asc())else:@@ -928,7 +928,7 @@ def build_source_passage_query(# Handle text search or vector searchif embedded_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL with pgvectorquery = query.order_by(SourcePassage.embedding.cosine_distance(embedded_text).asc())else:@@ -1015,7 +1015,7 @@ def build_agent_passage_query(# Handle text search or vector searchif embedded_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL with pgvectorquery = query.order_by(AgentPassage.embedding.cosine_distance(embedded_text).asc())else:diff --git a/letta/services/identity_manager.py b/letta/services/identity_manager.pyindex 8bd822978..da04e9071 100644--- a/letta/services/identity_manager.py+++ b/letta/services/identity_manager.py@@ -13,7 +13,7 @@ from letta.schemas.identity import Identity as PydanticIdentityfrom letta.schemas.identity import IdentityCreate, IdentityProperty, IdentityType, IdentityUpdate, IdentityUpsertfrom letta.schemas.user import User as PydanticUserfrom letta.server.db import db_registry-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsfrom letta.utils import enforce_types@@ -69,7 +69,7 @@ class IdentityManager:# For SQLite compatibility: check for unique constraint violation manually# since SQLite doesn't support postgresql_nulls_not_distinct=True- if not settings.letta_pg_uri_no_default: # Using SQLite+ if settings.database_engine is DatabaseChoice.SQLITE:# Check if an identity with the same identifier_key, project_id, and organization_id existsquery = select(IdentityModel).where(IdentityModel.identifier_key == new_identity.identifier_key,diff --git a/letta/services/job_manager.py b/letta/services/job_manager.pyindex 281268d2e..aa257feac 100644--- a/letta/services/job_manager.py+++ b/letta/services/job_manager.py@@ -28,7 +28,7 @@ from letta.schemas.step import Step as PydanticStepfrom letta.schemas.usage import LettaUsageStatisticsfrom letta.schemas.user import User as PydanticUserfrom letta.server.db import db_registry-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsfrom letta.utils import enforce_typeslogger = get_logger(__name__)@@ -336,7 +336,7 @@ class JobManager:before_timestamp = before_obj.created_at# SQLite does not support as granular timestamping, so we need to round the timestamp- if not settings.letta_pg_uri_no_default and isinstance(before_timestamp, datetime):+ if settings.database_engine is DatabaseChoice.SQLITE and isinstance(before_timestamp, datetime):before_timestamp = before_timestamp.strftime("%Y-%m-%d %H:%M:%S")conditions.append(@@ -350,7 +350,7 @@ class JobManager:# records after this cursor (newer)after_timestamp = after_obj.created_at# SQLite does not support as granular timestamping, so we need to round the timestamp- if not settings.letta_pg_uri_no_default and isinstance(after_timestamp, datetime):+ if settings.database_engine is DatabaseChoice.SQLITE and isinstance(after_timestamp, datetime):after_timestamp = after_timestamp.strftime("%Y-%m-%d %H:%M:%S")conditions.append(diff --git a/letta/services/message_manager.py b/letta/services/message_manager.pyindex 6770157f8..46e04d2c6 100644--- a/letta/services/message_manager.py+++ b/letta/services/message_manager.py@@ -18,7 +18,7 @@ from letta.schemas.user import User as PydanticUserfrom letta.server.db import db_registryfrom letta.services.file_manager import FileManagerfrom letta.services.helpers.agent_manager_helper import validate_agent_exists_async-from letta.settings import settings+from letta.settings import DatabaseChoice, settingsfrom letta.utils import enforce_typeslogger = get_logger(__name__)@@ -457,7 +457,7 @@ class MessageManager:# If query_text is provided, filter messages using database-specific JSON search.if query_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL: Use json_array_elements and ILIKEcontent_element = func.json_array_elements(MessageModel.content).alias("content_element")query = query.filter(@@ -565,7 +565,7 @@ class MessageManager:# If query_text is provided, filter messages using database-specific JSON search.if query_text:- if settings.letta_pg_uri_no_default:+ if settings.database_engine is DatabaseChoice.POSTGRES:# PostgreSQL: Use json_array_elements and ILIKEcontent_element = func.json_array_elements(MessageModel.content).alias("content_element")query = query.where(diff --git a/letta/settings.py b/letta/settings.pyindex b38071ca2..39fb754a2 100644--- a/letta/settings.py+++ b/letta/settings.py@@ -1,4 +1,5 @@import os+from enum import Enumfrom pathlib import Pathfrom typing import Optional@@ -182,6 +183,11 @@ if "--use-file-pg-uri" in sys.argv:pass+class DatabaseChoice(str, Enum):+ POSTGRES = "postgres"+ SQLITE = "sqlite"++class Settings(BaseSettings):model_config = SettingsConfigDict(env_prefix="letta_", extra="ignore")@@ -291,6 +297,10 @@ class Settings(BaseSettings):else:return None+ @property+ def database_engine(self) -> DatabaseChoice:+ return DatabaseChoice.POSTGRES if self.letta_pg_uri_no_default else DatabaseChoice.SQLITE+@propertydef plugin_register_dict(self) -> dict:plugins = {}