fix: make header names python-safe by saurabhkoshatwar · Pull Request #592 · googleapis/mcp-toolbox-sdk-python

saurabhkoshatwar · 2026-03-14T16:17:37Z

Fixes #580

Summary

Allow Toolbox tools to use parameter/header names that are not valid Python identifiers (e.g. X-Application-ID).
Introduce a Python‑safe field name mapping so function signatures and Pydantic models stay valid while preserving the original parameter names over the wire.

Details

Sanitize schema parameter names into Python‑safe field names and use those in inspect.Parameter and Pydantic models.
Maintain a mapping from Python‑safe names back to original schema names in ToolboxTool so requests still use the exact header/parameter names defined in tools.yaml.

anubhav756 · 2026-03-16T11:58:21Z

/gcbrun

anubhav756 · 2026-03-16T12:16:16Z

Thanks for the PR @saurabhkoshatwar !

Could you please take a look at the integration test failure?

I'm also thinking if we could add any more integration/unit tests to verify this change. For instance to see if there could still be any validation failures while actually using hyphenated parameters?

anubhav756 · 2026-03-25T06:28:56Z

/gcbrun

anubhav756 · 2026-03-25T06:29:16Z

Thanks for the PR @saurabhkoshatwar !

Could you please take a look at the integration test failure?

I'm also thinking if we could add any more integration/unit tests to verify this change. For instance to see if there could still be any validation failures while actually using hyphenated parameters?

@saurabhkoshatwar Bumping this up in case it got missed :)

anubhav756 · 2026-03-27T21:37:34Z

/gcbrun

saurabhkoshatwar · 2026-03-31T03:49:15Z

@anubhav756 could you please rerun the tests? Thanks!

anubhav756 · 2026-03-31T09:57:04Z

/gcbrun

