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

server: fix json_schema response_format handling (#10732) 

- Add validation that `json_schema.schema` is present when using
  `response_format.type: "json_schema"`. Previously, a missing schema
  would silently result in an empty schema `{}` being used, which
  matches any JSON and doesn't constrain the output.

- Update the error message for invalid response_format types to
  include "json_schema" as a valid option (was only listing "text"
  and "json_object").

Fixes: https://github.com/ggml-org/llama.cpp/issues/10732
This commit is contained in:
Chris Hasiński 2026-01-20 16:22:02 +01:00
parent d1e3556481
commit 1549bcee25
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/server/server-common.cpp
View File

@ -870,10 +870,15 @@ json oaicompat_chat_params_parse(
if (response_type == "json_object") {
json_schema = json_value(response_format, "schema", json::object());
} else if (response_type == "json_schema") {
// https://platform.openai.com/docs/api-reference/chat/create#chat-create-response_format
// OpenAI expects: response_format.json_schema.schema
auto schema_wrapper = json_value(response_format, "json_schema", json::object());
json_schema = json_value(schema_wrapper, "schema", json::object());
if (!schema_wrapper.contains("schema")) {
throw std::invalid_argument("response_format type \"json_schema\" requires \"json_schema.schema\" to be set");
}
json_schema = schema_wrapper.at("schema");
} else if (!response_type.empty() && response_type != "text") {
throw std::invalid_argument("response_format type must be one of \"text\" or \"json_object\", but got: " + response_type);
throw std::invalid_argument("response_format type must be one of \"text\", \"json_object\", or \"json_schema\", but got: " + response_type);
}
}