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

tool-call: ensure we don't return content when there are tool calls / warn

Browse source
This commit is contained in:
ochafik 2025-02-04 04:18:49 +00:00
parent 812544ab8b
commit d44eb95c67
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/chat.cpp
View file

@ -134,6 +134,14 @@ static common_chat_msg parse_json_tool_calls(
it = match.suffix().first; it = match.suffix().first;
result.tool_calls.push_back({name, arguments.is_string() ? arguments.get<std::string>() : arguments.dump(), /* id= */ ""}); result.tool_calls.push_back({name, arguments.is_string() ? arguments.get<std::string>() : arguments.dump(), /* id= */ ""});
} }
if (!result.tool_calls.empty()) {
if (!string_trim(result.content).empty()) {
LOG_WRN("Content found with tool calls: %s", result.content.c_str());
}
result.content = "";
result.role = "user";
}
return result; return result;
} }