wylab/llama.cpp
0
0
Fork 1
mirror of https://github.com/ggml-org/llama.cpp.git synced 2026-09-15 18:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

cont : restore (min|max)Length to imply string type

Browse Source
This commit is contained in:
Alde Rojas
2026-09-12 13:23:12 -05:00
parent 2372064fea
commit a1e2fc9e8b
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/json-schema.cpp
+1 -1
View File
@@ -287,7 +287,7 @@ class common_schema_builder {
if (schema.contains("items") || schema.contains("prefixItems")) {
return build_array(schema, path);
}
if (schema.contains("pattern") || get_format(schema, path) != common_schema::FORMAT_NONE) {
if (schema.contains("pattern") || schema.contains("minLength") || schema.contains("maxLength") || get_format(schema, path) != common_schema::FORMAT_NONE) {
return build_string(schema, path);
}
return std::make_unique<common_schema_any>();
tests/test-json-schema.cpp
+8 -5
View File
@@ -45,7 +45,7 @@ static void test_any(testing & t) {
});
t.test("keywords that do not imply a type", [](testing & t) {
auto doc = parse(R"({"description": "x", "format": "email", "minLength": 3, "additionalProperties": true})");
auto doc = parse(R"({"description": "x", "format": "email", "additionalProperties": true})");
root<common_schema_any>(t, doc);
});
}
@@ -122,9 +122,12 @@ static void test_string(testing & t) {
expect("email", common_schema::FORMAT_NONE);
});
t.test("pattern and known format imply a string", [](testing & t) {
t.test("pattern, length and known format imply a string", [](testing & t) {
auto doc_pattern = parse(R"({"pattern": "^a$"})");
t.assert_equal("pattern", "^a$", root<common_schema_string>(t, doc_pattern).pattern);
auto doc_length = parse(R"({"minLength": 1, "maxLength": 3})");
t.assert_equal("min_length", 1, root<common_schema_string>(t, doc_length).min_length);
t.assert_equal("max_length", 3, root<common_schema_string>(t, doc_length).max_length);
auto doc_format = parse(R"({"format": "uuid"})");
t.assert_equal("format", common_schema::FORMAT_UUID, root<common_schema_string>(t, doc_format).format);
});
@@ -377,7 +380,7 @@ static void test_may_be_string(testing & t) {
t.test("leaves", [&](testing & t) {
check(t, R"({"type": "string"})", true);
check(t, R"({"type": "integer"})", false);
check(t, R"({"minLength": 1})", false);
check(t, R"({"minLength": 1})", true);
check(t, R"({"pattern": "^[a-z]+$"})", true);
check(t, R"({"const": "hello"})", true);
check(t, R"({"const": 123})", false);
@@ -390,7 +393,7 @@ static void test_may_be_string(testing & t) {
check(t, R"({"anyOf": [{"type": "integer"}, {"type": "boolean"}]})", false);
check(t, R"({"allOf": [{"type": "string"}, {"minLength": 1}]})", true);
check(t, R"({"allOf": [{"type": "string"}, {"type": "integer"}]})", false);
check(t, R"({"allOf": [{"minLength": 1}, {"maxLength": 2}]})", false);
check(t, R"({"allOf": [{"minLength": 1}, {"maxLength": 2}]})", true);
});
t.test("ref", [&](testing & t) {
@@ -422,7 +425,7 @@ static void test_value_types(testing & t) {
t.test("leaves", [&](testing & t) {
check(t, R"({"type": "string"})", { common_schema::TYPE_STRING });
check(t, R"({"type": "number"})", { common_schema::TYPE_NUMBER, common_schema::TYPE_INTEGER });
check(t, R"({"minLength": 1})", common_schema::type_set::all());
check(t, R"({"description": "x"})", common_schema::type_set::all());
check(t, R"({"properties": {"a": {"type": "string"}}})", { common_schema::TYPE_OBJECT });
check(t, R"({"items": {"type": "string"}})", { common_schema::TYPE_ARRAY });
check(t, R"({"const": 1.5})", { common_schema::TYPE_NUMBER });