Skip to content

chat : add EOS token to additional_stops for autoparser templates #20805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jpohhhh wants to merge 1 commit into from
Closed

chat : add EOS token to additional_stops for autoparser templates #20805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions common/chat-auto-parser-generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ common_chat_params peg_generator::generate_parser(const common_chat_template &
data.format = COMMON_CHAT_FORMAT_PEG_NATIVE;
data.preserved_tokens = autoparser.preserved_tokens;

// Some models emit the EOS token as text (e.g. </s>) rather than as the
// special EOS token ID. Add it as a stop so the server strips it before
// the parser sees it. Without this, the trailing EOS text causes the
// parser to fail at end-of-input.
if (!tmpl.eos_token().empty()) {
data.additional_stops.push_back(tmpl.eos_token());
}

auto parser = autoparser.build_parser(inputs);
data.parser = parser.save();

Expand Down
19 changes: 19 additions & 0 deletions tests/test-chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,6 +2502,25 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
.tools({ special_function_tool })
.expect(message_assist_call_id)
.run();
// Regression: real Mistral Small 3.2 appends </s> after tool calls.
// Repro: Mistral-Small-3.2-24B-Instruct-2506 temp=0
// prompt="Weather in Tokyo?" tools=[get_weather]
{
auto tmpls2 = common_chat_templates_ptr(
common_chat_templates_init(nullptr, read_file("models/templates/Mistral-Small-3.2-24B-Instruct-2506.jinja"),
/*bos=*/"", /*eos=*/"</s>"));
common_chat_templates_inputs inputs2;
inputs2.tools = { special_function_tool };
inputs2.add_generation_prompt = true;
inputs2.use_jinja = true;
inputs2.messages = {{"user", "hi"}};
auto params2 = common_chat_templates_apply(tmpls2.get(), inputs2);
bool has_eos_stop = false;
for (const auto & s : params2.additional_stops) {
if (s == "</s>") { has_eos_stop = true; break; }
}
GGML_ASSERT(has_eos_stop && "autoparser must add EOS to additional_stops");
}
}
// Devstral
{
Expand Down