fastlifeweb 0.20.1__py3-none-any.whl → 0.21.0__py3-none-any.whl

fastlife/adapters/jinjax/widgets/checklist.py

@@ -3,8 +3,9 @@ Widget for field of type Set.
 """
 
 from collections.abc import Sequence
+from typing import Self
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_validator
 
 from .base import Widget
 
@@ -19,52 +20,45 @@ class Checkable(BaseModel):
     checked: bool
     error: str | None = Field(default=None)
 
-    @property
-    def id(self) -> str:
-        id = f"{self.name}-{self.value}-{self.token}"
-        return id.replace(".", "-").replace("_", "-")
+    id: str | None = Field(default=None)
+    field_name: str | None = Field(default=None)
 
-    @property
-    def field_name(self) -> str:
-        return f"{self.name}[]"
+    @model_validator(mode="after")
+    def fill_props(self) -> Self:
+        self.id = f"{self.name}-{self.value}-{self.token}".replace(".", "-")
+        self.field_name = f"{self.name}[]"
+        return self
 
 
 class ChecklistWidget(Widget[Sequence[Checkable]]):
     """
     Widget for field of type Set.
-
-    :param name: field name.
-    :param title: title for the widget.
-    :param hint: hint for human.
-    :param aria_label: html input aria-label value.
-    :param value: current value.
-    :param error: error of the value if any.
-    :param removable: display a button to remove the widget for optional fields.
-    :param token: token used to get unique id on the form.
     """
 
-    def __init__(
-        self,
-        name: str,
-        *,
-        title: str | None,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        value: Sequence[Checkable],
-        error: str | None = None,
-        token: str,
-        removable: bool,
-    ) -> None:
-        super().__init__(
-            name,
-            value=value,
-            error=error,
-            token=token,
-            title=title,
-            hint=hint,
-            aria_label=aria_label,
-            removable=removable,
-        )
-
-    def get_template(self) -> str:
-        return "pydantic_form.Checklist.jinja"
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+      <div class="pt-4">
+        <Details>
+          <Summary :id="id + '-summary'">
+            <H3 :class="H3_SUMMARY_CLASS">{{title}}</H3>
+            <pydantic_form.Error :text="error" />
+          </Summary>
+          <div>
+            {% for value in value %}
+            <div class="flex items-center mb-4">
+                <Checkbox :name="value.field_name" type="checkbox"
+                    :id="value.id"
+                    :value="value.value"
+                    :checked="value.checked" />
+                <Label :for="value.id"
+                    class="ms-2 text-base text-neutral-900 dark:text-white">
+                    {{- value.label -}}
+                </Label>
+                <pydantic_form.Error :text="value.error" />
+            </div>
+            {% endfor %}
+          </div>
+        </Details>
+      </div>
+    </pydantic_form.Widget>
+    """

fastlife/adapters/jinjax/widgets/dropdown.py

@@ -4,53 +4,47 @@ Widget for field of type Enum or Literal.
 
 from collections.abc import Sequence
 
+from pydantic import Field, field_validator
+
 from .base import Widget
 
 
 class DropDownWidget(Widget[str]):
     """
     Widget for field of type Enum or Literal.
+    """
 
