letta-client 1.0.0a6__py3-none-any.whl → 1.0.0a8__py3-none-any.whl

{letta_sdk/resources/messages → letta_client/resources/batches}/batches.py

@@ -7,8 +7,17 @@ from typing_extensions import Literal
 
 import httpx
 
+from ...types import batch_list_params, batch_create_params
 from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform, async_maybe_transform
+from .messages import (
+    MessagesResource,
+    AsyncMessagesResource,
+    MessagesResourceWithRawResponse,
+    AsyncMessagesResourceWithRawResponse,
+    MessagesResourceWithStreamingResponse,
+    AsyncMessagesResourceWithStreamingResponse,
+)
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -17,16 +26,18 @@ from ..._response import (
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._base_client import make_request_options
-from ...types.messages import batch_list_params, batch_create_params, batch_list_messages_params
-from ...types.messages.batch_job import BatchJob
-from ...types.messages.batch_list_response import BatchListResponse
-from ...types.messages.batch_list_messages_response import BatchListMessagesResponse
+from ...pagination import SyncArrayPage, AsyncArrayPage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.batch_job import BatchJob
 
 __all__ = ["BatchesResource", "AsyncBatchesResource"]
 
 
 class BatchesResource(SyncAPIResource):
+    @cached_property
+    def messages(self) -> MessagesResource:
+        return MessagesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> BatchesResourceWithRawResponse:
         """
@@ -144,7 +155,7 @@ class BatchesResource(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> BatchListResponse:
+    ) -> SyncArrayPage[BatchJob]:
         """List all batch runs.
 
         Args:
@@ -171,8 +182,9 @@ class BatchesResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get(
+        return self._get_api_list(
             "/v1/messages/batches",
+            page=SyncArrayPage[BatchJob],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -189,7 +201,7 @@ class BatchesResource(SyncAPIResource):
                     batch_list_params.BatchListParams,
                 ),
             ),
-            cast_to=BatchListResponse,
+            model=BatchJob,
         )
 
     def cancel(
@@ -225,76 +237,12 @@ class BatchesResource(SyncAPIResource):
             cast_to=object,
         )
 
-    def list_messages(
-        self,
-        batch_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        agent_id: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> BatchListMessagesResponse:
-        """
-        Get response messages for a specific batch job.
-
-        Args:
-          after: Message ID cursor for pagination. Returns messages that come after this message
-              ID in the specified sort order
-
-          agent_id: Filter messages by agent ID
-
-          before: Message ID cursor for pagination. Returns messages that come before this message
-              ID in the specified sort order
-
-          limit: Maximum number of messages to return
-
-          order: Sort order for messages by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not batch_id:
-            raise ValueError(f"Expected a non-empty value for `batch_id` but received {batch_id!r}")
-        return self._get(
-            f"/v1/messages/batches/{batch_id}/messages",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "after": after,
-                        "agent_id": agent_id,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    batch_list_messages_params.BatchListMessagesParams,
-                ),
-            ),
-            cast_to=BatchListMessagesResponse,
-        )
-
 
 class AsyncBatchesResource(AsyncAPIResource):
+    @cached_property
+    def messages(self) -> AsyncMessagesResource:
+        return AsyncMessagesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncBatchesResourceWithRawResponse:
         """
@@ -398,7 +346,7 @@ class AsyncBatchesResource(AsyncAPIResource):
             cast_to=BatchJob,
         )
 
-    async def list(
+    def list(
         self,
         *,
         after: Optional[str] | Omit = omit,
@@ -412,7 +360,7 @@ class AsyncBatchesResource(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> BatchListResponse:
+    ) -> AsyncPaginator[BatchJob, AsyncArrayPage[BatchJob]]:
         """List all batch runs.
 
         Args:
@@ -439,14 +387,15 @@ class AsyncBatchesResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._get(
+        return self._get_api_list(
             "/v1/messages/batches",
+            page=AsyncArrayPage[BatchJob],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "after": after,
                         "before": before,
@@ -457,7 +406,7 @@ class AsyncBatchesResource(AsyncAPIResource):
                     batch_list_params.BatchListParams,
                 ),
             ),
-            cast_to=BatchListResponse,
+            model=BatchJob,
         )
 
     async def cancel(
@@ -493,74 +442,6 @@ class AsyncBatchesResource(AsyncAPIResource):
             cast_to=object,
         )
 
-    async def list_messages(
-        self,
-        batch_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        agent_id: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> BatchListMessagesResponse:
-        """
-        Get response messages for a specific batch job.
-
-        Args:
-          after: Message ID cursor for pagination. Returns messages that come after this message
-              ID in the specified sort order
-
-          agent_id: Filter messages by agent ID
-
-          before: Message ID cursor for pagination. Returns messages that come before this message
-              ID in the specified sort order
-
-          limit: Maximum number of messages to return
-
-          order: Sort order for messages by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not batch_id:
-            raise ValueError(f"Expected a non-empty value for `batch_id` but received {batch_id!r}")
-        return await self._get(
-            f"/v1/messages/batches/{batch_id}/messages",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "after": after,
-                        "agent_id": agent_id,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    batch_list_messages_params.BatchListMessagesParams,
-                ),
-            ),
-            cast_to=BatchListMessagesResponse,
-        )
-
 
 class BatchesResourceWithRawResponse:
     def __init__(self, batches: BatchesResource) -> None:
