letta-nightly 0.6.2.dev20241210030340__py3-none-any.whl → 0.6.2.dev20241210104242__py3-none-any.whl

letta/client/client.py

@@ -3128,7 +3128,7 @@ class LocalClient(AbstractClient):
         return self.server.get_agent_recall_cursor(
             user_id=self.user_id,
             agent_id=agent_id,
-            cursor=cursor,
+            before=cursor,
             limit=limit,
             reverse=True,
         )

letta/orm/sqlalchemy_base.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from enum import Enum
 from typing import TYPE_CHECKING, List, Literal, Optional, Type
 
-from sqlalchemy import String, func, select
+from sqlalchemy import String, desc, func, or_, select
 from sqlalchemy.exc import DBAPIError
 from sqlalchemy.orm import Mapped, Session, mapped_column
 
@@ -60,14 +60,25 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
         end_date: Optional[datetime] = None,
         limit: Optional[int] = 50,
         query_text: Optional[str] = None,
+        ascending: bool = True,
         **kwargs,
     ) -> List[Type["SqlalchemyBase"]]:
-        """List records with advanced filtering and pagination options."""
+        """
+        List records with cursor-based pagination, ordering by created_at.
+        Cursor is an ID, but pagination is based on the cursor object's created_at value.
+        """
         if start_date and end_date and start_date > end_date:
             raise ValueError("start_date must be earlier than or equal to end_date")
 
         logger.debug(f"Listing {cls.__name__} with kwarg filters {kwargs}")
         with db_session as session:
+            # If cursor provided, get the reference object
+            cursor_obj = None
+            if cursor:
+                cursor_obj = session.get(cls, cursor)
+                if not cursor_obj:
+                    raise NoResultFound(f"No {cls.__name__} found with id {cursor}")
+
             query = select(cls)
 
             # Apply filtering logic
@@ -80,22 +91,38 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
 
             # Date range filtering
             if start_date:
-                query = query.filter(cls.created_at >= start_date)
+                query = query.filter(cls.created_at > start_date)
             if end_date:
-                query = query.filter(cls.created_at <= end_date)
-
-            # Cursor-based pagination
-            if cursor:
-                query = query.where(cls.id > cursor)
+                query = query.filter(cls.created_at < end_date)
+
+            # Cursor-based pagination using created_at
+            # TODO: There is a really nasty race condition issue here with Sqlite
+            # TODO: If they have the same created_at timestamp, this query does NOT match for whatever reason
+            if cursor_obj:
+                if ascending:
+                    query = query.where(cls.created_at >= cursor_obj.created_at).where(
+                        or_(cls.created_at > cursor_obj.created_at, cls.id > cursor_obj.id)
+                    )
+                else:
+                    query = query.where(cls.created_at <= cursor_obj.created_at).where(
+                        or_(cls.created_at < cursor_obj.created_at, cls.id < cursor_obj.id)
+                    )
 
             # Apply text search
             if query_text:
                 query = query.filter(func.lower(cls.text).contains(func.lower(query_text)))
 
-            # Handle ordering and soft deletes
+            # Handle soft deletes
             if hasattr(cls, "is_deleted"):
                 query = query.where(cls.is_deleted == False)
-            query = query.order_by(cls.id).limit(limit)
+
+            # Apply ordering by created_at
+            if ascending:
+                query = query.order_by(cls.created_at, cls.id)
+            else:
+                query = query.order_by(desc(cls.created_at), desc(cls.id))
+
+            query = query.limit(limit)
 
             return list(session.execute(query).scalars())
 

letta/server/rest_api/routers/v1/agents.py

