server : fix response_format json_schema when schema is not nested in the json_schema wrapper (#28697)
* server : accept top-level schema in response_format with type json_schema The OpenAI-compatible chat completions endpoint only applied the schema when it was nested inside response_format.json_schema.schema. When the schema was provided directly as response_format.schema (as documented in the server README, and used by some clients), it was silently ignored and generation ran unconstrained. Also mention json_schema in the error message for invalid response_format types, document the OpenAI wrapper form in the README, and add a test case for the top-level schema form. Fixes #10732 * server : let the json_schema wrapper take precedence by presence Pick the schema source based on whether response_format has a json_schema key, instead of falling back when the parsed wrapper schema is empty. An empty schema {} is valid (any JSON value), so the old check let a top-level schema override an explicit {} in the wrapper. Use json_value() for the top-level schema too, like the rest of the function, and add tests for the precedence. --------- Co-authored-by: linsen <251731047+linsen458-spec@users.noreply.github.com>
This commit is contained in:
1 parent
0eebb6eddc
commit
1945793e00
3 files changed
+12
-4
No files matched your search
@@ -1390,10 +1390,14 @@ json oaicompat_chat_params_parse(
|
||||
json_schema = json_value(response_format, "schema", json::object());
|
||||
}
|
||||
} else if (response_type == "json_schema") {
|
||||
auto schema_wrapper = json_value(response_format, "json_schema", json::object());
|
||||
json_schema = json_value(schema_wrapper, "schema", json::object());
|
||||
if (response_format.contains("json_schema")) {
|
||||
auto schema_wrapper = json_value(response_format, "json_schema", json::object());
|
||||
json_schema = json_value(schema_wrapper, "schema", json::object());
|
||||
} else {
|
||||
json_schema = json_value(response_format, "schema", json::object());
|
||||
}
|
||||
} 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user