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

Merge e45a3b354e into 05a6f0e894

This commit is contained in:
Mark Rietveld 2026-02-13 15:05:22 -08:00 committed by GitHub
parent 05a6f0e894 e45a3b354e
commit 44377eccb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/json-schema-to-grammar.cpp
View File

@ -961,7 +961,10 @@ public:
_build_min_max_int(min_value, max_value, out);
out << ") space";
return _add_rule(rule_name, out.str());
} else if (schema.empty() || schema_type == "object") {
} else if (schema.contains("required") && schema_type.is_null()) {
// Type can be null if schema contains "required". Properties are optional too
return _add_rule(rule_name, _add_primitive("object", PRIMITIVE_RULES.at("object")));
} else if (schema.empty() || schema_type == "object") {
return _add_rule(rule_name, _add_primitive("object", PRIMITIVE_RULES.at("object")));
} else {
if (!schema_type.is_string() || PRIMITIVE_RULES.find(schema_type.get<std::string>()) == PRIMITIVE_RULES.end()) {