@@ -420,7 +420,7 @@ def get_agent_messages(
     return server.get_agent_recall_cursor(
         user_id=actor.id,
         agent_id=agent_id,
-        cursor=before,
+        before=before,
         limit=limit,
         reverse=True,
         return_message_object=msg_object,

letta/server/server.py

@@ -101,11 +101,6 @@ class Server(object):
         """List all available agents to a user"""
         raise NotImplementedError
 
-    @abstractmethod
-    def get_agent_messages(self, user_id: str, agent_id: str, start: int, count: int) -> list:
-        """Paginated query of in-context messages in agent message queue"""
-        raise NotImplementedError
-
     @abstractmethod
     def get_agent_memory(self, user_id: str, agent_id: str) -> dict:
         """Return the memory of an agent (core memory + non-core statistics)"""
@@ -1173,55 +1168,6 @@ class SyncServer(Server):
         message = agent.message_manager.get_message_by_id(id=message_id, actor=self.default_user)
         return message
 
-    def get_agent_messages(
-        self,
-        agent_id: str,
-        start: int,
-        count: int,
-    ) -> Union[List[Message], List[LettaMessage]]:
-        """Paginated query of all messages in agent message queue"""
-        # Get the agent object (loaded in memory)
-        letta_agent = self.load_agent(agent_id=agent_id)
-
-        if start < 0 or count < 0:
-            raise ValueError("Start and count values should be non-negative")
-
-        if start + count < len(letta_agent._messages):  # messages can be returned from whats in memory
-            # Reverse the list to make it in reverse chronological order
-            reversed_messages = letta_agent._messages[::-1]
-            # Check if start is within the range of the list
-            if start >= len(reversed_messages):
-                raise IndexError("Start index is out of range")
-
-            # Calculate the end index, ensuring it does not exceed the list length
-            end_index = min(start + count, len(reversed_messages))
-
-            # Slice the list for pagination
-            messages = reversed_messages[start:end_index]
-
-        else:
-            # need to access persistence manager for additional messages
-
-            # get messages using message manager
-            page = letta_agent.message_manager.list_user_messages_for_agent(
-                agent_id=agent_id,
-                actor=self.default_user,
-                cursor=start,
-                limit=count,
-            )
-
-            messages = page
-            assert all(isinstance(m, Message) for m in messages)
-
-            ## Convert to json
-            ## Add a tag indicating in-context or not
-            # json_messages = [record.to_json() for record in messages]
-            # in_context_message_ids = [str(m.id) for m in letta_agent._messages]
-            # for d in json_messages:
-            #    d["in_context"] = True if str(d["id"]) in in_context_message_ids else False
-
-        return messages
-
     def get_agent_archival(self, user_id: str, agent_id: str, start: int, count: int) -> List[Passage]:
         """Paginated query of all messages in agent archival memory"""
         if self.user_manager.get_user_by_id(user_id=user_id) is None:
@@ -1303,7 +1249,8 @@ class SyncServer(Server):
         self,
         user_id: str,
         agent_id: str,
-        cursor: Optional[str] = None,
+        after: Optional[str] = None,
+        before: Optional[str] = None,
         limit: Optional[int] = 100,
         reverse: Optional[bool] = False,
         return_message_object: bool = True,
@@ -1320,12 +1267,15 @@ class SyncServer(Server):
         letta_agent = self.load_agent(agent_id=agent_id)
 
         # iterate over records
-        # TODO: Check "order_by", "order"
+        start_date = self.message_manager.get_message_by_id(after, actor=actor).created_at if after else None
+        end_date = self.message_manager.get_message_by_id(before, actor=actor).created_at if before else None
         records = letta_agent.message_manager.list_messages_for_agent(
             agent_id=agent_id,
             actor=actor,
-            cursor=cursor,
+            start_date=start_date,
+            end_date=end_date,
             limit=limit,
+            ascending=not reverse,
         )
 
         assert all(isinstance(m, Message) for m in records)

letta/services/message_manager.py

@@ -119,6 +119,7 @@ class MessageManager:
         limit: Optional[int] = 50,
         filters: Optional[Dict] = None,
         query_text: Optional[str] = None,
+        ascending: bool = True,
     ) -> List[PydanticMessage]:
         """List user messages with flexible filtering and pagination options.
 
@@ -159,6 +160,7 @@ class MessageManager:
         limit: Optional[int] = 50,
         filters: Optional[Dict] = None,
         query_text: Optional[str] = None,
+        ascending: bool = True,
     ) -> List[PydanticMessage]:
         """List messages with flexible filtering and pagination options.
 
@@ -188,6 +190,7 @@ class MessageManager:
                 end_date=end_date,
                 limit=limit,
                 query_text=query_text,
+                ascending=ascending,
                 **message_filters,
             )
 

letta/services/tool_execution_sandbox.py

@@ -459,7 +459,7 @@ class ToolExecutionSandbox:
         Generate the code string to call the function.
 
         Args:
-            inject_agent_state (bool): Whether to inject the agent's state as an input into the tool
+            inject_agent_state (bool): Whether to inject the axgent's state as an input into the tool
 
         Returns:
             str: Generated code string for calling the tool