@@ -578,9 +459,10 @@ class BatchesResourceWithRawResponse:
         self.cancel = to_raw_response_wrapper(
             batches.cancel,
         )
-        self.list_messages = to_raw_response_wrapper(
-            batches.list_messages,
-        )
+
+    @cached_property
+    def messages(self) -> MessagesResourceWithRawResponse:
+        return MessagesResourceWithRawResponse(self._batches.messages)
 
 
 class AsyncBatchesResourceWithRawResponse:
@@ -599,9 +481,10 @@ class AsyncBatchesResourceWithRawResponse:
         self.cancel = async_to_raw_response_wrapper(
             batches.cancel,
         )
-        self.list_messages = async_to_raw_response_wrapper(
-            batches.list_messages,
-        )
+
+    @cached_property
+    def messages(self) -> AsyncMessagesResourceWithRawResponse:
+        return AsyncMessagesResourceWithRawResponse(self._batches.messages)
 
 
 class BatchesResourceWithStreamingResponse:
@@ -620,9 +503,10 @@ class BatchesResourceWithStreamingResponse:
         self.cancel = to_streamed_response_wrapper(
             batches.cancel,
         )
-        self.list_messages = to_streamed_response_wrapper(
-            batches.list_messages,
-        )
+
+    @cached_property
+    def messages(self) -> MessagesResourceWithStreamingResponse:
+        return MessagesResourceWithStreamingResponse(self._batches.messages)
 
 
 class AsyncBatchesResourceWithStreamingResponse:
@@ -641,6 +525,7 @@ class AsyncBatchesResourceWithStreamingResponse:
         self.cancel = async_to_streamed_response_wrapper(
             batches.cancel,
         )
-        self.list_messages = async_to_streamed_response_wrapper(
-            batches.list_messages,
-        )
+
+    @cached_property
+    def messages(self) -> AsyncMessagesResourceWithStreamingResponse:
+        return AsyncMessagesResourceWithStreamingResponse(self._batches.messages)

letta_client/resources/batches/messages.py

