[0.1.11] Enforce null type checks for SchemaField

Support for plain methods/arbitrary objects in `default=` argument

Author: surenkov

django_pydantic_field/fields.py

@@ -148,37 +148,33 @@ def _deconstruct_config(self, kwargs):
         kwargs.update(self.export_params, config=self.config)
 
 
+if t.TYPE_CHECKING:
+    OptSchemaT = t.Optional[base.SchemaT]
+
 @t.overload
 def SchemaField(
-    schema: t.Union[t.Type["base.ST"], "t.ForwardRef", str] = ...,
+    schema: "t.Union[t.Type[base.ST], t.ForwardRef, str]" = ...,
     config: "base.ConfigType" = ...,
-    default: t.Union["base.ST", t.Type[NOT_PROVIDED], None] = ...,
-    null: t.Literal[True] = ...,
+    default: "t.Union[OptSchemaT, t.Callable[[], OptSchemaT]]" = ...,
     *args,
+    null: "t.Literal[True]",
     **kwargs,
-) -> t.Any:
+) -> "t.Optional[base.ST]":
     ...
 
-
 @t.overload
 def SchemaField(
-    schema: t.Union[t.Type["base.ST"], "t.ForwardRef", str] = ...,
+    schema: "t.Union[t.Type[base.ST], t.ForwardRef, str]" = ...,
     config: "base.ConfigType" = ...,
-    default: t.Union["base.ST", t.Type[NOT_PROVIDED]] = ...,
-    null: t.Literal[False] = ...,
+    default: "t.Union[base.SchemaT, t.Callable[[], base.SchemaT]]" = ...,
     *args,
+    null: "t.Literal[False]" = ...,
     **kwargs,
-) -> t.Any:
+) -> "base.ST":
     ...
 
 
-def SchemaField(
-    schema: t.Union[t.Type["base.ST"], "t.ForwardRef", str] = None,
-    config: "base.ConfigType" = None,
-    default: t.Union["base.ST", t.Type[NOT_PROVIDED], None] = NOT_PROVIDED,
-    *args,
-    **kwargs,
-) -> t.Any:
+def SchemaField(schema=None, config=None, default=NOT_PROVIDED, *args, **kwargs) -> t.Any:
     kwargs.update(schema=schema, config=config, default=default)
     return PydanticSchemaField(*args, **kwargs)
 

setup.cfg

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