Skip to content

armgit / letta

Public Imported from GitHub
0

Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.

feat: optimize read single id (#2517)

cthomas599e3e6081ef
diff --git a/letta/orm/sqlalchemy_base.py b/letta/orm/sqlalchemy_base.py
index 7c24e1e88..ead2a52f9 100644
--- a/letta/orm/sqlalchemy_base.py
+++ b/letta/orm/sqlalchemy_base.py
@@ -471,8 +471,10 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
"""
# this is ok because read_multiple will check if the
identifiers = [] if identifier is None else [identifier]
- found = await cls.read_multiple_async(db_session, identifiers, actor, access, access_type, **kwargs)
- if len(found) == 0:
+ query, query_conditions = cls._read_multiple_preprocess(identifiers, actor, access, access_type, **kwargs)
+ result = await db_session.execute(query)
+ item = result.scalar_one_or_none()
+ if item is None:
# for backwards compatibility.
conditions = []
if identifier:
@@ -482,7 +484,7 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
if hasattr(cls, "is_deleted"):
conditions.append("is_deleted=False")
raise NoResultFound(f"{cls.__name__} not found with {', '.join(conditions if conditions else ['no conditions'])}")
- return found[0]
+ return item
@classmethod
@handle_db_timeout
diff --git a/letta/server/rest_api/routers/v1/agents.py b/letta/server/rest_api/routers/v1/agents.py
index 11f9f69cb..c4d74ffed 100644
--- a/letta/server/rest_api/routers/v1/agents.py
+++ b/letta/server/rest_api/routers/v1/agents.py
@@ -638,7 +638,7 @@ async def send_message(
actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
user_eligible = actor.organization_id not in ["org-4a3af5dd-4c6a-48cb-ac13-3f73ecaaa4bf", "org-4ab3f6e8-9a44-4bee-aeb6-c681cbbc7bf6"]
# TODO: This is redundant, remove soon
- agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor)
+ agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor, include_relationships=["multi_agent_group"])
agent_eligible = agent.enable_sleeptime or agent.agent_type == AgentType.sleeptime_agent or not agent.multi_agent_group
experimental_header = request_obj.headers.get("X-EXPERIMENTAL") or "false"
feature_enabled = settings.use_experimental or experimental_header.lower() == "true"
@@ -714,7 +714,7 @@ async def send_message_streaming(
actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
user_eligible = actor.organization_id not in ["org-4a3af5dd-4c6a-48cb-ac13-3f73ecaaa4bf", "org-4ab3f6e8-9a44-4bee-aeb6-c681cbbc7bf6"]
# TODO: This is redundant, remove soon
- agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor)
+ agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor, include_relationships=["multi_agent_group"])
agent_eligible = agent.enable_sleeptime or agent.agent_type == AgentType.sleeptime_agent or not agent.multi_agent_group
experimental_header = request_obj.headers.get("X-EXPERIMENTAL") or "false"
feature_enabled = settings.use_experimental or experimental_header.lower() == "true"