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

letta_client/tools/client.py

@@ -1,33 +1,25 @@
 # 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.tool import Tool
-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.action_model import ActionModel
+from ..types.app_model import AppModel
+from ..types.mcp_tool import McpTool
 from ..types.pip_requirement import PipRequirement
-from ..core.serialization import convert_and_respect_annotation_metadata
+from ..types.tool import Tool
 from ..types.tool_return_message import ToolReturnMessage
-from ..types.app_model import AppModel
-from ..types.action_model import ActionModel
-from .types.list_mcp_servers_response_value import ListMcpServersResponseValue
+from .raw_client import AsyncRawToolsClient, RawToolsClient
 from .types.add_mcp_server_request import AddMcpServerRequest
 from .types.add_mcp_server_response_item import AddMcpServerResponseItem
-from ..types.mcp_tool import McpTool
+from .types.connect_mcp_server_request import ConnectMcpServerRequest
 from .types.delete_mcp_server_response_item import DeleteMcpServerResponseItem
+from .types.list_mcp_servers_response_value import ListMcpServersResponseValue
+from .types.streaming_response import StreamingResponse
+from .types.test_mcp_server_request import TestMcpServerRequest
 from .types.update_mcp_server_request import UpdateMcpServerRequest
 from .types.update_mcp_server_response import UpdateMcpServerResponse
-from .types.test_mcp_server_request import TestMcpServerRequest
-from .types.connect_mcp_server_request import ConnectMcpServerRequest
-from .types.streaming_response import StreamingResponse
-import httpx_sse
-import json
-from ..core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -35,7 +27,18 @@ OMIT = typing.cast(typing.Any, ...)
 
 class ToolsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawToolsClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> RawToolsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawToolsClient
+        """
+        return self._raw_client
 
     def retrieve(self, tool_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> Tool:
         """
@@ -65,34 +68,8 @@ class ToolsClient:
             tool_id="tool_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.retrieve(tool_id, request_options=request_options)
