fh-pydantic-form 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

fh_pydantic_form/__init__.py

@@ -1,4 +1,5 @@
 import datetime
+import decimal
 from enum import Enum
 from typing import Literal, get_origin
 
@@ -17,6 +18,7 @@ from fh_pydantic_form.field_renderers import (
     BaseModelFieldRenderer,
     BooleanFieldRenderer,
     DateFieldRenderer,
+    DecimalFieldRenderer,
     EnumFieldRenderer,
     ListFieldRenderer,
     LiteralFieldRenderer,
@@ -55,6 +57,7 @@ def register_default_renderers() -> None:
     FieldRendererRegistry.register_type_renderer(bool, BooleanFieldRenderer)
     FieldRendererRegistry.register_type_renderer(int, NumberFieldRenderer)
     FieldRendererRegistry.register_type_renderer(float, NumberFieldRenderer)
+    FieldRendererRegistry.register_type_renderer(decimal.Decimal, DecimalFieldRenderer)
     FieldRendererRegistry.register_type_renderer(datetime.date, DateFieldRenderer)
     FieldRendererRegistry.register_type_renderer(datetime.time, TimeFieldRenderer)
 
@@ -87,13 +90,16 @@ def register_default_renderers() -> None:
 
     # Register list renderer for List[*] types
     def is_list_field(field_info):
-        """Check if field is a list type"""
+        """Check if field is a list type, including Optional[List[...]]"""
         annotation = getattr(field_info, "annotation", None)
-        return (
-            annotation is not None
-            and hasattr(annotation, "__origin__")
-            and annotation.__origin__ is list
-        )
+        if annotation is None:
+            return False
+
+        # Handle Optional[List[...]] by unwrapping the Optional
+        underlying_type = _get_underlying_type_if_optional(annotation)
+
+        # Check if the underlying type is a list
+        return get_origin(underlying_type) is list
 
     FieldRendererRegistry.register_type_renderer_with_predicate(
         is_list_field, ListFieldRenderer

fh_pydantic_form/defaults.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime as _dt
+import decimal
 from enum import Enum
 from typing import Any, Literal, get_args, get_origin
 
@@ -25,6 +26,7 @@ _SIMPLE_DEFAULTS = {
     int: 0,
     float: 0.0,
     bool: False,
+    decimal.Decimal: decimal.Decimal("0"),
     _dt.date: lambda: _today(),  # callable - gets current date (late-bound)
     _dt.time: lambda: _dt.time(0, 0),  # callable - midnight
 }
@@ -52,6 +54,10 @@ def default_for_annotation(annotation: Any) -> Any:
     if _is_optional_type(annotation):
         return None
 
+    # List[T] → []
+    if origin is list:
+        return []
+
     # Literal[...] → first literal value
     if origin is Literal:
         return _first_literal_choice(annotation)

fh_pydantic_form/field_renderers.py

@@ -1,6 +1,7 @@
 import logging
 import re
 from datetime import date, time
+from decimal import Decimal
 from enum import Enum
 from typing import (
     Any,
@@ -510,7 +511,7 @@ class BaseFieldRenderer(MetricsRendererMixin):
         label_text_span = fh.Span(label_text, **span_attrs)
 
         # Prepare label attributes
-        label_attrs = {"For": self.field_name}
+        label_attrs = {"for": self.field_name}
 
         # Build label classes with tokenized gap
         label_gap_class = spacing("label_gap", self.spacing)
@@ -705,6 +706,66 @@ class NumberFieldRenderer(BaseFieldRenderer):
         return mui.Input(**input_attrs)
 
 
+class DecimalFieldRenderer(BaseFieldRenderer):
+    """Renderer for decimal.Decimal fields"""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize decimal field renderer, passing all arguments to parent"""
+        super().__init__(*args, **kwargs)
+
+    def render_input(self) -> FT:
+        """
+        Render input element for decimal fields
+
+        Returns:
+            A NumberInput component appropriate for decimal values
+        """
+        # Determine if field is required
+        has_default = get_default(self.field_info) is not _UNSET
+        is_field_required = not self.is_optional and not has_default
+
+        placeholder_text = f"Enter {self.original_field_name.replace('_', ' ')}"
+        if self.is_optional:
+            placeholder_text += " (Optional)"
+
+        input_cls_parts = ["w-full"]
+        input_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if input_spacing_cls:
+            input_cls_parts.append(input_spacing_cls)
+
+        # Convert Decimal value to string for display
+        if isinstance(self.value, Decimal):
+            # Use format to avoid scientific notation
+            display_value = format(self.value, "f")
+            # Normalize zero values to display as "0"
+            if self.value == 0:
+                display_value = "0"
+        elif self.value is not None:
+            display_value = str(self.value)
+        else:
+            display_value = ""
+
+        input_attrs = {
+            "value": display_value,
+            "id": self.field_name,
+            "name": self.field_name,
+            "type": "number",
+            "placeholder": placeholder_text,
+            "required": is_field_required,
+            "cls": " ".join(input_cls_parts),
+            "step": "any",  # Allow arbitrary decimal precision
+        }
+
+        # Only add the disabled attribute if the field should actually be disabled
+        if self.disabled:
+            input_attrs["disabled"] = True
+
+        return mui.Input(**input_attrs)
+
+
 class BooleanFieldRenderer(BaseFieldRenderer):
     """Renderer for boolean fields"""
 
@@ -1523,12 +1584,15 @@ class ListFieldRenderer(BaseFieldRenderer):
         annotation = getattr(self.field_info, "annotation", None)
         item_type = None  # Initialize here to avoid UnboundLocalError
 
+        # Handle Optional[List[...]] by unwrapping the Optional first
+        base_annotation = _get_underlying_type_if_optional(annotation)
+
         if (
-            annotation is not None
-            and hasattr(annotation, "__origin__")
-            and annotation.__origin__ is list
+            base_annotation is not None
+            and hasattr(base_annotation, "__origin__")
+            and base_annotation.__origin__ is list
         ):
-            item_type = annotation.__args__[0]
+            item_type = base_annotation.__args__[0]
 
         if not item_type:
             logger.error(f"Cannot determine item type for list field {self.field_name}")
@@ -1600,10 +1664,20 @@ class ListFieldRenderer(BaseFieldRenderer):
             if self.disabled:
                 add_button_attrs["disabled"] = "true"
 
+            # Differentiate message for Optional[List] vs required List
+            if self.is_optional:
+                empty_message = (
+                    "No items in this optional list. Click 'Add Item' if needed."
+                )
+            else:
+                empty_message = (
+                    "No items in this required list. Click 'Add Item' to create one."
+                )
+
             empty_state = mui.Alert(
                 fh.Div(
                     mui.UkIcon("info", cls="mr-2"),
-                    "No items in this list. Click 'Add Item' to create one.",
+                    empty_message,
                     mui.Button("Add Item", **add_button_attrs),
                     cls="flex flex-col items-start",
                 ),

fh_pydantic_form/form_parser.py

@@ -7,8 +7,8 @@ from typing import (
     Optional,
     Tuple,
     Union,
-    get_origin,
     get_args,
+    get_origin,
 )
 
 from fh_pydantic_form.type_helpers import (
@@ -438,7 +438,7 @@ def _parse_list_fields(
     list_field_defs: Dict[str, Dict[str, Any]],
     base_prefix: str = "",
     exclude_fields: Optional[List[str]] = None,
-) -> Dict[str, List[Any]]:
+) -> Dict[str, Optional[List[Any]]]:
     """
     Parse list fields from form data by analyzing keys and reconstructing ordered lists.
 
@@ -490,7 +490,7 @@ def _parse_list_fields(
                 list_items_temp[field_name][idx_str][subfield] = value
 
     # Build final lists based on tracked order
-    final_lists = {}
+    final_lists: Dict[str, Optional[List[Any]]] = {}
     for field_name, ordered_indices in list_item_indices_ordered.items():
         field_def = list_field_defs[field_name]
         item_type = field_def["item_type"]
@@ -544,8 +544,12 @@ def _parse_list_fields(
         if field_name in final_lists:
             continue
 
-        # User submitted form with zero items → honour intent with empty list
-        final_lists[field_name] = []
+        # User submitted form with zero items → honour intent with None for Optional[List]
+        field_info = field_def["field_info"]
+        if _is_optional_type(field_info.annotation):
+            final_lists[field_name] = None  # Use None for empty Optional[List]
+        else:
+            final_lists[field_name] = []  # Regular empty list for required fields
 
     return final_lists
 

fh_pydantic_form/form_renderer.py

@@ -435,7 +435,7 @@ class PydanticForm(Generic[ModelType]):
                     try:
                         default_factory = field_info.default_factory
                         if callable(default_factory):
-                            initial_value = default_factory()
+                            initial_value = default_factory()  # type: ignore[call-arg]
                         else:
                             initial_value = None
                             logger.warning(

{fh_pydantic_form-0.3.3.dist-info → fh_pydantic_form-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-pydantic-form
-Version: 0.3.3
+Version: 0.3.5
 Summary: a library to turn any pydantic BaseModel object into a fasthtml/monsterui input form
 Project-URL: Homepage, https://github.com/Marcura/fh-pydantic-form
 Project-URL: Repository, https://github.com/Marcura/fh-pydantic-form

{fh_pydantic_form-0.3.3.dist-info → fh_pydantic_form-0.3.5.dist-info}/RECORD

@@ -1,17 +1,17 @@
-fh_pydantic_form/__init__.py,sha256=uNDN6UXIM25U7NazFi0Y9ivAeA8plERrRBk7TOd6P6M,4313
+fh_pydantic_form/__init__.py,sha256=uPN0pwErHoe69tDoCDdIYD_iCslMKRgfYw6pvL4McHE,4608
 fh_pydantic_form/color_utils.py,sha256=M0HSXX0i-lSHkcsgesxw7d3PEAnLsZ46i_STymZAM_k,18271
 fh_pydantic_form/comparison_form.py,sha256=Y-OKAjTxMiixBC05SK1ofZ_A3zkvjUFp8tTE-_wUn60,21660
 fh_pydantic_form/constants.py,sha256=-N9wzkibFNn-V6cO8iWTQ7_xBvwSr2hBdq-m3apmW4M,169
-fh_pydantic_form/defaults.py,sha256=Pwv46v7e43cykx4Pt01e4nw-6FBkHmPvTZK36ZTZqgA,6068
-fh_pydantic_form/field_renderers.py,sha256=wX8XhesFH7Pt8l0stYR4FVQciVo2GBxADGnvwofu6YU,80944
-fh_pydantic_form/form_parser.py,sha256=7GTOBNQSfJltDHZnM12FxTJj0X_IMWoDV3lJbDF3EpY,25879
-fh_pydantic_form/form_renderer.py,sha256=3v4NPFQJ37m__kNo-sbNqaItR2AvcDzn5KRt44qCBTo,36198
+fh_pydantic_form/defaults.py,sha256=9vV0f4PapTOgqNsIxoW6rEbpYO66O4uiKvpd6hzR1-M,6189
+fh_pydantic_form/field_renderers.py,sha256=twAqHvWkDL6M-HRcdi_JrR2BgzkPmMyF_vojId5ABa0,83574
+fh_pydantic_form/form_parser.py,sha256=DsOMiCXRRHswL37Vqv7bvMv3Q7nQdXp0oP3_ZoIJfVc,26172
+fh_pydantic_form/form_renderer.py,sha256=0OrOA0--KT1r-HX37AGeDkC2rmbUSbJ4fgL04wG7pI8,36224
 fh_pydantic_form/list_path.py,sha256=AA8bmDmaYy4rlGIvQOOZ0fP2tgcimNUB2Re5aVGnYc8,5182
 fh_pydantic_form/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fh_pydantic_form/registry.py,sha256=b5zIjOpfmCUCs2njgp4PdDu70ioDIAfl49oU-Nf2pg4,4810
 fh_pydantic_form/type_helpers.py,sha256=JUzHT8YrWj2_g7f_Wr2GL9i3BgP1zZftFrrO8xDPeis,7409
 fh_pydantic_form/ui_style.py,sha256=UPK5OBwUVVTLnfvQ-yKukz2vbKZaT_GauaNB7OGc-Uw,3848
-fh_pydantic_form-0.3.3.dist-info/METADATA,sha256=oLRfQeZIxBjls-FwIN8yXgcJOLDJmw-UXLeeo6R7kmg,38420
-fh_pydantic_form-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fh_pydantic_form-0.3.3.dist-info/licenses/LICENSE,sha256=AOi2eNK3D2aDycRHfPRiuACZ7WPBsKHTV2tTYNl7cls,577
-fh_pydantic_form-0.3.3.dist-info/RECORD,,
+fh_pydantic_form-0.3.5.dist-info/METADATA,sha256=S3vgfnQpOhl4YAcDPje_4w9lNOtOnIRslrgnYiiYrT8,38420
+fh_pydantic_form-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fh_pydantic_form-0.3.5.dist-info/licenses/LICENSE,sha256=AOi2eNK3D2aDycRHfPRiuACZ7WPBsKHTV2tTYNl7cls,577
+fh_pydantic_form-0.3.5.dist-info/RECORD,,