github/MemGPT
7
0
Fork 0
mirror of https://github.com/cpacker/MemGPT.git synced 2025-06-03 04:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Caren Thomas 2025-05-16 01:58:06 -07:00
parent 88932f6269
commit 414bf5829c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
letta/services/agent_manager.py
View File

@ -1191,13 +1191,8 @@ class AgentManager:
@enforce_types
async def get_in_context_messages_async(self, agent_id: str, actor: PydanticUser) -> List[PydanticMessage]:
<<<<<<< HEAD
agent = await self.get_agent_by_id_async(agent_id=agent_id, actor=actor)
return await self.message_manager.get_messages_by_ids_async(message_ids=agent.message_ids, actor=actor)
=======
message_ids = self.get_agent_by_id(agent_id=agent_id, actor=actor).message_ids
return await self.message_manager.get_messages_by_ids_async(message_ids=message_ids, actor=actor)
>>>>>>> main
@enforce_types
def get_system_message(self, agent_id: str, actor: PydanticUser) -> PydanticMessage: