support typeddicts where not all fields are not required

Author: samuelcolvin

src/validators/typed_dict.rs

@@ -35,7 +35,6 @@ pub struct TypedDictValidator {
     extras_validator: Option<Box<CombinedValidator>>,
     strict: bool,
     loc_by_alias: bool,
-    allow_partial: bool,
 }
 
 impl BuildValidator for TypedDictValidator {
@@ -125,14 +124,12 @@ impl BuildValidator for TypedDictValidator {
                 required,
             });
         }
-        let allow_partial = fields.iter().all(|f| !f.required);
         Ok(Self {
             fields,
             extra_behavior,
             extras_validator,
             strict,
             loc_by_alias: config.get_as(intern!(py, "loc_by_alias"))?.unwrap_or(true),
-            allow_partial,
         }
         .into())
     }
@@ -209,7 +206,7 @@ impl Validator for TypedDictValidator {
                         }
                         Err(ValError::Omit) => continue,
                         Err(ValError::LineErrors(line_errors)) => {
-                            if !is_last_partial {
+                            if !is_last_partial || field.required {
                                 for err in line_errors {
                                     errors.push(lookup_path.apply_error_loc(err, self.loc_by_alias, &field.name));
                                 }
@@ -365,6 +362,6 @@ impl Validator for TypedDictValidator {
     }
 
     fn supports_partial(&self) -> bool {
-        self.allow_partial
+        true
     }
 }

tests/validators/test_allow_partial.py

@@ -138,6 +138,7 @@ def test_partial_typed_dict():
 
     assert v.validate_python({'a': 11, 'b': '12', 'c': 13}) == snapshot(IsStrictDict(a=11, b=12, c=13))
     assert v.validate_python({'a': 11, 'c': 13, 'b': '12'}) == snapshot(IsStrictDict(a=11, b=12, c=13))
+    assert v.validate_python(MyMapping({'a': 11, 'c': 13, 'b': '12'})) == snapshot(IsStrictDict(a=11, b=12, c=13))
 
     assert v.validate_python({'a': 11, 'b': '12', 'c': 13}, allow_partial=True) == snapshot({'a': 11, 'b': 12, 'c': 13})
     with pytest.raises(ValidationError) as exc_info:
@@ -154,6 +155,9 @@ def test_partial_typed_dict():
         ]
     )
     assert v.validate_python({'a': 11, 'b': '12', 'c': 1}, allow_partial=True) == snapshot(IsStrictDict(a=11, b=12))
+    assert v.validate_python(MyMapping({'a': 11, 'b': '12', 'c': 1}), allow_partial=True) == snapshot(
+        IsStrictDict(a=11, b=12)
+    )
     assert v.validate_python({'a': 11, 'c': 13, 'b': 1}, allow_partial=True) == snapshot(IsStrictDict(a=11, c=13))
     with pytest.raises(ValidationError) as exc_info:
         v.validate_python({'a': 11, 'c': 1, 'b': 12}, allow_partial=True)
@@ -202,8 +206,11 @@ def test_non_partial_typed_dict():
     assert v.validate_python({'a': 11, 'b': '12', 'c': 13}) == snapshot({'a': 11, 'b': 12, 'c': 13})
     with pytest.raises(ValidationError, match='Input should be greater than 10'):
         v.validate_python({'a': 11, 'b': '12', 'c': 1})
-    with pytest.raises(ValidationError, match='Input should be greater than 10'):
-        v.validate_python({'a': 11, 'b': '12', 'c': 1}, allow_partial=False)
+    assert v.validate_python({'a': 11, 'b': '12', 'c': 1}, allow_partial=True) == snapshot({'a': 11, 'b': 12})
+    with pytest.raises(ValidationError, match=r'b\s+Field required'):
+        v.validate_python({'a': 11, 'c': 12}, allow_partial=True)
+    with pytest.raises(ValidationError, match=r'b\s+Input should be greater than 10'):
+        v.validate_python({'a': 11, 'c': 12, 'b': 1}, allow_partial=True)
 
 
 def test_double_nested():