ikawrakow/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-03-07 12:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow arbitrary arguments order for Q3C, Q3CN, and Qwen3.5 (#1352)

Browse Source 
This should fix the read file at offset/limit issue, where the tool
definition has offset before limit, while the model sets limit before
offset.
This commit is contained in:
Yap Sok Ann
2026-03-03 21:39:16 +07:00
committed by GitHub
parent 505e2c57f9
commit ea3e8e30e1
3 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/chat-parser-xml-toolcall.cpp
View File

@@ -245,15 +245,28 @@ void build_grammar_xml_tool_call(common_chat_params & data, const json & tools,
auto next_arg_with_sep = builder.add_rule(name + "-last-arg-end", form.last_val_end ? gbnf_format_literal(*form.last_val_end) : gbnf_format_literal(form.val_end));
decltype(next_arg_with_sep) next_arg = "\"\"";
for (auto i = arg_rules.size() - 1; /* i >= 0 && */ i < arg_rules.size(); --i) {
std::string include_this_arg = arg_rules[i].symbol_name + " " + next_arg_with_sep;
next_arg = builder.add_rule(name + "-arg-after-" + std::to_string(i), arg_rules[i].is_required ?
include_this_arg : "( " + include_this_arg + " ) | " + next_arg
);
include_this_arg = gbnf_format_literal(form.val_end) + " " + include_this_arg;
next_arg_with_sep = builder.add_rule(name + "-arg-after-" + std::to_string(i) + "-with-sep", arg_rules[i].is_required ?
include_this_arg : "( " + include_this_arg + " ) | " + next_arg_with_sep
);
if (form.relax_arg) {
if (!arg_rules.empty()) {
std::vector<std::string> arg_symbols;
arg_symbols.reserve(arg_rules.size());
for (const auto & rule : arg_rules) {
arg_symbols.push_back(rule.symbol_name);
}
auto any_arg = builder.add_rule(name + "-any-arg", string_join(arg_symbols, " | "));
auto any_arg_with_end = builder.add_rule(name + "-any-arg-with-end", any_arg + " " + next_arg_with_sep);
next_arg = builder.add_rule(name + "-args-relaxed", "( " + any_arg_with_end + " )*");
}
} else {
for (auto i = arg_rules.size() - 1; /* i >= 0 && */ i < arg_rules.size(); --i) {
std::string include_this_arg = arg_rules[i].symbol_name + " " + next_arg_with_sep;
next_arg = builder.add_rule(name + "-arg-after-" + std::to_string(i), arg_rules[i].is_required ?
include_this_arg : "( " + include_this_arg + " ) | " + next_arg
);
include_this_arg = gbnf_format_literal(form.val_end) + " " + include_this_arg;
next_arg_with_sep = builder.add_rule(name + "-arg-after-" + std::to_string(i) + "-with-sep", arg_rules[i].is_required ?
include_this_arg : "( " + include_this_arg + " ) | " + next_arg_with_sep
);
}
}
std::string quoted_name = name;