Allow raw dict to be passed as field config

Author: surenkov

django_pydantic_field/base.py

@@ -4,6 +4,7 @@
 from django.core.serializers.json import DjangoJSONEncoder
 
 import pydantic
+from pydantic.config import get_config, inherit_config
 from pydantic.main import create_model
 from pydantic.typing import display_as_type
 
@@ -87,13 +88,16 @@ def _get_field_schema_name(self, schema: t.Type[t.Any]) -> str:
 
     def _get_field_schema_params(self, schema: t.Type["ST"], config: t.Optional["ConfigType"] = None, **kwargs) -> dict:
         params: t.Dict[str, t.Any] = dict(kwargs, __root__=(t.Optional[schema], ...))
-
-        if config is None:
-            config = getattr(schema, "Config", None)
+        parent_config = getattr(schema, "Config", None)
 
         if config is not None:
-            params.update(__config__=config)
+            config = get_config(config)
+            if parent_config is not None:
+                config = inherit_config(config, parent_config)
+        else:
+            config = parent_config
 
+        params.update(__config__=config)
         return params
 
     def _extract_export_kwargs(self, ctx: dict, extractor=dict.get):

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = django-pydantic-field
-version = 0.1.4
+version = 0.1.5
 url = https://github.com/surenkov/django-pydantic-field
 
 description = Django JSONField with Pydantic models as a Schema

tests/conftest.py

@@ -12,6 +12,10 @@ class InnerSchema(pydantic.BaseModel):
     stub_int: int = 1
     stub_list: t.List[date]
 
+    class Config:
+        allow_mutation = True
+        frozen = False
+
 
 @dataclass
 class SampleDataclass:

tests/test_base_marshalling.py

@@ -71,6 +71,17 @@ def test_schema_wrapper_transformers():
     assert parsed_wrapper.__root__ == [expected_decoded]
 
 
+class test_schema_wrapper_config_inheritance():
+    wrapper = base.SchemaWrapper()
+    parsed_wrapper = wrapper._wrap_schema(InnerSchema, config={"allow_mutation": False})
+    assert not parsed_wrapper.Config.allow_mutation
+    assert not parsed_wrapper.Config.frozen
+
+    parsed_wrapper = wrapper._wrap_schema(t.List[InnerSchema], config={"frozen": True})
+    assert parsed_wrapper.Config.allow_mutation
+    assert parsed_wrapper.Config.frozen
+
+
 @pytest.mark.parametrize("type_, encoded, decoded", [
     (InnerSchema, '{"stub_str": "abc", "stub_list": ["2022-07-01"], "stub_int": 1}', InnerSchema(stub_str="abc", stub_list=[date(2022, 7, 1)])),
     (SampleDataclass, '{"stub_str": "abc", "stub_list": ["2022-07-01"], "stub_int": 1}', SampleDataclass(stub_str="abc", stub_list=[date(2022, 7, 1)])),

tests/test_django_model_field.py

@@ -16,7 +16,7 @@
 
 
 class SampleModel(models.Model):
-    sample_field: InnerSchema = fields.SchemaField()
+    sample_field: InnerSchema = fields.SchemaField(config={"frozen": True, "allow_mutation": False})
     sample_list: t.List[InnerSchema] = fields.SchemaField()
     sample_seq: t.Sequence[InnerSchema] = fields.SchemaField(schema=t.List[InnerSchema])