fastlifeweb 0.27.0__tar.gz → 0.28.0__tar.gz

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.28.0  - Released on 2025-09-19
+* Introduce new template engine xcomponent that will replace jinjax.
+* At the moment, the template engine has to be installed as an extra
+  dependencie, none of them will be installed by default.
+  install fastlifeweb[jinjax] insted of fastlife for the compatibility.
+  The new template engine, xcomponent, has to be installed as
+  fastlifeweb[xcomponent].
+
+## 0.27.1  - Released on 2025-07-10
+* Add response_model to @resource_view in order to document views that use StreamResponse.
+
 ## 0.27.0  - Released on 2025-04-24
 * Add i18n support on pydantic form.
 

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.27.0
+Version: 0.28.0
 Summary: High-level web framework
 Author-Email: Guillaume Gauvrit <guillaume@gauvr.it>
 License: MIT
@@ -19,13 +19,16 @@ Project-URL: Changelog, https://mardiros.github.io/fastlife/user/changelog.html
 Requires-Python: >=3.11
 Requires-Dist: fastapi[standard]<0.116.0,>=0.115.4
 Requires-Dist: itsdangerous<3,>=2.1.2
-Requires-Dist: jinjax<0.49,>=0.48
 Requires-Dist: markupsafe<3,>=2.1.3
 Requires-Dist: multidict<7,>=6.0.5
 Requires-Dist: pydantic<3,>=2.5.3
 Requires-Dist: pydantic-settings<3,>=2.0.3
 Requires-Dist: python-multipart<1,>=0.0.13
 Requires-Dist: venusian<4,>=3.0.0
+Provides-Extra: jinjax
+Requires-Dist: jinjax<0.49,>=0.48; extra == "jinjax"
+Provides-Extra: xcomponent
+Requires-Dist: xcomponent<0.7,>=0.6.6; extra == "xcomponent"
 Provides-Extra: testing
 Requires-Dist: beautifulsoup4; extra == "testing"
 Provides-Extra: docs
@@ -77,7 +80,7 @@ to maintain and scale your project.
 
 ## Tests
 
