letta-client 0.1.233__py3-none-any.whl → 0.1.235__py3-none-any.whl

letta_client/agents/messages/client.py

@@ -1,28 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
+from ...types.agent_state import AgentState
 from ...types.letta_message_union import LettaMessageUnion
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
-from ...errors.unprocessable_entity_error import UnprocessableEntityError
-from ...types.http_validation_error import HttpValidationError
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.letta_response import LettaResponse
 from ...types.message_create import MessageCreate
 from ...types.message_type import MessageType
-from ...types.letta_response import LettaResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
+from ...types.run import Run
+from .raw_client import AsyncRawMessagesClient, RawMessagesClient
+from .types.letta_streaming_response import LettaStreamingResponse
 from .types.messages_modify_request import MessagesModifyRequest
 from .types.messages_modify_response import MessagesModifyResponse
-from .types.letta_streaming_response import LettaStreamingResponse
-import httpx_sse
-import json
-from ...types.run import Run
-from ...types.agent_state import AgentState
 from .types.messages_preview_raw_payload_request import MessagesPreviewRawPayloadRequest
-from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -30,7 +22,18 @@ OMIT = typing.cast(typing.Any, ...)
 
 class MessagesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawMessagesClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> RawMessagesClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawMessagesClient
+        """
+        return self._raw_client
 
     def list(
         self,
@@ -97,44 +100,19 @@ class MessagesClient:
             agent_id="agent_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages",
-            method="GET",
-            params={
-                "after": after,
-                "before": before,
-                "limit": limit,
-                "group_id": group_id,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_err": include_err,
-            },
+        _response = self._raw_client.list(
+            agent_id,
+            after=after,
+            before=before,
+            limit=limit,
+            group_id=group_id,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_err=include_err,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[LettaMessageUnion],
-                    construct_type(
-                        type_=typing.List[LettaMessageUnion],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def create(
         self,
@@ -208,46 +186,18 @@ class MessagesClient:
             ],
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-            },
+        _response = self._raw_client.create(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    LettaResponse,
-                    construct_type(
-                        type_=LettaResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def modify(
         self,
@@ -292,38 +242,8 @@ class MessagesClient:
             ),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/{jsonable_encoder(message_id)}",
-            method="PATCH",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=MessagesModifyRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MessagesModifyResponse,
-                    construct_type(
-                        type_=MessagesModifyResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.modify(agent_id, message_id, request=request, request_options=request_options)
+        return _response.data
 
     def create_stream(
         self,
@@ -337,6 +257,7 @@ class MessagesClient:
         include_return_message_types: typing.Optional[typing.Sequence[MessageType]] = OMIT,
         enable_thinking: typing.Optional[str] = OMIT,
         stream_tokens: typing.Optional[bool] = OMIT,
+        include_pings: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.Iterator[LettaStreamingResponse]:
         """
@@ -372,6 +293,9 @@ class MessagesClient:
         stream_tokens : typing.Optional[bool]
             Flag to determine if individual tokens should be streamed. Set to True for token streaming (requires stream_steps = True).
 
