Implement retry_with_lax_check in build_simple_serializer

Author: alexdrydew

src/serializers/type_serializers/simple.rs

@@ -86,7 +86,7 @@ impl TypeSerializer for NoneSerializer {
 }
 
 macro_rules! build_simple_serializer {
-    ($struct_name:ident, $expected_type:literal, $rust_type:ty, $ob_type:expr, $key_method:ident) => {
+    ($struct_name:ident, $expected_type:literal, $rust_type:ty, $ob_type:expr, $key_method:ident, $subtypes_allowed:expr) => {
         #[derive(Debug, Clone)]
         pub struct $struct_name;
 
@@ -164,6 +164,10 @@ macro_rules! build_simple_serializer {
             fn get_name(&self) -> &str {
                 Self::EXPECTED_TYPE
             }
+
+            fn retry_with_lax_check(&self) -> bool {
+                $subtypes_allowed
+            }
         }
     };
 }
@@ -172,7 +176,7 @@ pub(crate) fn to_str_json_key(key: &PyAny) -> PyResult<Cow<str>> {
     Ok(key.str()?.to_string_lossy())
 }
 
-build_simple_serializer!(IntSerializer, "int", Int, ObType::Int, to_str_json_key);
+build_simple_serializer!(IntSerializer, "int", Int, ObType::Int, to_str_json_key, true);
 
 pub(crate) fn bool_json_key(key: &PyAny) -> PyResult<Cow<str>> {
     let v = if key.is_true().unwrap_or(false) {
@@ -183,4 +187,4 @@ pub(crate) fn bool_json_key(key: &PyAny) -> PyResult<Cow<str>> {
     Ok(Cow::Borrowed(v))
 }
 
-build_simple_serializer!(BoolSerializer, "bool", bool, ObType::Bool, bool_json_key);
+build_simple_serializer!(BoolSerializer, "bool", bool, ObType::Bool, bool_json_key, false);

tests/serializers/test_union.py

@@ -517,14 +517,19 @@ class Item(BaseModel):
 EXAMPLE_UUID = uuid.uuid4()
 
 
-@pytest.mark.parametrize('order', ['direct', 'inverse'])
+class IntSubclass(int):
+    pass
+
+
+@pytest.mark.parametrize('reverse', [False, True])
 @pytest.mark.parametrize(
     'core_schema_left,core_schema_right,input_value,expected_value',
     [
         (core_schema.int_schema(), core_schema.bool_schema(), True, True),
         (core_schema.int_schema(), core_schema.bool_schema(), 1, 1),
         (core_schema.str_schema(), core_schema.int_schema(), 1, 1),
         (core_schema.str_schema(), core_schema.int_schema(), '1', '1'),
+        (core_schema.int_schema(), core_schema.bool_schema(), IntSubclass(1), 1),
         (
             core_schema.decimal_schema(),
             core_schema.int_schema(),
@@ -538,6 +543,18 @@ class Item(BaseModel):
             Decimal('1.'),
             Decimal('1.'),
         ),
+        (
+            core_schema.decimal_schema(),
+            core_schema.str_schema(),
+            Decimal('_1'),
+            Decimal('_1'),
+        ),
+        (
+            core_schema.decimal_schema(),
+            core_schema.str_schema(),
+            '_1',
+            '_1',
+        ),
         (
             core_schema.uuid_schema(),
             core_schema.str_schema(),
@@ -553,24 +570,25 @@ class Item(BaseModel):
     ],
 )
 def test_union_serializer_picks_exact_type_over_subclass(
-    core_schema_left, core_schema_right, input_value, expected_value, order
+    core_schema_left, core_schema_right, input_value, expected_value, reverse
 ):
     s = SchemaSerializer(
         core_schema.union_schema(
-            [core_schema_left, core_schema_right] if order == 'direct' else [core_schema_right, core_schema_left]
+            [core_schema_right, core_schema_left] if reverse else [core_schema_left, core_schema_right]
         )
     )
     assert s.to_python(input_value) == expected_value
 
 
-@pytest.mark.parametrize('order', ['direct', 'inverse'])
+@pytest.mark.parametrize('reverse', [False, True])
 @pytest.mark.parametrize(
     'core_schema_left,core_schema_right,input_value,expected_value',
     [
         (core_schema.int_schema(), core_schema.bool_schema(), True, True),
         (core_schema.int_schema(), core_schema.bool_schema(), 1, 1),
         (core_schema.str_schema(), core_schema.int_schema(), 1, 1),
         (core_schema.str_schema(), core_schema.int_schema(), '1', '1'),
+        (core_schema.int_schema(), core_schema.bool_schema(), IntSubclass(1), 1),
         (
             core_schema.decimal_schema(),
             core_schema.int_schema(),
@@ -584,14 +602,26 @@ def test_union_serializer_picks_exact_type_over_subclass(
             Decimal('1.'),
             '1',
         ),
+        (
+            core_schema.decimal_schema(),
+            core_schema.str_schema(),
+            Decimal('_1'),
+            '1',
+        ),
+        (
+            core_schema.decimal_schema(),
+            core_schema.str_schema(),
+            '_1',
+            '_1',
+        ),
     ],
 )
 def test_union_serializer_picks_exact_type_over_subclass_json(
-    core_schema_left, core_schema_right, input_value, expected_value, order
+    core_schema_left, core_schema_right, input_value, expected_value, reverse
 ):
     s = SchemaSerializer(
         core_schema.union_schema(
-            [core_schema_left, core_schema_right] if order == 'direct' else [core_schema_right, core_schema_left]
+            [core_schema_right, core_schema_left] if reverse else [core_schema_left, core_schema_right]
         )
     )
     assert s.to_python(input_value, mode='json') == expected_value