jdelony/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-06-28 04:30:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1958 from ikawrakow/ik/handle_think_no_space

Browse Source
This commit is contained in:
Kawrakow 2026-06-12 21:27:23 +02:00 committed by GitHub
commit 5f917a64b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/chat-peg-parser.cpp
View File

@ -785,7 +785,22 @@ common_peg_parser common_chat_peg_builder::prefix(const std::string & s, const s
if (delimiter.empty()) { if (delimiter.empty()) {
return literal(s); return literal(s);
} }
return literal(s.substr(0, s.rfind(delimiter))); auto pos = s.rfind(delimiter);
if (pos == std::string::npos) {
// The generation prompt may force-open the reasoning block without the
// whitespace that surrounds the detected tag (e.g. a prompt ending in
// '<think>' while history renders '<think>\n'). Only strip when the
// prompt ends exactly with the trimmed tag, so prompts with trailing
// whitespace after the tag (e.g. '<think>\n') keep their behavior.
if (auto b = delimiter.find_first_not_of(" \t\n\r"); b != std::string::npos) {
auto e = delimiter.find_last_not_of (" \t\n\r");
auto trimmed = delimiter.substr(b, e - b + 1);
if (s.size() >= trimmed.size() && s.compare(s.size() - trimmed.size(), trimmed.size(), trimmed) == 0) {
pos = s.size() - trimmed.size();
}
}
}
return literal(s.substr(0, pos));
} }
common_peg_parser common_chat_peg_builder::optspace(const std::string & tag) { common_peg_parser common_chat_peg_builder::optspace(const std::string & tag) {