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

server : proper error handling for missing elements in messages array (OpenAI compatible backend) (#13540)

Browse source
This commit is contained in:
Piotr Wilkin (ilintar) 2025-05-15 08:40:58 +02:00 • committed by GitHub
parent b2838049cc
commit c753d7bed0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/server/utils.hpp
View file

@ -643,6 +643,18 @@ static json oaicompat_completion_params_parse(
throw std::runtime_error("Expected 'messages' to be an array"); throw std::runtime_error("Expected 'messages' to be an array");
} }
for (auto & msg : messages) { for (auto & msg : messages) {
std::string role = json_value(msg, "role", std::string());
if (role != "assistant" && !msg.contains("content")) {
throw std::runtime_error("All non-assistant messages must contain 'content'");
}
if (role == "assistant") {
if (!msg.contains("content") && !msg.contains("tool_calls")) {
throw std::runtime_error("Assistant message must contain either 'content' or 'tool_calls'!");
}
if (!msg.contains("content")) {
continue; // avoid errors with no content
}
}
json & content = msg.at("content"); json & content = msg.at("content");
if (content.is_string() || content.is_null()) { if (content.is_string() || content.is_null()) {
continue; continue;