happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix reasoning detection

This commit is contained in:
Piotr Wilkin 2026-02-03 02:27:01 +01:00
parent b0853baca7
commit 80b7e161ff
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/chat-auto-parser-helpers.cpp
View File

@ -374,3 +374,13 @@ std::vector<segment> segmentize_markers(const std::string & text) {
return retval; return retval;
} }
std::vector<segment> prune_whitespace_segments(const std::vector<segment> & segments) {
std::vector<segment> result;
for (const auto & seg : segments) {
if (!trim_whitespace(seg.value).empty()) {
result.push_back(seg);
}
}
return result;
}

5
common/chat-auto-parser-helpers.h
View File

@ -19,4 +19,7 @@ std::string until_common_prefix(const std::string & full, const std::string & le
std::string after_common_suffix(const std::string & full, const std::string & left, const std::string & right); std::string after_common_suffix(const std::string & full, const std::string & left, const std::string & right);
// Segmentize text into markers and non-marker fragments // Segmentize text into markers and non-marker fragments
std::vector<segment> segmentize_markers(const std::string & text); std::vector<segment> segmentize_markers(const std::string & text);
// Prune whitespace-only segments from a vector of segments
std::vector<segment> prune_whitespace_segments(const std::vector<segment> & segments);

8
common/chat-diff-analyzer.cpp
View File

@ -287,7 +287,7 @@ void differential_analyzer::compare_reasoning_presence(const common_chat_templat
const std::string reasoning_content = "Let me think about this."; const std::string reasoning_content = "Let me think about this.";
if (!diff.right.empty() && diff.right.find(reasoning_content) != std::string::npos) { if (!diff.right.empty() && diff.right.find(reasoning_content) != std::string::npos) {
auto seg = segmentize_markers(diff.right); auto seg = prune_whitespace_segments(segmentize_markers(diff.right));
if (seg.size() >= 3 && trim_whitespace(seg[1].value) == reasoning_content) { if (seg.size() >= 3 && trim_whitespace(seg[1].value) == reasoning_content) {
// easy one: opening marker - reasoning - closing marker (possibly with trailing whitespace) // easy one: opening marker - reasoning - closing marker (possibly with trailing whitespace)
result.reasoning = reasoning_mode::TAG_BASED; result.reasoning = reasoning_mode::TAG_BASED;
@ -312,10 +312,10 @@ void differential_analyzer::compare_reasoning_presence(const common_chat_templat
// right: reasoning_content // right: reasoning_content
// suffix: <closing marker>content // suffix: <closing marker>content
// prefix: ...<opening marker> // prefix: ...<opening marker>
auto suf_seg = segmentize_markers(diff.suffix); auto suf_seg = prune_whitespace_segments(segmentize_markers(diff.suffix));
if (trim_whitespace(diff.left).empty() && suf_seg.size() >= 2 && suf_seg[0].type == segment_type::MARKER && if (trim_whitespace(diff.left).empty() && suf_seg.size() >= 2 && suf_seg[0].type == segment_type::MARKER &&
trim_whitespace(suf_seg[1].value).substr(0, 11) == "I can help.") { trim_whitespace(suf_seg[1].value).substr(0, 11) == "I can help.") {
auto pre_seg = segmentize_markers(diff.prefix); auto pre_seg = prune_whitespace_segments(segmentize_markers(diff.prefix));
if (pre_seg[pre_seg.size() - 1].type == segment_type::MARKER || if (pre_seg[pre_seg.size() - 1].type == segment_type::MARKER ||
(pre_seg.size() > 1 && trim_whitespace(pre_seg[pre_seg.size() - 1].value).empty() && (pre_seg.size() > 1 && trim_whitespace(pre_seg[pre_seg.size() - 1].value).empty() &&
pre_seg[pre_seg.size() - 2].type == segment_type::MARKER)) { pre_seg[pre_seg.size() - 2].type == segment_type::MARKER)) {
@ -577,7 +577,7 @@ void differential_analyzer::compare_content_values(const common_chat_template &
LOG_DBG("C1: No content markers\n"); LOG_DBG("C1: No content markers\n");
result.content = content_mode::PLAIN; result.content = content_mode::PLAIN;
found_plain_content = true; found_plain_content = true;
} else if (result.reasoning == reasoning_mode::FORCED_CLOSED && } else if (result.reasoning != reasoning_mode::NONE && !result.markers.reasoning_end.empty() &&
diff_reasoning.left.find(result.markers.reasoning_end) != std::string::npos) { diff_reasoning.left.find(result.markers.reasoning_end) != std::string::npos) {
std::string post_closed_reasoning = diff_reasoning.left.substr( std::string post_closed_reasoning = diff_reasoning.left.substr(
diff_reasoning.left.find(result.markers.reasoning_end) + result.markers.reasoning_end.length()); diff_reasoning.left.find(result.markers.reasoning_end) + result.markers.reasoning_end.length());