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

Update json-schema-to-grammar.cpp

Browse source
This commit is contained in:
ochafik 2024-03-12 00:02:45 +00:00
parent d934adccea
commit 8caaf1641d
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
examples/server/json-schema-to-grammar.cpp
View file

@ -439,16 +439,16 @@ public:
_rules["space"] = SPACE_RULE; _rules["space"] = SPACE_RULE;
} }
json resolve_refs(nlohmann::json& schema, const std::string& url) { void resolve_refs(nlohmann::json& schema, const std::string& url) {
/* /*
* Resolves all $ref fields in the given schema, fetching any remote schemas, * Resolves all $ref fields in the given schema, fetching any remote schemas,
* replacing $ref with absolute reference URL and populating _refs with the * replacing each $ref with absolute reference URL and populates _refs with the
* respective referenced (sub)schema dictionaries. * respective referenced (sub)schema dictionaries.
*/ */
function<json(json&)> visit_refs = [&](json& n) { function<void(json&)> visit_refs = [&](json& n) {
if (n.is_array()) { if (n.is_array()) {
for (auto& x : n) { for (auto& x : n) {
x = visit_refs(x); visit_refs(x);
} }
} else if (n.is_object()) { } else if (n.is_object()) {
if (n.contains("$ref")) { if (n.contains("$ref")) {
@ -463,11 +463,11 @@ public:
} else { } else {
// Fetch the referenced schema and resolve its refs // Fetch the referenced schema and resolve its refs
auto referenced = _fetch_json.value()(ref); auto referenced = _fetch_json.value()(ref);
target = resolve_refs(referenced, base_url); resolve_refs(referenced, base_url);
_refs[base_url] = target; _refs[base_url] = referenced;
} }
if (ref.find('#') == string::npos || ref.substr(ref.find('#') + 1).empty()) { if (ref.find('#') == string::npos || ref.substr(ref.find('#') + 1).empty()) {
return target; return;
} }
} else if (ref.find("#/") == 0) { } else if (ref.find("#/") == 0) {
target = schema; target = schema;
@ -475,7 +475,7 @@ public:
ref = url + ref; ref = url + ref;
} else { } else {
_errors.push_back("Unsupported ref: " + ref); _errors.push_back("Unsupported ref: " + ref);
return n; return;
} }
string pointer = ref.substr(ref.find('#') + 1); string pointer = ref.substr(ref.find('#') + 1);
vector<string> tokens = split(pointer, "/"); vector<string> tokens = split(pointer, "/");
@ -483,7 +483,7 @@ public:
string sel = tokens[i]; string sel = tokens[i];
if (target.is_null() || !target.contains(sel)) { if (target.is_null() || !target.contains(sel)) {
_errors.push_back("Error resolving ref " + ref + ": " + sel + " not in " + target.dump()); _errors.push_back("Error resolving ref " + ref + ": " + sel + " not in " + target.dump());
return n; return;
} }
target = target[sel]; target = target[sel];
} }
@ -495,10 +495,9 @@ public:
} }
} }
} }
return n;
}; };
return visit_refs(schema); visit_refs(schema);
} }
string visit(const json& schema, const string& name) { string visit(const json& schema, const string& name) {
@ -661,12 +660,9 @@ public:
string json_schema_to_grammar(const json& schema) { string json_schema_to_grammar(const json& schema) {
auto dotall = false; SchemaConverter converter(/* fetch_json= */ std::nullopt, /* dotall= */ false);
string url("input");
SchemaConverter converter(/* fetch_json= */ std::nullopt, dotall);
auto copy = schema; auto copy = schema;
copy = converter.resolve_refs(copy, url); converter.resolve_refs(copy, "input");
converter.visit(copy, ""); converter.visit(copy, "");
converter.check_errors(); converter.check_errors();
return converter.format_grammar(); return converter.format_grammar();