CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-28 08:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the test

Browse Source
This commit is contained in:
Jesse CreateThis
2025-08-22 12:53:18 -04:00
parent fe86282efe
commit 3d00d625cd
2 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/chat.cpp
View File

@@ -618,6 +618,7 @@ const char * common_chat_format_name(common_chat_format format) {
case COMMON_CHAT_FORMAT_FIREFUNCTION_V2: return "FireFunction v2"; case COMMON_CHAT_FORMAT_FIREFUNCTION_V2: return "FireFunction v2";
case COMMON_CHAT_FORMAT_FUNCTIONARY_V3_2: return "Functionary v3.2"; case COMMON_CHAT_FORMAT_FUNCTIONARY_V3_2: return "Functionary v3.2";
case COMMON_CHAT_FORMAT_FUNCTIONARY_V3_1_LLAMA_3_1: return "Functionary v3.1 Llama 3.1"; case COMMON_CHAT_FORMAT_FUNCTIONARY_V3_1_LLAMA_3_1: return "Functionary v3.1 Llama 3.1";
case COMMON_CHAT_FORMAT_DEEPSEEK_V3_1: return "DeepSeek V3.1";
case COMMON_CHAT_FORMAT_HERMES_2_PRO: return "Hermes 2 Pro"; case COMMON_CHAT_FORMAT_HERMES_2_PRO: return "Hermes 2 Pro";
case COMMON_CHAT_FORMAT_COMMAND_R7B: return "Command R7B"; case COMMON_CHAT_FORMAT_COMMAND_R7B: return "Command R7B";
case COMMON_CHAT_FORMAT_GRANITE: return "Granite"; case COMMON_CHAT_FORMAT_GRANITE: return "Granite";
@@ -1352,18 +1353,15 @@ static void common_chat_parse_deepseek_v3_1(common_chat_msg_parser & builder) {
// First, try to find the "</think>" tag that separates thinking from regular content // First, try to find the "</think>" tag that separates thinking from regular content
static const common_regex thinking_end_regex("</think>"); static const common_regex thinking_end_regex("</think>");
if (auto res = builder.try_find_regex(thinking_end_regex)) { if (auto res = builder.try_find_regex(thinking_end_regex, std::string::npos, false)) {
// Extract everything before "</think>" as reasoning content // The prelude contains everything before the "</think>" tag
auto reasoning_content = builder.str(common_string_range{0, res->groups[0].begin}); auto stripped_reasoning = string_strip(res->prelude);
auto stripped_reasoning = string_strip(reasoning_content);
if (!stripped_reasoning.empty()) { if (!stripped_reasoning.empty()) {
builder.add_reasoning_content(stripped_reasoning); builder.add_reasoning_content(stripped_reasoning);
} }
// Move past the "</think>" tag // The parser position is already advanced past the "</think>" tag by try_find_regex
builder.move_to(res->groups[0].end);
// The rest is regular content // The rest is regular content
builder.add_content(builder.consume_rest()); builder.add_content(builder.consume_rest());
} else { } else {

47
tests/test-chat-parser.cpp
View File

@@ -197,7 +197,51 @@ static void test_deepseek_v3_1() {
/* .thinking_forced_open = */ false, /* .thinking_forced_open = */ false,
/* .parse_tool_calls = */ true, /* .parse_tool_calls = */ true,
}; };
common_chat_msg_parser builder("REASONING</think>ok", /* is_partial= */ false, {}); common_chat_msg_parser builder("REASONING</think>ok", /* is_partial= */ false, syntax);
assert_equals(std::string("REASONING"), builder.result().reasoning_content);
assert_equals(std::string("ok"), builder.result().content);
}
// Test with whitespace around reasoning content
{
common_chat_syntax syntax = {
/* .format = */ COMMON_CHAT_FORMAT_DEEPSEEK_V3_1,
/* .reasoning_format = */ COMMON_REASONING_FORMAT_DEEPSEEK,
/* .reasoning_in_content = */ false,
/* .thinking_forced_open = */ false,
/* .parse_tool_calls = */ true,
};
common_chat_msg_parser builder(" REASONING WITH SPACES </think>ok", /* is_partial= */ false, syntax);
assert_equals(std::string("REASONING WITH SPACES"), builder.result().reasoning_content);
assert_equals(std::string("ok"), builder.result().content);
}
// Test without thinking tag (should be all regular content)
{
common_chat_syntax syntax = {
/* .format = */ COMMON_CHAT_FORMAT_DEEPSEEK_V3_1,
/* .reasoning_format = */ COMMON_REASONING_FORMAT_DEEPSEEK,
/* .reasoning_in_content = */ false,
/* .thinking_forced_open = */ false,
/* .parse_tool_calls = */ true,
};
common_chat_msg_parser builder("just regular content", /* is_partial= */ false, syntax);
assert_equals(std::string(""), builder.result().reasoning_content);
assert_equals(std::string("just regular content"), builder.result().content);
}
// Test with empty reasoning content
{
common_chat_syntax syntax = {
/* .format = */ COMMON_CHAT_FORMAT_DEEPSEEK_V3_1,
/* .reasoning_format = */ COMMON_REASONING_FORMAT_DEEPSEEK,
/* .reasoning_in_content = */ false,
/* .thinking_forced_open = */ false,
/* .parse_tool_calls = */ true,
};
common_chat_msg_parser builder(" </think>ok", /* is_partial= */ false, syntax);
assert_equals(std::string(""), builder.result().reasoning_content);
assert_equals(std::string("ok"), builder.result().content);
} }
} }
@@ -362,6 +406,7 @@ int main() {
test_json_with_dumped_args(); test_json_with_dumped_args();
test_reasoning(); test_reasoning();
test_regex(); test_regex();
test_deepseek_v3_1();
std::cout << "All tests passed!\n"; std::cout << "All tests passed!\n";
return 0; return 0;
} }