1920345c3b
* Add files via upload * fix unit test * fix crashes for --reasoning-format=none * Patch buggy official MiniMax-M2 chat template * add upstream minja fix: https://github.com/ochafik/minja/pull/7 * Fix <think> token not generated * add test copied from https://github.com/ggml-org/llama.cpp/pull/16946 * cleanup * Hopes to fix the compilation error on CI * Delete chat template patching since it’s fixed by upstream Minja * Remove undeeded Minimax-M2 template patch https://github.com/ochafik/minja/pull/7#issuecomment-3480356100 * Add proper handling of optional parameters with test merged tests from: https://github.com/ggml-org/llama.cpp/pull/16946/commits/23d4bb75c485c12ac89f81c424dc03c87a640e8c * Fix making all tool parameters optional * Move xml tool parser to separate file * cleanup & add tests for GLM4.5 * add streaming tests & enhancement & cleanups Add streaming test for both GLM 4.5 and minimax-m2. Cleanup for preserved_tokens. Cleanup for grammar rule name. Enhance the parser's stability. * cleanup & add support for Kimi-K2 Qwen3-Coder Apriel-1.5 Xiaomi-MiMo * apply suggestions from reviewers * fix a misuse for data.grammar_lazy * fix grammar when tool have no argument * Fix `no triggers set for lazy grammar!` for GLM4.5/4.6. Insert additional stops for Kimi-K2 * update chat.cpp * fix grammar for GLM 4.5/4.6 * Try fix Jinja template for GLM * Try fix GLM-4.6.jinja * Update common/chat-parser-xml-toolcall.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Update tests/test-chat.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * improve chat template for GLM, rename Kimi-K2 template to Kimi-K2-Thinking * Improve Kimi-K2 chat template * Fix unit test * Fix "Invalid tool call arguments passed" in a rare case. In a rare case, the model may emit a raw string that begins with a valid JSON string. This commit adds unit tests to cover that scenario and fixes the regression introduced during the Kimi-K2 adaptation. --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>
45 lines
2.2 KiB
C++
45 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include "chat.h"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
|
|
// Sample config:
|
|
// MiniMax-M2 (left): <minimax:tool_call>\n<invoke name="tool-name">\n<parameter name="key">value</parameter>\n...</invoke>\n...</minimax:tool_call>
|
|
// GLM 4.5 (right): <tool_call>function_name\n<arg_key>key</arg_key>\n<arg_value>value</arg_value>\n</tool_call>
|
|
struct xml_tool_call_format {
|
|
std::string scope_start; // <minimax:tool_call>\n // \n // can be empty
|
|
std::string tool_start; // <invoke name=\" // <tool_call>
|
|
std::string tool_sep; // \">\n // \n // can be empty only for parse_xml_tool_calls
|
|
std::string key_start; // <parameter name=\" // <arg_key>
|
|
std::string key_val_sep; // \"> // </arg_key>\n<arg_value>
|
|
std::string val_end; // </parameter>\n // </arg_value>\n
|
|
std::string tool_end; // </invoke>\n // </tool_call>\n
|
|
std::string scope_end; // </minimax:tool_call> // // can be empty
|
|
// Set this if there can be dynamic spaces inside key_val_sep.
|
|
// e.g. key_val_sep=</arg_key> key_val_sep2=<arg_value> for GLM4.5
|
|
std::optional<std::string> key_val_sep2 = std::nullopt;
|
|
// Set true if argval should only be raw string. e.g. Hello "world" hi
|
|
// Set false if argval should only be json string. e.g. "Hello \"world\" hi"
|
|
// Defaults to std::nullopt, both will be allowed.
|
|
std::optional<bool> raw_argval = std::nullopt;
|
|
std::optional<std::string> last_val_end = std::nullopt;
|
|
std::optional<std::string> last_tool_end = std::nullopt;
|
|
bool trim_raw_argval = false;
|
|
bool allow_toolcall_in_think = false; // TODO: UNTESTED!!!
|
|
};
|
|
|
|
// make a GBNF that accept any strings except those containing any of the forbidden strings.
|
|
std::string make_gbnf_excluding(std::vector<std::string> forbids);
|
|
|
|
/**
|
|
* Build grammar for xml-style tool call
|
|
* form.scope_start and form.scope_end can be empty.
|
|
* Requires data.format for model-specific hacks.
|
|
*/
|
|
void build_grammar_xml_tool_call(common_chat_params & data, const nlohmann::ordered_json & tools, const struct xml_tool_call_format & form);
|