fastlifeweb 0.5.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

fastlife/templating/renderer/widgets/factory.py

@@ -2,6 +2,7 @@ import secrets
 from collections.abc import MutableSequence, Sequence
 from decimal import Decimal
 from enum import Enum
+from inspect import isclass
 from types import NoneType
 from typing import Any, Literal, Mapping, Optional, Type, cast, get_origin
 from uuid import UUID
@@ -10,6 +11,7 @@ from markupsafe import Markup
 from pydantic import BaseModel, EmailStr, SecretStr, ValidationError
 from pydantic.fields import FieldInfo
 
+from fastlife.request.model_result import ModelResult
 from fastlife.shared_utils.infer import is_complex_type, is_union
 from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 from fastlife.templating.renderer.widgets.boolean import BooleanWidget
@@ -31,21 +33,25 @@ class WidgetFactory:
 
     def get_markup(
         self,
-        base: Type[Any],
-        form_data: Mapping[str, Any],
+        model: ModelResult[Any],
         *,
-        prefix: str,
         removable: bool,
         field: FieldInfo | None = None,
     ) -> Markup:
         return self.get_widget(
-            base, form_data, prefix=prefix, removable=removable, field=field
+            model.model.__class__,
+            model.form_data,
+            model.errors,
+            prefix=model.prefix,
+            removable=removable,
+            field=field,
         ).to_html(self.renderer)
 
     def get_widget(
         self,
         base: Type[Any],
         form_data: Mapping[str, Any],
+        form_errors: Mapping[str, Any],
         *,
         prefix: str,
         removable: bool,
@@ -54,6 +60,7 @@ class WidgetFactory:
         return self.build(
             base,
             value=form_data.get(prefix, {}),
+            form_errors=form_errors,
             name=prefix,
             removable=removable,
             field=field,
@@ -66,11 +73,12 @@ class WidgetFactory:
         name: str = "",
         value: Any,
         removable: bool,
+        form_errors: Mapping[str, Any],
         field: FieldInfo | None = None,
     ) -> Widget[Any]:
         if field and field.metadata:
             for widget in field.metadata:
-                if issubclass(widget, Widget):
+                if isclass(widget) and issubclass(widget, Widget):
                     return cast(
                         Widget[Any],
                         widget(
@@ -80,44 +88,59 @@ class WidgetFactory:
                             title=field.title if field else "",
                             aria_label=field.description if field else None,
                             token=self.token,
+                            error=form_errors.get(name),
                         ),
                     )
 
         type_origin = get_origin(typ)
         if type_origin:
             if is_union(typ):
-                return self.build_union(name, typ, field, value, removable)
+                return self.build_union(name, typ, field, value, form_errors, removable)
 
             if (
                 type_origin is Sequence
                 or type_origin is MutableSequence
                 or type_origin is list
             ):
-                return self.build_sequence(name, typ, field, value, removable)
+                return self.build_sequence(
+                    name, typ, field, value, form_errors, removable
+                )
 
             if type_origin is Literal:
-                return self.build_literal(name, typ, field, value, removable)
+                return self.build_literal(
+                    name, typ, field, value, form_errors, removable
+                )
 
             if type_origin is set:
-                return self.build_set(name, typ, field, value, removable)
+                return self.build_set(name, typ, field, value, form_errors, removable)
 
         if issubclass(typ, Enum):  # if it raises here, the type_origin is unknown
-            return self.build_enum(name, typ, field, value, removable)
+            return self.build_enum(name, typ, field, value, form_errors, removable)
 
         if issubclass(typ, BaseModel):  # if it raises here, the type_origin is unknown
-            return self.build_model(name, typ, field, value or {}, removable)
+            return self.build_model(
+                name, typ, field, value or {}, form_errors, removable
+            )
 
         if issubclass(typ, bool):
-            return self.build_boolean(name, typ, field, value or False, removable)
+            return self.build_boolean(
+                name, typ, field, value or False, form_errors, removable
+            )
 
         if issubclass(typ, EmailStr):  # type: ignore
-            return self.build_emailtype(name, typ, field, value or "", removable)
+            return self.build_emailtype(
+                name, typ, field, value or "", form_errors, removable
+            )
 
         if issubclass(typ, SecretStr):
-            return self.build_secretstr(name, typ, field, value or "", removable)
+            return self.build_secretstr(
+                name, typ, field, value or "", form_errors, removable
+            )
 
         if issubclass(typ, (int, str, float, Decimal, UUID)):
-            return self.build_simpletype(name, typ, field, value or "", removable)
+            return self.build_simpletype(
+                name, typ, field, value or "", form_errors, removable
+            )
 
         raise NotImplementedError(f"{typ} not implemented")  # coverage: ignore
 
@@ -127,6 +150,7 @@ class WidgetFactory:
         typ: Type[BaseModel],
         field: Optional[FieldInfo],
         value: Mapping[str, Any],
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         ret: dict[str, Any] = {}
@@ -143,6 +167,7 @@ class WidgetFactory:
                 name=child_key,
                 field=field,
                 value=value.get(key),
+                form_errors=form_errors,
                 removable=False,
             )
         return ModelWidget(
@@ -151,6 +176,7 @@ class WidgetFactory:
             removable=removable,
             title=get_title(typ),
             token=self.token,
+            error=form_errors.get(field_name),
         )
 
     def build_union(
@@ -159,6 +185,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: Optional[FieldInfo],
         value: Any,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         types: list[Type[Any]] = []
@@ -176,7 +203,12 @@ class WidgetFactory:
             and not is_complex_type(types[0])
         ):
             return self.build(
-                types[0], name=field_name, field=field, value=value, removable=False
+                types[0],
+                name=field_name,
+                field=field,
+                value=value,
+                form_errors=form_errors,
+                removable=False,
             )
         child = None
         if value:
