common : add support for multiple end sequences in the reasoning budget sampler#25544
Open
aldehir wants to merge 8 commits into
Open
common : add support for multiple end sequences in the reasoning budget sampler#25544aldehir wants to merge 8 commits into
aldehir wants to merge 8 commits into
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.
Overview
Add support for multiple end sequences in the reasoning budget sampler. This is required to support #24202, which allows Qwen 3+ models to terminate their thinking process with either
</think>or<tool_call>.This PR contains quite a bit of changes to support this:
peg-parser.cppare moved out to a separatetrie.cpp/h. These are used to handle the token matching underneath, as they already support matching multiple sequences.reasoning_end_tagtoreasoning_end_tags.reasoning_end_tagand have an extrareasoning_additional_end_tagsfield if that feels more appropriate.common_reasoning_budget_get_end_match()to obtain the matching sequence. Since<tool_call>is also a trigger token for the grammar sampler, we need to feed it to the sampler whengrammar_lazy = true. Either this, or we revert our decision to suppress the grammar sampler while reasoning.Requirements