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

Whoops

This commit is contained in:
Piotr Wilkin 2026-02-12 17:22:59 +01:00
parent 58d822ca0c
commit 2da282018e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/chat-diff-analyzer.cpp
View File

@ -125,9 +125,9 @@ static json build_tool_call(const std::string & name, const json & args, const s
} }
static json first_tool_call_zero_args = build_tool_call("foofoo", json::object(), "call00001"); static json first_tool_call_zero_args = build_tool_call("foofoo", json::object(), "call00001");
static json first_tool_call_one_arg = build_tool_call("foofoo", json{ "first", "XXXX" }, "call00001"); static json first_tool_call_one_arg = build_tool_call("foofoo", {{ "first", "XXXX" }}, "call00001");
static json first_tool_call_one_arg_other_val = build_tool_call("foofoo",json{{ "first", "YYYY" }}, "call00001"); static json first_tool_call_one_arg_other_val = build_tool_call("foofoo", {{ "first", "YYYY" }}, "call00001");
static json first_tool_call_other_arg = build_tool_call("foofoo",json{ { "second", "YYYY" }}, "call00001"); static json first_tool_call_other_arg = build_tool_call("foofoo", {{ "second", "YYYY" }}, "call00001");
static json first_tool_call = static json first_tool_call =
build_tool_call("foofoo", json{{ "first", "XXXX" }, { "second", "YYYY" }}, "call00001"); build_tool_call("foofoo", json{{ "first", "XXXX" }, { "second", "YYYY" }}, "call00001");

14
tools/parser/debug-template-parser.cpp
View File

@ -39,6 +39,7 @@ struct debug_options {
bool with_tools = true; bool with_tools = true;
bool generation_prompt = true; bool generation_prompt = true;
bool enable_reasoning = true; bool enable_reasoning = true;
bool debug_jinja = false;
output_mode mode = output_mode::BOTH; output_mode mode = output_mode::BOTH;
input_message_type input_message = input_message_type::NONE; input_message_type input_message = input_message_type::NONE;
}; };
@ -88,6 +89,7 @@ static void print_usage(const char * program_name) {
LOG_ERR(" --generation-prompt=0|1 Set add_generation_prompt (default: 1)\n"); LOG_ERR(" --generation-prompt=0|1 Set add_generation_prompt (default: 1)\n");
LOG_ERR(" --enable-reasoning=0|1 Enable reasoning parsing (default: 1)\n"); LOG_ERR(" --enable-reasoning=0|1 Enable reasoning parsing (default: 1)\n");
LOG_ERR(" --output=MODE Output mode: analysis, template, both (default: both)\n"); LOG_ERR(" --output=MODE Output mode: analysis, template, both (default: both)\n");
LOG_ERR(" --debug-jinja Enable Jinja fine-grained debug\n");
LOG_ERR(" --input-message=TYPE Message type to render:\n"); LOG_ERR(" --input-message=TYPE Message type to render:\n");
LOG_ERR(" content_only, reasoning_content, tool_call_only,\n"); LOG_ERR(" content_only, reasoning_content, tool_call_only,\n");
LOG_ERR(" content_tool_call, reasoning_tool_call,\n"); LOG_ERR(" content_tool_call, reasoning_tool_call,\n");
@ -112,7 +114,9 @@ static bool parse_options(int argc, char ** argv, debug_options & opts) {
for (int i = 2; i < argc; ++i) { for (int i = 2; i < argc; ++i) {
std::string arg = argv[i]; std::string arg = argv[i];
if (arg == "--no-tools") { if (arg == "--debug-jinja") {
opts.debug_jinja = true;
} else if (arg == "--no-tools") {
opts.with_tools = false; opts.with_tools = false;
} else if (arg.rfind("--generation-prompt=", 0) == 0) { } else if (arg.rfind("--generation-prompt=", 0) == 0) {
opts.generation_prompt = parse_bool_option(arg.substr(20)); opts.generation_prompt = parse_bool_option(arg.substr(20));
@ -339,15 +343,15 @@ int main(int argc, char ** argv) {
// Set log level to most verbose to capture all debug output // Set log level to most verbose to capture all debug output
common_log_set_verbosity_thold(99); common_log_set_verbosity_thold(99);
if (std::getenv("LLAMA_DEBUG_JINJA") != nullptr) {
jinja::enable_debug(true);
}
debug_options opts; debug_options opts;
if (!parse_options(argc, argv, opts)) { if (!parse_options(argc, argv, opts)) {
return 1; return 1;
} }
if (opts.debug_jinja || std::getenv("LLAMA_DEBUG_JINJA") != nullptr) {
jinja::enable_debug(true);
}
std::string template_source; std::string template_source;
try { try {
// Check if the file is a GGUF file // Check if the file is a GGUF file