Add DecimalField, FloatField and IntField wtf forms support

Author: insspb

flask_mongoengine/db_fields.py

@@ -85,6 +85,30 @@ def _setup_strings_common_validators(options: dict, obj: fields.StringField) ->
     return options
 
 
+@wtf_required
+def _setup_numbers_common_validators(
+    options: dict, obj: Union[fields.IntField, fields.DecimalField, fields.FloatField]
+) -> dict:
+    """
+    Extend :attr:`base_options` with common validators for number types.
+
+    :param options: dict, usually from :class:`WtfFieldMixin.wtf_generated_options`
+    :param obj: Any :class:`mongoengine.fields.IntField` or
+        :class:`mongoengine.fields.DecimalField` or
+        :class:`mongoengine.fields.FloatField` subclasses instance.
+    """
+    assert isinstance(
+        obj, (fields.IntField, fields.DecimalField, fields.FloatField)
+    ), "Improperly configured"
+
+    if obj.min_value or obj.max_value:
+        options["validators"].insert(
+            0, wtf_validators_.NumberRange(min=obj.min_value, max=obj.max_value)
+        )
+
+    return options
+
+
 class WtfFieldMixin:
     """
     Extension wrapper class for mongoengine BaseField.
@@ -425,18 +449,16 @@ class DecimalField(WtfFieldMixin, fields.DecimalField):
     DEFAULT_WTF_FIELD = wtf_fields.DecimalField if wtf_fields else None
     DEFAULT_WTF_CHOICES_COERCE = decimal.Decimal
 
-    def to_wtf_field(
-        self,
-        *,
-        model: Optional[Type] = None,
-        field_kwargs: Optional[dict] = None,
-    ):
+    @property
+    @wtf_required
+    def wtf_generated_options(self) -> dict:
         """
-        Protection from execution of :func:`to_wtf_field` in form generation.
-
-        :raises NotImplementedError: Field converter to WTForm Field not implemented.
+        Extend form validators with :class:`wtforms.validators.NumberRange`.
         """
-        raise NotImplementedError("Field converter to WTForm Field not implemented.")
+        options = super().wtf_generated_options
+        options = _setup_numbers_common_validators(options, self)
+
+        return options
 
 
 class DictField(WtfFieldMixin, fields.DictField):
@@ -610,21 +632,19 @@ class FloatField(WtfFieldMixin, fields.FloatField):
     All arguments should be passed as keyword arguments, to exclude unexpected behaviour.
     """
 
-    DEFAULT_WTF_FIELD = wtf_fields.FloatField if wtf_fields else None
+    DEFAULT_WTF_FIELD = custom_fields.MongoFloatField if wtf_fields else None
     DEFAULT_WTF_CHOICES_COERCE = float
 
-    def to_wtf_field(
-        self,
-        *,
-        model: Optional[Type] = None,
-        field_kwargs: Optional[dict] = None,
-    ):
+    @property
+    @wtf_required
+    def wtf_generated_options(self) -> dict:
         """
-        Protection from execution of :func:`to_wtf_field` in form generation.
-
-        :raises NotImplementedError: Field converter to WTForm Field not implemented.
+        Extend form validators with :class:`wtforms.validators.NumberRange`.
         """
-        raise NotImplementedError("Field converter to WTForm Field not implemented.")
+        options = super().wtf_generated_options
+        options = _setup_numbers_common_validators(options, self)
+
+        return options
 
 
 class GenericEmbeddedDocumentField(WtfFieldMixin, fields.GenericEmbeddedDocumentField):
@@ -770,18 +790,16 @@ class IntField(WtfFieldMixin, fields.IntField):
     DEFAULT_WTF_FIELD = wtf_fields.IntegerField if wtf_fields else None
     DEFAULT_WTF_CHOICES_COERCE = int
 
-    def to_wtf_field(
-        self,
-        *,
-        model: Optional[Type] = None,
-        field_kwargs: Optional[dict] = None,
-    ):
+    @property
+    @wtf_required
+    def wtf_generated_options(self) -> dict:
         """
-        Protection from execution of :func:`to_wtf_field` in form generation.
-
-        :raises NotImplementedError: Field converter to WTForm Field not implemented.
+        Extend form validators with :class:`wtforms.validators.NumberRange`.
         """
-        raise NotImplementedError("Field converter to WTForm Field not implemented.")
+        options = super().wtf_generated_options
+        options = _setup_numbers_common_validators(options, self)
+
+        return options
 
 
 class LazyReferenceField(WtfFieldMixin, fields.LazyReferenceField):

flask_mongoengine/wtf/fields.py

@@ -353,3 +353,12 @@ class MongoURLField(EmptyStringIsNoneMixin, wtf_fields.URLField):
     """
 
     pass
+
+
+class MongoFloatField(wtf_fields.FloatField):
+    """
+    Regular :class:`wtforms.fields.FloatField`, with widget replaced to
+    :class:`wtforms.widgets.NumberInput`.
+    """
+
+    widget = wtf_widgets.NumberInput(step="any")

tests/test_db_fields.py

@@ -154,21 +154,18 @@ def test__ensure_callable_or_list__raise_error_if_argument_not_callable_and_not_
             db_fields.ComplexDateTimeField,
             db_fields.DateField,
             db_fields.DateTimeField,
-            db_fields.DecimalField,
             db_fields.DictField,
             db_fields.DynamicField,
             db_fields.EmbeddedDocumentField,
             db_fields.EmbeddedDocumentListField,
             db_fields.EnumField,
             db_fields.FileField,
-            db_fields.FloatField,
             db_fields.GenericEmbeddedDocumentField,
             db_fields.GenericLazyReferenceField,
             db_fields.GenericReferenceField,
             db_fields.GeoJsonBaseField,
             db_fields.GeoPointField,
             db_fields.ImageField,
-            db_fields.IntField,
             db_fields.LazyReferenceField,
             db_fields.LineStringField,
             db_fields.ListField,