+        include_pings : typing.Optional[bool]
+            Whether to include periodic keepalive ping messages in the stream to prevent connection timeouts.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -404,54 +328,20 @@ class MessagesClient:
         for chunk in response:
             yield chunk
         """
-        with self._client_wrapper.httpx_client.stream(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/stream",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-                "stream_tokens": stream_tokens,
-            },
+        with self._raw_client.create_stream(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
+            stream_tokens=stream_tokens,
+            include_pings=include_pings,
             request_options=request_options,
-            omit=OMIT,
-        ) as _response:
-            try:
-                if 200 <= _response.status_code < 300:
-                    _event_source = httpx_sse.EventSource(_response)
-                    for _sse in _event_source.iter_sse():
-                        try:
-                            yield typing.cast(
-                                LettaStreamingResponse,
-                                construct_type(
-                                    type_=LettaStreamingResponse,  # type: ignore
-                                    object_=json.loads(_sse.data),
-                                ),
-                            )
-                        except:
-                            pass
-                    return
-                _response.read()
-                if _response.status_code == 422:
-                    raise UnprocessableEntityError(
-                        typing.cast(
-                            HttpValidationError,
-                            construct_type(
-                                type_=HttpValidationError,  # type: ignore
-                                object_=_response.json(),
-                            ),
-                        )
-                    )
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        ) as r:
+            yield from r.data
 
     def cancel(
         self,
@@ -491,36 +381,8 @@ class MessagesClient:
             agent_id="agent_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/cancel",
-            method="POST",
-            json=request,
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, typing.Optional[typing.Any]],
-                    construct_type(
-                        type_=typing.Dict[str, typing.Optional[typing.Any]],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.cancel(agent_id, request=request, request_options=request_options)
+        return _response.data
 
     def create_async(
         self,
@@ -601,50 +463,19 @@ class MessagesClient:
             ],
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/async",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-                "callback_url": callback_url,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = self._raw_client.create_async(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
+            callback_url=callback_url,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Run,
-                    construct_type(
-                        type_=Run,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def reset(
         self,
@@ -683,37 +514,10 @@ class MessagesClient:
             agent_id="agent_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/reset-messages",
-            method="PATCH",
-            params={
-                "add_default_initial_messages": add_default_initial_messages,
-            },
-            request_options=request_options,
+        _response = self._raw_client.reset(
+            agent_id, add_default_initial_messages=add_default_initial_messages, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    AgentState,
-                    construct_type(
-                        type_=AgentState,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def preview_raw_payload(
         self,
@@ -767,43 +571,24 @@ class MessagesClient:
             ),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/preview-raw-payload",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=MessagesPreviewRawPayloadRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, typing.Optional[typing.Any]],
-                    construct_type(
-                        type_=typing.Dict[str, typing.Optional[typing.Any]],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.preview_raw_payload(agent_id, request=request, request_options=request_options)
+        return _response.data
 
 
 class AsyncMessagesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawMessagesClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawMessagesClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawMessagesClient
+        """
+        return self._raw_client
 
     async def list(
         self,
@@ -878,44 +663,19 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages",
-            method="GET",
-            params={
-                "after": after,
-                "before": before,
-                "limit": limit,
-                "group_id": group_id,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_err": include_err,
-            },
+        _response = await self._raw_client.list(
+            agent_id,
+            after=after,
+            before=before,
+            limit=limit,
+            group_id=group_id,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_err=include_err,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[LettaMessageUnion],
-                    construct_type(
-                        type_=typing.List[LettaMessageUnion],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def create(
         self,
@@ -997,46 +757,18 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-            },
+        _response = await self._raw_client.create(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    LettaResponse,
-                    construct_type(
-                        type_=LettaResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def modify(
         self,
@@ -1089,38 +821,10 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/{jsonable_encoder(message_id)}",
-            method="PATCH",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=MessagesModifyRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
+        _response = await self._raw_client.modify(
+            agent_id, message_id, request=request, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MessagesModifyResponse,
-                    construct_type(
-                        type_=MessagesModifyResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def create_stream(
         self,
@@ -1134,6 +838,7 @@ class AsyncMessagesClient:
         include_return_message_types: typing.Optional[typing.Sequence[MessageType]] = OMIT,
         enable_thinking: typing.Optional[str] = OMIT,
         stream_tokens: typing.Optional[bool] = OMIT,
+        include_pings: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.AsyncIterator[LettaStreamingResponse]:
         """
@@ -1169,6 +874,9 @@ class AsyncMessagesClient:
         stream_tokens : typing.Optional[bool]
             Flag to determine if individual tokens should be streamed. Set to True for token streaming (requires stream_steps = True).
 
+        include_pings : typing.Optional[bool]
+            Whether to include periodic keepalive ping messages in the stream to prevent connection timeouts.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1209,54 +917,21 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        async with self._client_wrapper.httpx_client.stream(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/stream",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-                "stream_tokens": stream_tokens,
-            },
+        async with self._raw_client.create_stream(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
+            stream_tokens=stream_tokens,
+            include_pings=include_pings,
             request_options=request_options,
-            omit=OMIT,
-        ) as _response:
-            try:
-                if 200 <= _response.status_code < 300:
-                    _event_source = httpx_sse.EventSource(_response)
-                    async for _sse in _event_source.aiter_sse():
-                        try:
-                            yield typing.cast(
-                                LettaStreamingResponse,
-                                construct_type(
-                                    type_=LettaStreamingResponse,  # type: ignore
-                                    object_=json.loads(_sse.data),
-                                ),
-                            )
-                        except:
-                            pass
-                    return
-                await _response.aread()
-                if _response.status_code == 422:
-                    raise UnprocessableEntityError(
-                        typing.cast(
-                            HttpValidationError,
-                            construct_type(
-                                type_=HttpValidationError,  # type: ignore
-                                object_=_response.json(),
-                            ),
-                        )
-                    )
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        ) as r:
+            async for _chunk in r.data:
+                yield _chunk
 
     async def cancel(
         self,
@@ -1304,36 +979,8 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/cancel",
-            method="POST",
-            json=request,
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, typing.Optional[typing.Any]],
-                    construct_type(
-                        type_=typing.Dict[str, typing.Optional[typing.Any]],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = await self._raw_client.cancel(agent_id, request=request, request_options=request_options)
+        return _response.data
 
     async def create_async(
         self,
@@ -1422,50 +1069,19 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/async",
-            method="POST",
-            json={
-                "messages": convert_and_respect_annotation_metadata(
-                    object_=messages, annotation=typing.Sequence[MessageCreate], direction="write"
-                ),
-                "max_steps": max_steps,
-                "use_assistant_message": use_assistant_message,
-                "assistant_message_tool_name": assistant_message_tool_name,
-                "assistant_message_tool_kwarg": assistant_message_tool_kwarg,
-                "include_return_message_types": include_return_message_types,
-                "enable_thinking": enable_thinking,
-                "callback_url": callback_url,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = await self._raw_client.create_async(
+            agent_id,
+            messages=messages,
+            max_steps=max_steps,
+            use_assistant_message=use_assistant_message,
+            assistant_message_tool_name=assistant_message_tool_name,
+            assistant_message_tool_kwarg=assistant_message_tool_kwarg,
+            include_return_message_types=include_return_message_types,
+            enable_thinking=enable_thinking,
+            callback_url=callback_url,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Run,
-                    construct_type(
-                        type_=Run,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def reset(
         self,
@@ -1512,37 +1128,10 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/reset-messages",
-            method="PATCH",
-            params={
-                "add_default_initial_messages": add_default_initial_messages,
-            },
-            request_options=request_options,
+        _response = await self._raw_client.reset(
+            agent_id, add_default_initial_messages=add_default_initial_messages, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    AgentState,
-                    construct_type(
-                        type_=AgentState,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def preview_raw_payload(
         self,
@@ -1604,35 +1193,7 @@ class AsyncMessagesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/agents/{jsonable_encoder(agent_id)}/messages/preview-raw-payload",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=MessagesPreviewRawPayloadRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
+        _response = await self._raw_client.preview_raw_payload(
+            agent_id, request=request, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, typing.Optional[typing.Any]],
-                    construct_type(
-                        type_=typing.Dict[str, typing.Optional[typing.Any]],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        construct_type(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data