-    :param name: field name.
-    :param title: title for the widget.
-    :param hint: hint for human.
-    :param aria_label: html input aria-label value.
-    :param value: current value.
-    :param error: error of the value if any.
-    :param options: List of possible values.
-    :param removable: display a button to remove the widget for optional fields.
-    :param token: token used to get unique id on the form.
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+      <div class="pt-4">
+        <Label :for="id">{{title}}</Label>
+        <Select :name="name" :id="id">
+          {%- for opt in options -%}
+          <Option :value="opt.value" id={{id + "-" + opt.value.replace(" ", " -")}}
+            :selected="value==opt.value">
+            {{- opt.text -}}
+          </Option>
+          {%- endfor -%}
+        </Select>
+        <pydantic_form.Error :text="error" />
+        <pydantic_form.Hint :text="hint" />
+      </div>
+    </pydantic_form.Widget>
     """
 
-    def __init__(
-        self,
-        name: str,
-        *,
-        title: str | None,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        value: str | None = None,
-        error: str | None = None,
-        options: Sequence[tuple[str, str]] | Sequence[str],
-        removable: bool = False,
-        token: str | None = None,
-    ) -> None:
-        super().__init__(
-            name,
-            value=value,
-            error=error,
-            title=title,
-            token=token,
-            removable=removable,
-            hint=hint,
-            aria_label=aria_label,
-        )
-        self.options: list[dict[str, str]] = []
+    options: list[dict[str | int, str | int]] = Field(default_factory=list)
+
+    @field_validator("options", mode="before")
+    @classmethod
+    def validate_options(
+        cls, options: Sequence[str | int | tuple[str | int, str | int]] | None
+    ) -> Sequence[dict[str | int, str | int]]:
+        if not options:
+            return []
+        ret: list[dict[str | int, str | int]] = []
         for opt in options:
             if isinstance(opt, tuple):
-                self.options.append({"value": opt[0], "text": opt[1]})
+                ret.append({"value": opt[0], "text": opt[1]})
             else:
-                self.options.append({"value": opt, "text": opt})
-
-    def get_template(self) -> str:
-        return "pydantic_form.Dropdown.jinja"
+                ret.append({"value": opt, "text": opt})
+        return ret

fastlife/adapters/jinjax/widgets/hidden.py

@@ -1,33 +1,25 @@
 """Hidden fields"""
 
-from typing import Any
+from fastlife.domain.model.types import Builtins
 
 from .base import Widget
 
 
-class HiddenWidget(Widget[str]):
+class HiddenWidget(Widget[Builtins]):
     '''
     Widget to annotate to display a field as an hidden field.
 
     ::
         from pydantic import BaseModel
+        from fastlife.adapters.jinjax.widgets.base import CustomWidget
         from fastlife.adapters.jinjax.widgets.hidden import HiddenWidget
 
         class MyForm(BaseModel):
-            id: Annotated[str, HiddenWidget] = Field(...)
+            id: Annotated[str, CustomWidget(HiddenWidget)] = Field(...)
             """Identifier in the database."""
 
     '''
 
-    def __init__(
-        self,
-        name: str,
-        *,
-        value: str,
-        token: str,
-        **kwargs: Any,
-    ) -> None:
-        super().__init__(name, value=value, token=token)
-
-    def get_template(self) -> str:
-        return "pydantic_form.Hidden.jinja"
+    template = """
+    <Hidden :name="name" :value="value" :id="id" />
+    """

fastlife/adapters/jinjax/widgets/model.py

@@ -1,51 +1,44 @@
 """Pydantic models"""
 
 from collections.abc import Sequence
-from typing import Any
 
 from markupsafe import Markup
+from pydantic import Field
 
 from fastlife.services.templates import AbstractTemplateRenderer
 
-from .base import Widget
-
-
-class ModelWidget(Widget[Sequence[Widget[Any]]]):
-    def __init__(
-        self,
-        name: str,
-        *,
-        value: Sequence[Widget[Any]],
-        error: str | None = None,
-        removable: bool,
-        title: str,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        token: str,
-        nested: bool,
-    ):
-        super().__init__(
-            name,
-            title=title,
-            hint=hint,
-            aria_label=aria_label,
-            value=value,
-            error=error,
-            removable=removable,
-            token=token,
-        )
-        self.nested = nested
-
-    def get_template(self) -> str:
-        return "pydantic_form.Model.jinja"
+from .base import TWidget, Widget
+
+
+class ModelWidget(Widget[Sequence[TWidget]]):
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+    <div id="{{id}}"{% if nested %} class="m-4"{%endif%}>
+        {% if nested %}
+        <Details>
+        <Summary :id="id + '-summary'">
+            <H3 :class="H3_SUMMARY_CLASS">{{title}}</H3>
+            <pydantic_form.Error :text="error" />
+        </Summary>
+        <div>
+            {% for child in children_widgets %}
+            {{ child }}
+            {% endfor %}
+        </div>
+        </Details>
+        {% else %}
+            {% for child in children_widgets %}
+            {{ child }}
+            {% endfor %}
+        {% endif %}
+    </div>
+    </pydantic_form.Widget>
+    """
+
+    nested: bool = Field(default=False)
+    children_widgets: list[str] | None = Field(default=None)
 
     def to_html(self, renderer: AbstractTemplateRenderer) -> Markup:
         """Return the html version."""
