Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic improvements of json_schema (follow up on PR #98) #133

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+83 −0
Draft

Basic improvements of json_schema (follow up on PR #98) #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions src/json_schema/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,89 @@ mod tests {
],
vec!["this isnt valid json"],
),
// Confirm that oneOf doesn't produce illegal lookaround: https://github.com/dottxt-ai/outlines/issues/823
//
// The pet field uses the discriminator field to decide which schema (Cat or Dog) applies, based on the pet_type property.
// - if pet_type is "cat", the Cat schema applies, requiring a meows field (integer)
// - if pet_type is "dog", the Dog schema applies, requiring a barks field (number)
//
// So, expected object requires two fields:
// - pet, which must be one of two types: Cat or Dog, determined by the pet_type field
// - n, an integer
(
r##"{
"$defs": {
"Cat": {
"properties": {
"pet_type": {
"const": "cat",
"enum": ["cat"],
"title": "Pet Type",
"type": "string"
},
"meows": {
"title": "Meows",
"type": "integer"
}
},
"required": ["pet_type", "meows"],
"title": "Cat",
"type": "object"
},
"Dog": {
"properties": {
"pet_type": {
"const": "dog",
"enum": ["dog"],
"title": "Pet Type",
"type": "string"
},
"barks": {
"title": "Barks",
"type": "number"
}
},
"required": ["pet_type", "barks"],
"title": "Dog",
"type": "object"
}
},
"properties": {
"pet": {
"discriminator": {
"mapping": {
"cat": "#/$defs/Cat",
"dog": "#/$defs/Dog"
},
"propertyName": "pet_type"
},
"oneOf": [
{"$ref": "#/$defs/Cat"},
{"$ref": "#/$defs/Dog"}
],
"title": "Pet"
},
"n": {
"title": "N",
"type": "integer"
}
},
"required": ["pet", "n"],
"title": "Model",
"type": "object"
}"##,
r#"\{[ ]?"pet"[ ]?:[ ]?((?:\{[ ]?"pet_type"[ ]?:[ ]?("cat")[ ]?,[ ]?"meows"[ ]?:[ ]?(-)?(0|[1-9][0-9]*)[ ]?\})|(?:\{[ ]?"pet_type"[ ]?:[ ]?("dog")[ ]?,[ ]?"barks"[ ]?:[ ]?((-)?(0|[1-9][0-9]*))(\.[0-9]+)?([eE][+-][0-9]+)?[ ]?\}))[ ]?,[ ]?"n"[ ]?:[ ]?(-)?(0|[1-9][0-9]*)[ ]?\}"#,
vec![
r#"{ "pet": { "pet_type": "cat", "meows": 5 }, "n": 10 }"#,
r#"{ "pet": { "pet_type": "dog", "barks": 3.5 }, "n": 7 }"#,
],
vec![
// Missing required fields
r#"{ "pet": { "pet_type": "cat" }, "n": 10 }"#,
// Incorrect pet_type
r#"{ "pet": { "pet_type": "bird", "meows": 2 }, "n": 5 }"#
],
),
] {
let json: Value = serde_json::from_str(schema).expect("Can't parse json");
let result = to_regex(&json, None).expect("To regex failed");
Expand Down