@@ -0,0 +1,238 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.batches import message_list_params
+from ...types.batches.message_list_response import MessageListResponse
+
+__all__ = ["MessagesResource", "AsyncMessagesResource"]
+
+
+class MessagesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MessagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
+        """
+        return MessagesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MessagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
+        """
+        return MessagesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        batch_id: str,
+        *,
+        after: Optional[str] | Omit = omit,
+        agent_id: Optional[str] | Omit = omit,
+        before: Optional[str] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        order: Literal["asc", "desc"] | Omit = omit,
+        order_by: Literal["created_at"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessageListResponse:
+        """
+        Get response messages for a specific batch job.
+
+        Args:
+          after: Message ID cursor for pagination. Returns messages that come after this message
+              ID in the specified sort order
+
+          agent_id: Filter messages by agent ID
+
+          before: Message ID cursor for pagination. Returns messages that come before this message
+              ID in the specified sort order
+
+          limit: Maximum number of messages to return
+
+          order: Sort order for messages by creation time. 'asc' for oldest first, 'desc' for
+              newest first
+
+          order_by: Field to sort by
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not batch_id:
+            raise ValueError(f"Expected a non-empty value for `batch_id` but received {batch_id!r}")
+        return self._get(
+            f"/v1/messages/batches/{batch_id}/messages",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "after": after,
+                        "agent_id": agent_id,
+                        "before": before,
+                        "limit": limit,
+                        "order": order,
+                        "order_by": order_by,
+                    },
+                    message_list_params.MessageListParams,
+                ),
+            ),
+            cast_to=MessageListResponse,
+        )
+
+
+class AsyncMessagesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMessagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMessagesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMessagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
+        """
+        return AsyncMessagesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        batch_id: str,
+        *,
+        after: Optional[str] | Omit = omit,
+        agent_id: Optional[str] | Omit = omit,
+        before: Optional[str] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        order: Literal["asc", "desc"] | Omit = omit,
+        order_by: Literal["created_at"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessageListResponse:
+        """
+        Get response messages for a specific batch job.
+
+        Args:
+          after: Message ID cursor for pagination. Returns messages that come after this message
+              ID in the specified sort order
+
+          agent_id: Filter messages by agent ID
+
+          before: Message ID cursor for pagination. Returns messages that come before this message
+              ID in the specified sort order
+
+          limit: Maximum number of messages to return
+
+          order: Sort order for messages by creation time. 'asc' for oldest first, 'desc' for
+              newest first
+
+          order_by: Field to sort by
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not batch_id:
+            raise ValueError(f"Expected a non-empty value for `batch_id` but received {batch_id!r}")
+        return await self._get(
+            f"/v1/messages/batches/{batch_id}/messages",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "after": after,
+                        "agent_id": agent_id,
+                        "before": before,
+                        "limit": limit,
+                        "order": order,
+                        "order_by": order_by,
+                    },
+                    message_list_params.MessageListParams,
+                ),
+            ),
+            cast_to=MessageListResponse,
+        )
+
+
+class MessagesResourceWithRawResponse:
+    def __init__(self, messages: MessagesResource) -> None:
+        self._messages = messages
+
+        self.list = to_raw_response_wrapper(
+            messages.list,
+        )
+
+
+class AsyncMessagesResourceWithRawResponse:
+    def __init__(self, messages: AsyncMessagesResource) -> None:
+        self._messages = messages
+
+        self.list = async_to_raw_response_wrapper(
+            messages.list,
+        )
+
+
+class MessagesResourceWithStreamingResponse:
+    def __init__(self, messages: MessagesResource) -> None:
+        self._messages = messages
+
+        self.list = to_streamed_response_wrapper(
+            messages.list,
+        )
+
+
+class AsyncMessagesResourceWithStreamingResponse:
+    def __init__(self, messages: AsyncMessagesResource) -> None:
+        self._messages = messages
+
+        self.list = async_to_streamed_response_wrapper(
+            messages.list,
+        )

{letta_sdk/resources/agents/core_memory → letta_client/resources/blocks}/__init__.py

@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .agents import (
+    AgentsResource,
+    AsyncAgentsResource,
+    AgentsResourceWithRawResponse,
+    AsyncAgentsResourceWithRawResponse,
+    AgentsResourceWithStreamingResponse,
+    AsyncAgentsResourceWithStreamingResponse,
+)
 from .blocks import (
     BlocksResource,
     AsyncBlocksResource,
@@ -8,26 +16,18 @@ from .blocks import (
     BlocksResourceWithStreamingResponse,
     AsyncBlocksResourceWithStreamingResponse,
 )
-from .core_memory import (
-    CoreMemoryResource,
-    AsyncCoreMemoryResource,
-    CoreMemoryResourceWithRawResponse,
-    AsyncCoreMemoryResourceWithRawResponse,
-    CoreMemoryResourceWithStreamingResponse,
-    AsyncCoreMemoryResourceWithStreamingResponse,
-)
 
 __all__ = [
+    "AgentsResource",
+    "AsyncAgentsResource",
+    "AgentsResourceWithRawResponse",
+    "AsyncAgentsResourceWithRawResponse",
+    "AgentsResourceWithStreamingResponse",
+    "AsyncAgentsResourceWithStreamingResponse",
     "BlocksResource",
     "AsyncBlocksResource",
     "BlocksResourceWithRawResponse",
     "AsyncBlocksResourceWithRawResponse",
     "BlocksResourceWithStreamingResponse",
     "AsyncBlocksResourceWithStreamingResponse",
-    "CoreMemoryResource",
-    "AsyncCoreMemoryResource",
-    "CoreMemoryResourceWithRawResponse",
-    "AsyncCoreMemoryResourceWithRawResponse",
-    "CoreMemoryResourceWithStreamingResponse",
-    "AsyncCoreMemoryResourceWithStreamingResponse",
 ]