-        children_widget = [child.to_html(renderer) for child in self.value or []]
-        kwargs = {
-            "widget": self,
-            "children_widget": children_widget,
-        }
-        return Markup(
-            renderer.render_template(self.get_template(), globals=None, **kwargs)
-        )
+        self.children_widgets = [child.to_html(renderer) for child in self.value or []]
+        return Markup(renderer.render_template(self))

fastlife/adapters/jinjax/widgets/sequence.py

@@ -2,52 +2,73 @@ from collections.abc import Sequence
 from typing import Any
 
 from markupsafe import Markup
+from pydantic import Field
 
 from fastlife.services.templates import AbstractTemplateRenderer
 
-from .base import TypeWrapper, Widget
-
-
-class SequenceWidget(Widget[Sequence[Widget[Any]]]):
-    def __init__(
-        self,
-        name: str,
-        *,
-        title: str | None,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        value: Sequence[Widget[Any]] | None,
-        error: str | None = None,
-        item_type: type[Any],
-        token: str,
-        removable: bool,
-    ):
-        super().__init__(
-            name,
-            value=value,
-            error=error,
-            title=title,
-            hint=hint,
-            aria_label=aria_label,
-            token=token,
-            removable=removable,
-        )
-        self.item_type = item_type
-
-    def get_template(self) -> str:
-        return "pydantic_form.Sequence.jinja"
+from .base import TWidget, TypeWrapper, Widget
+
+
+class SequenceWidget(Widget[Sequence[TWidget]]):
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+      <Details :id="id">
+        <Summary :id="id + '-summary'">
+          <H3 :class="H3_SUMMARY_CLASS">{{title}}</H3>
+          <pydantic_form.Error :text="error" />
+        </Summary>
+        <div>
+          {% set fnGetName = "get" + id.replace("-", "_") %}
+          <script>
+            function {{ fnGetName }} () {
+              const el = document.getElementById("{{id}}-content");
+              const len = el.dataset.length;
+              el.dataset.length = parseInt(len) + 1;
+              return "{{wrapped_type.name}}." + len;
+            }
+          </script>
+
+          <div id="{{id}}-content" class="m-4"
+            data-length="{{children_widgets|length|string}}">
+            {% set container_id = id + "-children-container" %}
+            <div id="{{container_id}}">
+              {% for child in children_widgets %}
+              {{ child }}
+              {% endfor%}
+            </div>
+          </div>
+
+          <div>
+            {% set container_id = "#" + id + "-children-container" %}
+            {% set add_id = id + "-add" %}
+            {% set vals = 'js:{"name": '
+                + fnGetName
+                + '(), "token": "'
+                + wrapped_type.token + '", "removable": true}' %}
+            <Button type="button"
+                :hx-target="container_id" hx-swap="beforeend"
+                :id="add_id"
+                :hx-vals="vals"
+                :hx-get="wrapped_type.url">
+              Add
+            </Button>
+          </div>
+        </div>
+      </Details>
+    </pydantic_form.Widget>
+    """
+
+    item_type: type[Any]
+    wrapped_type: TypeWrapper | None = Field(default=None)
+    children_widgets: list[str] = Field(default=None)
 
     def build_item_type(self, route_prefix: str) -> TypeWrapper:
         return TypeWrapper(self.item_type, route_prefix, self.name, self.token)
 
     def to_html(self, renderer: "AbstractTemplateRenderer") -> Markup:
         """Return the html version."""
-        children = [Markup(item.to_html(renderer)) for item in self.value or []]
-        return Markup(
-            renderer.render_template(
-                self.get_template(),
-                widget=self,
-                type=self.build_item_type(renderer.route_prefix),
-                children_widgets=children,
-            )
-        )
+        self.wrapped_type = self.build_item_type(renderer.route_prefix)
+        self.children_widgets = [
+            Markup(item.to_html(renderer)) for item in self.value or []
+        ]
+        return Markup(renderer.render_template(self))

fastlife/adapters/jinjax/widgets/text.py

@@ -1,52 +1,31 @@
 from collections.abc import Sequence
 
+from pydantic import Field
+
+from fastlife.domain.model.types import Builtins
+
 from .base import Widget
 
 
-class TextWidget(Widget[str]):
+class TextWidget(Widget[Builtins]):
     """
     Widget for text like field (email, ...).
