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

qwen hermes tool calling : fixed grammar rules names

This commit is contained in:
Pierre F 2025-08-25 19:45:19 +02:00
parent 79e4a7bdbc
commit dbae9214b9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/chat.cpp
View File

@ -1824,20 +1824,20 @@ static common_chat_params common_chat_params_init_hermes_2_pro(const common_chat
"( \"```\\n\" | \"```json\\n\" | \"```xml\\n\" ) space " + wrappable_tool_call + " space \"```\" space "); "( \"```\\n\" | \"```json\\n\" | \"```xml\\n\" ) space " + wrappable_tool_call + " space \"```\" space ");
auto tool_call = builder.add_rule("tool_call", string_join(tool_call_alts, " | ")); auto tool_call = builder.add_rule("tool_call", string_join(tool_call_alts, " | "));
builder.add_rule("thinking_start", "\"<think>\""); builder.add_rule("thinking-start", "\"<think>\"");
builder.add_rule("thinking_content", "[^\\x00]*"); builder.add_rule("thinking-content", "[^\\x00]*");
builder.add_rule("thinking_end", "\"</think>\" space"); builder.add_rule("thinking-end", "\"</think>\" space");
//thinking grammar logic depending on if thinking_forced_open was to true (so already opened (and maybe closed)) and if thinking is even allowed //thinking grammar logic depending on if thinking_forced_open was to true (so already opened (and maybe closed)) and if thinking is even allowed
std::string thinking_grammar_logic = ""; // thinking tag was closed or not supported/wanted std::string thinking_grammar_logic = ""; // thinking tag was closed or not supported/wanted
if (extra_context["enable_thinking"]) { if (extra_context["enable_thinking"]) {
if (data.thinking_forced_open) { if (data.thinking_forced_open) {
//thinking tag was already opened by used so we don't need to add it again //thinking tag was already opened by used so we don't need to add it again
thinking_grammar_logic = "thinking_content thinking_end "; thinking_grammar_logic = "thinking-content thinking-end ";
} }
else else
{ {
thinking_grammar_logic = "thinking_start thinking_content thinking_end "; thinking_grammar_logic = "thinking-start thinking-content thinking-end ";
} }
} }