Merge pull request #70 from surenkov/69-the-allow_null-parameter-is-not-passed-in-rest-framework-schemafield

Propagate `allow_null` parameter to base DRF Field

Author: surenkov

django_pydantic_field/v2/rest_framework/fields.py

@@ -23,17 +23,16 @@ def __init__(
         self,
         schema: type[types.ST],
         config: pydantic.ConfigDict | None = None,
-        *args,
-        allow_null: bool = False,
         **kwargs,
     ):
         deprecation.truncate_deprecated_v1_export_kwargs(kwargs)
+        allow_null = kwargs.get("allow_null", False)
 
         self.schema = schema
         self.config = config
         self.export_kwargs = types.SchemaAdapter.extract_export_kwargs(kwargs)
         self.adapter = types.SchemaAdapter(schema, config, None, None, allow_null, **self.export_kwargs)
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def bind(self, field_name: str, parent: BaseSerializer):
         if not self.adapter.is_bound:

django_pydantic_field/v2/utils.py

@@ -51,7 +51,7 @@ def get_origin_type(cls: type):
 if sys.version_info >= (3, 9):
 
     def evaluate_forward_ref(ref: ty.ForwardRef, ns: Mapping[str, ty.Any]) -> ty.Any:
-        return ref._evaluate(dict(ns), {}, frozenset())
+        return ref._evaluate(dict(ns), {}, recursive_guard=frozenset())
 
 else:
 

tests/v2/rest_framework/test_fields.py

@@ -90,6 +90,27 @@ def test_model_serializer_marshalling_with_schema_field():
     assert serializer.data == expected_data
 
 
+def test_serializer_field_allow_null_passes():
+    class SampleSerializer(serializers.Serializer):
+        foo = rest_framework.SchemaField(InnerSchema, allow_null=True)
+
+    serializer = SampleSerializer(data={"foo": None})
+    try:
+        serializer.is_valid(raise_exception=True)
+    except exceptions.ValidationError:
+        pytest.fail("Null value should be accepted.")
+
+
+def test_serializer_field_disallow_null_fails():
+    class SampleSerializer(serializers.Serializer):
+        foo = rest_framework.SchemaField(InnerSchema, allow_null=False)
+
+    serializer = SampleSerializer(data={"foo": None})
+
+    with pytest.raises(exceptions.ValidationError, match=".*This field may not be null.*"):
+        serializer.is_valid(raise_exception=True)
+
+
 @pytest.mark.parametrize(
     "export_kwargs",
     [