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

{letta_sdk/resources/tools → letta_client/resources}/tools.py

@@ -7,61 +7,29 @@ from typing_extensions import Literal
 
 import httpx
 
-from ...types import (
-    tool_run_params,
-    tool_list_params,
-    tool_count_params,
-    tool_create_params,
-    tool_modify_params,
-    tool_upsert_params,
-)
-from .mcp.mcp import (
-    McpResource,
-    AsyncMcpResource,
-    McpResourceWithRawResponse,
-    AsyncMcpResourceWithRawResponse,
-    McpResourceWithStreamingResponse,
-    AsyncMcpResourceWithStreamingResponse,
-)
-from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
-from ..._utils import maybe_transform, async_maybe_transform
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ..types import tool_list_params, tool_count_params, tool_create_params, tool_update_params, tool_upsert_params
+from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...types.tool import Tool
-from ..._base_client import make_request_options
-from .composio.composio import (
-    ComposioResource,
-    AsyncComposioResource,
-    ComposioResourceWithRawResponse,
-    AsyncComposioResourceWithRawResponse,
-    ComposioResourceWithStreamingResponse,
-    AsyncComposioResourceWithStreamingResponse,
-)
-from ...types.tool_list_response import ToolListResponse
-from ...types.tool_count_response import ToolCountResponse
-from ...types.tool_return_message import ToolReturnMessage
-from ...types.npm_requirement_param import NpmRequirementParam
-from ...types.pip_requirement_param import PipRequirementParam
-from ...types.tool_upsert_base_response import ToolUpsertBaseResponse
+from ..pagination import SyncArrayPage, AsyncArrayPage
+from ..types.tool import Tool
+from .._base_client import AsyncPaginator, make_request_options
+from ..types.tool_count_response import ToolCountResponse
+from ..types.npm_requirement_param import NpmRequirementParam
+from ..types.pip_requirement_param import PipRequirementParam
+from ..types.tool_upsert_base_tools_response import ToolUpsertBaseToolsResponse
 
 __all__ = ["ToolsResource", "AsyncToolsResource"]
 
 
 class ToolsResource(SyncAPIResource):
-    @cached_property
-    def composio(self) -> ComposioResource:
-        return ComposioResource(self._client)
-
-    @cached_property
-    def mcp(self) -> McpResource:
-        return McpResource(self._client)
-
     @cached_property
     def with_raw_response(self) -> ToolsResourceWithRawResponse:
         """
@@ -88,6 +56,7 @@ class ToolsResource(SyncAPIResource):
         args_json_schema: Optional[Dict[str, object]] | Omit = omit,
         default_requires_approval: Optional[bool] | Omit = omit,
         description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
         json_schema: Optional[Dict[str, object]] | Omit = omit,
         npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
         pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
@@ -113,6 +82,9 @@ class ToolsResource(SyncAPIResource):
 
           description: The description of the tool.
 
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
           json_schema: The JSON schema of the function (auto-generated from source_code if not
               provided)
 
@@ -142,6 +114,7 @@ class ToolsResource(SyncAPIResource):
                     "args_json_schema": args_json_schema,
                     "default_requires_approval": default_requires_approval,
                     "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
                     "json_schema": json_schema,
                     "npm_requirements": npm_requirements,
                     "pip_requirements": pip_requirements,
@@ -172,6 +145,8 @@ class ToolsResource(SyncAPIResource):
         Get a tool by ID
 
         Args:
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -190,6 +165,96 @@ class ToolsResource(SyncAPIResource):
             cast_to=Tool,
         )
 
+    def update(
+        self,
+        tool_id: str,
+        *,
+        args_json_schema: Optional[Dict[str, object]] | Omit = omit,
+        default_requires_approval: Optional[bool] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
+        json_schema: Optional[Dict[str, object]] | Omit = omit,
+        metadata: Optional[Dict[str, object]] | Omit = omit,
+        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
+        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
+        return_char_limit: Optional[int] | Omit = omit,
+        source_code: Optional[str] | Omit = omit,
+        source_type: Optional[str] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Tool:
+        """
+        Update an existing tool
+
+        Args:
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
+
+          args_json_schema: The args JSON schema of the function.
+
+          default_requires_approval: Whether or not to require approval before executing this tool.
+
+          description: The description of the tool.
+
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
+          json_schema: The JSON schema of the function (auto-generated from source_code if not
+              provided)
+
+          metadata: A dictionary of additional metadata for the tool.
+
+          npm_requirements: Optional list of npm packages required by this tool.
+
+          pip_requirements: Optional list of pip packages required by this tool.
+
+          return_char_limit: The maximum number of characters in the response.
+
+          source_code: The source code of the function.
+
+          source_type: The type of the source code.
+
+          tags: Metadata tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not tool_id:
+            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
+        return self._patch(
+            f"/v1/tools/{tool_id}",
+            body=maybe_transform(
+                {
+                    "args_json_schema": args_json_schema,
+                    "default_requires_approval": default_requires_approval,
+                    "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
+                    "json_schema": json_schema,
+                    "metadata": metadata,
+                    "npm_requirements": npm_requirements,
+                    "pip_requirements": pip_requirements,
+                    "return_char_limit": return_char_limit,
+                    "source_code": source_code,
+                    "source_type": source_type,
+                    "tags": tags,
+                },
+                tool_update_params.ToolUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Tool,
+        )
+
     def list(
         self,
         *,
@@ -211,7 +276,7 @@ class ToolsResource(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolListResponse:
+    ) -> SyncArrayPage[Tool]:
         """
         Get a list of all tools available to agents.
 
@@ -251,8 +316,9 @@ class ToolsResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get(
+        return self._get_api_list(
             "/v1/tools/",
+            page=SyncArrayPage[Tool],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -276,7 +342,7 @@ class ToolsResource(SyncAPIResource):
                     tool_list_params.ToolListParams,
                 ),
             ),
-            cast_to=ToolListResponse,
+            model=Tool,
         )
 
     def delete(
@@ -294,6 +360,8 @@ class ToolsResource(SyncAPIResource):
         Delete a tool by name
 
         Args:
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -380,20 +448,19 @@ class ToolsResource(SyncAPIResource):
             cast_to=int,
         )
 
-    def modify(
+    def upsert(
         self,
-        tool_id: str,
         *,
+        source_code: str,
         args_json_schema: Optional[Dict[str, object]] | Omit = omit,
         default_requires_approval: Optional[bool] | Omit = omit,
         description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
         json_schema: Optional[Dict[str, object]] | Omit = omit,
-        metadata: Optional[Dict[str, object]] | Omit = omit,
         npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
         pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
-        return_char_limit: Optional[int] | Omit = omit,
-        source_code: Optional[str] | Omit = omit,
-        source_type: Optional[str] | Omit = omit,
+        return_char_limit: int | Omit = omit,
+        source_type: str | Omit = omit,
         tags: Optional[SequenceNotStr[str]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -403,29 +470,30 @@ class ToolsResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Tool:
         """
-        Update an existing tool
+        Create or update a tool
 
         Args:
+          source_code: The source code of the function.
+
           args_json_schema: The args JSON schema of the function.
 
           default_requires_approval: Whether or not to require approval before executing this tool.
 
           description: The description of the tool.
 
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
           json_schema: The JSON schema of the function (auto-generated from source_code if not
               provided)
 
-          metadata: A dictionary of additional metadata for the tool.
-
           npm_requirements: Optional list of npm packages required by this tool.
 
           pip_requirements: Optional list of pip packages required by this tool.
 
           return_char_limit: The maximum number of characters in the response.
 
-          source_code: The source code of the function.
-
-          source_type: The type of the source code.
+          source_type: The source type of the function.
 
           tags: Metadata tags.
 
@@ -437,25 +505,23 @@ class ToolsResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not tool_id:
-            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
-        return self._patch(
-            f"/v1/tools/{tool_id}",
+        return self._put(
+            "/v1/tools/",
             body=maybe_transform(
                 {
+                    "source_code": source_code,
                     "args_json_schema": args_json_schema,
                     "default_requires_approval": default_requires_approval,
                     "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
                     "json_schema": json_schema,
-                    "metadata": metadata,
                     "npm_requirements": npm_requirements,
                     "pip_requirements": pip_requirements,
                     "return_char_limit": return_char_limit,
-                    "source_code": source_code,
                     "source_type": source_type,
                     "tags": tags,
                 },
-                tool_modify_params.ToolModifyParams,
+                tool_upsert_params.ToolUpsertParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -463,85 +529,54 @@ class ToolsResource(SyncAPIResource):
             cast_to=Tool,
         )
 
-    def run(
+    def upsert_base_tools(
         self,
         *,
-        args: Dict[str, object],
-        source_code: str,
-        args_json_schema: Optional[Dict[str, object]] | Omit = omit,
-        env_vars: Dict[str, str] | Omit = omit,
-        json_schema: Optional[Dict[str, object]] | Omit = omit,
-        name: Optional[str] | Omit = omit,
-        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
-        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
-        source_type: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolReturnMessage:
-        """
-        Attempt to build a tool from source, then run it on the provided arguments
-
-        Args:
-          args: The arguments to pass to the tool.
-
-          source_code: The source code of the function.
-
-          args_json_schema: The args JSON schema of the function.
-
-          env_vars: The environment variables to pass to the tool.
-
-          json_schema: The JSON schema of the function (auto-generated from source_code if not
-              provided)
-
-          name: The name of the tool to run.
-
-          npm_requirements: Optional list of npm packages required by this tool.
-
-          pip_requirements: Optional list of pip packages required by this tool.
+    ) -> ToolUpsertBaseToolsResponse:
+        """Upsert base tools"""
+        return self._post(
+            "/v1/tools/add-base-tools",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ToolUpsertBaseToolsResponse,
+        )
 
-          source_type: The type of the source code.
 
-          extra_headers: Send extra headers
+class AsyncToolsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncToolsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_query: Add additional query parameters to the request
+        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncToolsResourceWithRawResponse(self)
 
-          extra_body: Add additional JSON properties to the request
+    @cached_property
+    def with_streaming_response(self) -> AsyncToolsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
         """
-        return self._post(
-            "/v1/tools/run",
-            body=maybe_transform(
-                {
-                    "args": args,
-                    "source_code": source_code,
-                    "args_json_schema": args_json_schema,
-                    "env_vars": env_vars,
-                    "json_schema": json_schema,
-                    "name": name,
-                    "npm_requirements": npm_requirements,
-                    "pip_requirements": pip_requirements,
-                    "source_type": source_type,
-                },
-                tool_run_params.ToolRunParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ToolReturnMessage,
-        )
+        return AsyncToolsResourceWithStreamingResponse(self)
 
-    def upsert(
+    async def create(
         self,
         *,
         source_code: str,
         args_json_schema: Optional[Dict[str, object]] | Omit = omit,
         default_requires_approval: Optional[bool] | Omit = omit,
         description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
         json_schema: Optional[Dict[str, object]] | Omit = omit,
         npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
         pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
@@ -556,7 +591,7 @@ class ToolsResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Tool:
         """
-        Create or update a tool
+        Create a new tool
 
         Args:
           source_code: The source code of the function.
@@ -567,6 +602,9 @@ class ToolsResource(SyncAPIResource):
 
           description: The description of the tool.
 
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
           json_schema: The JSON schema of the function (auto-generated from source_code if not
               provided)
 
@@ -588,14 +626,15 @@ class ToolsResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._put(
+        return await self._post(
             "/v1/tools/",
-            body=maybe_transform(
+            body=await async_maybe_transform(
                 {
                     "source_code": source_code,
                     "args_json_schema": args_json_schema,
                     "default_requires_approval": default_requires_approval,
                     "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
                     "json_schema": json_schema,
                     "npm_requirements": npm_requirements,
                     "pip_requirements": pip_requirements,
@@ -603,7 +642,7 @@ class ToolsResource(SyncAPIResource):
                     "source_type": source_type,
                     "tags": tags,
                 },
-                tool_upsert_params.ToolUpsertParams,
+                tool_create_params.ToolCreateParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -611,8 +650,9 @@ class ToolsResource(SyncAPIResource):
             cast_to=Tool,
         )
 
-    def upsert_base(
+    async def retrieve(
         self,
+        tool_id: str,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -620,57 +660,46 @@ class ToolsResource(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolUpsertBaseResponse:
-        """Upsert base tools"""
-        return self._post(
-            "/v1/tools/add-base-tools",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ToolUpsertBaseResponse,
-        )
-
-
-class AsyncToolsResource(AsyncAPIResource):
-    @cached_property
-    def composio(self) -> AsyncComposioResource:
-        return AsyncComposioResource(self._client)
+    ) -> Tool:
+        """
+        Get a tool by ID
 
-    @cached_property
-    def mcp(self) -> AsyncMcpResource:
-        return AsyncMcpResource(self._client)
+        Args:
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
 
-    @cached_property
-    def with_raw_response(self) -> AsyncToolsResourceWithRawResponse:
-        """
-        This property can be used as a prefix for any HTTP method call to return
-        the raw response object instead of the parsed content.
+          extra_headers: Send extra headers
 
-        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
-        """
-        return AsyncToolsResourceWithRawResponse(self)
+          extra_query: Add additional query parameters to the request
 
-    @cached_property
-    def with_streaming_response(self) -> AsyncToolsResourceWithStreamingResponse:
-        """
-        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+          extra_body: Add additional JSON properties to the request
 
-        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
+          timeout: Override the client-level default timeout for this request, in seconds
         """
-        return AsyncToolsResourceWithStreamingResponse(self)
+        if not tool_id:
+            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
+        return await self._get(
+            f"/v1/tools/{tool_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Tool,
+        )
 
-    async def create(
+    async def update(
         self,
+        tool_id: str,
         *,
-        source_code: str,
         args_json_schema: Optional[Dict[str, object]] | Omit = omit,
         default_requires_approval: Optional[bool] | Omit = omit,
         description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
         json_schema: Optional[Dict[str, object]] | Omit = omit,
+        metadata: Optional[Dict[str, object]] | Omit = omit,
         npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
         pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
-        return_char_limit: int | Omit = omit,
-        source_type: str | Omit = omit,
+        return_char_limit: Optional[int] | Omit = omit,
+        source_code: Optional[str] | Omit = omit,
+        source_type: Optional[str] | Omit = omit,
         tags: Optional[SequenceNotStr[str]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -680,10 +709,10 @@ class AsyncToolsResource(AsyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Tool:
         """
-        Create a new tool
+        Update an existing tool
 
         Args:
-          source_code: The source code of the function.
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
 
           args_json_schema: The args JSON schema of the function.
 
@@ -691,16 +720,23 @@ class AsyncToolsResource(AsyncAPIResource):
 
           description: The description of the tool.
 
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
           json_schema: The JSON schema of the function (auto-generated from source_code if not
               provided)
 
+          metadata: A dictionary of additional metadata for the tool.
+
           npm_requirements: Optional list of npm packages required by this tool.
 
           pip_requirements: Optional list of pip packages required by this tool.
 
           return_char_limit: The maximum number of characters in the response.
 
-          source_type: The source type of the function.
+          source_code: The source code of the function.
+
+          source_type: The type of the source code.
 
           tags: Metadata tags.
 
@@ -712,22 +748,26 @@ class AsyncToolsResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._post(
-            "/v1/tools/",
+        if not tool_id:
+            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
+        return await self._patch(
+            f"/v1/tools/{tool_id}",
             body=await async_maybe_transform(
                 {
-                    "source_code": source_code,
                     "args_json_schema": args_json_schema,
                     "default_requires_approval": default_requires_approval,
                     "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
                     "json_schema": json_schema,
+                    "metadata": metadata,
                     "npm_requirements": npm_requirements,
                     "pip_requirements": pip_requirements,
                     "return_char_limit": return_char_limit,
+                    "source_code": source_code,
                     "source_type": source_type,
                     "tags": tags,
                 },
-                tool_create_params.ToolCreateParams,
+                tool_update_params.ToolUpdateParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -735,40 +775,7 @@ class AsyncToolsResource(AsyncAPIResource):
             cast_to=Tool,
         )
 
-    async def retrieve(
-        self,
-        tool_id: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> Tool:
-        """
-        Get a tool by ID
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not tool_id:
-            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
-        return await self._get(
-            f"/v1/tools/{tool_id}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=Tool,
-        )
-
-    async def list(
+    def list(
         self,
         *,
         after: Optional[str] | Omit = omit,
@@ -789,7 +796,7 @@ class AsyncToolsResource(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolListResponse:
+    ) -> AsyncPaginator[Tool, AsyncArrayPage[Tool]]:
         """
         Get a list of all tools available to agents.
 
@@ -829,14 +836,15 @@ class AsyncToolsResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._get(
+        return self._get_api_list(
             "/v1/tools/",
+            page=AsyncArrayPage[Tool],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "after": after,
                         "before": before,
@@ -854,7 +862,7 @@ class AsyncToolsResource(AsyncAPIResource):
                     tool_list_params.ToolListParams,
                 ),
             ),
-            cast_to=ToolListResponse,
+            model=Tool,
         )
 
     async def delete(
@@ -872,6 +880,8 @@ class AsyncToolsResource(AsyncAPIResource):
         Delete a tool by name
 
         Args:
+          tool_id: The ID of the tool in the format 'tool-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -958,161 +968,6 @@ class AsyncToolsResource(AsyncAPIResource):
             cast_to=int,
         )
 
-    async def modify(
-        self,
-        tool_id: str,
-        *,
-        args_json_schema: Optional[Dict[str, object]] | Omit = omit,
-        default_requires_approval: Optional[bool] | Omit = omit,
-        description: Optional[str] | Omit = omit,
-        json_schema: Optional[Dict[str, object]] | Omit = omit,
-        metadata: Optional[Dict[str, object]] | Omit = omit,
-        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
-        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
-        return_char_limit: Optional[int] | Omit = omit,
-        source_code: Optional[str] | Omit = omit,
-        source_type: Optional[str] | Omit = omit,
-        tags: Optional[SequenceNotStr[str]] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> Tool:
-        """
-        Update an existing tool
-
-        Args:
-          args_json_schema: The args JSON schema of the function.
-
-          default_requires_approval: Whether or not to require approval before executing this tool.
-
-          description: The description of the tool.
-
-          json_schema: The JSON schema of the function (auto-generated from source_code if not
-              provided)
-
-          metadata: A dictionary of additional metadata for the tool.
-
-          npm_requirements: Optional list of npm packages required by this tool.
-
-          pip_requirements: Optional list of pip packages required by this tool.
-
-          return_char_limit: The maximum number of characters in the response.
-
-          source_code: The source code of the function.
-
-          source_type: The type of the source code.
-
-          tags: Metadata tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not tool_id:
-            raise ValueError(f"Expected a non-empty value for `tool_id` but received {tool_id!r}")
-        return await self._patch(
-            f"/v1/tools/{tool_id}",
-            body=await async_maybe_transform(
-                {
-                    "args_json_schema": args_json_schema,
-                    "default_requires_approval": default_requires_approval,
-                    "description": description,
-                    "json_schema": json_schema,
-                    "metadata": metadata,
-                    "npm_requirements": npm_requirements,
-                    "pip_requirements": pip_requirements,
-                    "return_char_limit": return_char_limit,
-                    "source_code": source_code,
-                    "source_type": source_type,
-                    "tags": tags,
-                },
-                tool_modify_params.ToolModifyParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=Tool,
-        )
-
-    async def run(
-        self,
-        *,
-        args: Dict[str, object],
-        source_code: str,
-        args_json_schema: Optional[Dict[str, object]] | Omit = omit,
-        env_vars: Dict[str, str] | Omit = omit,
-        json_schema: Optional[Dict[str, object]] | Omit = omit,
-        name: Optional[str] | Omit = omit,
-        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
-        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
-        source_type: Optional[str] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolReturnMessage:
-        """
-        Attempt to build a tool from source, then run it on the provided arguments
-
-        Args:
-          args: The arguments to pass to the tool.
-
-          source_code: The source code of the function.
-
-          args_json_schema: The args JSON schema of the function.
-
-          env_vars: The environment variables to pass to the tool.
-
-          json_schema: The JSON schema of the function (auto-generated from source_code if not
-              provided)
-
-          name: The name of the tool to run.
-
-          npm_requirements: Optional list of npm packages required by this tool.
-
-          pip_requirements: Optional list of pip packages required by this tool.
-
-          source_type: The type of the source code.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        return await self._post(
-            "/v1/tools/run",
-            body=await async_maybe_transform(
-                {
-                    "args": args,
-                    "source_code": source_code,
-                    "args_json_schema": args_json_schema,
-                    "env_vars": env_vars,
-                    "json_schema": json_schema,
-                    "name": name,
-                    "npm_requirements": npm_requirements,
-                    "pip_requirements": pip_requirements,
-                    "source_type": source_type,
-                },
-                tool_run_params.ToolRunParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ToolReturnMessage,
-        )
-
     async def upsert(
         self,
         *,
@@ -1120,6 +975,7 @@ class AsyncToolsResource(AsyncAPIResource):
         args_json_schema: Optional[Dict[str, object]] | Omit = omit,
         default_requires_approval: Optional[bool] | Omit = omit,
         description: Optional[str] | Omit = omit,
+        enable_parallel_execution: Optional[bool] | Omit = omit,
         json_schema: Optional[Dict[str, object]] | Omit = omit,
         npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
         pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
@@ -1145,6 +1001,9 @@ class AsyncToolsResource(AsyncAPIResource):
 
           description: The description of the tool.
 
+          enable_parallel_execution: If set to True, then this tool will potentially be executed concurrently with
+              other tools. Default False.
+
           json_schema: The JSON schema of the function (auto-generated from source_code if not
               provided)
 
@@ -1174,6 +1033,7 @@ class AsyncToolsResource(AsyncAPIResource):
                     "args_json_schema": args_json_schema,
                     "default_requires_approval": default_requires_approval,
                     "description": description,
+                    "enable_parallel_execution": enable_parallel_execution,
                     "json_schema": json_schema,
                     "npm_requirements": npm_requirements,
                     "pip_requirements": pip_requirements,
@@ -1189,7 +1049,7 @@ class AsyncToolsResource(AsyncAPIResource):
             cast_to=Tool,
         )
 
-    async def upsert_base(
+    async def upsert_base_tools(
         self,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -1198,14 +1058,14 @@ class AsyncToolsResource(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> ToolUpsertBaseResponse:
+    ) -> ToolUpsertBaseToolsResponse:
         """Upsert base tools"""
         return await self._post(
             "/v1/tools/add-base-tools",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=ToolUpsertBaseResponse,
+            cast_to=ToolUpsertBaseToolsResponse,
         )
 
 
@@ -1219,6 +1079,9 @@ class ToolsResourceWithRawResponse:
         self.retrieve = to_raw_response_wrapper(
             tools.retrieve,
         )
+        self.update = to_raw_response_wrapper(
+            tools.update,
+        )
         self.list = to_raw_response_wrapper(
             tools.list,
         )
@@ -1228,27 +1091,13 @@ class ToolsResourceWithRawResponse:
         self.count = to_raw_response_wrapper(
             tools.count,
         )
-        self.modify = to_raw_response_wrapper(
-            tools.modify,
-        )
-        self.run = to_raw_response_wrapper(
-            tools.run,
-        )
         self.upsert = to_raw_response_wrapper(
             tools.upsert,
         )
-        self.upsert_base = to_raw_response_wrapper(
-            tools.upsert_base,
+        self.upsert_base_tools = to_raw_response_wrapper(
+            tools.upsert_base_tools,
         )
 
-    @cached_property
-    def composio(self) -> ComposioResourceWithRawResponse:
-        return ComposioResourceWithRawResponse(self._tools.composio)
-
-    @cached_property
-    def mcp(self) -> McpResourceWithRawResponse:
-        return McpResourceWithRawResponse(self._tools.mcp)
-
 
 class AsyncToolsResourceWithRawResponse:
     def __init__(self, tools: AsyncToolsResource) -> None:
@@ -1260,6 +1109,9 @@ class AsyncToolsResourceWithRawResponse:
         self.retrieve = async_to_raw_response_wrapper(
             tools.retrieve,
         )
+        self.update = async_to_raw_response_wrapper(
+            tools.update,
+        )
         self.list = async_to_raw_response_wrapper(
             tools.list,
         )
@@ -1269,27 +1121,13 @@ class AsyncToolsResourceWithRawResponse:
         self.count = async_to_raw_response_wrapper(
             tools.count,
         )
-        self.modify = async_to_raw_response_wrapper(
-            tools.modify,
-        )
-        self.run = async_to_raw_response_wrapper(
-            tools.run,
-        )
         self.upsert = async_to_raw_response_wrapper(
             tools.upsert,
         )
-        self.upsert_base = async_to_raw_response_wrapper(
-            tools.upsert_base,
+        self.upsert_base_tools = async_to_raw_response_wrapper(
+            tools.upsert_base_tools,
         )
 
-    @cached_property
-    def composio(self) -> AsyncComposioResourceWithRawResponse:
-        return AsyncComposioResourceWithRawResponse(self._tools.composio)
-
-    @cached_property
-    def mcp(self) -> AsyncMcpResourceWithRawResponse:
-        return AsyncMcpResourceWithRawResponse(self._tools.mcp)
-
 
 class ToolsResourceWithStreamingResponse:
     def __init__(self, tools: ToolsResource) -> None:
@@ -1301,6 +1139,9 @@ class ToolsResourceWithStreamingResponse:
         self.retrieve = to_streamed_response_wrapper(
             tools.retrieve,
         )
+        self.update = to_streamed_response_wrapper(
+            tools.update,
+        )
         self.list = to_streamed_response_wrapper(
             tools.list,
         )
@@ -1310,27 +1151,13 @@ class ToolsResourceWithStreamingResponse:
         self.count = to_streamed_response_wrapper(
             tools.count,
         )
-        self.modify = to_streamed_response_wrapper(
-            tools.modify,
-        )
-        self.run = to_streamed_response_wrapper(
-            tools.run,
-        )
         self.upsert = to_streamed_response_wrapper(
             tools.upsert,
         )
-        self.upsert_base = to_streamed_response_wrapper(
-            tools.upsert_base,
+        self.upsert_base_tools = to_streamed_response_wrapper(
+            tools.upsert_base_tools,
         )
 
-    @cached_property
-    def composio(self) -> ComposioResourceWithStreamingResponse:
-        return ComposioResourceWithStreamingResponse(self._tools.composio)
-
-    @cached_property
-    def mcp(self) -> McpResourceWithStreamingResponse:
-        return McpResourceWithStreamingResponse(self._tools.mcp)
-
 
 class AsyncToolsResourceWithStreamingResponse:
     def __init__(self, tools: AsyncToolsResource) -> None:
@@ -1342,6 +1169,9 @@ class AsyncToolsResourceWithStreamingResponse:
         self.retrieve = async_to_streamed_response_wrapper(
             tools.retrieve,
         )
+        self.update = async_to_streamed_response_wrapper(
+            tools.update,
+        )
         self.list = async_to_streamed_response_wrapper(
             tools.list,
         )
@@ -1351,23 +1181,9 @@ class AsyncToolsResourceWithStreamingResponse:
         self.count = async_to_streamed_response_wrapper(
             tools.count,
         )
-        self.modify = async_to_streamed_response_wrapper(
-            tools.modify,
-        )
-        self.run = async_to_streamed_response_wrapper(
-            tools.run,
-        )
         self.upsert = async_to_streamed_response_wrapper(
             tools.upsert,
         )
-        self.upsert_base = async_to_streamed_response_wrapper(
-            tools.upsert_base,
+        self.upsert_base_tools = async_to_streamed_response_wrapper(
+            tools.upsert_base_tools,
         )
-
-    @cached_property
-    def composio(self) -> AsyncComposioResourceWithStreamingResponse:
-        return AsyncComposioResourceWithStreamingResponse(self._tools.composio)
-
-    @cached_property
-    def mcp(self) -> AsyncMcpResourceWithStreamingResponse:
-        return AsyncMcpResourceWithStreamingResponse(self._tools.mcp)