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

Fix sanitizer warnings

This commit is contained in:
Piotr Wilkin 2026-01-23 20:49:39 +01:00 committed by Piotr Wilkin
parent 76647dee2e
commit 16f756b4c5
1 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
common/jinja/caps.cpp
View File

@ -240,65 +240,81 @@ caps caps_get(jinja::program & prog) {
);
// case: requires non-null content in tool calls
caps_try_execute(
prog,
[&]() {
// messages
return json::array({
{
{"role", "user"},
{"content", "User message"},
},
{
{"role", "assistant"},
{"tool_calls", json::array({
{
{"id", "call0001"},
{"type", "function"},
{"function", {
{"name", "tool1"},
{"arguments", {
{"arg", "value"}
}}
}}
if (result.supports_tool_calls) {
caps_try_execute(
prog,
[&]() {
// messages
return json::array({
{
{ "role", "user" },
{ "content", "User message" },
},
{
{ "role", "assistant" },
{ "tool_calls",
json::array({
{
{ "id", "call0001" },
{ "type", "function" },
{ "function",
{
{ "name", "tool1" },
{ "arguments",
{
{ "arg", "value" }
}
}
}
}
},
})
}
},
{
{ "role", "user" },
{ "content", "User message" },
},
});
},
[&]() {
// tools
return json::array({
{
{ "name", "tool" },
{ "type", "function" },
{ "function",
{
{ "name", "tool1" },
{ "description", "Tool description" },
{ "parameters",
{
{ "type", "object" },
{ "properties",
{
{ "arg",
{
{ "type", "string" },
{ "description", "Arg description" },
}
},
}
},
{ "required", json::array({ "arg" }) },
}
},
}
},
})}
},
{
{"role", "user"},
{"content", "User message"},
},
});
},
[&]() {
// tools
return json::array({
{
{"name", "tool"},
{"type", "function"},
{"function", {
{"name", "tool1"},
{"description", "Tool description"},
{"parameters", {
{"type", "object"},
{"properties", {
{"arg", {
{"type", "string"},
{"description", "Arg description"},
}},
}},
{"required", json::array({ "arg" })},
}},
}},
},
});
},
[&](bool success, value & messages, value & tools) {
if (!success) {
result.requires_non_null_content = true;
},
});
},
[&](bool success, value & /* messages */, value & /* tools */) {
if (!success) {
result.requires_non_null_content = true;
}
}
}
);
);
}
// case: preserve reasoning content in chat history
caps_try_execute(