fix(tools): support draft-07 schema definitions#5955
Open
he-yufeng wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Fixes #5940.
MCP tools may publish JSON Schema draft-07 input schemas using
definitionsand$ref: "#/definitions/...". ADK currently dereferences only$defs, so draft-07 schemas keep dangling refs and can crash later inSchema.from_json_schemawithKeyError: 'definitions'.This change lets the schema dereferencer read both forms:
definitions$defs, with$defstaking precedence when both are presentIt also removes either definitions block after references have been resolved.
Validation
.\.venv\Scripts\python.exe -m pytest tests\unittests\tools\test_gemini_schema_util.py -q.\.venv\Scripts\python.exe -m py_compile src\google\adk\tools\_gemini_schema_util.py tests\unittests\tools\test_gemini_schema_util.py.\.venv\Scripts\python.exe -m pyink --check src\google\adk\tools\_gemini_schema_util.py tests\unittests\tools\test_gemini_schema_util.pygit diff --checkNote: running the same pytest command with the base Python environment failed during collection because that environment has an older
google-genaipackage missingtypes.AvatarConfig. The repo-local.venvhasgoogle-genai==2.6.0and passed the target tests.