fastlifeweb 0.3.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

fastlife/templating/renderer/jinjax.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 
 from fastlife.shared_utils.resolver import resolve_path
 
-from .abstract import AbstractTemplateRenderer
+from .abstract import AbstractTemplateRenderer, AbstractTemplateRendererFactory
 
 
 def build_searchpath(template_search_path: str) -> Sequence[str]:
@@ -27,33 +27,35 @@ def build_searchpath(template_search_path: str) -> Sequence[str]:
     return searchpath
 
 
-class JinjaxTemplateRenderer(AbstractTemplateRenderer):
-    route_prefix: str
-    """Used to prefix url to fetch fast life widgets."""
-
-    def __init__(self, settings: "Settings") -> None:
-        self.route_prefix = settings.fastlife_route_prefix
-        self.form_data_model_prefix = settings.form_data_model_prefix
-        self.csrf_token_name = settings.csrf_token_name
-
-        self.catalog = Catalog()
-        for path in build_searchpath(settings.template_search_path):
-            self.catalog.add_folder(path)
+class JinjaxRenderer(AbstractTemplateRenderer):
+    def __init__(
+        self,
+        catalog: Catalog,
+        request: Request,
+        csrf_token_name: str,
+        form_data_model_prefix: str,
+        route_prefix: str,
+    ):
+        self.route_prefix = route_prefix
+        self.catalog = catalog
+        self.request = request
+        self.csrf_token_name = csrf_token_name
+        self.form_data_model_prefix = form_data_model_prefix
 
-    def render_page(self, request: Request, template: str, **params: Any) -> str:
-        return self.catalog.render(  # type:ignore
-            template,
-            request=request,
-            csrf_token={
+    def build_globals(self) -> Mapping[str, Any]:
+        return {
+            "request": self.request,
+            "csrf_token": {
                 "name": self.csrf_token_name,
-                "value": request.scope.get(self.csrf_token_name, ""),
+                "value": self.request.scope.get(self.csrf_token_name, ""),
             },
-            pydantic_form=self.pydantic_form,
-            **params
-        )
+            "pydantic_form": self.pydantic_form,
+        }
 
     def render_template(self, template: str, **params: Any) -> str:
-        return self.catalog.render(template, **params)  # type:ignore
+        return self.catalog.render(  # type: ignore
+            template, __globals=self.build_globals(), **params
+        )
 
     def pydantic_form(
         self,
@@ -71,3 +73,29 @@ class JinjaxTemplateRenderer(AbstractTemplateRenderer):
             removable=removable,
             field=field,
         )
+
+
+class JinjaxTemplateRenderer(AbstractTemplateRendererFactory):
+    route_prefix: str
+    """Used to prefix url to fetch fast life widgets."""
+
+    def __init__(self, settings: "Settings") -> None:
+        self.route_prefix = settings.fastlife_route_prefix
+        self.form_data_model_prefix = settings.form_data_model_prefix
+        self.csrf_token_name = settings.csrf_token_name
+
+        self.catalog = Catalog(
+            use_cache=settings.jinjax_use_cache,
+            auto_reload=settings.jinjax_auto_reload,
+        )
+        for path in build_searchpath(settings.template_search_path):
+            self.catalog.add_folder(path)
+
+    def __call__(self, request: Request) -> AbstractTemplateRenderer:
+        return JinjaxRenderer(
+            self.catalog,
+            request,
+            self.csrf_token_name,
+            self.form_data_model_prefix,
+            self.route_prefix,
+        )

fastlife/templating/renderer/widgets/base.py

@@ -1,12 +1,14 @@
 import abc
 import secrets
-from typing import Any, Mapping, Optional, Type
+from typing import Any, Generic, Mapping, Optional, Type, TypeVar
 
 from markupsafe import Markup
 
 from fastlife.shared_utils.infer import is_union
 from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 
+T = TypeVar("T")
+
 
 def get_title(typ: Type[Any]) -> str:
     return getattr(
@@ -16,7 +18,7 @@ def get_title(typ: Type[Any]) -> str:
     )
 
 
-class Widget(abc.ABC):
+class Widget(abc.ABC, Generic[T]):
     name: str
     "variable name, nested variables have dots"
     title: str
@@ -32,12 +34,14 @@ class Widget(abc.ABC):
         self,
         name: str,
         *,
+        value: Optional[T] = None,
         title: Optional[str] = None,
         token: Optional[str] = None,
         aria_label: Optional[str] = None,
         removable: bool = False,
     ):
         self.name = name
