The agent engineering platform.
Python agentsaiai-agentsanthropicchatgptdeepagentsenterpriseframeworkgeminigenerative-ailangchainlanggraphllmmultiagentopen-sourceopenaipydanticpythonragtypescript
fix(core): respect pydantic aliases when validating tool inputs (#39572)
Hunter Lovellcde529347a05
diff --git a/libs/core/langchain_core/tools/base.py b/libs/core/langchain_core/tools/base.pyindex 89fe3c4509..5dcea96b17 100644--- a/libs/core/langchain_core/tools/base.py+++ b/libs/core/langchain_core/tools/base.py@@ -835,6 +835,7 @@ class ChildTool(BaseTool):tool_input[k] = tool_call_idresult_v2 = input_args.model_validate(tool_input)result_dict = result_v2.model_dump()+ provided_fields = result_v2.model_fields_setresult = result_v2elif issubclass(input_args, BaseModelV1):# Check args_schema for InjectedToolCallId@@ -852,6 +853,7 @@ class ChildTool(BaseTool):tool_input[k] = tool_call_idresult_v1 = input_args.parse_obj(tool_input)result_dict = result_v1.dict()+ provided_fields = result_v1.__fields_set__result = result_v1else:msg = ( # type: ignore[unreachable]@@ -859,15 +861,19 @@ class ChildTool(BaseTool):)raise NotImplementedError(msg)- # Include fields from tool_input, plus fields with explicit defaults.- # This applies Pydantic defaults (like Field(default=1)) while excluding- # synthetic "args"/"kwargs" fields that Pydantic creates for *args/**kwargs.+ # Include fields from tool_input, fields provided through Pydantic aliases,+ # plus fields with explicit defaults. This applies Pydantic defaults (like+ # Field(default=1)) while excluding synthetic "args"/"kwargs" fields that+ # Pydantic creates for *args/**kwargs.field_info = get_fields(input_args)validated_input = {}for k in result_dict:if k in tool_input:# Field was provided in input - include it (validated)validated_input[k] = getattr(result, k)+ elif k in provided_fields:+ # Field was provided through a Pydantic alias - include it.+ validated_input[k] = getattr(result, k)elif k in field_info and k not in {"args", "kwargs"}:# Check if field has an explicit default defined in the schema.# Exclude "args"/"kwargs" as these are synthetic fields for variadicdiff --git a/libs/core/tests/unit_tests/test_tools.py b/libs/core/tests/unit_tests/test_tools.pyindex 2aaf509c5a..d304b51fa2 100644--- a/libs/core/tests/unit_tests/test_tools.py+++ b/libs/core/tests/unit_tests/test_tools.py@@ -23,7 +23,14 @@ from typing import ()import pytest-from pydantic import BaseModel, ConfigDict, Field, RootModel, ValidationError+from pydantic import (+ AliasChoices,+ BaseModel,+ ConfigDict,+ Field,+ RootModel,+ ValidationError,+)from pydantic.v1 import BaseModel as BaseModelV1from pydantic.v1 import ValidationError as ValidationErrorV1from typing_extensions import TypedDict, override@@ -4024,6 +4031,22 @@ async def test_tool_call_id_passed_via_run_method(method: str) -> None:assert handler.captured_tool_call_ids[0] == "run_method_tool_call_id"+def test_tool_args_schema_required_field_validation_alias() -> None:+ """Test required args provided through validation aliases reach the tool."""++ class Args(BaseModel):+ """Tool arguments."""++ canonical: str = Field(validation_alias=AliasChoices("canonical", "alias"))++ @tool(args_schema=Args)+ def aliased_tool(canonical: str) -> str:+ """Return the canonical argument."""+ return canonical++ assert aliased_tool.invoke({"alias": "value"}) == "value"++def test_tool_args_schema_default_values() -> None:"""Test that Pydantic default values from `args_schema` are applied.