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

tool-call: allow empty message content when there's tool_calls in format_chat

Browse source
This commit is contained in:
ochafik 2024-09-26 02:19:04 +01:00
parent d928ff4dfd
commit ab25e3fbf9
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/server/utils.hpp
View file

@ -77,8 +77,8 @@ inline std::string format_chat(const struct llama_model * model, const std::stri
msg.content += "\n" + part["text"].get<std::string>(); msg.content += "\n" + part["text"].get<std::string>();
} }
} }
} else { } else if (!(curr_msg.is_null() && curr_msg.contains("tool_calls"))) {
throw std::runtime_error("Invalid 'content' type (ref: https://github.com/ggerganov/llama.cpp/issues/8367)"); throw std::runtime_error("Invalid 'content' type (ref: https://github.com/ggerganov/llama.cpp/issues/8367): " + curr_msg.dump());
} }
} else { } else {
throw std::runtime_error("Missing 'content' (ref: https://github.com/ggerganov/llama.cpp/issues/8367)"); throw std::runtime_error("Missing 'content' (ref: https://github.com/ggerganov/llama.cpp/issues/8367)");
@ -474,6 +474,7 @@ static json format_final_response_oaicompat(const json & request, const json & r
auto tools = json_value(request, "tools", json::array()); auto tools = json_value(request, "tools", json::array());
json tool_calls; json tool_calls;
json message_content; json message_content;
printf("# CONTENT: %s\n\n", content.c_str());
if (json_value(request, "parse_tool_calls", false) if (json_value(request, "parse_tool_calls", false)
&& !(parsed_tool_calls = parse_tool_calls(tools, chat_template, content)).tool_calls.empty()) { && !(parsed_tool_calls = parse_tool_calls(tools, chat_template, content)).tool_calls.empty()) {
finish_reason = "tool"; finish_reason = "tool";
@ -513,6 +514,7 @@ static json format_final_response_oaicompat(const json & request, const json & r
}}, }},
{"id", completion_id} {"id", completion_id}
}; };
printf("# RES: %s\n\n", res.dump(2).c_str());
// extra fields for debugging purposes // extra fields for debugging purposes
if (verbose) { if (verbose) {