Skip to content

Accept array in chat message content field #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2025
Merged

Accept array in chat message content field #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions llama.cpp/server/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,24 @@ inline std::string format_chat(const struct llama_model * model, const std::stri

for (size_t i = 0; i < messages.size(); ++i) {
auto &curr_msg = messages[i];
str[i*2 + 0] = json_value(curr_msg, "role", std::string(""));
str[i*2 + 1] = json_value(curr_msg, "content", std::string(""));
alloc_size += str[i*2 + 1].length();
chat[i].role = str[i*2 + 0].c_str();
str[i*2 + 0] = json_value(curr_msg, "role", std::string(""));

// Handle content as string or array
std::string content;
if (curr_msg.contains("content") && curr_msg["content"].is_array()) {
for (auto &part : curr_msg["content"]) {
if (part.contains("type") && part["type"] == "text" && part.contains("text") && part["text"].is_string()) {
content += part["text"].get<std::string>();
}
// TODO: handle image_url data (?)
}
} else {
content = json_value(curr_msg, "content", std::string(""));
}

str[i*2 + 1] = content;
alloc_size += str[i*2 + 1].length();
chat[i].role = str[i*2 + 0].c_str();
chat[i].content = str[i*2 + 1].c_str();
}

Expand Down
41 changes: 35 additions & 6 deletions llamafile/server/v1_chat_completions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,41 @@ Client::get_v1_chat_completions_params(V1ChatCompletionParams* params)
return send_error(400, "message must have string role");
if (!is_legal_role(message["role"].getString()))
return send_error(400, "message role not system user assistant");
if (!message["content"].isString())
return send_error(400, "message must have string content");
if (message["content"].getString().empty())
return send_error(400, "message must not have empty content");
params->messages.emplace_back(message["role"].getString(),
message["content"].getString());

// Accept string or array for content
if (message["content"].isString()) {
if (message["content"].getString().empty())
return send_error(400, "message must not have empty content");
params->messages.emplace_back(message["role"].getString(),
message["content"].getString());
} else if (message["content"].isArray()) {
std::string combined_content;
std::vector<Json>& content_array = message["content"].getArray();
if (content_array.empty())
return send_error(400, "message content array must not be empty");
for (Json& part : content_array) {
if (!part.isObject() || !part["type"].isString())
return send_error(400, "content array items must be objects with type");
std::string type = part["type"].getString();
if (type == "text") {
if (!part["text"].isString())
return send_error(400, "text part must have string text");
combined_content += part["text"].getString();
} else if (type == "image_url") {
if (!part["image_url"].isObject() || !part["image_url"]["url"].isString())
return send_error(400, "image_url part must have url string");
// TODO collect image data (?)
// std::string image_url = part["image_url"]["url"].getString();
} else {
return send_error(400, "unsupported content part type");
}
}
if (combined_content.empty())
return send_error(400, "message must not have empty content");
params->messages.emplace_back(message["role"].getString(), combined_content);
} else {
return send_error(400, "message content must be string or array");
}
}

// n: integer|null
Expand Down