{letta_nightly-0.6.2.dev20241210030340.dist-info → letta_nightly-0.6.2.dev20241210104242.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.6.2.dev20241210030340
+Version: 0.6.2.dev20241210104242
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team

{letta_nightly-0.6.2.dev20241210030340.dist-info → letta_nightly-0.6.2.dev20241210104242.dist-info}/RECORD

@@ -13,7 +13,7 @@ letta/cli/cli.py,sha256=yjopYQj6DrYcRAg9FjD974zOqPUlCjzanD1EsSIRFXE,16832
 letta/cli/cli_config.py,sha256=tB0Wgz3O9j6KiCsU1HWfsKmhNM9RqLsAxzxEDFQFGnM,8565
 letta/cli/cli_load.py,sha256=xFw-CuzjChcIptaqQ1XpDROENt0JSjyPeiQ0nmEeO1k,2706
 letta/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-letta/client/client.py,sha256=hhCn2cA52O2lGjxv0zKYtABKQYBhG_F_SEasKEK5lII,127092
+letta/client/client.py,sha256=mO9m6bktXYzF_QSkWiVDnKdxiHGQhWEgBnVHt9dMSiQ,127092
 letta/client/streaming.py,sha256=Hh5pjlyrdCuO2V75ZCxSSOCPd3BmHdKFGaIUJC6fBp0,4775
 letta/client/utils.py,sha256=OJlAKWrldc4I6M1WpcTWNtPJ4wfxlzlZqWLfCozkFtI,2872
 letta/config.py,sha256=AF4XY6grcu87OLjrWXh1ufnyKWsCL0qER-_9jQCAlU0,18947
@@ -105,7 +105,7 @@ letta/orm/mixins.py,sha256=TpP5dFAcGu2VvHZQSt8ymc0UjQhcVp5-Fc2C4v_nUTM,1508
 letta/orm/organization.py,sha256=ZoHow3Tpdh9TXDvB4VZbArbUCgbErFTSQMriYAzulqA,2397
 letta/orm/sandbox_config.py,sha256=PCMHE-eJPzBT-90OYtXjEMRF4f9JB8AJIGETE7bu-f0,2870
 letta/orm/source.py,sha256=Ib0XHCMt345RjBSC30A398rZ21W5mA4PXX00XNXyd24,2021
-letta/orm/sqlalchemy_base.py,sha256=Wgmy9QAiLW1sS7jm3rtow8HWtdwkPLvRJpDEp1VN4LE,13878
+letta/orm/sqlalchemy_base.py,sha256=fGoFtBMwt6qZDsSj1jwr8gNttp2kyOHZqo1OxywJVpc,15133
 letta/orm/tool.py,sha256=seND1kw-GvdtIumGDrsUH0EtE7F59YUzK-XYenOZ4vE,3070
 letta/orm/tools_agents.py,sha256=mBMGQsTEx_ckfhZb2-2nqbxHBEMhvDXim6w6tFHHWBQ,1195
 letta/orm/user.py,sha256=bUZzyBQXfR0w7mZAkThPAQE6kKx6W--Rw6uAiPEUW3s,1133
@@ -186,7 +186,7 @@ letta/server/rest_api/routers/openai/assistants/threads.py,sha256=g8iu98__tQEMY9
 letta/server/rest_api/routers/openai/chat_completions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/server/rest_api/routers/openai/chat_completions/chat_completions.py,sha256=qFMpxfYIlJ-PW08IQt09RW44u6hwkssdsUT-h_GuOvE,4836
 letta/server/rest_api/routers/v1/__init__.py,sha256=RZc0fIHNN4BGretjU6_TGK7q49RyV4jfYNudoiK_sUo,762
-letta/server/rest_api/routers/v1/agents.py,sha256=18x44MxYBvGQHmSKF1HQ-dlETQEOyetPFC1yoxEqObw,27891
+letta/server/rest_api/routers/v1/agents.py,sha256=_1rRBIaCMQT5hpyNRWfTetBEB00JHS4vwJL9ExMz3kw,27891
 letta/server/rest_api/routers/v1/blocks.py,sha256=hLGwm56xCA09KdEi8P0V3s__pD_yyl07p17cdSfDj8g,4878
 letta/server/rest_api/routers/v1/health.py,sha256=pKCuVESlVOhGIb4VC4K-H82eZqfghmT6kvj2iOkkKuc,401
 letta/server/rest_api/routers/v1/jobs.py,sha256=gnu__rjcd9SpKdQkSD_sci-xJYH0fw828PuHMcYwsCw,2678
@@ -198,7 +198,7 @@ letta/server/rest_api/routers/v1/tools.py,sha256=ajYUo_cgUBDfm4Ja_EufxSdhBWoAb5N
 letta/server/rest_api/routers/v1/users.py,sha256=M1wEr2IyHzuRwINYxLXTkrbAH3osLe_cWjzrWrzR1aw,3729
 letta/server/rest_api/static_files.py,sha256=NG8sN4Z5EJ8JVQdj19tkFa9iQ1kBPTab9f_CUxd_u4Q,3143
 letta/server/rest_api/utils.py,sha256=6Z0T0kHIwDAgTIFh38Q1JQ_nhANgdqXcSlsuY41pL6M,3158
-letta/server/server.py,sha256=3sgoeetKRww5gPZyWiKhbMkvhyWPLAnI6A1NYBoW-YI,81922
+letta/server/server.py,sha256=db4lkuXS0JVhakRrCBumte3NZ7jKVk6z2Is_PbD7aYg,80019
 letta/server/startup.sh,sha256=722uKJWB2C4q3vjn39De2zzPacaZNw_1fN1SpLGjKIo,1569
 letta/server/static_files/assets/index-43ab4d62.css,sha256=Q6tNYu7XNRgkTZau1dVwCQTT4YpLGLF7VgTNzLcMaQI,7613
 letta/server/static_files/assets/index-4848e3d7.js,sha256=XkoX-NW0x1Hb7uTWslfpuPP73MnNDthOdJLHLID9EhM,146806
@@ -216,12 +216,12 @@ letta/services/agents_tags_manager.py,sha256=zNqeXDpaf4dQ77jrRHiQfITdk4FawBzcND-
 letta/services/block_manager.py,sha256=BmuK0k3yl9byT703syGtZNfjUdM2FkOwlE6bQYIQtjI,5448
 letta/services/blocks_agents_manager.py,sha256=mfO3EMW9os_E1_r4SRlC2wmBFFLpt8p-yhdOH_Iotaw,5627
 letta/services/job_manager.py,sha256=FrkSXloke48CZKuzlYdysxM5gKWoTu7FRigPrs_YW4A,3645
-letta/services/message_manager.py,sha256=DjxD4CtyLsJjsOQt-3znslR8htQBqOOuYNvK6RJCrsE,7581
+letta/services/message_manager.py,sha256=ucFJLbK835YSfEENoxdKB3wPZgO-NYFO9EvDV0W-sc0,7682
 letta/services/organization_manager.py,sha256=B7BgHkZcAOP1fzbg2fFF8eTfKmqOiGvoojQ8ys7JVY4,3412
 letta/services/per_agent_lock_manager.py,sha256=porM0cKKANQ1FvcGXOO_qM7ARk5Fgi1HVEAhXsAg9-4,546
 letta/services/sandbox_config_manager.py,sha256=PqlS47FAYYmiUFd9bUV4W1t4FjhMqiDoh3Blw_1tiCM,13269
 letta/services/source_manager.py,sha256=8TILbVvJx1bopgDbIJCiIguZBw7uyYDFkasZxVos_G8,6560
-letta/services/tool_execution_sandbox.py,sha256=GTWdfAKIMIuODEFbmReyEYkOnE62uzDF-3FHWee1s3A,21295
+letta/services/tool_execution_sandbox.py,sha256=NIadt_Rct5WrVfQSdWlRc095ihUGc0-QvF_dH5qZXOM,21296
 letta/services/tool_manager.py,sha256=lfrfWyxiFUWcEf-nATHs7r76XWutMYbOPyePs543ZOo,7681
 letta/services/tool_sandbox_env/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/services/tools_agents_manager.py,sha256=kF6yIsUO154_Q3l-cEeSU56QW-VUr_M6B-9csqhHBkg,4847
@@ -231,8 +231,8 @@ letta/streaming_interface.py,sha256=_FPUWy58j50evHcpXyd7zB1wWqeCc71NCFeWh_TBvnw,
 letta/streaming_utils.py,sha256=329fsvj1ZN0r0LpQtmMPZ2vSxkDBIUUwvGHZFkjm2I8,11745
 letta/system.py,sha256=buKYPqG5n2x41hVmWpu6JUpyd7vTWED9Km2_M7dLrvk,6960
 letta/utils.py,sha256=L8c6S77gyMYFgVP6ncGRaNbGjWtg6BOU_whI1vjt9Ts,32915
-letta_nightly-0.6.2.dev20241210030340.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
-letta_nightly-0.6.2.dev20241210030340.dist-info/METADATA,sha256=rDMf6d3sIU9YD69kVu5go6wdd9J2Zb77t05v3Vu7fho,11459
-letta_nightly-0.6.2.dev20241210030340.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-letta_nightly-0.6.2.dev20241210030340.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
-letta_nightly-0.6.2.dev20241210030340.dist-info/RECORD,,
+letta_nightly-0.6.2.dev20241210104242.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
+letta_nightly-0.6.2.dev20241210104242.dist-info/METADATA,sha256=_Srlq9gfn8M6NvP9C7JZ2YHGX7Ss782h0o4JeYtlm1Q,11459
+letta_nightly-0.6.2.dev20241210104242.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+letta_nightly-0.6.2.dev20241210104242.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
+letta_nightly-0.6.2.dev20241210104242.dist-info/RECORD,,