vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tool-call: r1: add one more trigger approx "<｜tool calls begin｜>"

Browse source
This commit is contained in:
Olivier Chafik 2025-02-04 00:28:40 +00:00
parent bff549deb6
commit ce28224de8
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/chat.cpp
View file

@ -117,7 +117,6 @@ static common_chat_msg parse_json_tool_calls(
std::sregex_iterator rend; std::sregex_iterator rend;
std::sregex_iterator rit(it, end, function_regex); std::sregex_iterator rit(it, end, function_regex);
if (rit == rend) { if (rit == rend) {
fprintf(stderr, "No more tool calls found\n");
result.content += std::string(it, end); result.content += std::string(it, end);
break; break;
} }
@ -127,10 +126,10 @@ static common_chat_msg parse_json_tool_calls(
json arguments; json arguments;
if (!parse_json(it, end, arguments)) { if (!parse_json(it, end, arguments)) {
throw std::runtime_error("Failed to parse json tool call arguments"); throw std::runtime_error("Failed to parse json tool call arguments: " + input);
} }
if (!std::regex_search(it, end, match, close_regex)) { if (!std::regex_search(it, end, match, close_regex)) {
throw std::runtime_error("Malformed input, missing closing pattern"); throw std::runtime_error("Malformed input, missing closing pattern: " + input);
} }
it = match.suffix().first; it = match.suffix().first;
result.tool_calls.push_back({name, arguments.is_string() ? arguments.get<std::string>() : arguments.dump(), /* id= */ ""}); result.tool_calls.push_back({name, arguments.is_string() ? arguments.get<std::string>() : arguments.dump(), /* id= */ ""});
@ -574,13 +573,14 @@ static common_chat_params common_chat_params_init_deepseek_r1(const common_chat_
// Distill Qwen 7B & 32B models seem confused re/ syntax of their tool call opening tag, // Distill Qwen 7B & 32B models seem confused re/ syntax of their tool call opening tag,
// so we accept common variants (then it's all constrained) // so we accept common variants (then it's all constrained)
builder.add_rule("root", builder.add_rule("root",
"( \"<｜tool▁calls▁begin｜>\" | \"<｜tool_calls_begin｜>\" | \"<｜tool calls begin｜>\" ) " "( \"<｜tool▁calls▁begin｜>\" | \"<｜tool_calls_begin｜>\" | \"<｜tool calls begin｜>\" | \"<｜tool\\_calls\\_begin｜>\" ) "
"(" +string_join(tool_rules, " | ") + ")" + (inputs.parallel_tool_calls ? "*" : "") + " " "(" +string_join(tool_rules, " | ") + ")" + (inputs.parallel_tool_calls ? "*" : "") + " "
"\"<｜tool▁calls▁end｜>\"" "\"<｜tool▁calls▁end｜>\""
" space"); " space");
data.grammar_triggers.push_back({"<｜tool▁calls▁begin｜>", /* .at_start = */ false}); data.grammar_triggers.push_back({"<｜tool▁calls▁begin｜>", /* .at_start = */ false});
data.grammar_triggers.push_back({"<｜tool_calls_begin｜>", /* .at_start = */ false}); data.grammar_triggers.push_back({"<｜tool_calls_begin｜>", /* .at_start = */ false});
data.grammar_triggers.push_back({"<｜tool calls begin｜>", /* .at_start = */ false}); data.grammar_triggers.push_back({"<｜tool calls begin｜>", /* .at_start = */ false});
data.grammar_triggers.push_back({"<｜tool\\_calls\\_begin｜>", /* .at_start = */ false});
data.preserved_tokens = { data.preserved_tokens = {
"<think>", "<think>",
"</think>", "</think>",
@ -614,7 +614,7 @@ static common_chat_params common_chat_params_init_deepseek_r1(const common_chat_
return data; return data;
} }
static common_chat_msg common_chat_parse_deepseek_r1(const std::string & input) { static common_chat_msg common_chat_parse_deepseek_r1(const std::string & input) {
static std::regex trigger_regex("<｜tool▁calls▁begin｜>|<｜tool_calls_begin｜>|<｜tool calls begin｜>"); static std::regex trigger_regex("<｜tool▁calls▁begin｜>|<｜tool_calls_begin｜>|<｜tool calls begin｜>|<｜tool\\\\_calls\\\\_begin｜>");
static std::regex function_regex("<｜tool▁call▁begin｜>function<｜tool▁sep｜>([^\n]+)\n```json\n"); static std::regex function_regex("<｜tool▁call▁begin｜>function<｜tool▁sep｜>([^\n]+)\n```json\n");
static std::regex close_regex("```<｜tool▁call▁end｜>"); static std::regex close_regex("```<｜tool▁call▁end｜>");
static std::regex think_regex(R"(<think>([\s\S\n]*)(</think>)?([\s\S\r\n]*))"); static std::regex think_regex(R"(<think>([\s\S\n]*)(</think>)?([\s\S\r\n]*))");

2
models/templates/llama-cpp-deepseek-r1.jinja
View file

@ -9,7 +9,7 @@
{%- endfor -%} {%- endfor -%}
{{bos_token}} {{bos_token}}
{%- if tools %} {%- if tools %}
You can call any of the following function tools to satisfy the user's requests: {{tools | map(attribute='function') | tojson(indent=4)}} You can call any of the following function tools to satisfy the user's requests: {{tools | map(attribute='function') | tojson(indent=2)}}
Example function tool call syntax: Example function tool call syntax: