letta-nightly 0.5.1.dev20241029104141__py3-none-any.whl → 0.5.1.dev20241030104135__py3-none-any.whl

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

@@ -359,7 +359,7 @@ def update_message(
     return server.update_agent_message(agent_id=agent_id, request=request)
 
 
-@router.post("/{agent_id}/messages", response_model=LettaResponse, operation_id="create_agent_message")
+@router.post("/{agent_id}/messages", response_model=None, operation_id="create_agent_message")
 async def send_message(
     agent_id: str,
     server: SyncServer = Depends(get_letta_server),
@@ -373,16 +373,10 @@ async def send_message(
     """
     actor = server.get_user_or_default(user_id=user_id)
 
-    # TODO(charles): support sending multiple messages
-    assert len(request.messages) == 1, f"Multiple messages not supported: {request.messages}"
-    request.messages[0]
-
     return await send_message_to_agent(
         server=server,
         agent_id=agent_id,
         user_id=actor.id,
-        # role=message.role,
-        # message=message.text,
         messages=request.messages,
         stream_steps=request.stream_steps,
         stream_tokens=request.stream_tokens,
@@ -463,8 +457,12 @@ async def send_message_to_agent(
         # Offload the synchronous message_func to a separate thread
         streaming_interface.stream_start()
         task = asyncio.create_task(
-            # asyncio.to_thread(message_func, user_id=user_id, agent_id=agent_id, message=message, timestamp=timestamp)
-            asyncio.to_thread(server.send_messages, user_id=user_id, agent_id=agent_id, messages=messages)
+            asyncio.to_thread(
+                server.send_messages,
+                user_id=user_id,
+                agent_id=agent_id,
+                messages=messages,
+            )
         )
 
         if stream_steps:
@@ -474,7 +472,11 @@ async def send_message_to_agent(
 
             # return a stream
             return StreamingResponse(
-                sse_async_generator(streaming_interface.get_generator(), finish_message=include_final_message),
+                sse_async_generator(
+                    streaming_interface.get_generator(),
+                    usage_task=task,
+                    finish_message=include_final_message,
+                ),
                 media_type="text/event-stream",
             )
 

letta/server/rest_api/utils.py

@@ -1,10 +1,13 @@
+import asyncio
 import json
 import traceback
+import warnings
 from enum import Enum
-from typing import AsyncGenerator, Union
+from typing import AsyncGenerator, Optional, Union
 
 from pydantic import BaseModel
 
+from letta.schemas.usage import LettaUsageStatistics
 from letta.server.rest_api.interface import StreamingServerInterface
 from letta.server.server import SyncServer
 
@@ -24,7 +27,11 @@ def sse_formatter(data: Union[dict, str]) -> str:
     return f"data: {data_str}\n\n"
 
 
-async def sse_async_generator(generator: AsyncGenerator, finish_message=True):
+async def sse_async_generator(
+    generator: AsyncGenerator,
+    usage_task: Optional[asyncio.Task] = None,
+    finish_message=True,
+):
     """
     Wraps a generator for use in Server-Sent Events (SSE), handling errors and ensuring a completion message.
 
@@ -45,6 +52,18 @@ async def sse_async_generator(generator: AsyncGenerator, finish_message=True):
                 chunk = str(chunk)
             yield sse_formatter(chunk)
 
+        # If we have a usage task, wait for it and send its result
+        if usage_task is not None:
+            try:
+                usage = await usage_task
+                # Double-check the type
+                if not isinstance(usage, LettaUsageStatistics):
+                    raise ValueError(f"Expected LettaUsageStatistics, got {type(usage)}")
+                yield sse_formatter({"usage": usage.model_dump()})
+            except Exception as e:
+                warnings.warn(f"Error getting usage data: {e}")
+                yield sse_formatter({"error": "Failed to get usage data"})
+
     except Exception as e:
         print("stream decoder hit error:", e)
         print(traceback.print_stack())

{letta_nightly-0.5.1.dev20241029104141.dist-info → letta_nightly-0.5.1.dev20241030104135.dist-info}/METADATA

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

{letta_nightly-0.5.1.dev20241029104141.dist-info → letta_nightly-0.5.1.dev20241030104135.dist-info}/RECORD

@@ -169,7 +169,7 @@ letta/server/rest_api/routers/openai/assistants/threads.py,sha256=WXVGBaBvSNPB7Z
 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=-uye6cm4SnoQGwxhr1N1FrSXOlnO2Hvbfj6k8JSc45k,4918
 letta/server/rest_api/routers/v1/__init__.py,sha256=sqlVZa-u9DJwdRsp0_8YUGrac9DHguIB4wETlEDRylA,666
-letta/server/rest_api/routers/v1/agents.py,sha256=EoUWyhiWYYxhtwZUg9agyDeCpixLqzsP9YXIk_zX7MM,25355
+letta/server/rest_api/routers/v1/agents.py,sha256=Ph3J90KKuUVXL1MotJFTtSg9_s9f2GkgbiAbJyj00V8,25166
 letta/server/rest_api/routers/v1/blocks.py,sha256=0WekE_yBD2U3jYgPxI0DCFjACWavCAlvm_Ybw5SZBnw,2583
 letta/server/rest_api/routers/v1/health.py,sha256=pKCuVESlVOhGIb4VC4K-H82eZqfghmT6kvj2iOkkKuc,401
 letta/server/rest_api/routers/v1/jobs.py,sha256=a-j0v-5A0un0pVCOHpfeWnzpOWkVDQO6ti42k_qAlZY,2272
@@ -179,7 +179,7 @@ letta/server/rest_api/routers/v1/sources.py,sha256=eY_pk9jRL2Y9yIZdsTjH6EuKsfH1n
 letta/server/rest_api/routers/v1/tools.py,sha256=aVZcVxL68Oq8N6p3p_MsGrNxmnK3-UWAIHdVztFw_Nk,3794
 letta/server/rest_api/routers/v1/users.py,sha256=bxQ-YdevjDqmgNDfbSPAG_4KEVvPNBHD_-Lp1MdeMec,3374
 letta/server/rest_api/static_files.py,sha256=NG8sN4Z5EJ8JVQdj19tkFa9iQ1kBPTab9f_CUxd_u4Q,3143
-letta/server/rest_api/utils.py,sha256=Fc2ZGKzLaBa2sEtSTVjJ8D5M0xIwsWC0CVAOIJaD3rY,2176
+letta/server/rest_api/utils.py,sha256=GdHYCzXtbM5VCAYDPR0z5gnNZpRhwPld2BGZV7xT6cU,2924
 letta/server/server.py,sha256=HeIucHAaf6CpV0izHTnrMfQwDX-Lbs7j9DHYogZpLAc,80255
 letta/server/startup.sh,sha256=o2dY9wc5Ew1j_10U6dK2FYevAj79udZ-T969j5rG-a0,311
 letta/server/static_files/assets/index-3ab03d5b.css,sha256=OrA9W4iKJ5h2Wlr7GwdAT4wow0CM8hVit1yOxEL49Qw,54295
@@ -202,8 +202,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=SXLEYhyp3gHyIjrxNIKNZZ5ittKo3KOj6zxgC_Trex0,31012
-letta_nightly-0.5.1.dev20241029104141.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
-letta_nightly-0.5.1.dev20241029104141.dist-info/METADATA,sha256=_xR7OpWIFvzC-jEsKBRLUsZ1cXbNOYvxH1ZlSB2U9EY,10660
-letta_nightly-0.5.1.dev20241029104141.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-letta_nightly-0.5.1.dev20241029104141.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
-letta_nightly-0.5.1.dev20241029104141.dist-info/RECORD,,
+letta_nightly-0.5.1.dev20241030104135.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
+letta_nightly-0.5.1.dev20241030104135.dist-info/METADATA,sha256=uGyx0kl-8ZxebvCtXGM5Ko0oQNo_hmgRGzuiO0DnPMc,10660
+letta_nightly-0.5.1.dev20241030104135.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+letta_nightly-0.5.1.dev20241030104135.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
+letta_nightly-0.5.1.dev20241030104135.dist-info/RECORD,,