+        return _response.data
 
     def delete(
         self, tool_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -124,34 +101,8 @@ class ToolsClient:
             tool_id="tool_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    construct_type(
-                        type_=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.delete(tool_id, request_options=request_options)
+        return _response.data
 
     def modify(
         self,
@@ -218,50 +169,19 @@ class ToolsClient:
             tool_id="tool_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="PATCH",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = self._raw_client.modify(
+            tool_id,
+            description=description,
+            tags=tags,
+            source_code=source_code,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 count(
         self,
@@ -295,37 +215,8 @@ class ToolsClient:
         )
         client.tools.count()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/count",
-            method="GET",
-            params={
-                "include_base_tools": include_base_tools,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    int,
-                    construct_type(
-                        type_=int,  # 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.count(include_base_tools=include_base_tools, request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -364,39 +255,8 @@ class ToolsClient:
         )
         client.tools.list()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="GET",
-            params={
-                "after": after,
-                "limit": limit,
-                "name": name,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Tool],
-                    construct_type(
-                        type_=typing.List[Tool],  # 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.list(after=after, limit=limit, name=name, request_options=request_options)
+        return _response.data
 
     def create(
         self,
@@ -460,47 +320,18 @@ class ToolsClient:
             source_code="source_code",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="POST",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
+        _response = self._raw_client.create(
+            source_code=source_code,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 upsert(
         self,
@@ -564,47 +395,18 @@ class ToolsClient:
             source_code="source_code",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="PUT",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
+        _response = self._raw_client.upsert(
+            source_code=source_code,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 upsert_base_tools(self, *, request_options: typing.Optional[RequestOptions] = None) -> typing.List[Tool]:
         """
@@ -630,34 +432,8 @@ class ToolsClient:
         )
         client.tools.upsert_base_tools()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/add-base-tools",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Tool],
-                    construct_type(
-                        type_=typing.List[Tool],  # 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.upsert_base_tools(request_options=request_options)
+        return _response.data
 
     def run_tool_from_source(
         self,
@@ -722,50 +498,18 @@ class ToolsClient:
             args={"key": "value"},
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/run",
-            method="POST",
-            json={
-                "source_code": source_code,
-                "args": args,
-                "env_vars": env_vars,
-                "name": name,
-                "source_type": source_type,
-                "args_json_schema": args_json_schema,
-                "json_schema": json_schema,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = self._raw_client.run_tool_from_source(
+            source_code=source_code,
+            args=args,
+            env_vars=env_vars,
+            name=name,
+            source_type=source_type,
+            args_json_schema=args_json_schema,
+            json_schema=json_schema,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ToolReturnMessage,
-                    construct_type(
-                        type_=ToolReturnMessage,  # 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 list_composio_apps(
         self, *, user_id: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -795,37 +539,8 @@ class ToolsClient:
         )
         client.tools.list_composio_apps()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/composio/apps",
-            method="GET",
-            headers={
-                "user-id": str(user_id) if user_id is not None else None,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[AppModel],
-                    construct_type(
-                        type_=typing.List[AppModel],  # 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.list_composio_apps(user_id=user_id, request_options=request_options)
+        return _response.data
 
     def list_composio_actions_by_app(
         self, composio_app_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -857,34 +572,8 @@ class ToolsClient:
             composio_app_name="composio_app_name",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/composio/apps/{jsonable_encoder(composio_app_name)}/actions",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[ActionModel],
-                    construct_type(
-                        type_=typing.List[ActionModel],  # 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.list_composio_actions_by_app(composio_app_name, request_options=request_options)
+        return _response.data
 
     def add_composio_tool(
         self, composio_action_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -916,34 +605,8 @@ class ToolsClient:
             composio_action_name="composio_action_name",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/composio/{jsonable_encoder(composio_action_name)}",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.add_composio_tool(composio_action_name, request_options=request_options)
+        return _response.data
 
     def list_mcp_servers(
         self, *, user_id: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -973,37 +636,8 @@ class ToolsClient:
         )
         client.tools.list_mcp_servers()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers",
-            method="GET",
-            headers={
-                "user-id": str(user_id) if user_id is not None else None,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, ListMcpServersResponseValue],
-                    construct_type(
-                        type_=typing.Dict[str, ListMcpServersResponseValue],  # 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.list_mcp_servers(user_id=user_id, request_options=request_options)
+        return _response.data
 
     def add_mcp_server(
         self, *, request: AddMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -1039,38 +673,8 @@ class ToolsClient:
             ),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers",
-            method="PUT",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=AddMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[AddMcpServerResponseItem],
-                    construct_type(
-                        type_=typing.List[AddMcpServerResponseItem],  # 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.add_mcp_server(request=request, request_options=request_options)
+        return _response.data
 
     def list_mcp_tools_by_server(
         self, mcp_server_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1102,34 +706,8 @@ class ToolsClient:
             mcp_server_name="mcp_server_name",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}/tools",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[McpTool],
-                    construct_type(
-                        type_=typing.List[McpTool],  # 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.list_mcp_tools_by_server(mcp_server_name, request_options=request_options)
+        return _response.data
 
     def add_mcp_tool(
         self, mcp_server_name: str, mcp_tool_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1164,34 +742,8 @@ class ToolsClient:
             mcp_tool_name="mcp_tool_name",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}/{jsonable_encoder(mcp_tool_name)}",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.add_mcp_tool(mcp_server_name, mcp_tool_name, request_options=request_options)
+        return _response.data
 
     def delete_mcp_server(
         self, mcp_server_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1223,34 +775,8 @@ class ToolsClient:
             mcp_server_name="mcp_server_name",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[DeleteMcpServerResponseItem],
-                    construct_type(
-                        type_=typing.List[DeleteMcpServerResponseItem],  # 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.delete_mcp_server(mcp_server_name, request_options=request_options)
+        return _response.data
 
     def update_mcp_server(
         self,
@@ -1289,38 +815,10 @@ class ToolsClient:
             request=UpdateStdioMcpServer(),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}",
-            method="PATCH",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=UpdateMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    UpdateMcpServerResponse,
-                    construct_type(
-                        type_=UpdateMcpServerResponse,  # 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.update_mcp_server(
+            mcp_server_name, request=request, request_options=request_options
+        )
+        return _response.data
 
     def test_mcp_server(
         self, *, request: TestMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -1357,38 +855,8 @@ class ToolsClient:
             ),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers/test",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=TestMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    construct_type(
-                        type_=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.test_mcp_server(request=request, request_options=request_options)
+        return _response.data
 
     def connect_mcp_server(
         self, *, request: ConnectMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -1427,50 +895,24 @@ class ToolsClient:
         for chunk in response:
             yield chunk
         """
-        with self._client_wrapper.httpx_client.stream(
-            "v1/tools/mcp/servers/connect",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=ConnectMcpServerRequest, direction="write"
-            ),
-            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(
-                                StreamingResponse,
-                                construct_type(
-                                    type_=StreamingResponse,  # 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)
+        with self._raw_client.connect_mcp_server(request=request, request_options=request_options) as r:
+            yield from r.data
 
 
 class AsyncToolsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawToolsClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawToolsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawToolsClient
+        """
+        return self._raw_client
 
     async def retrieve(self, tool_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> Tool:
         """
@@ -1508,34 +950,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.retrieve(tool_id, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, tool_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1575,34 +991,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    construct_type(
-                        type_=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.delete(tool_id, request_options=request_options)
+        return _response.data
 
     async def modify(
         self,
@@ -1677,50 +1067,19 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/{jsonable_encoder(tool_id)}",
-            method="PATCH",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = await self._raw_client.modify(
+            tool_id,
+            description=description,
+            tags=tags,
+            source_code=source_code,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 count(
         self,
@@ -1762,37 +1121,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/count",
-            method="GET",
-            params={
-                "include_base_tools": include_base_tools,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    int,
-                    construct_type(
-                        type_=int,  # 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.count(include_base_tools=include_base_tools, request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -1839,39 +1169,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="GET",
-            params={
-                "after": after,
-                "limit": limit,
-                "name": name,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Tool],
-                    construct_type(
-                        type_=typing.List[Tool],  # 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.list(after=after, limit=limit, name=name, request_options=request_options)
+        return _response.data
 
     async def create(
         self,
@@ -1943,47 +1242,18 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="POST",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
+        _response = await self._raw_client.create(
+            source_code=source_code,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 upsert(
         self,
@@ -2055,47 +1325,18 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/",
-            method="PUT",
-            json={
-                "description": description,
-                "tags": tags,
-                "source_code": source_code,
-                "source_type": source_type,
-                "json_schema": json_schema,
-                "args_json_schema": args_json_schema,
-                "return_char_limit": return_char_limit,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
+        _response = await self._raw_client.upsert(
+            source_code=source_code,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            args_json_schema=args_json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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 upsert_base_tools(self, *, request_options: typing.Optional[RequestOptions] = None) -> typing.List[Tool]:
         """
@@ -2129,34 +1370,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/add-base-tools",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Tool],
-                    construct_type(
-                        type_=typing.List[Tool],  # 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.upsert_base_tools(request_options=request_options)
+        return _response.data
 
     async def run_tool_from_source(
         self,
@@ -2229,50 +1444,18 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/run",
-            method="POST",
-            json={
-                "source_code": source_code,
-                "args": args,
-                "env_vars": env_vars,
-                "name": name,
-                "source_type": source_type,
-                "args_json_schema": args_json_schema,
-                "json_schema": json_schema,
-                "pip_requirements": convert_and_respect_annotation_metadata(
-                    object_=pip_requirements, annotation=typing.Sequence[PipRequirement], direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = await self._raw_client.run_tool_from_source(
+            source_code=source_code,
+            args=args,
+            env_vars=env_vars,
+            name=name,
+            source_type=source_type,
+            args_json_schema=args_json_schema,
+            json_schema=json_schema,
+            pip_requirements=pip_requirements,
             request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ToolReturnMessage,
-                    construct_type(
-                        type_=ToolReturnMessage,  # 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 list_composio_apps(
         self, *, user_id: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -2310,37 +1493,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/composio/apps",
-            method="GET",
-            headers={
-                "user-id": str(user_id) if user_id is not None else None,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[AppModel],
-                    construct_type(
-                        type_=typing.List[AppModel],  # 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.list_composio_apps(user_id=user_id, request_options=request_options)
+        return _response.data
 
     async def list_composio_actions_by_app(
         self, composio_app_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -2380,34 +1534,10 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/composio/apps/{jsonable_encoder(composio_app_name)}/actions",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.list_composio_actions_by_app(
+            composio_app_name, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[ActionModel],
-                    construct_type(
-                        type_=typing.List[ActionModel],  # 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 add_composio_tool(
         self, composio_action_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -2447,34 +1577,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/composio/{jsonable_encoder(composio_action_name)}",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.add_composio_tool(composio_action_name, request_options=request_options)
+        return _response.data
 
     async def list_mcp_servers(
         self, *, user_id: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -2512,37 +1616,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers",
-            method="GET",
-            headers={
-                "user-id": str(user_id) if user_id is not None else None,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Dict[str, ListMcpServersResponseValue],
-                    construct_type(
-                        type_=typing.Dict[str, ListMcpServersResponseValue],  # 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.list_mcp_servers(user_id=user_id, request_options=request_options)
+        return _response.data
 
     async def add_mcp_server(
         self, *, request: AddMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -2586,38 +1661,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers",
-            method="PUT",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=AddMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[AddMcpServerResponseItem],
-                    construct_type(
-                        type_=typing.List[AddMcpServerResponseItem],  # 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.add_mcp_server(request=request, request_options=request_options)
+        return _response.data
 
     async def list_mcp_tools_by_server(
         self, mcp_server_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -2657,34 +1702,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}/tools",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[McpTool],
-                    construct_type(
-                        type_=typing.List[McpTool],  # 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.list_mcp_tools_by_server(mcp_server_name, request_options=request_options)
+        return _response.data
 
     async def add_mcp_tool(
         self, mcp_server_name: str, mcp_tool_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -2727,34 +1746,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}/{jsonable_encoder(mcp_tool_name)}",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Tool,
-                    construct_type(
-                        type_=Tool,  # 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.add_mcp_tool(mcp_server_name, mcp_tool_name, request_options=request_options)
+        return _response.data
 
     async def delete_mcp_server(
         self, mcp_server_name: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -2794,34 +1787,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[DeleteMcpServerResponseItem],
-                    construct_type(
-                        type_=typing.List[DeleteMcpServerResponseItem],  # 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.delete_mcp_server(mcp_server_name, request_options=request_options)
+        return _response.data
 
     async def update_mcp_server(
         self,
@@ -2868,38 +1835,10 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/tools/mcp/servers/{jsonable_encoder(mcp_server_name)}",
-            method="PATCH",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=UpdateMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    UpdateMcpServerResponse,
-                    construct_type(
-                        type_=UpdateMcpServerResponse,  # 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.update_mcp_server(
+            mcp_server_name, request=request, request_options=request_options
+        )
+        return _response.data
 
     async def test_mcp_server(
         self, *, request: TestMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -2944,38 +1883,8 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/tools/mcp/servers/test",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=TestMcpServerRequest, direction="write"
-            ),
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    construct_type(
-                        type_=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.test_mcp_server(request=request, request_options=request_options)
+        return _response.data
 
     async def connect_mcp_server(
         self, *, request: ConnectMcpServerRequest, request_options: typing.Optional[RequestOptions] = None
@@ -3022,42 +1931,6 @@ class AsyncToolsClient:
 
         asyncio.run(main())
         """
-        async with self._client_wrapper.httpx_client.stream(
-            "v1/tools/mcp/servers/connect",
-            method="POST",
-            json=convert_and_respect_annotation_metadata(
-                object_=request, annotation=ConnectMcpServerRequest, direction="write"
-            ),
-            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(
-                                StreamingResponse,
-                                construct_type(
-                                    type_=StreamingResponse,  # 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)
+        async with self._raw_client.connect_mcp_server(request=request, request_options=request_options) as r:
+            async for _chunk in r.data:
+                yield _chunk