fix(core): strip injected args before validation for strict schemas #34248
+133
−20
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
StructuredToolwith strictargs_schema(extra="forbid") rejecting injected argumentsProblem
When using
StructuredToolwith a Pydantic args_schema that hasmodel_config = {"extra": "forbid"}, injected arguments (annotated withInjectedToolArg) cause a validation error:This happens because injected args are passed to
model_validate()before being stripped, and Pydantic's strict mode rejects them as unknown fields.Solution
Extract injected args that are NOT declared in the schema before validation, then re-add them after validation completes. This:
Test Plan
test_tool_injected_arg_with_strict_schemaFixes #34246