fix(mcp): isolate strict schema conversion from non-strict fallback#3199
Merged
seratch merged 1 commit intoopenai:mainfrom May 8, 2026
Merged
Conversation
ensure_strict_json_schema mutates the schema in place and may raise partway through, leaving strict-mode artifacts (e.g. required or additionalProperties: false) on a schema that to_function_tool still serves with strict_json_schema=False. Convert a separate deepcopy so the original schema survives a failed strict conversion.
Member
|
@codex review |
seratch
approved these changes
May 8, 2026
|
Codex Review: Didn't find any major issues. What shall we delve into next? ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
This was referenced May 9, 2026
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
ensure_strict_json_schemamutates the input schema in place and may raise partway through (e.g. when a nested object hasadditionalProperties: true). When that happens,MCPUtil.to_function_toolcatches the exception and proceeds withis_strict=False— but the schema it serves to the model has already been partially mutated, leaking strict-mode artifacts likeadditionalProperties: falseandrequired: [...]onto a tool we explicitly mark as non-strict.Repro on
main:The fix passes a fresh
copy.deepcopy(schema)toensure_strict_json_schema, so a partial in-place mutation cannot leak into the non-strict fallback.Test
tests/mcp/test_mcp_util.py::test_to_function_tool_failed_strict_conversion_keeps_original_schema— fails on main with the partially-mutated schema, passes after this change.