…Declaration` mapping (googleapis#594) * fix(adk): Handle complex types in tool schemas * chore: delint

…-adk` (googleapis#579) * feat(adk): Support ToolContext for aut_token_getters in toolbox-adk * chore: Add clarifying comment * fix: fix lint and tests * chore: refactor tool strict validation logic * chore: delint * chore: delint * chore: fix tests and type check * fix: fix CI/CD pipeline for toolbox-adk for local toolbox-core

…parsing (googleapis#601)

) * fix: Update core dependency package version * feat(telemetry): add MCP semantic telemetry to toolbox-core client - Instrument toolbox-core Client per MCP semantic conventions - Enable telemetry across adk, langchain, and llamaindex modules - Update test coverage and telemetry-related dependencies * tests(telemetry): added coverage and documentation for telemetry * fix(tests): lint errors * fix(telemetry): client naming + type fixes * feat(telemetry): add warnings --------- Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

…oogleapis#602) * chore(adk): remove id_token monkey patch following upstream ADK fix ### Description Removes the `id_token` monkey-patching in `toolbox_adk/tool.py` since the upstream fix in ADK has been successfully merged ([google/adk-python#4402](google/adk-python#4402)). With the ADK natively retaining the `id_token`, the workaround is no longer necessary. * fix(adk): bump ADK version * fix(adk): upgrade google-auth dep version

…o v0.30.0 to v0.30.0 (googleapis#598) Co-authored-by: dishaprakash <57954147+dishaprakash@users.noreply.github.com>

Settings are controlled through UI

* fix: improve func_docstring * file format

* docs: cleanup README * adk readme cleanup v1 * adk readme cleanup v2 * core readme cleanup v1 * core readme cleanup v2 * langchain readme cleanup v1 * langchain readme cleanup v2 * langchain readme cleanup v3 * llamaindex readme cleanup v1 * Apply suggestions from code review Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com> * suggested changes from review * Update README.md Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com> * added open telemetry link * Update README.md Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com> * fix identation * minor fix * minor fix v2 * Update README.md Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com> --------- Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

Release-As: 1.0.0

* chore(main): release toolbox-core 1.0.0 * Update CHANGELOG.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

* chore(main): release toolbox-adk 1.0.0 * dep: Update toolbox-core dep version * Update CHANGELOG.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

* chore(main): release toolbox-langchain 1.0.0 * Update CHANGELOG.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

* chore(main): release toolbox-llamaindex 1.0.0 * Update CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

…o v0.31.0 to v0.31.0 (googleapis#609)

…apis#607)

…oogleapis#616)

…" (googleapis#608) This reverts commit 746a7f5.

…leapis#615) Bumps [langchain-core](https://github.com/langchain-ai/langchain) from 1.2.11 to 1.2.22. - [Release notes](https://github.com/langchain-ai/langchain/releases) - [Commits](langchain-ai/langchain@langchain-core==1.2.11...langchain-core==1.2.22) --- updated-dependencies: - dependency-name: langchain-core dependency-version: 1.2.22 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Twisha Bansal <58483338+twishabansal@users.noreply.github.com>

fix: make header names python-safe

f9190bd

saurabhkoshatwar requested a review from a team as a code owner March 14, 2026 16:17

blunderbuss-gcf bot assigned anubhav756 Mar 14, 2026

anubhav756 mentioned this pull request Mar 16, 2026

MCP Toolbox HTTP Source - Header Parameter don't allow headers with hyphen. #580

Open

3 tasks

anubhav756 added priority: p2 Moderately-important priority. Fix may not be included in next release. help wanted labels Mar 16, 2026

github-actions bot removed the help wanted label Mar 17, 2026

anubhav756 force-pushed the skoshatwar/issue-fix-580 branch 2 times, most recently from 99c3383 to 992c3a5 Compare March 25, 2026 06:26

anubhav756 force-pushed the skoshatwar/issue-fix-580 branch from 992c3a5 to de80c29 Compare March 27, 2026 21:37

tests fix

610a9ca

anubhav756 force-pushed the skoshatwar/issue-fix-580 branch from a5305cd to d092006 Compare March 31, 2026 09:56

anubhav756 and others added 11 commits April 1, 2026 08:10

feat(adk): Enable support for ADK 2.0 (googleapis#584)

c1ae55a

fix(adk): Preserve complex schema types (arrays/objects) in `Function…

78451c2

…Declaration` mapping (googleapis#594) * fix(adk): Handle complex types in tool schemas * chore: delint

fix(core): resolve dropped default parameter values in MCP transport …

26827cf

…parsing (googleapis#601)

chore(deps): update mcp toolbox server version in integration tests t…

e50dfa8

…o v0.30.0 to v0.30.0 (googleapis#598) Co-authored-by: dishaprakash <57954147+dishaprakash@users.noreply.github.com>

ci: remove sync repo settings file (googleapis#595)

8284782

Settings are controlled through UI

fix: improve func_docstring (googleapis#593)

8120c2c

* fix: improve func_docstring * file format

chore: release 1.0.0 (googleapis#603)

f33e8b1

Release-As: 1.0.0

release-please bot and others added 12 commits April 1, 2026 08:10

chore(main): release toolbox-core 1.0.0 (googleapis#590)

1506c28

* chore(main): release toolbox-core 1.0.0 * Update CHANGELOG.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anubhav Dhawan <anubhavdhawan@google.com>

chore(deps): update dependency toolbox-core to v1 (googleapis#604)

1744842

chore(deps): update mcp toolbox server version in integration tests t…

0563294

…o v0.31.0 to v0.31.0 (googleapis#609)

chore(deps): update dependency requests to v2.33.0 [security] (google…

ead1744

…apis#607)

chore(deps): update dependency langchain-core to v1.2.22 [security] (g…

919461a

…oogleapis#616)

Revert "chore(main): release toolbox-llamaindex 1.0.0 (googleapis#589)…

fd248a0

…" (googleapis#608) This reverts commit 746a7f5.

lint fix

001898a

add .venv to gitignore

8aa416d

saurabhkoshatwar force-pushed the skoshatwar/issue-fix-580 branch from 3ab9bb9 to 8aa416d Compare April 1, 2026 15:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: make header names python-safe#592

fix: make header names python-safe#592
saurabhkoshatwar wants to merge 25 commits intogoogleapis:mainfrom
saurabhkoshatwar:skoshatwar/issue-fix-580

saurabhkoshatwar commented Mar 14, 2026 •

edited by anubhav756

Loading

Uh oh!

anubhav756 commented Mar 16, 2026

Uh oh!

anubhav756 commented Mar 16, 2026

Uh oh!

anubhav756 commented Mar 25, 2026

Uh oh!

anubhav756 commented Mar 25, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

saurabhkoshatwar commented Mar 31, 2026

Uh oh!

anubhav756 commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

saurabhkoshatwar commented Mar 14, 2026 • edited by anubhav756 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Uh oh!

anubhav756 commented Mar 16, 2026

Uh oh!

anubhav756 commented Mar 16, 2026

Uh oh!

anubhav756 commented Mar 25, 2026

Uh oh!

anubhav756 commented Mar 25, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

saurabhkoshatwar commented Mar 31, 2026

Uh oh!

anubhav756 commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

saurabhkoshatwar commented Mar 14, 2026 •

edited by anubhav756

Loading