+        self.value = value
         self.title = title or name.split(".")[-1]
         self.aria_label = aria_label or ""
         self.token = token or secrets.token_urlsafe(4).replace("_", "-")
@@ -79,6 +83,12 @@ class TypeWrapper:
     def fullname(self) -> str:
         return _get_fullname(self.typ)
 
+    @property
+    def id(self) -> str:
+        name = self.name.replace("_", "-").replace(".", "-").replace(":", "-")
+        typ = self.typ.__name__.replace("_", "-")
+        return f"{name}-{typ}-{self.token}"
+
     @property
     def params(self) -> Mapping[str, str]:
         return {"name": self.name, "token": self.token, "title": self.title}

fastlife/templating/renderer/widgets/boolean.py

@@ -3,7 +3,7 @@ from typing import Optional
 from .base import Widget
 
 
-class BooleanWidget(Widget):
+class BooleanWidget(Widget[bool]):
     def __init__(
         self,
         name: str,
@@ -13,8 +13,9 @@ class BooleanWidget(Widget):
         removable: bool = False,
         token: str,
     ) -> None:
-        super().__init__(name, title=title, removable=removable, token=token)
-        self.value = value
+        super().__init__(
+            name, title=title, value=value, removable=removable, token=token
+        )
 
     def get_template(self) -> str:
         return "pydantic_form.Boolean"

fastlife/templating/renderer/widgets/dropdown.py

@@ -3,27 +3,28 @@ from typing import Optional, Sequence, Tuple
 from .base import Widget
 
 
-class DropDownWidget(Widget):
+class DropDownWidget(Widget[str]):
     def __init__(
         self,
         name: str,
         *,
         title: Optional[str],
+        value: Optional[str] = None,
         options: Sequence[Tuple[str, str]] | Sequence[str],
         removable: bool = False,
-        value: str = "",
         token: Optional[str] = None,
-        help_text: Optional[str] = None,
+        hint: Optional[str] = None,
     ) -> None:
-        super().__init__(name, title=title, token=token, removable=removable)
+        super().__init__(
+            name, value=value, title=title, token=token, removable=removable
+        )
         self.options: list[dict[str, str]] = []
         for opt in options:
             if isinstance(opt, tuple):
                 self.options.append({"value": opt[0], "text": opt[1]})
             else:
                 self.options.append({"value": opt, "text": opt})
-        self.value = value
-        self.help_text = help_text
+        self.hint = hint
 
     def get_template(self) -> str:
         return "pydantic_form.Dropdown"

fastlife/templating/renderer/widgets/factory.py

@@ -2,7 +2,7 @@ import secrets
 from collections.abc import MutableSequence, Sequence
 from decimal import Decimal
 from types import NoneType
-from typing import Any, Literal, Mapping, Optional, Type, get_origin
+from typing import Any, Literal, Mapping, Optional, Type, cast, get_origin
 from uuid import UUID
 
 from markupsafe import Markup
@@ -48,7 +48,7 @@ class WidgetFactory:
         prefix: str,
         removable: bool,
         field: FieldInfo | None = None,
-    ) -> Widget:
+    ) -> Widget[Any]:
         return self.build(
             base,
             value=form_data.get(prefix, {}),
@@ -65,7 +65,22 @@ class WidgetFactory:
         value: Any,
         removable: bool,
         field: FieldInfo | None = None,
-    ) -> Widget:
+    ) -> Widget[Any]:
+        if field and field.metadata:
+            for widget in field.metadata:
+                if issubclass(widget, Widget):
+                    return cast(
+                        Widget[Any],
+                        widget(
+                            name,
+                            value=value,
+                            removable=removable,
+                            title=field.title if field else "",
+                            aria_label=field.description if field else None,
+                            token=self.token,
+                        ),
+                    )
+
         type_origin = get_origin(typ)
         if type_origin:
             if is_union(typ):
@@ -87,7 +102,7 @@ class WidgetFactory:
         if issubclass(typ, bool):
             return self.build_boolean(name, typ, field, value or False, removable)
 
-        if issubclass(typ, EmailStr):
+        if issubclass(typ, EmailStr):  # type: ignore
             return self.build_emailtype(name, typ, field, value or "", removable)
 
         if issubclass(typ, SecretStr):
@@ -96,7 +111,7 @@ class WidgetFactory:
         if issubclass(typ, (int, str, float, Decimal, UUID)):
             return self.build_simpletype(name, typ, field, value or "", removable)
 
