Tool → FunctionTool

Author: jlowin

src/marvin/_mappings/base_model.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 from pydantic.json_schema import GenerateJsonSchema, JsonSchemaMode
 
-from marvin.types import Function, Tool, ToolSet
+from marvin.types import Function, FunctionTool, ToolSet
 
 
 class FunctionSchema(GenerateJsonSchema):
@@ -15,10 +15,10 @@ def generate(self, schema: Any, mode: JsonSchemaMode = "validation"):
 
 def cast_model_to_tool(
     model: type[BaseModel],
-) -> Tool[BaseModel]:
+) -> FunctionTool[BaseModel]:
     model_name = model.__name__
     model_description = model.__doc__
-    return Tool[BaseModel](
+    return FunctionTool[BaseModel](
         type="function",
         function=Function[BaseModel](
             name=model_name,

src/marvin/_mappings/types.py

@@ -6,7 +6,7 @@
 from pydantic.fields import FieldInfo
 
 from marvin.settings import settings
-from marvin.types import Grammar, Tool, ToolSet
+from marvin.types import FunctionTool, Grammar, ToolSet
 
 from .base_model import cast_model_to_tool, cast_model_to_toolset
 
@@ -46,7 +46,7 @@ def cast_type_to_tool(
     field_name: str,
     field_description: str,
     python_function: Optional[Callable[..., Any]] = None,
-) -> Tool[BaseModel]:
+) -> FunctionTool[BaseModel]:
     return cast_model_to_tool(
         model=cast_type_to_model(
             _type,

src/marvin/beta/applications/applications.py

@@ -6,7 +6,7 @@
 from marvin.beta.assistants import Assistant
 from marvin.beta.assistants.runs import Run
 from marvin.tools.assistants import AssistantTool
-from marvin.types import Tool
+from marvin.types import FunctionTool
 from marvin.utilities.jinja import Environment as JinjaEnvironment
 from marvin.utilities.tools import tool_from_function
 
@@ -66,7 +66,7 @@ def get_tools(self) -> list[AssistantTool]:
         tools = []
 
         for tool in [self.state.as_tool(name="state")] + self.tools:
-            if not isinstance(tool, Tool):
+            if not isinstance(tool, FunctionTool):
                 kwargs = None
                 signature = inspect.signature(tool)
                 for parameter in signature.parameters.values():

src/marvin/beta/applications/state/state.py

@@ -5,7 +5,7 @@
 from jsonpatch import JsonPatch
 from pydantic import BaseModel, Field, PrivateAttr, SerializeAsAny
 
-from marvin.types import Tool
+from marvin.types import FunctionTool
 from marvin.utilities.tools import tool_from_function
 
 
@@ -66,7 +66,7 @@ def update_state_jsonpatches(self, patches: list[JSONPatchModel]):
         self.set_state(state)
         return "Application state updated successfully!"
 
-    def as_tool(self, name: str = None) -> "Tool":
+    def as_tool(self, name: str = None) -> "FunctionTool":
         if name is None:
             name = "state"
         schema = self.get_schema()

src/marvin/beta/assistants/assistants.py

@@ -8,7 +8,7 @@
 import marvin.utilities.openai
 import marvin.utilities.tools
 from marvin.tools.assistants import AssistantTool
-from marvin.types import Tool
+from marvin.types import FunctionTool
 from marvin.utilities.asyncio import (
     ExposeSyncMethodsMixin,
     expose_sync_method,
@@ -64,7 +64,7 @@ def get_tools(self) -> list[AssistantTool]:
         return [
             (
                 tool
-                if isinstance(tool, Tool)
+                if isinstance(tool, FunctionTool)
                 else marvin.utilities.tools.tool_from_function(tool)
             )
             for tool in self.tools

src/marvin/beta/assistants/runs.py

@@ -11,7 +11,7 @@
 import marvin.utilities.openai
 import marvin.utilities.tools
 from marvin.tools.assistants import AssistantTool, CancelRun
-from marvin.types import Tool
+from marvin.types import FunctionTool
 from marvin.utilities.asyncio import ExposeSyncMethodsMixin, expose_sync_method
 from marvin.utilities.logging import get_logger
 
@@ -61,12 +61,12 @@ class Run(BaseModel, ExposeSyncMethodsMixin):
     data: Any = None
 
     @field_validator("tools", "additional_tools", mode="before")
-    def format_tools(cls, tools: Union[None, list[Union[Tool, Callable]]]):
+    def format_tools(cls, tools: Union[None, list[Union[FunctionTool, Callable]]]):
         if tools is not None:
             return [
                 (
                     tool
-                    if isinstance(tool, Tool)
+                    if isinstance(tool, FunctionTool)
                     else marvin.utilities.tools.tool_from_function(tool)
                 )
                 for tool in tools

src/marvin/tools/assistants.py

@@ -1,11 +1,11 @@
 from typing import Any, Union
 
-from marvin.types import CodeInterpreterTool, RetrievalTool, Tool
+from marvin.types import CodeInterpreterTool, FunctionTool, RetrievalTool
 
 Retrieval = RetrievalTool()
 CodeInterpreter = CodeInterpreterTool()
 
-AssistantTool = Union[RetrievalTool, CodeInterpreterTool, Tool]
+AssistantTool = Union[RetrievalTool, CodeInterpreterTool, FunctionTool]
 
 
 class CancelRun(Exception):

src/marvin/types.py

@@ -60,21 +60,24 @@ def create(
         return instance
 
 
-class Tool(MarvinType, Generic[T]):
+class Tool(MarvinType):
     type: str
+
+
+class FunctionTool(Tool, Generic[T]):
     function: Optional[Function[T]] = None
 
 
 class ToolSet(MarvinType, Generic[T]):
-    tools: Optional[list[Tool[T]]] = None
+    tools: Optional[list[Union[Tool, FunctionTool[T]]]] = None
     tool_choice: Optional[Union[Literal["auto"], dict[str, Any]]] = None
 
 
-class RetrievalTool(Tool[T]):
+class RetrievalTool(FunctionTool[T]):
     type: Literal["retrieval"] = "retrieval"
 
 
-class CodeInterpreterTool(Tool[T]):
+class CodeInterpreterTool(FunctionTool[T]):
     type: Literal["code_interpreter"] = "code_interpreter"
 
 
@@ -244,7 +247,7 @@ class Run(MarvinType, Generic[T]):
     status: str
     model: str
     instructions: Optional[str]
-    tools: Optional[list[Tool[T]]] = None
+    tools: Optional[list[FunctionTool[T]]] = None
     metadata: dict[str, str]
 
 

src/marvin/utilities/tools.py

@@ -17,7 +17,7 @@
 from pydantic.fields import FieldInfo
 from pydantic.json_schema import GenerateJsonSchema, JsonSchemaMode
 
-from marvin.types import Function, Tool
+from marvin.types import Function, FunctionTool
 from marvin.utilities.asyncio import run_sync
 from marvin.utilities.logging import get_logger
 
@@ -63,7 +63,7 @@ def generate(self, schema: Any, mode: JsonSchemaMode = "validation"):
         return json_schema
 
 
-def tool_from_type(type_: U, tool_name: str = None) -> Tool[U]:
+def tool_from_type(type_: U, tool_name: str = None) -> FunctionTool[U]:
     """
     Creates an OpenAI-compatible tool from a Python type.
     """
@@ -99,7 +99,7 @@ def tool_from_model(model: type[M], python_fn: Callable[[str], M] = None):
     def tool_fn(**data) -> M:
         return TypeAdapter(model).validate_python(data)
 
-    return Tool[M](
+    return FunctionTool[M](
         type="function",
         function=Function[M].create(
             name=model.__name__,
@@ -130,7 +130,7 @@ def tool_from_function(
         fn, config=pydantic.ConfigDict(arbitrary_types_allowed=True)
     ).json_schema()
 
-    return Tool[T](
+    return FunctionTool[T](
         type="function",
         function=Function[T].create(
             name=name or fn.__name__,
@@ -142,7 +142,7 @@ def tool_from_function(
 
 
 def call_function_tool(
-    tools: list[Tool],
+    tools: list[FunctionTool],
     function_name: str,
     function_arguments_json: str,
     return_string: bool = False,