-
-    :param name: input name.
-    :param title: title for the widget.
-    :param hint: hint for human.
-    :param aria_label: html input aria-label value.
-    :param placeholder: html input placeholder value.
-    :param error: error of the value if any.
-    :param value: current value.
-    :param removable: display a button to remove the widget for optional fields.
-    :param token: token used to get unique id on the form.
     """
 
-    def __init__(
-        self,
-        name: str,
-        *,
-        title: str | None,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        placeholder: str | None = None,
-        error: str | None = None,
-        value: str = "",
-        input_type: str = "text",
-        removable: bool = False,
-        token: str,
-    ) -> None:
-        super().__init__(
-            name,
-            value=value,
-            title=title,
-            hint=hint,
-            aria_label=aria_label,
-            token=token,
-            error=error,
-            removable=removable,
-        )
-        self.placeholder = placeholder or ""
-        self.input_type = input_type
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+      <div class="pt-4">
+        <Label :for="id">{{title}}</Label>
+        <pydantic_form.Error :text="error" />
+        <Input :name="name" :value="value" :type="input_type" :id="id"
+          :aria-label="aria_label" :placeholder="placeholder" />
+        <pydantic_form.Hint :text="hint" />
+      </div>
+    </pydantic_form.Widget>
+    """
 
-    def get_template(self) -> str:
-        return "pydantic_form.Text.jinja"
+    input_type: str = Field(default="text")
+    placeholder: str | None = Field(default=None)
 
 
 class TextareaWidget(Widget[Sequence[str]]):
@@ -54,12 +33,13 @@ class TextareaWidget(Widget[Sequence[str]]):
     Render a Textearea for a string or event a sequence of string.
 
     ```
+    from fastlife.adapters.jinjax.widgets.base import CustomWidget
     from fastlife.adapters.jinjax.widgets.text import TextareaWidget
     from pydantic import BaseModel, Field, field_validator
 
     class TaggedParagraphForm(BaseModel):
-        paragraph: Annotated[str, TextareaWidget] = Field(...)
-        tags: Annotated[Sequence[str], TextareaWidget] = Field(
+        paragraph: Annotated[str, CustomWidget(TextareaWidget)] = Field(...)
+        tags: Annotated[Sequence[str], CustomWidget(TextareaWidget)] = Field(
             default_factory=list,
             title="Tags",
             description="One tag per line",
@@ -69,43 +49,24 @@ class TextareaWidget(Widget[Sequence[str]]):
         def split(cls, s: Any) -> Sequence[str]:
             return s.split() if s else []
     ```
-
-    :param name: input name.
-    :param title: title for the widget.
-    :param hint: hint for human.
-    :param aria_label: html input aria-label value.
-    :param placeholder: html input placeholder value.
-    :param error: error of the value if any.
-    :param value: current value.
-    :param removable: display a button to remove the widget for optional fields.
-    :param token: token used to get unique id on the form.
-
     """
 
-    def __init__(
-        self,
-        name: str,
-        *,
-        title: str | None,
-        hint: str | None = None,
-        aria_label: str | None = None,
-        placeholder: str | None = None,
-        error: str | None = None,
-        value: Sequence[str] | None = None,
-        removable: bool = False,
-        token: str,
-    ) -> None:
-        super().__init__(
-            name,
-            value=value or [],
-            title=title,
-            hint=hint,
-            aria_label=aria_label,
-            token=token,
-            error=error,
-            removable=removable,
-        )
-        self.placeholder = placeholder or ""
+    template = """
+    <pydantic_form.Widget :widget_id="id" :removable="removable">
+      <div class="pt-4">
+        <Label :for="id">{{title}}</Label>
+        <pydantic_form.Error :text="error" />
+        <Textarea :name="name" :id="id" :aria-label="aria_label">
+            {%- if v is string -%}
+            {{- v -}}}
+            {%- else -%}
+            {%- for v in value %}{{v}}
+    {% endfor -%}
+            {% endif %}
+        </Textarea>
+        <pydantic_form.Hint :text="hint" />
+      </div>
+    </pydantic_form.Widget>
+    """
 
-    def get_template(self) -> str:
-        return "pydantic_form.Textarea.jinja"
+    placeholder: str = Field(default="")