fh-pydantic-form 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

fh_pydantic_form/__init__.py

@@ -87,13 +87,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/comparison_form.py

@@ -347,6 +347,13 @@ class ComparisonForm(Generic[ModelType]):
             # Determine comparison-specific refresh endpoint
             comparison_refresh = f"/compare/{self.name}/{'left' if form is self.left_form else 'right'}/refresh"
 
+            # Get label color for this field if specified
+            label_color = (
+                form.label_colors.get(field_name)
+                if hasattr(form, "label_colors")
+                else None
+            )
+
             # Create renderer
             renderer = renderer_cls(
                 field_name=field_name,
@@ -357,6 +364,7 @@ class ComparisonForm(Generic[ModelType]):
                 spacing=form.spacing,
                 field_path=[field_name],
                 form_name=form.name,
+                label_color=label_color,  # Pass the label color if specified
                 metrics_dict=form.metrics_dict,  # Use form's own metrics
                 refresh_endpoint_override=comparison_refresh,  # Pass comparison-specific refresh endpoint
             )
@@ -375,77 +383,6 @@ class ComparisonForm(Generic[ModelType]):
         # Return wrapper with display: contents
         return fh.Div(*cells, id=wrapper_id, cls="contents")
 
-    # def _create_field_pairs(
-    #     self,
-    # ) -> List[Tuple[str, BaseFieldRenderer, BaseFieldRenderer]]:
-    #     """
-    #     Create pairs of renderers (left, right) for each field path
-
-    #     Returns:
-    #         List of (path_string, left_renderer, right_renderer) tuples
-    #     """
-    #     pairs = []
-    #     registry = FieldRendererRegistry()
-
-    #     # Walk through model fields to create renderer pairs
-    #     for field_name, field_info in self.model_class.model_fields.items():
-    #         # Skip fields that are excluded in either form
-    #         if field_name in (self.left_form.exclude_fields or []) or field_name in (
-    #             self.right_form.exclude_fields or []
-    #         ):
-    #             logger.debug(
-    #                 f"Skipping field '{field_name}' - excluded in one or both forms"
-    #             )
-    #             continue
-
-    #         # Get values from each form
-    #         left_value = self.left_form.values_dict.get(field_name)
-    #         right_value = self.right_form.values_dict.get(field_name)
-
-    #         # Get the path string for comparison lookup
-    #         path_str = field_name
-    #         left_comparison_metric = self.left_metrics.get(path_str)
-    #         right_comparison_metric = self.right_metrics.get(path_str)
-
-    #         # Get renderer class
-    #         renderer_cls = registry.get_renderer(field_name, field_info)
-    #         if not renderer_cls:
-    #             from fh_pydantic_form.field_renderers import StringFieldRenderer
-
-    #             renderer_cls = StringFieldRenderer
-
-    #         # Create left renderer
-    #         left_renderer = renderer_cls(
-    #             field_name=field_name,
-    #             field_info=field_info,
-    #             value=left_value,
-    #             prefix=self.left_form.base_prefix,
-    #             disabled=self.left_form.disabled,
-    #             spacing=self.left_form.spacing,
-    #             field_path=[field_name],
-    #             form_name=self.left_form.name,
-    #             comparison=left_comparison_metric,
-    #             comparison_map=self.left_metrics,  # Pass the full comparison map
-    #         )
-
-    #         # Create right renderer
-    #         right_renderer = renderer_cls(
-    #             field_name=field_name,
-    #             field_info=field_info,
-    #             value=right_value,
-    #             prefix=self.right_form.base_prefix,
-    #             disabled=self.right_form.disabled,
-    #             spacing=self.right_form.spacing,
-    #             field_path=[field_name],
-    #             form_name=self.right_form.name,
-    #             comparison=right_comparison_metric,
-    #             comparison_map=self.right_metrics,  # Pass the full comparison map
-    #         )
-
-    #         pairs.append((path_str, left_renderer, right_renderer))
-
-    #     return pairs
-
     def render_inputs(self) -> FT:
         """
         Render the comparison form with side-by-side layout

fh_pydantic_form/field_renderers.py

@@ -1523,12 +1523,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 +1603,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.2.dist-info → fh_pydantic_form-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-pydantic-form
-Version: 0.3.2
+Version: 0.3.4
 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.2.dist-info → fh_pydantic_form-0.3.4.dist-info}/RECORD

@@ -1,17 +1,17 @@
-fh_pydantic_form/__init__.py,sha256=uNDN6UXIM25U7NazFi0Y9ivAeA8plERrRBk7TOd6P6M,4313
+fh_pydantic_form/__init__.py,sha256=rFuRyXVlitbFQfR4BxRLZR_CxCMJwE_QbQyt1h_4568,4479
 fh_pydantic_form/color_utils.py,sha256=M0HSXX0i-lSHkcsgesxw7d3PEAnLsZ46i_STymZAM_k,18271
-fh_pydantic_form/comparison_form.py,sha256=iljizwqia-9J4-2lVF4yDvoVkGE56FUfHDD3k2ejSnM,24270
+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/field_renderers.py,sha256=yJuV1bMVhL_7o1tZDyw20DJzy3-OQbq_Ygc_tHpsLsU,81459
+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.2.dist-info/METADATA,sha256=Yk4mV476Uy8JjfHjcUurMazvQbYALsSd1Lk5TnwuJJ4,38420
-fh_pydantic_form-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fh_pydantic_form-0.3.2.dist-info/licenses/LICENSE,sha256=AOi2eNK3D2aDycRHfPRiuACZ7WPBsKHTV2tTYNl7cls,577
-fh_pydantic_form-0.3.2.dist-info/RECORD,,
+fh_pydantic_form-0.3.4.dist-info/METADATA,sha256=gKrPm2PdFdKvU2d3WvyjoioH-LRe3K0Nj4SXGa7vlhs,38420
+fh_pydantic_form-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fh_pydantic_form-0.3.4.dist-info/licenses/LICENSE,sha256=AOi2eNK3D2aDycRHfPRiuACZ7WPBsKHTV2tTYNl7cls,577
+fh_pydantic_form-0.3.4.dist-info/RECORD,,