DSPy: The framework for programming—not prompting—language models
Python
Support composite arg type parsing in `dspy.Tool` (#8095)
Chen Qianc498de551563
diff --git a/dspy/predict/react.py b/dspy/predict/react.pyindex a91dab779..21fa17576 100644--- a/dspy/predict/react.py+++ b/dspy/predict/react.py@@ -1,8 +1,7 @@import logging-from typing import Any, Callable, Literal, get_origin+from typing import Any, Callable, Literalfrom litellm import ContextWindowExceededError-from pydantic import BaseModelimport dspyfrom dspy.primitives.program import Module@@ -82,18 +81,7 @@ class ReAct(Module):trajectory[f"tool_args_{idx}"] = pred.next_tool_argstry:- parsed_tool_args = {}- tool = self.tools[pred.next_tool_name]- for k, v in pred.next_tool_args.items():- if hasattr(tool, "arg_types") and k in tool.arg_types:- arg_type = tool.arg_types[k]- if isinstance((origin := get_origin(arg_type) or arg_type), type) and issubclass(- origin, BaseModel- ):- parsed_tool_args[k] = arg_type.model_validate(v)- continue- parsed_tool_args[k] = v- trajectory[f"observation_{idx}"] = self.tools[pred.next_tool_name](**parsed_tool_args)+ trajectory[f"observation_{idx}"] = self.tools[pred.next_tool_name](**pred.next_tool_args)except Exception as e:trajectory[f"observation_{idx}"] = f"Failed to execute: {e}"diff --git a/dspy/primitives/tool.py b/dspy/primitives/tool.pyindex 8b3d1fa9e..94817397e 100644--- a/dspy/primitives/tool.py+++ b/dspy/primitives/tool.py@@ -2,7 +2,7 @@ import inspectfrom typing import Any, Callable, Optional, get_origin, get_type_hintsfrom jsonschema import ValidationError, validate-from pydantic import BaseModel, TypeAdapter+from pydantic import BaseModel, TypeAdapter, create_modelfrom dspy.utils.callback import with_callbacks@@ -130,6 +130,19 @@ class Tool:self.args = self.args or argsself.arg_types = self.arg_types or arg_types+ def _parse_args(self, **kwargs):+ parsed_kwargs = {}+ for k, v in kwargs.items():+ if k in self.arg_types and self.arg_types[k] != any:+ # Create a pydantic model wrapper with a dummy field `value` to parse the arg to the correct type.+ # This is specifically useful for handling nested Pydantic models like `list[list[MyPydanticModel]]`+ pydantic_wrapper = create_model("Wrapper", value=(self.arg_types[k], ...))+ parsed = pydantic_wrapper.model_validate({"value": v})+ parsed_kwargs[k] = parsed.value+ else:+ parsed_kwargs[k] = v+ return parsed_kwargs+@with_callbacksdef __call__(self, **kwargs):for k, v in kwargs.items():@@ -142,4 +155,6 @@ class Tool:validate(instance=instance, schema=self.args[k])except ValidationError as e:raise ValueError(f"Arg {k} is invalid: {e.message}")- return self.func(**kwargs)++ parsed_kwargs = self._parse_args(**kwargs)+ return self.func(**parsed_kwargs)diff --git a/tests/primitives/test_tool.py b/tests/primitives/test_tool.pyindex 02e8170be..ce6b3f441 100644--- a/tests/primitives/test_tool.py+++ b/tests/primitives/test_tool.py@@ -159,3 +159,37 @@ def test_tool_with_default_args_without_type_hints():tool = Tool(foo)assert tool.args["x"]["default"] == 100assert not hasattr(tool.args["x"], "type")+++def test_tool_call_parses_args():+ tool = Tool(dummy_with_pydantic)++ args = {+ "model": {+ "field1": "hello",+ "field2": 123,+ }+ }++ result = tool(**args)+ assert result == "hello 123"+++def test_tool_call_parses_nested_list_of_pydantic_model():+ def dummy_function(x: list[list[DummyModel]]):+ return x++ tool = Tool(dummy_function)+ args = {+ "x": [+ [+ {+ "field1": "hello",+ "field2": 123,+ }+ ]+ ]+ }++ result = tool(**args)+ assert result == [[DummyModel(field1="hello", field2=123)]]