Skip to content

fix(genai): use tool_call_schema to exclude injected arguments #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix(genai): use tool_call_schema to exclude injected arguments #1387

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8885e9
fix(genai): use tool_call_schema to exclude injected arguments
cyhhao Nov 26, 2025
41a59a7
Merge branch 'main' into fix/use-tool-call-schema-for-injected-args
mdrxy Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions libs/genai/langchain_google_genai/_function_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,20 @@ def _format_base_tool_to_function_declaration(
),
)

if isinstance(tool.args_schema, dict):
schema = tool.args_schema
elif issubclass(tool.args_schema, BaseModel):
schema = tool.args_schema.model_json_schema()
elif issubclass(tool.args_schema, BaseModelV1):
schema = tool.args_schema.schema()
# Use tool_call_schema instead of args_schema to properly exclude
# injected arguments (e.g., ToolRuntime, InjectedState, InjectedStore)
# that should not be exposed to the model.
tool_schema = tool.tool_call_schema
if isinstance(tool_schema, dict):
schema = tool_schema
elif issubclass(tool_schema, BaseModel):
schema = tool_schema.model_json_schema()
elif issubclass(tool_schema, BaseModelV1):
schema = tool_schema.schema()
else:
msg = (
"args_schema must be a Pydantic BaseModel or JSON schema, "
f"got {tool.args_schema}."
"tool_call_schema must be a Pydantic BaseModel or JSON schema, "
f"got {tool_schema}."
)
raise NotImplementedError(msg)
parameters = _dict_to_gapic_schema(schema)
Expand Down