Merge pull request #717 from jimkring/patch-3

handle empty tool call function arguments

mirascope/beta/openai/realtime/tool.py

@@ -107,6 +107,7 @@ def from_tool_call(cls, tool_call: FunctionCallArguments) -> OpenAIRealtimeTool:
         Args:
             tool_call: The OpenAI tool call from which to construct this tool instance.
         """
-        model_json = jiter.from_json(tool_call["arguments"].encode())
-        model_json["tool_call"] = tool_call.copy()
+        model_json = {"tool_call": tool_call.copy()}
+        if args := tool_call.get("arguments", None):
+            model_json |= jiter.from_json(args.encode())
         return cls.model_validate(model_json)

mirascope/core/azure/tool.py

@@ -87,6 +87,7 @@ def from_tool_call(cls, tool_call: ChatCompletionsToolCall) -> AzureTool:
         Args:
             tool_call: The Azure tool call from which to construct this tool instance.
         """
-        model_json = jiter.from_json(tool_call.function.arguments.encode())
-        model_json["tool_call"] = tool_call
+        model_json = {"tool_call": tool_call}
+        if args := tool_call.function.arguments:
+            model_json |= jiter.from_json(args.encode())
         return cls.model_validate(model_json)

mirascope/core/gemini/tool.py

@@ -98,8 +98,7 @@ def from_tool_call(cls, tool_call: FunctionCall) -> GeminiTool:
         Args:
             tool_call: The Gemini tool call from which to construct this tool instance.
         """
-        if not tool_call.args:
-            raise ValueError("Tool call doesn't have any arguments.")
-        model_json: dict[str, Any] = dict(tool_call.args.items())
-        model_json["tool_call"] = tool_call
+        model_json = {"tool_call": tool_call}
+        if tool_call.args:
+            model_json |= dict(tool_call.args.items())
         return cls.model_validate(model_json)

mirascope/core/groq/tool.py

@@ -74,6 +74,7 @@ def from_tool_call(cls, tool_call: ChatCompletionMessageToolCall) -> GroqTool:
         Args:
             tool_call: The Groq tool call from which to construct this tool instance.
         """
-        model_json = jiter.from_json(tool_call.function.arguments.encode())
-        model_json["tool_call"] = tool_call.model_dump()
+        model_json = {"tool_call": tool_call}
+        if args := tool_call.function.arguments:
+            model_json |= jiter.from_json(args.encode())
         return cls.model_validate(model_json)

mirascope/core/mistral/tool.py

@@ -72,8 +72,9 @@ def from_tool_call(cls, tool_call: ToolCall) -> MistralTool:
         Args:
             tool_call: The Mistral tool call from which to construct this tool instance.
         """
-        model_json = tool_call.function.arguments
-        if isinstance(model_json, str):
-            model_json = jiter.from_json(model_json.encode())
-        model_json["tool_call"] = tool_call.model_dump()
+        model_json = {"tool_call": tool_call}
+        if args := tool_call.function.arguments:
+            model_json |= (
+                jiter.from_json(args.encode()) if isinstance(args, str) else args
+            )
         return cls.model_validate(model_json)

mirascope/core/openai/tool.py

@@ -90,6 +90,7 @@ def from_tool_call(cls, tool_call: ChatCompletionMessageToolCall) -> OpenAITool:
         Args:
             tool_call: The OpenAI tool call from which to construct this tool instance.
         """
-        model_json = jiter.from_json(tool_call.function.arguments.encode())
-        model_json["tool_call"] = tool_call.model_dump()
+        model_json = {"tool_call": tool_call}
+        if args := tool_call.function.arguments:
+            model_json |= jiter.from_json(args.encode())
         return cls.model_validate(model_json)

mirascope/core/vertex/tool.py

@@ -95,8 +95,7 @@ def from_tool_call(cls, tool_call: FunctionCall) -> VertexTool:
         Args:
             tool_call: The Vertex tool call from which to construct this tool instance.
         """
-        if not tool_call.args:
-            raise ValueError("Tool call doesn't have any arguments.")
-        model_json: dict[str, Any] = dict(tool_call.args.items())
-        model_json["tool_call"] = tool_call
+        model_json = {"tool_call": tool_call}
+        if tool_call.args:
+            model_json |= dict(tool_call.args.items())
         return cls.model_validate(model_json)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mirascope"
-version = "1.10.0"
+version = "1.10.1"
 description = "LLM abstractions that aren't obstructions"
 readme = "README.md"
 license = { file = "LICENSE" }

tests/core/gemini/test_tool.py

@@ -85,9 +85,3 @@ class Nested(GeminiTool):
         "with \\$defs.",
     ):
         Nested.tool_schema()
-
-
-def test_gemini_tool_no_args() -> None:
-    """Tests the `GeminiTool` class with no arguments."""
-    with pytest.raises(ValueError, match="Tool call doesn't have any arguments."):
-        FormatBook.from_tool_call(FunctionCall(name="FormatBook", args={}))

tests/core/vertex/test_tool.py

@@ -83,9 +83,3 @@ class Nested(VertexTool):
         "with \\$defs.",
     ):
         Nested.tool_schema()
-
-
-def test_vertex_tool_no_args() -> None:
-    """Tests the `VertexTool` class with no arguments."""
-    with pytest.raises(ValueError, match="Tool call doesn't have any arguments."):
-        FormatBook.from_tool_call(FunctionCall({"name": "FormatBook", "args": {}}))