-Fastlife come with [a test client](https://mardiros.github.io/fastlife/develop/fastlife/fastlife.testing.testclient.html) that can interact with html inside unit tests.
+Fastlife comes with [a test client](https://mardiros.github.io/fastlife/develop/fastlife/fastlife.testing.testclient.html) that can interact with html inside unit tests.
 
 
 ## Try it

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/README.md

@@ -39,7 +39,7 @@ to maintain and scale your project.
 
 ## Tests
 
-Fastlife come with [a test client](https://mardiros.github.io/fastlife/develop/fastlife/fastlife.testing.testclient.html) that can interact with html inside unit tests.
+Fastlife comes with [a test client](https://mardiros.github.io/fastlife/develop/fastlife/fastlife.testing.testclient.html) that can interact with html inside unit tests.
 
 
 ## Try it

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/pyproject.toml

@@ -14,12 +14,11 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
     "Typing :: Typed",
 ]
-version = "0.27.0"
+version = "0.28.0"
 requires-python = ">=3.11"
 dependencies = [
     "fastapi[standard] >=0.115.4,<0.116.0",
     "itsdangerous >=2.1.2,<3",
-    "jinjax >=0.48,<0.49",
     "markupsafe >=2.1.3,<3",
     "multidict >=6.0.5,<7",
     "pydantic >=2.5.3,<3",
@@ -39,6 +38,12 @@ Issues = "https://github.com/mardiros/fastlife/issues"
 Changelog = "https://mardiros.github.io/fastlife/user/changelog.html"
 
 [project.optional-dependencies]
+jinjax = [
+    "jinjax >=0.48,<0.49",
+]
+xcomponent = [
+    "xcomponent >=0.6.6,<0.7",
+]
 testing = [
     "beautifulsoup4",
 ]
@@ -58,6 +63,7 @@ dev = [
     "heroicons >= 2.7.0,<3",
     "httpx >= 0.28.1,<0.29",
     "hypercorn >= 0.14.4,<0.15",
+    "jinjax >=0.48,<0.49",
     "mypy >= 1.4.0,<2",
     "pytailwindcss >= 0.2.0,<0.3",
     "pytest >= 8.2.0,<9",
@@ -68,6 +74,7 @@ dev = [
     "tursu >=0.16.0,<1",
     "types-beautifulsoup4 >=4.12.0.6,<5",
     "uvicorn >=0.34.0,<1.0",
+    "xcomponent >=0.6.6,<0.7",
 ]
 doc = [
     "furo >=2024.5.6",
@@ -149,6 +156,7 @@ filterwarnings = [
     "ignore:.*find_module\\(\\) is deprecated.*:DeprecationWarning",
     "ignore:.*FileFinder.find_loader\\(\\) is deprecated.*:DeprecationWarning",
     "ignore:.*Pydantic serializer warnings.*:UserWarning",
+    "ignore:.*__get_pydantic_core_schema__.*:DeprecationWarning",
 ]
 testpaths = [
     "tests",

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/src/fastlife/__init__.py

@@ -41,7 +41,7 @@ from .domain.model.security_policy import (
     Unauthenticated,
     Unauthorized,
 )
-from .domain.model.template import JinjaXTemplate
+from .domain.model.template import JinjaXTemplate, XTemplate
 
 # from .request.form_data import model
 from .service.registry import DefaultRegistry, GenericRegistry, TRegistry, TSettings
@@ -105,6 +105,7 @@ __all__ = [
     "TIdentity",
     # Template
     "JinjaXTemplate",
+    "XTemplate",
     # i18n
     "Localizer",
     "TranslatableStringFactory",

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/src/fastlife/adapters/jinjax/renderer.py

@@ -17,6 +17,7 @@ from fastlife import Request
 from fastlife.adapters.fastapi.form import FormModel
 from fastlife.adapters.fastapi.localizer import get_localizer
 from fastlife.adapters.jinjax.widget_factory.factory import WidgetFactory
+from fastlife.config import Configurator, configure
 from fastlife.domain.model.template import InlineTemplate
 
 if TYPE_CHECKING:
@@ -162,3 +163,10 @@ class JinjaxEngine(AbstractTemplateRendererFactory):
             self.catalog,
             request,
         )
+
+
+@configure
+def includeme(conf: Configurator) -> None:
+    conf.add_renderer(
+        conf.registry.settings.jinjax_file_ext, JinjaxEngine(conf.registry.settings)
+    )

{fastlifeweb-0.27.0 → fastlifeweb-0.28.0}/src/fastlife/adapters/jinjax/widgets/union.py

@@ -23,7 +23,7 @@ class UnionWidget(Widget[TWidget]):
       <div id="{{id}}">
         <Details>
           <Summary :id="id + '-union-summary'">
-            <H3 :class="H3_SUMMARY_CLASS">{{ gettext(title) }}</H3>
+            <H3 :class="H3_SUMMARY_CLASS">{ globals.gettext(title) }</H3>
             <pydantic_form.Error :text="error" />
           </Summary>
           <div hx-sync="this" id="{{id}}-child">

fastlifeweb-0.28.0/src/fastlife/adapters/xcomponent/__init__.py

@@ -0,0 +1 @@
+

fastlifeweb-0.28.0/src/fastlife/adapters/xcomponent/catalog.py

@@ -0,0 +1,11 @@
+from typing import Any
+
+from xcomponent import Catalog
+
+catalog = Catalog()
+"""The catalog to register components."""
+
+
+@catalog.function(name="len")
+def length(iterable: Any) -> int:
+    return len(iterable)

fastlifeweb-0.28.0/src/fastlife/adapters/xcomponent/html/__init__.py

@@ -0,0 +1,7 @@
+"""
+This module load the html components for the xcomponent template engine.
+
+Those components are loaded, injected in the catalog using a
+{meth}`config.include <fastlife.config.configurator.Configurator.include>`
+done before the app is created.
+"""

fastlifeweb-0.28.0/src/fastlife/adapters/xcomponent/html/collapsible.py

@@ -0,0 +1,76 @@
+"""Collapsible components, using details/summary."""
+
+from collections.abc import Mapping
+
+from xcomponent import XNode
+
+from fastlife.adapters.xcomponent.catalog import catalog
+
+
+@catalog.component
+def Details(
+    children: XNode,
+    globals: Mapping[str, str],
+    id: str | None = None,
+    class_: str | None = None,
+    open: bool = True,
+) -> str:
+    """
+    Produce a ``<details>`` html node in order to create a collapsible box.
+
+    .. code-block:: html
+
+      <Details>
+        <Summary id="my-summary">
+          <H3 class={globals.H3_SUMMARY_CLASS}>A title</H3>
+        </Summary>
+        <div>
+          Some content
+        </div>
+      </Details>
+
+    :param id: unique identifier of the element.
+    :param class_: css class for the node, defaults to
+        :attr:`fastlife.template_globals.Globals.DETAILS_CLASS`.
+    :param open: open/close state.
+    """
+    return """
+    <details id={id} class={class_ or globals.DETAILS_CLASS} open={open}>
+        {children}
+    </details>
+    """
+
+
+@catalog.component
+def Summary(
+    children: XNode,
+    globals: Mapping[str, str],
+    id: str | None = None,
+    class_: str | None = None,
+    open: bool = True,
+) -> str:
+    """
+    Create html ``<summary>`` node for the
+    :func:`fastlife.adapters.xcomponent.html.collapsible.Details` component.
+
+    :param id: unique identifier of the element.
+    :param class_: css class for the node, defaults to
+        :attr:`fastlife.template_globals.Globals.SUMMARY_CLASS`.
+    :param open: Open or collapse the content of the details.
+    """
+    return """
+    <summary id={id} class={class_ or globals.SUMMARY_CLASS}
+      style="list-style: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;"
+      onclick={"document.getElementById('" + id + "-icon').classList.toggle('rotate-90')"}>
+      <Icon name="chevron-right" id={id + '-icon'}
+        class={
+            if open {
+                "w-8 h-8 transform transition-transform duration-300 rotate-90"
+            }
+            else {
+                "w-8 h-8 transform transition-transform duration-300"
+            }
+        } />
+        { children }
+    </summary>
+    """

fastlifeweb-0.28.0/src/fastlife/adapters/xcomponent/html/form.py

@@ -0,0 +1,437 @@
+from collections.abc import Mapping
+from typing import Literal
+
+from xcomponent import XNode
+
+from fastlife.adapters.xcomponent.catalog import catalog
+
+
+@catalog.component
+def Form(
+    children: XNode,
+    globals: Mapping[str, str],
+    id: str | None = None,
+    class_: str | None = None,
+    method: Literal["get", "post"] | None = None,
+    action: str | None = None,
+    hx_target: str | None = None,
+    hx_select: str | None = None,
+    hx_swap: str | None = None,
+    hx_post: str | Literal[True] | None = None,
+    hx_disable: Literal[True] | None = None,
+) -> str:
+    return """
+        <form
+            id={id}
+            class={class_ or globals.FORM_CLASS}
+            hx-disable={hx_disable}
+            hx-post={hx_post}
+            hx-select={hx_select}
+            hx-swap={hx_swap}
+            hx-target={hx_target}
+            action={action}
+            method={method}
+            >
+            <CsrfToken />
+            { children }
+        </form>
+    """
+
+
+@catalog.component
+def CsrfToken(globals: dict[str, str]) -> str:
+    return """
+        <Hidden
+            name={globals.request.csrf_token.name}
+            value={globals.request.csrf_token.value}
+            />
+    """
+
+
+@catalog.component
+def Input(
+    name: str,
+    value: str = "",
+    type: str = "text",
+    id: str | None = None,
+    class_: str | None = None,
+    aria_label: str | None = None,
+    placeholder: str | None = None,
+    inputmode: Literal[
+        "none", "text", "decimal", "numeric", "tel", "search", "email", "url"
+    ]
+    | None = None,
+    autocomplete: Literal[
+        "on",
+        "off",
+        "name",
+        "username",
+        "current-password",
+        "new-password",
+        "one-time-code",
+        "email",
+        "tel",
+        "organization",
+        "street-address",
+        "address-line1",
+        "address-line2",
+        "address-line3",
+        "postal-code",
+        "country",
+        "country-name",
+        "cc-name",
+        "cc-number",
+        "cc-exp",
+        "cc-csc",
+        "tel-country-code",
+        "tel-national",
+        "tel-area-code",
+        "tel-local",
+        "tel-extension",
+        "bday",
+        "bday-day",
+        "bday-month",
+        "bday-year",
+        "transaction-amount",
+        "transaction-currency",
+    ]
+    | None = None,
+    autofocus: bool = False,
+) -> str:
+    return """
+    <input
+        type={type}
+        name={name}
+        value={value}
+        id={id}
+        aria-label={ aria_label }
+        placeholder={ placeholder }
+        inputmode={inputmode}
+        autocomplete={autocomplete}
+        class={class_ or globals.INPUT_CLASS}
+        autofocus={autofocus}
+    />
+    """
+
+
+@catalog.component
+def Hidden(
+    name: str,
+    value: str,
+    id: str | None = None,
+) -> str:
+    return """
+        <input name={name} value={value} type="hidden" id={id} />
+    """
+
+
+@catalog.component
+def Button(
+    children: XNode,
+    globals: Mapping[str, str],
+    type: Literal["submit", "button", "reset"] = "submit",
+    id: str | None = None,
+    class_: str | None = None,
+    name: str = "action",
+    value: str = "submit",
+    hidden: bool = False,
+    aria_label: str | None = None,
+    onclick: str | None = None,
+    hx_target: str | None = None,
+    hx_swap: str | None = None,
+    hx_select: str | None = None,
+    hx_on_after_request: str | None = None,
+    hx_vals: str | None = None,
+    hx_confirm: str | None = None,
+    hx_get: str | None = None,
+    hx_post: str | None = None,
+    hx_put: str | None = None,
+    hx_patch: str | None = None,
+    hx_delete: str | None = None,
+    hx_params: str | None = None,
+    hx_push_url: bool = False,
+    full_width: bool = False,
+) -> str:
+    return """
+    <button
+        type={type}
+        name={name}
+        value={value}
+        id={id}
+        hx-target={hx_target}
+        hx-swap={hx_swap}
+        hx-select={hx_select}
+        onclick={onclick}
+        hx-on::after-request={hx_on_after_request}
+        hx-vals={hx_vals}
+        hx-confirm={hx_confirm}
+        hx-get={hx_get}
+        hx-post={hx_post}
+        hx-put={hx_put}
+        hx-patch={hx_patch}
+        hx-delete={hx_delete}
+        hx-push-url={hx_push_url}
+        hx-params={hx_params}
+        aria-label={aria_label}
+        class={
+            if full_width {
+                "w-full " + (class_ or globals.BUTTON_CLASS)
+            }
+            else {
+                class_ or globals.BUTTON_CLASS
+            }
+        }
+        hidden={hidden}
+        >
+        {children}
+    </button>
+    """
+
+
+@catalog.component
+def Checkbox(
+    name: str,
+    globals: Mapping[str, str],
+    id: str | None = None,
+    class_: str | None = None,
+    value: str | None = None,
+    checked: bool = False,
+) -> str:
+    """
+    Create html ``<input type="checkbox" />`` node.
+
+    :param name: Name of the checkbox
+    :param id: unique identifier of the element
+    :param class_: css class for the node, defaults to
+                  :attr:`fastlife.template_globals.Globals.CHECKBOX_CLASS`
+    :param value: http submitted value if the checkbox is checked
+    :param checked: Initialized the checkbox as ticked
+    """
+    return """
+        <input
+            name={name}
+            type="checkbox"
+            id={id}
+            value={value}
+            class={class_ or globals.CHECKBOX_CLASS }
+            checked={checked}
+            />
+    """
+
+
+@catalog.component
+def Password(
+    name: str,
+    globals: Mapping[str, str],
+    id: str | None = None,
+    class_: str | None = None,
+    aria_label: str | None = None,
+    placeholder: str | None = None,
+    autocomplete: Literal[
+        "on",
+        "off",
+        "current-password",
+        "new-password",
+    ]
+    | None = None,
+    inputmode: Literal[
+        "none",
+        "text",
+        "numeric",
+    ]
+    | None = None,
+    minlength: int | None = None,
+    maxlength: int | None = None,
+    pattern: str | None = None,
+    autofocus: bool = False,
+    required: bool = False,
+    readonly: bool = False,
+) -> str:
+    """
+    Produce ``<input type="password">`` node.
+
+    :param name: submitted name in the form
+    :param id: unique identifier of the element
+    :param class_: css class for the node, defaults to
+                  :attr:`fastlife.template_globals.Globals.INPUT_CLASS`
+    :param aria_label: aria-label
+    :param placeholder: brief hint to the user as to what kind of information
+                        is expected in the field
+    :param autocomplete: Define autocomplete mode
+    :param inputmode: Define a virtual keyboard layout
+    :param minlength: Minimum length
+    :param maxlength: Maximum length
+    :param pattern: Must match a pattern
+    :param autofocus: Give the focus
+    :param required: Mark as required field
+    :param readonly: Mark as readonly field
+    """
+    return """
+    <input
+        name={name}
+        type="password"
+        id={id}
+        aria-label={aria_label}
+        placeholder={placeholder}
+        autocomplete={autocomplete}
+        inputmode={inputmode}
+        minlength={minlength}
+        maxlength={maxlength}
+        pattern={pattern}
+        class={class_ or globals.INPUT_CLASS}
+        autofocus={autofocus}
+        required={required}
+        readonly={readonly}
+    />
+    """
+
+
+@catalog.component
+def Label(
+    children: XNode,
+    globals: Mapping[str, str],
+    for_: str | None = None,
+    id: str | None = None,
+    class_: str | None = None,
+) -> str:
+    """
+    Produce ``<label>`` node.
+
+    :param for_: unique identifier of the target element.
+    :param id: unique identifier of the element.
+    :param class_: css class for the node, defaults to
+                  :attr:`fastlife.template_globals.Globals.LABEL_CLASS`.
+    """
+    return """
+    <label for={for_} class={class_ or globals.LABEL_CLASS} id={id}>
+        {children}
+    </label>
+    """
+
+
+@catalog.component
+def Option(
+    children: XNode,
+    globals: Mapping[str, str],
+    value: str,
+    id: str | None = None,
+    selected: bool = False,
+) -> str:
+    """
+    Produce ``<option>`` node.
+
+    :param value: posted value after submitted the selected value
+    :param id: unique identifier of the element
+    :param selected: Used to select the option while rendering the form
+    """
+    return """
+    <option value={value} id={id} selected={selected}>
+        {children}
+    </option>
+    """
+
+
+@catalog.component
+def Select(
+    children: XNode,
+    globals: Mapping[str, str],
+    name: str,
+    id: str | None = None,
+    class_: str | None = None,
+    multiple: bool = False,
+) -> str:
+    """
+    Create html ``<select>`` node.
+
+    :param name: name of the submitted
+    :param id: unique identifier of the element
+    :param class_: css class for the node, defaults to
+                  :attr:`fastlife.template_globals.Globals.SELECT_CLASS`
+    :param multiple: Mark as multiple
+    """
+    return """
+    <select name={name} id={id} class={class_ or globals.SELECT_CLASS}
+            multiple={multiple}>
+        {children}
+    </select>
+    """
+
+
+@catalog.component
+def Radio(
+    globals: Mapping[str, str],
+    label: str,
+    name: str,
+    value: str,
+    id: str | None = None,
+    checked: bool = False,
+    disabled: bool = False,
+    onclick: str | None = None,
+    div_class: str | None = None,
+    class_: str | None = None,
+    label_class: str | None = None,
+) -> str:
+    """
+    Produce a ``<input type="radio">`` with its associated label inside a div.
+
+    :param label: label text associated to the radio
+    :param name: name of the submitted
+    :param value: value that will be submitted if selected
+    :param id: unique identifier of the element
+    :param checked: Tick the radio button
+    :param disabled: Mark the radio button as disabled
+    :param onclick: execute some javascript while clicking
+    :param div_class: css class for the div node, defaults to
+                     :attr:`fastlife.template_globals.Globals.RADIO_DIV_CLASS`
+    :param class_: css class for the input node, defaults to
+                   :attr:`fastlife.template_globals.Globals.RADIO_INPUT_CLASS`
+    :param label_class: css class for the label node, defaults to
+                        :attr:`fastlife.template_globals.Globals.RADIO_LABEL_CLASS`
+    """
+
+    return """
+    <div class={div_class or globals.RADIO_DIV_CLASS}>
+        <input type="radio" name={name} id={id} value={value}
+            class={class_ or globals.RADIO_INPUT_CLASS}
+            onclick={onclick}
+            checked={checked}
+            disabled={disabled} />
+        <Label for={id} class={label_class or globals.RADIO_LABEL_CLASS}>
+            {label}
+        </Label>
+    </div>
+    """
+
+
+@catalog.component
+def Textarea(
+    children: XNode,
+    globals: Mapping[str, str],
+    name: str,
+    id: str | None = None,
+    class_: str | None = None,
+    aria_label: str | None = None,
+    placeholder: str | None = None,
+) -> str:
+    """
+    html ``<textarea>`` node.
+
+    :param name: name of the submitted
+    :param id: unique identifier of the element
+    :param class_: css class for the node, defaults to
+                   :attr:`fastlife.template_globals.Globals.INPUT_CLASS`
+    :param aria_label: aria-label
+    :param placeholder: brief hint to the user as to what kind of information
+                        is expected in the field
+    """
+
+    return """
+    <textarea
+        name={name}
+        id={id}
+        aria-label={aria_label}
+        placeholder={placeholder}
+        class={class_ or globals.INPUT_CLASS}>
+        {children}
+    </textarea>
+    """