From b4d28e9fe4b26e09ce6c9fede13fbc4f0571791e Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 15 Aug 2025 12:07:15 +0200 Subject: [PATCH] common : use common_chat_templates for add_bos and add_eos This commit updates common_chat_templates_apply_jinja to use the the add_bos and add_eos parameters from the chat template instead of the inputs. The motivation for this is that currently if the `add_bos` and `add_eos` from the input parameters are used it is possible to there will be a missmatch between the model and the chat template which can lead to the the removal of duplicate BOS/EOS tokens in chat.cpp `apply` to not happen leading to two BOS tokens being added to the template. --- common/chat.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/chat.cpp b/common/chat.cpp index 00f30994b5b09..23d3828f9cc2d 100644 --- a/common/chat.cpp +++ b/common/chat.cpp @@ -2061,8 +2061,8 @@ static common_chat_params common_chat_templates_apply_jinja( params.enable_thinking = inputs.enable_thinking; params.grammar = inputs.grammar; params.now = inputs.now; - params.add_bos = inputs.add_bos; - params.add_eos = inputs.add_eos; + params.add_bos = tmpls->add_bos; + params.add_eos = tmpls->add_eos; params.extra_context = json::object(); for (auto el : inputs.chat_template_kwargs) {