mirror of
https://github.com/deepseek-ai/deepseek-recipe.git
synced 2026-10-28 17:17:08 +08:00
Retain enum constraints on nullable primitive schemas
This commit is contained in:
parent
935817c66f
commit
30e230306d
@ -21,6 +21,8 @@ pub(crate) enum JsonSchema {
|
|||||||
SimpleAnyOf {
|
SimpleAnyOf {
|
||||||
r#type: Vec<SimpleJsonSchemaType>,
|
r#type: Vec<SimpleJsonSchemaType>,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
r#enum: Option<Vec<serde_json::Value>>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
description: Option<String>,
|
description: Option<String>,
|
||||||
},
|
},
|
||||||
#[untagged_deserialize(field = "type")]
|
#[untagged_deserialize(field = "type")]
|
||||||
@ -364,3 +366,21 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod contribution_regression {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn nullable_enum_constraints_survive_normalization() {
|
||||||
|
let input = serde_json::json!({"type":"object","properties":{"state":{"type":["string","null"],"enum":["on",null]}}});
|
||||||
|
let result = normalize_strict_schema(input, true, |e| e.to_string(), "root").unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
result["properties"]["state"]["enum"],
|
||||||
|
serde_json::json!(["on", null])
|
||||||
|
);
|
||||||
|
let validator = jsonschema::options().offline().build(&result).unwrap();
|
||||||
|
assert!(validator.is_valid(&serde_json::json!({"state":null})));
|
||||||
|
assert!(!validator.is_valid(&serde_json::json!({"state":"invalid"})));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user