nicolas
/
ik_llama_opt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix jinja (#1518)

This commit is contained in:
Kawrakow 2026-03-26 17:24:11 +01:00 committed by GitHub
parent 8ab016e2d5
commit 78977c0c0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/chat.cpp
View File

@ -22,6 +22,7 @@
#include <stdexcept>
#include <string>
#include <vector>
#include <fstream>
using json = nlohmann::ordered_json;
@ -550,6 +551,8 @@ std::string common_chat_format_single(
std::string fmt_past_msg;
if (!past_msg.empty()) {
inputs.messages = past_msg;
auto & extra = inputs.messages.emplace_back();
extra.role = new_msg.role;
inputs.add_generation_prompt = false;
fmt_past_msg = common_chat_templates_apply(tmpls, inputs).prompt;
}
@ -557,11 +560,21 @@ std::string common_chat_format_single(
// if the past_msg ends with a newline, we must preserve it in the formatted version
if (add_ass && !fmt_past_msg.empty() && fmt_past_msg.back() == '\n') {
ss << "\n";
};
}
if (inputs.messages.empty()) {
inputs.messages.push_back(new_msg);
} else {
inputs.messages.back() = new_msg;
}
// format chat with new_msg
inputs.messages.push_back(new_msg);
inputs.add_generation_prompt = add_ass;
auto fmt_new_msg = common_chat_templates_apply(tmpls, inputs).prompt;
if (fmt_new_msg.size() < fmt_past_msg.size()) {
LOG_ERR("============================================ Oops: new message is of length %zu, past message is %zu\n", fmt_new_msg.size(), fmt_past_msg.size());
LOG_ERR("=== past message: <%s>\n", fmt_past_msg.c_str());
LOG_ERR("=== new message: <%s>\n", fmt_new_msg.c_str());
throw std::runtime_error("Failed to apply chat template");
}
// get the diff part
ss << fmt_new_msg.substr(fmt_past_msg.size(), fmt_new_msg.size() - fmt_past_msg.size());
return ss.str();