Backport Gemma4 tool parser fixes to 2026.4 - #4511
Open
DassaultFalconKing wants to merge 2 commits into
Open
Conversation
…inotoolkit#4493) Moving towards convention "if we can emit correct output, do it, even if it's not completely in line with expected structure". This approach is more forgiving if model skips some closures. It also helps if model reaches `max_tokens` limit mid generation and is in general more live-streaming kind of approach.
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
2 participants
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
main-2026.4.DefaultContentParser/contentParserfrom Gemma4 parsing fixes #4508 do not exist on the 2026.4OutputParser.output_parser.cppis left atmain-2026.4HEAD; the Gemma4parseChunktag-erase loop is the compatible content-leak fix.This matches what is already on
main:503ff866278e9236d08bc9b6ddd18ec879660f7295628b45a082bd3d9562a3ad2f3d0762d5883ca4Without this backport, Gemma4 native tool markup can leak into OpenAI
message.contentinstead ofmessage.tool_calls.Test plan
530dc63f) with this parser:Gemma4OutputParserTest.*— 43 tests PASSED/v1/chat/completionswithtool_choice=auto: tool call exposed asmessage.tool_calls(get_weather, arguments{"city":"Berlin"}), not raw tool markup incontentGemma4OutputParserTest.*