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

tool-call: adjust triggers to most common tool call variations from Llama-3.1-8B and Llama-3.2-3B

Browse source
This commit is contained in:
Olivier Chafik 2024-10-03 19:17:32 +01:00
parent ece12b074f
commit b4fc1e8ba7
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/tool-call.cpp
View file

@ -274,14 +274,22 @@ llama_tool_call_handler llama_tool_call_handler_init(
builder.add_schema(name + "-args", parameters) + builder.add_schema(name + "-args", parameters) +
" \"}\"")); " \"}\""));
if (allow_content && !eagerly_match_any_json) { if (allow_content && !eagerly_match_any_json) {
handler.grammar_trigger_words.push_back("\n{\"name\": \"" + name + "\""); handler.grammar_trigger_words.push_back("{\"name\": \"" + name + "\"");
// Accommodate most common tool call variations from Llama-3.1-8B and Llama-3.2-3B.
// Note that c++11's regex doesn't support partial matches, otherwise it would make
// sense to add support for trigger regexes to the antiprompt mechanism.
handler.grammar_trigger_words.push_back("{\n\t\"name\": \"" + name + "\"");
handler.grammar_trigger_words.push_back("{\n \"name\": \"" + name + "\"");
handler.grammar_trigger_words.push_back("{\n \"name\": \"" + name + "\"");
} }
} }
} }
if (allow_content && eagerly_match_any_json) { if (allow_content && eagerly_match_any_json) {
handler.grammar_trigger_words.push_back("\n{\"");
handler.grammar_trigger_words.push_back("{\""); handler.grammar_trigger_words.push_back("{\"");
handler.grammar_trigger_words.push_back("{\n\t\"");
handler.grammar_trigger_words.push_back("{\n \"");
handler.grammar_trigger_words.push_back("{\n \"");
} }
builder.add_rule("root", join(tool_rules.begin(), tool_rules.end(), " | ")); builder.add_rule("root", join(tool_rules.begin(), tool_rules.end(), " | "));