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

letta_client/resources/tools.py

@@ -7,7 +7,7 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..types import tool_list_params, tool_count_params, tool_create_params, tool_update_params, tool_upsert_params
+from ..types import tool_list_params, tool_count_params, tool_create_params, tool_modify_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
@@ -19,12 +19,16 @@ from .._response import (
     async_to_streamed_response_wrapper,
 )
 from ..pagination import SyncArrayPage, AsyncArrayPage
-from ..types.tool import Tool
+from ..types.tool import Tool, BaseTool
 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
+import typing
+from pydantic import BaseModel
+from textwrap import dedent
+import inspect
 
 __all__ = ["ToolsResource", "AsyncToolsResource"]
 
@@ -165,96 +169,6 @@ 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,
         *,
@@ -448,6 +362,96 @@ class ToolsResource(SyncAPIResource):
             cast_to=int,
         )
 
+    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,
+        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_modify_params.ToolModifyParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Tool,
+        )
+
     def upsert(
         self,
         *,
@@ -548,6 +552,303 @@ class ToolsResource(SyncAPIResource):
             cast_to=ToolUpsertBaseToolsResponse,
         )
 
+    def create_from_function(
+        self,
+        *,
+        func: typing.Callable[..., typing.Any],
+        args_schema: typing.Optional[typing.Type[BaseModel]] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        source_type: str | Omit = omit,
+        json_schema: Optional[Dict[str, object]] | Omit = omit,
+        return_char_limit: int | Omit = omit,
+        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
+        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
+        default_requires_approval: Optional[bool] | 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:
+        """
+        Create a new tool from a callable
+
+        Args:
+          func: The callable to create the tool from.
+
+          args_schema: The arguments schema of the function, as a Pydantic model.
+
+          description: The description of the tool.
+
+          tags: Metadata tags.
+
+          source_type: The source type of the function.
+
+          json_schema: The JSON schema of the function (auto-generated from source_code if not
+              provided)
+
+          return_char_limit: The maximum number of characters in the response.
+
+          pip_requirements: Optional list of pip packages required by this tool.
+
+          npm_requirements: Optional list of npm packages required by this tool.
+
+          default_requires_approval: Whether or not to require approval before executing this tool.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+        
+        def add_two_numbers(a: int, b: int) -> int:
+            return a + b
+        
+        client.tools.create_from_function(
+            func=add_two_numbers,
+        )
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int
+
+        def manage_inventory(data: InventoryEntry, quantity_change: int) -> bool:
+            pass
+        
+        client.tools.create_from_function(
+            func=manage_inventory,
+            args_schema=InventoryEntryData,
+        )
+        """
+        source_code = dedent(inspect.getsource(func))
+        args_json_schema: Optional[Dict[str, object]] | Omit = omit
+        if not isinstance(args_schema, Omit) and args_schema is not None:
+            args_json_schema = args_schema.model_json_schema()
+
+        return self.create(
+            source_code=source_code,
+            args_json_schema=args_json_schema,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
+            npm_requirements=npm_requirements,
+            default_requires_approval=default_requires_approval,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
+    def upsert_from_function(
+        self,
+        *,
+        func: typing.Callable[..., typing.Any],
+        args_schema: typing.Optional[typing.Type[BaseModel]] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        source_type: str | Omit = omit,
+        json_schema: Optional[Dict[str, object]] | Omit = omit,
+        return_char_limit: int | Omit = omit,
+        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
+        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
+        default_requires_approval: Optional[bool] | 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:
+        """
+        Create or update a tool from a callable
+
+        Args:
+          func: The callable to create or update the tool from.
+
+          args_schema: The arguments schema of the function, as a Pydantic model.
+
+          description: The description of the tool.
+
+          tags: Metadata tags.
+
+          source_type: The source type of the function.
+
+          json_schema: The JSON schema of the function (auto-generated from source_code if not
+              provided)
+
+          return_char_limit: The maximum number of characters in the response.
+
+          pip_requirements: Optional list of pip packages required by this tool.
+
+          npm_requirements: Optional list of npm packages required by this tool.
+
+          default_requires_approval: Whether or not to require approval before executing this tool.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+
+        def add_two_numbers(a: int, b: int) -> int:
+            return a + b
+        
+        client.tools.upsert_from_function(
+            func=add_two_numbers,
+        )
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int
+
+        def manage_inventory(data: InventoryEntry, quantity_change: int) -> bool:
+            pass
+        
+        client.tools.upsert_from_function(
+            func=manage_inventory,
+            args_schema=InventoryEntryData,
+        )
+        """
+        source_code = dedent(inspect.getsource(func))
+        args_json_schema: Optional[Dict[str, object]] | Omit = omit
+        if not isinstance(args_schema, Omit) and args_schema is not None:
+            args_json_schema = args_schema.model_json_schema()
+
+        return self.upsert(
+            source_code=source_code,
+            args_json_schema=args_json_schema,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
+            npm_requirements=npm_requirements,
+            default_requires_approval=default_requires_approval,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
+    def add(
+        self,
+        *,
+        tool: BaseTool,
+        # 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:
+        """
+        Add a tool to Letta from a custom Tool class
+
+        Args:
+          tool: The tool object to be added.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+
+        class InventoryItem(BaseModel):
+            sku: str  # Unique product identifier
+            name: str  # Product name
+            price: float  # Current price
+            category: str  # Product category (e.g., "Electronics", "Clothing")
+
+        class InventoryEntry(BaseModel):
+            timestamp: int  # Unix timestamp of the transaction
+            item: InventoryItem  # The product being updated
+            transaction_id: str  # Unique identifier for this inventory update
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int  # Change in quantity (positive for additions, negative for removals)
+
+        class ManageInventoryTool(BaseTool):
+            name: str = "manage_inventory"
+            args_schema: Type[BaseModel] = InventoryEntryData
+            description: str = "Update inventory catalogue with a new data entry"
+            tags: List[str] = ["inventory", "shop"]
+
+            def run(self, data: InventoryEntry, quantity_change: int) -> bool:
+                '''
+                Implementation of the manage_inventory tool
+                '''
+                print(f"Updated inventory for {data.item.name} with a quantity change of {quantity_change}")
+                return True
+                
+        client.tools.add(
+            tool=ManageInventoryTool()
+        )
+        """
+        source_code = tool.get_source_code()
+        args_json_schema = tool.args_schema.model_json_schema() if tool.args_schema else None
+
+        # Convert PipRequirement/NpmRequirement models to Param dicts
+        pip_requirements_param = (
+            [typing.cast(PipRequirementParam, req.model_dump()) for req in tool.pip_requirements]
+            if tool.pip_requirements
+            else omit
+        )
+        npm_requirements_param = (
+            [typing.cast(NpmRequirementParam, req.model_dump()) for req in tool.npm_requirements]
+            if tool.npm_requirements
+            else omit
+        )
+
+        return self.upsert(
+            source_code=source_code,
+            args_json_schema=args_json_schema or omit,
+            description=tool.description or omit,
+            tags=tool.tags or omit,
+            source_type=tool.source_type or omit,
+            json_schema=tool.json_schema or omit,
+            return_char_limit=tool.return_char_limit or omit,
+            pip_requirements=pip_requirements_param,
+            npm_requirements=npm_requirements_param,
+            default_requires_approval=tool.default_requires_approval or omit,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
 
 class AsyncToolsResource(AsyncAPIResource):
     @cached_property
@@ -685,96 +986,6 @@ class AsyncToolsResource(AsyncAPIResource):
             cast_to=Tool,
         )
 
-    async 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 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,
-                    "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,
         *,
@@ -968,6 +1179,96 @@ 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,
+        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 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,
+                    "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,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Tool,
+        )
+
     async def upsert(
         self,
         *,
@@ -1068,6 +1369,305 @@ class AsyncToolsResource(AsyncAPIResource):
             cast_to=ToolUpsertBaseToolsResponse,
         )
 
+    async def create_from_function(
+        self,
+        *,
+        func: typing.Callable[..., typing.Any],
+        args_schema: typing.Optional[typing.Type[BaseModel]] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        source_type: str | Omit = omit,
+        json_schema: Optional[Dict[str, object]] | Omit = omit,
+        return_char_limit: int | Omit = omit,
+        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
+        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
+        default_requires_approval: Optional[bool] | 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:
+        """
+        Create a new tool from a callable
+
+        Args:
+          func: The callable to create the tool from.
+
+          args_schema: The arguments schema of the function, as a Pydantic model.
+
+          description: The description of the tool.
+
+          tags: Metadata tags.
+
+          source_type: The source type of the function.
+
+          json_schema: The JSON schema of the function (auto-generated from source_code if not
+              provided)
+
+          return_char_limit: The maximum number of characters in the response.
+
+          pip_requirements: Optional list of pip packages required by this tool.
+
+          npm_requirements: Optional list of npm packages required by this tool.
+
+          default_requires_approval: Whether or not to require approval before executing this tool.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+        
+        def add_two_numbers(a: int, b: int) -> int:
+            return a + b
+        
+        await client.tools.create_from_function(
+            func=add_two_numbers,
+        )
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int
+
+        def manage_inventory(data: InventoryEntry, quantity_change: int) -> bool:
+            pass
+        
+        await client.tools.create_from_function(
+            func=manage_inventory,
+            args_schema=InventoryEntryData,
+        )
+        """
+        source_code = dedent(inspect.getsource(func))
+        args_json_schema: Optional[Dict[str, object]] | Omit = omit
+        if not isinstance(args_schema, Omit) and args_schema is not None:
+            args_json_schema = args_schema.model_json_schema()
+
+        return await self.create(
+            source_code=source_code,
+            args_json_schema=args_json_schema,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
+            npm_requirements=npm_requirements,
+            default_requires_approval=default_requires_approval,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
+
+    async def upsert_from_function(
+        self,
+        *,
+        func: typing.Callable[..., typing.Any],
+        args_schema: typing.Optional[typing.Type[BaseModel]] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        source_type: str | Omit = omit,
+        json_schema: Optional[Dict[str, object]] | Omit = omit,
+        return_char_limit: int | Omit = omit,
+        pip_requirements: Optional[Iterable[PipRequirementParam]] | Omit = omit,
+        npm_requirements: Optional[Iterable[NpmRequirementParam]] | Omit = omit,
+        default_requires_approval: Optional[bool] | 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:
+        """
+        Create or update a tool from a callable
+
+        Args:
+          func: The callable to create or update the tool from.
+
+          args_schema: The arguments schema of the function, as a Pydantic model.
+
+          description: The description of the tool.
+
+          tags: Metadata tags.
+
+          source_type: The source type of the function.
+
+          json_schema: The JSON schema of the function (auto-generated from source_code if not
+              provided)
+
+          return_char_limit: The maximum number of characters in the response.
+
+          pip_requirements: Optional list of pip packages required by this tool.
+
+          npm_requirements: Optional list of npm packages required by this tool.
+
+          default_requires_approval: Whether or not to require approval before executing this tool.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+
+        def add_two_numbers(a: int, b: int) -> int:
+            return a + b
+        
+        await client.tools.upsert_from_function(
+            func=add_two_numbers,
+        )
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int
+
+        def manage_inventory(data: InventoryEntry, quantity_change: int) -> bool:
+            pass
+        
+        await client.tools.upsert_from_function(
+            func=manage_inventory,
+            args_schema=InventoryEntryData,
+        )
+        """
+        source_code = dedent(inspect.getsource(func))
+        args_json_schema: Optional[Dict[str, object]] | Omit = omit
+        if not isinstance(args_schema, Omit) and args_schema is not None:
+            args_json_schema = args_schema.model_json_schema()
+
+        return await self.upsert(
+            source_code=source_code,
+            args_json_schema=args_json_schema,
+            description=description,
+            tags=tags,
+            source_type=source_type,
+            json_schema=json_schema,
+            return_char_limit=return_char_limit,
+            pip_requirements=pip_requirements,
+            npm_requirements=npm_requirements,
+            default_requires_approval=default_requires_approval,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+    
+    async def add(
+        self,
+        *,
+        tool: BaseTool,
+        # 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:
+        """
+        Add a tool to Letta from a custom Tool class
+
+        Args:
+          tool: The tool object to be added.
+
+          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
+
+        Examples:
+        from letta_client import Letta
+
+        client = Letta(
+            token="YOUR_TOKEN",
+        )
+
+        class InventoryItem(BaseModel):
+            sku: str  # Unique product identifier
+            name: str  # Product name
+            price: float  # Current price
+            category: str  # Product category (e.g., "Electronics", "Clothing")
+
+        class InventoryEntry(BaseModel):
+            timestamp: int  # Unix timestamp of the transaction
+            item: InventoryItem  # The product being updated
+            transaction_id: str  # Unique identifier for this inventory update
+
+        class InventoryEntryData(BaseModel):
+            data: InventoryEntry
+            quantity_change: int  # Change in quantity (positive for additions, negative for removals)
+
+        class ManageInventoryTool(BaseTool):
+            name: str = "manage_inventory"
+            args_schema: Type[BaseModel] = InventoryEntryData
+            description: str = "Update inventory catalogue with a new data entry"
+            tags: List[str] = ["inventory", "shop"]
+
+            def run(self, data: InventoryEntry, quantity_change: int) -> bool:
+                '''
+                Implementation of the manage_inventory tool
+                '''
+                print(f"Updated inventory for {data.item.name} with a quantity change of {quantity_change}")
+                return True
+                
+        await client.tools.add(
+            tool=ManageInventoryTool()
+        )
+        """
+        source_code = tool.get_source_code()
+        args_json_schema = tool.args_schema.model_json_schema() if tool.args_schema else None
+
+        # Convert PipRequirement/NpmRequirement models to Param dicts
+        pip_requirements_param = (
+            [typing.cast(PipRequirementParam, req.model_dump()) for req in tool.pip_requirements]
+            if tool.pip_requirements
+            else omit
+        )
+        npm_requirements_param = (
+            [typing.cast(NpmRequirementParam, req.model_dump()) for req in tool.npm_requirements]
+            if tool.npm_requirements
+            else omit
+        )
+
+        return await self.upsert(
+            source_code=source_code,
+            args_json_schema=args_json_schema or omit,
+            description=tool.description or omit,
+            tags=tool.tags or omit,
+            source_type=tool.source_type or omit,
+            json_schema=tool.json_schema or omit,
+            return_char_limit=tool.return_char_limit or omit,
+            pip_requirements=pip_requirements_param,
+            npm_requirements=npm_requirements_param,
+            default_requires_approval=tool.default_requires_approval or omit,
+            extra_headers=extra_headers,
+            extra_query=extra_query,
+            extra_body=extra_body,
+            timeout=timeout,
+        )
+
 
 class ToolsResourceWithRawResponse:
     def __init__(self, tools: ToolsResource) -> None:
@@ -1079,9 +1679,6 @@ 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,
         )
@@ -1091,6 +1688,9 @@ class ToolsResourceWithRawResponse:
         self.count = to_raw_response_wrapper(
             tools.count,
         )
+        self.modify = to_raw_response_wrapper(
+            tools.modify,
+        )
         self.upsert = to_raw_response_wrapper(
             tools.upsert,
         )
@@ -1109,9 +1709,6 @@ 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,
         )
@@ -1121,6 +1718,9 @@ class AsyncToolsResourceWithRawResponse:
         self.count = async_to_raw_response_wrapper(
             tools.count,
         )
+        self.modify = async_to_raw_response_wrapper(
+            tools.modify,
+        )
         self.upsert = async_to_raw_response_wrapper(
             tools.upsert,
         )
@@ -1139,9 +1739,6 @@ 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,
         )
@@ -1151,6 +1748,9 @@ class ToolsResourceWithStreamingResponse:
         self.count = to_streamed_response_wrapper(
             tools.count,
         )
+        self.modify = to_streamed_response_wrapper(
+            tools.modify,
+        )
         self.upsert = to_streamed_response_wrapper(
             tools.upsert,
         )
@@ -1169,9 +1769,6 @@ 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,
         )
@@ -1181,6 +1778,9 @@ class AsyncToolsResourceWithStreamingResponse:
         self.count = async_to_streamed_response_wrapper(
             tools.count,
         )
+        self.modify = async_to_streamed_response_wrapper(
+            tools.modify,
+        )
         self.upsert = async_to_streamed_response_wrapper(
             tools.upsert,
         )