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

json: nit: move string rules together

Browse source
This commit is contained in:
Olivier Chafik 2024-06-08 21:21:35 +01:00
parent ac2a8f8930
commit 3549702da7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/json-schema-to-grammar.cpp
View file

@ -173,7 +173,7 @@ static void _generate_min_max_int(int min_value, int max_value, std::stringstrea
} }
out << "]"; out << "]";
}; };
auto more_digits = [&](int min_digits, int max_digits) {//} = std::numeric_limits<int>::max()) { auto more_digits = [&](int min_digits, int max_digits) {
out << "[0-9]"; out << "[0-9]";
if (min_digits == max_digits && min_digits == 1) { if (min_digits == max_digits && min_digits == 1) {
return; return;
@ -862,6 +862,11 @@ public:
} else if ((schema_type.is_null() || schema_type == "string") && STRING_FORMAT_RULES.find(schema_format + "-string") != STRING_FORMAT_RULES.end()) { } else if ((schema_type.is_null() || schema_type == "string") && STRING_FORMAT_RULES.find(schema_format + "-string") != STRING_FORMAT_RULES.end()) {
auto prim_name = schema_format + "-string"; auto prim_name = schema_format + "-string";
return _add_rule(rule_name, _add_primitive(prim_name, STRING_FORMAT_RULES.at(prim_name))); return _add_rule(rule_name, _add_primitive(prim_name, STRING_FORMAT_RULES.at(prim_name)));
} else if (schema_type == "string" && (schema.contains("minLength") || schema.contains("maxLength"))) {
std::string char_rule = _add_primitive("char", PRIMITIVE_RULES.at("char"));
int min_len = schema.contains("minLength") ? schema["minLength"].get<int>() : 0;
int max_len = schema.contains("maxLength") ? schema["maxLength"].get<int>() : std::numeric_limits<int>::max();
return _add_rule(rule_name, "\"\\\"\" " + build_repetition(char_rule, min_len, max_len) + " \"\\\"\" space");
} else if (schema_type == "integer" && (schema.contains("minimum") || schema.contains("exclusiveMinimum") || schema.contains("maximum") || schema.contains("exclusiveMaximum"))) { } else if (schema_type == "integer" && (schema.contains("minimum") || schema.contains("exclusiveMinimum") || schema.contains("maximum") || schema.contains("exclusiveMaximum"))) {
int min_value = std::numeric_limits<int>::min(); int min_value = std::numeric_limits<int>::min();
int max_value = std::numeric_limits<int>::max(); int max_value = std::numeric_limits<int>::max();
@ -880,11 +885,6 @@ public:
_generate_min_max_int(min_value, max_value, out); _generate_min_max_int(min_value, max_value, out);
out << ") space"; out << ") space";
return _add_rule(rule_name, out.str()); return _add_rule(rule_name, out.str());
} else if (schema_type == "string" && (schema.contains("minLength") || schema.contains("maxLength"))) {
std::string char_rule = _add_primitive("char", PRIMITIVE_RULES.at("char"));
int min_len = schema.contains("minLength") ? schema["minLength"].get<int>() : 0;
int max_len = schema.contains("maxLength") ? schema["maxLength"].get<int>() : std::numeric_limits<int>::max();
return _add_rule(rule_name, "\"\\\"\" " + build_repetition(char_rule, min_len, max_len) + " \"\\\"\" space");
} else if (schema.empty() || schema_type == "object") { } else if (schema.empty() || schema_type == "object") {
return _add_rule(rule_name, _add_primitive("object", PRIMITIVE_RULES.at("object"))); return _add_rule(rule_name, _add_primitive("object", PRIMITIVE_RULES.at("object")));
} else { } else {