v1

docs/src/tutorial/form/code03.py

@@ -1,22 +1,17 @@
 from ninja import Form, Schema
-from pydantic import FieldValidationInfo
+from typing import Annotated, TypeVar
+from pydantic import WrapValidator
 from pydantic_core import PydanticUseDefault
-from pydantic_core import core_schema
-from typing import Any, Generic, TypeVar
 
-PydanticField = TypeVar("PydanticField")
 
+def _empty_str_to_default(v, handler, info):
+    if isinstance(v, str) and v == '':
+        raise PydanticUseDefault
+    return handler(v)
 
-class EmptyStrToDefault(Generic[PydanticField]):
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source, handler):
-        return core_schema.field_plain_validator_function(cls.validate)
 
-    @classmethod
-    def validate(cls, value: Any, info: FieldValidationInfo) -> Any:
-        if value == "":
-            raise PydanticUseDefault()
-        return value
+T = TypeVar('T')
+EmptyStrToDefault = Annotated[T, WrapValidator(_empty_str_to_default)]
 
 
 class Item(Schema):

ninja/__init__.py

@@ -2,6 +2,7 @@
 
 __version__ = "1.0a1"
 
+
 from pydantic import Field
 
 from ninja.files import UploadedFile

ninja/orm/fields.py

@@ -5,7 +5,6 @@
 
 from django.db.models import ManyToManyField
 from django.db.models.fields import Field as DjangoField
-from django.utils.functional import keep_lazy_text
 from pydantic import IPvAnyAddress
 from pydantic.fields import FieldInfo
 from pydantic_core import PydanticUndefined, core_schema
@@ -16,7 +15,9 @@
 __all__ = ["create_m2m_link_type", "get_schema_field", "get_related_field_schema"]
 
 
-@keep_lazy_text
+# keep_lazy seems not needed as .title forces translation anyway
+# https://github.com/vitalik/django-ninja/issues/774
+# @keep_lazy_text
 def title_if_lower(s: str) -> str:
     if s == s.lower():
         return s.title()
@@ -102,9 +103,7 @@ def _validate(cls, v: Any, _):
 
 
 @no_type_check
-def get_schema_field(
-    field: DjangoField, *, depth: int = 0, optional: bool = False
-) -> Tuple:
+def get_schema_field(field: DjangoField, *, depth: int = 0, optional: bool = False) -> Tuple:
     "Returns pydantic field from django's model field"
     alias = None
     default = ...