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

Fix gpt-oss tool calling: pass tool args and tool responses as json

This commit is contained in:
matteo serva 2026-02-14 09:01:48 +01:00
parent c7db95f106
commit 4018b9ca80
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/chat.cpp
View File

@ -2029,9 +2029,25 @@ static common_chat_params common_chat_params_init_gpt_oss(const common_chat_temp
auto has_reasoning_content = msg.contains("reasoning_content") && msg.at("reasoning_content").is_string();
auto has_tool_calls = msg.contains("tool_calls") && msg.at("tool_calls").is_array();
if (has_reasoning_content && has_tool_calls) {
if (msg.at("role") == "tool")
{
auto adjusted_message = msg;
std::string response = msg.value("content",std::string());
adjusted_message["content"] = json::parse(response);
adjusted_messages.push_back(adjusted_message);
} else if (has_tool_calls) {
auto adjusted_message = msg;
adjusted_message["thinking"] = msg.at("reasoning_content");
if(has_reasoning_content)
{
adjusted_message["thinking"] = msg.at("reasoning_content");
}
for ( auto& tool_call : adjusted_message.at("tool_calls"))
{
auto& function = tool_call.at("function");
std::string args = function.value("arguments",std::string());
function["arguments"] = json::parse(args);
}
adjusted_messages.push_back(adjusted_message);
} else {
adjusted_messages.push_back(msg);