tests for extra filtering

Author: samuelcolvin

src/serializers/fields.rs

@@ -210,6 +210,9 @@ impl TypeSerializer for GeneralFieldsSerializer {
         // this is used to include `__pydantic_extra__` in serialization on models
         if let Some(extra_dict) = extra_dict {
             for (key, value) in extra_dict.iter() {
+                if extra.exclude_none && value.is_none() {
+                    continue;
+                }
                 if let Some((next_include, next_exclude)) = self.filter.key_filter(key, include, exclude)? {
                     let value = infer_to_python(value, next_include, next_exclude, &td_extra)?;
                     output_dict.set_item(key, value)?;
@@ -288,6 +291,9 @@ impl TypeSerializer for GeneralFieldsSerializer {
         // this is used to include `__pydantic_extra__` in serialization on models
         if let Some(extra_dict) = extra_dict {
             for (key, value) in extra_dict.iter() {
+                if extra.exclude_none && value.is_none() {
+                    continue;
+                }
                 let filter = self.filter.key_filter(key, include, exclude).map_err(py_err_se_err)?;
                 if let Some((next_include, next_exclude)) = filter {
                     let output_key = infer_json_key(key, &td_extra).map_err(py_err_se_err)?;

tests/serializers/test_model.py

@@ -778,3 +778,27 @@ class MyModel:
     assert s.to_python(m) == {'field_a': b'test', 'field_b': 12, 'field_c': 'extra'}
     assert s.to_python(m, mode='json') == {'field_a': 'test', 'field_b': 12, 'field_c': 'extra'}
     assert s.to_json(m) == b'{"field_a":"test","field_b":12,"field_c":"extra"}'
+
+    # test filtering
+    m = v.validate_python({'field_a': b'test', 'field_b': 12, 'field_c': None, 'field_d': [1, 2, 3]})
+    assert isinstance(m, MyModel)
+    assert m.__dict__ == {'field_a': b'test', 'field_b': 12}
+    assert m.__pydantic_extra__ == {'field_c': None, 'field_d': [1, 2, 3]}
+    assert m.__pydantic_fields_set__ == {'field_a', 'field_b', 'field_c', 'field_d'}
+
+    assert s.to_python(m) == {'field_a': b'test', 'field_b': 12, 'field_c': None, 'field_d': [1, 2, 3]}
+    assert s.to_json(m) == b'{"field_a":"test","field_b":12,"field_c":null,"field_d":[1,2,3]}'
+
+    assert s.to_python(m, exclude_none=True) == {'field_a': b'test', 'field_b': 12, 'field_d': [1, 2, 3]}
+    assert s.to_json(m, exclude_none=True) == b'{"field_a":"test","field_b":12,"field_d":[1,2,3]}'
+
+    assert s.to_python(m, exclude={'field_c'}) == {'field_a': b'test', 'field_b': 12, 'field_d': [1, 2, 3]}
+    assert s.to_json(m, exclude={'field_c'}) == b'{"field_a":"test","field_b":12,"field_d":[1,2,3]}'
+
+    assert s.to_python(m, exclude={'field_d': [0]}) == {
+        'field_a': b'test',
+        'field_b': 12,
+        'field_c': None,
+        'field_d': [2, 3],
+    }
+    assert s.to_json(m, exclude={'field_d': [0]}) == b'{"field_a":"test","field_b":12,"field_c":null,"field_d":[2,3]}'