-        raise NotImplementedError(f"{typ} not implemented")
+        raise NotImplementedError(f"{typ} not implemented")  # coverage: ignore
 
     def build_model(
         self,
@@ -105,14 +120,16 @@ class WidgetFactory:
         field: Optional[FieldInfo],
         value: Mapping[str, Any],
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         ret: dict[str, Any] = {}
         for key, field in typ.model_fields.items():
             child_key = f"{field_name}.{key}" if field_name else key
             if field.exclude:
                 continue
             if field.annotation is None:
-                raise ValueError(f"Missing annotation for {field} in {child_key}")
+                raise ValueError(  # coverage: ignore
+                    f"Missing annotation for {field} in {child_key}"
+                )
             ret[key] = self.build(
                 field.annotation,
                 name=child_key,
@@ -122,7 +139,7 @@ class WidgetFactory:
             )
         return ModelWidget(
             field_name,
-            children_widget=list(ret.values()),
+            value=list(ret.values()),
             removable=removable,
             title=get_title(typ),
             token=self.token,
@@ -135,7 +152,7 @@ class WidgetFactory:
         field: Optional[FieldInfo],
         value: Any,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         types: list[Type[Any]] = []
         # required = True
         for typ in field_type.__args__:  # type: ignore
@@ -172,7 +189,7 @@ class WidgetFactory:
         widget = UnionWidget(
             field_name,
             # we assume those types are BaseModel
-            child=child,
+            value=child,
             children_types=types,  # type: ignore
             title=field.title if field else "",
             token=self.token,
@@ -188,7 +205,7 @@ class WidgetFactory:
         field: Optional[FieldInfo],
         value: Optional[Sequence[Any]],
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         typ = field_type.__args__[0]  # type: ignore
         value = value or []
         items = [
@@ -203,9 +220,9 @@ class WidgetFactory:
         ]
         return SequenceWidget(
             field_name,
-            help_text=field.description if field else "",
+            hint=field.description if field else "",
             title=field.title if field else "",
-            items=items,
+            value=items,
             item_type=typ,  # type: ignore
             token=self.token,
             removable=removable,
@@ -218,7 +235,7 @@ class WidgetFactory:
         field: FieldInfo | None,
         value: bool,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         return BooleanWidget(
             field_name,
             removable=removable,
@@ -234,10 +251,10 @@ class WidgetFactory:
         field: FieldInfo | None,
         value: str | int | float,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         return TextWidget(
             field_name,
-            help_text=field.description if field else "",
+            hint=field.description if field else "",
             input_type="email",
             placeholder=str(field.examples[0]) if field and field.examples else None,
             removable=removable,
@@ -253,10 +270,10 @@ class WidgetFactory:
         field: FieldInfo | None,
         value: SecretStr | str,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         return TextWidget(
             field_name,
-            help_text=field.description if field else "",
+            hint=field.description if field else "",
             input_type="password",
             placeholder=str(field.examples[0]) if field and field.examples else None,
             removable=removable,
@@ -272,7 +289,7 @@ class WidgetFactory:
         field: FieldInfo | None,
         value: str | int | float,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         choices: list[str] = field_type.__args__  # type: ignore
         if len(choices) == 1:
             return HiddenWidget(
@@ -296,10 +313,10 @@ class WidgetFactory:
         field: FieldInfo | None,
         value: str | int | float,
         removable: bool,
-    ) -> Widget:
+    ) -> Widget[Any]:
         return TextWidget(
             field_name,
-            help_text=field.description if field else None,
+            hint=field.description if field else None,
             placeholder=str(field.examples[0]) if field and field.examples else None,
             aria_label=field.description if field else None,
             removable=removable,

fastlife/templating/renderer/widgets/hidden.py

@@ -1,7 +1,7 @@
 from .base import Widget
 
 
-class HiddenWidget(Widget):
+class HiddenWidget(Widget[str]):
     def __init__(
         self,
         name: str,
@@ -9,8 +9,7 @@ class HiddenWidget(Widget):
         value: str,
         token: str,
     ) -> None:
-        super().__init__(name, token=token)
-        self.value = value
+        super().__init__(name, value=value, token=token)
 
     def get_template(self) -> str:
         return "pydantic_form.Hidden"

fastlife/templating/renderer/widgets/model.py

@@ -1,4 +1,4 @@
-from typing import Sequence
+from typing import Any, Sequence
 
 from markupsafe import Markup
 
@@ -7,25 +7,26 @@ from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 from .base import Widget
 
 
-class ModelWidget(Widget):
+class ModelWidget(Widget[Sequence[Widget[Any]]]):
     def __init__(
         self,
         name: str,
         *,
-        children_widget: Sequence[Widget],
+        value: Sequence[Widget[Any]],
         removable: bool,
         title: str,
         token: str,
     ):
-        super().__init__(name, title=title, removable=removable, token=token)
-        self.children_widget = children_widget
+        super().__init__(
+            name, title=title, value=value, removable=removable, token=token
+        )
 
     def get_template(self) -> str:
         return "pydantic_form.Model"
 
     def to_html(self, renderer: AbstractTemplateRenderer) -> Markup:
         """Return the html version"""
-        children_widget = [child.to_html(renderer) for child in self.children_widget]
+        children_widget = [child.to_html(renderer) for child in self.value or []]
         kwargs = {
             "widget": self,
             "children_widget": children_widget,

fastlife/templating/renderer/widgets/sequence.py

@@ -7,24 +7,23 @@ from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 from .base import TypeWrapper, Widget
 
 
-class SequenceWidget(Widget):
-    items: Sequence[Widget]
-
+class SequenceWidget(Widget[Sequence[Widget[Any]]]):
     def __init__(
         self,
         name: str,
         *,
         title: Optional[str],
-        help_text: Optional[str],
-        items: Optional[Sequence[Widget]],
+        hint: Optional[str],
+        value: Optional[Sequence[Widget[Any]]],
         item_type: Type[Any],
         token: str,
         removable: bool,
     ):
-        super().__init__(name, title=title, token=token, removable=removable)
-        self.items = items or []
+        super().__init__(
+            name, value=value, title=title, token=token, removable=removable
+        )
         self.item_type = item_type
-        self.help_text = help_text
+        self.hint = hint
 
     def get_template(self) -> str:
         return "pydantic_form/Sequence"
@@ -34,7 +33,7 @@ class SequenceWidget(Widget):
 
     def to_html(self, renderer: "AbstractTemplateRenderer") -> Markup:
         """Return the html version"""
-        children = [Markup(item.to_html(renderer)) for item in self.items]
+        children = [Markup(item.to_html(renderer)) for item in self.value or []]
         return Markup(
             renderer.render_template(
                 self.get_template(),

fastlife/templating/renderer/widgets/text.py

@@ -3,7 +3,7 @@ from typing import Optional
 from .base import Widget
 
 
-class TextWidget(Widget):
+class TextWidget(Widget[str]):
     def __init__(
         self,
         name: str,
@@ -14,15 +14,19 @@ class TextWidget(Widget):
         removable: bool = False,
         value: str = "",
         token: Optional[str] = None,
-        help_text: Optional[str] = None,
+        hint: Optional[str] = None,
         input_type: str = "text"
     ) -> None:
         super().__init__(
-            name, title=title, aria_label=aria_label, token=token, removable=removable
+            name,
+            value=value,
+            title=title,
+            aria_label=aria_label,
+            token=token,
+            removable=removable,
         )
         self.placeholder = placeholder or ""
-        self.value = value
-        self.help_text = help_text
+        self.hint = hint
         self.input_type = input_type
 
     def get_template(self) -> str:

fastlife/templating/renderer/widgets/union.py

@@ -1,4 +1,4 @@
-from typing import Optional, Sequence, Type, Union
+from typing import Any, Optional, Sequence, Type, Union
 
 from markupsafe import Markup
 from pydantic import BaseModel
@@ -8,19 +8,20 @@ from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 from .base import TypeWrapper, Widget
 
 
-class UnionWidget(Widget):
+class UnionWidget(Widget[Widget[Any]]):
     def __init__(
         self,
         name: str,
         *,
         title: Optional[str],
-        child: Optional[Widget],
+        value: Optional[Widget[Any]],
         children_types: Sequence[Type[BaseModel]],
         token: str,
         removable: bool,
     ):
-        super().__init__(name, title=title, token=token, removable=removable)
-        self.child = child
+        super().__init__(
+            name, value=value, title=title, token=token, removable=removable
+        )
         self.children_types = children_types
         self.parent_name = name
 
@@ -35,7 +36,7 @@ class UnionWidget(Widget):
 
     def to_html(self, renderer: "AbstractTemplateRenderer") -> Markup:
         """Return the html version"""
-        child = Markup(self.child.to_html(renderer)) if self.child else ""
+        child = Markup(self.value.to_html(renderer)) if self.value else ""
         return Markup(
             renderer.render_template(
                 self.get_template(),