@@ -191,6 +223,7 @@ class WidgetFactory:
                         name=field_name,
                         field=field,
                         value=value,
+                        form_errors=form_errors,
                         removable=False,
                     )
 
@@ -202,6 +235,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
         return widget
@@ -212,6 +246,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: Optional[FieldInfo],
         value: Optional[Sequence[Any]],
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         typ = field_type.__args__[0]  # type: ignore
@@ -222,6 +257,7 @@ class WidgetFactory:
                 name=f"{field_name}.{idx}",
                 value=v,
                 field=field,
+                form_errors=form_errors,
                 removable=True,
             )
             for idx, v in enumerate(value)
@@ -234,6 +270,7 @@ class WidgetFactory:
             item_type=typ,  # type: ignore
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_set(
@@ -242,6 +279,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: Optional[FieldInfo],
         value: Optional[Sequence[Any]],
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         choice_wrapper = field_type.__args__[0]
@@ -257,6 +295,7 @@ class WidgetFactory:
                         checked=c in value if value else False,  # type: ignore
                         name=field_name,
                         token=self.token,
+                        error=form_errors.get(f"{field_name}-{c}"),
                     )
                     for c in litchoice
                 ]
@@ -271,6 +310,7 @@ class WidgetFactory:
                     checked=e.name in value if value else False,  # type: ignore
                     name=field_name,
                     token=self.token,
+                    error=form_errors.get(f"{field_name}-{e.name}"),
                 )
                 for e in choice_wrapper
             ]
@@ -283,6 +323,7 @@ class WidgetFactory:
             token=self.token,
             value=choices,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_boolean(
@@ -291,6 +332,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: FieldInfo | None,
         value: bool,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         return BooleanWidget(
@@ -299,6 +341,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=value,
+            error=form_errors.get(field_name),
         )
 
     def build_emailtype(
@@ -307,6 +350,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: FieldInfo | None,
         value: str | int | float,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         return TextWidget(
@@ -318,6 +362,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_secretstr(
@@ -326,6 +371,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: FieldInfo | None,
         value: SecretStr | str,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         return TextWidget(
@@ -337,6 +383,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=value.get_secret_value() if isinstance(value, SecretStr) else value,
+            error=form_errors.get(field_name),
         )
 
     def build_literal(
@@ -345,6 +392,7 @@ class WidgetFactory:
         field_type: Type[Any],  # a literal actually
         field: FieldInfo | None,
         value: str | int | float,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         choices: list[str] = field_type.__args__  # type: ignore
@@ -361,6 +409,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_enum(
@@ -369,6 +418,7 @@ class WidgetFactory:
         field_type: Type[Any],  # an enum subclass
         field: FieldInfo | None,
         value: str | int | float,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         options = [(item.name, item.value) for item in field_type]  # type: ignore
@@ -379,6 +429,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_simpletype(
@@ -387,6 +438,7 @@ class WidgetFactory:
         field_type: Type[Any],
         field: FieldInfo | None,
         value: str | int | float,
+        form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
         return TextWidget(
@@ -398,4 +450,5 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )

fastlife/templating/renderer/widgets/model.py

@@ -13,12 +13,18 @@ class ModelWidget(Widget[Sequence[Widget[Any]]]):
         name: str,
         *,
         value: Sequence[Widget[Any]],
+        error: str | None = None,
         removable: bool,
         title: str,
         token: str,
     ):
         super().__init__(
-            name, title=title, value=value, removable=removable, token=token
+            name,
+            title=title,
+            value=value,
+            error=error,
+            removable=removable,
+            token=token,
         )
 
     def get_template(self) -> str:

fastlife/templating/renderer/widgets/sequence.py

@@ -15,12 +15,18 @@ class SequenceWidget(Widget[Sequence[Widget[Any]]]):
         title: Optional[str],
         hint: Optional[str],
         value: Optional[Sequence[Widget[Any]]],
+        error: str | None = None,
         item_type: Type[Any],
         token: str,
         removable: bool,
     ):
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.item_type = item_type
         self.hint = hint

fastlife/templating/renderer/widgets/text.py

@@ -11,11 +11,12 @@ class TextWidget(Widget[str]):
         title: Optional[str],
         aria_label: Optional[str] = None,
         placeholder: Optional[str] = None,
+        error: str | None = None,
         removable: bool = False,
         value: str = "",
         token: Optional[str] = None,
         hint: Optional[str] = None,
-        input_type: str = "text"
+        input_type: str = "text",
     ) -> None:
         super().__init__(
             name,
@@ -23,6 +24,7 @@ class TextWidget(Widget[str]):
             title=title,
             aria_label=aria_label,
             token=token,
+            error=error,
             removable=removable,
         )
         self.placeholder = placeholder or ""

fastlife/templating/renderer/widgets/union.py

@@ -15,12 +15,18 @@ class UnionWidget(Widget[Widget[Any]]):
         *,
         title: Optional[str],
         value: Optional[Widget[Any]],
+        error: str | None = None,
         children_types: Sequence[Type[BaseModel]],
         token: str,
         removable: bool,
     ):
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.children_types = children_types
         self.parent_name = name