fastlifeweb 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

fastlife/configurator/__init__.py

@@ -1,3 +1,4 @@
+"""Configure fastlife app for dependency injection."""
 from .configurator import Configurator, configure
 
 __all__ = ["Configurator", "configure"]

fastlife/configurator/configurator.py

@@ -2,6 +2,7 @@
 The configurator is here to register routes in a fastapi app,
 with dependency injection.
 """
+
 import importlib
 import inspect
 import logging
@@ -26,6 +27,7 @@ from fastapi.params import Depends as DependsType
 from fastapi.staticfiles import StaticFiles
 
 from fastlife.configurator.base import AbstractMiddleware
+from fastlife.configurator.route_handler import FastlifeRoute
 from fastlife.security.csrf import check_csrf
 
 from .settings import Settings
@@ -38,6 +40,14 @@ VENUSIAN_CATEGORY = "fastlife"
 
 
 class Configurator:
+    """
+    Configure and build an application.
+
+    Initialize the app from the settings.
+
+    :param settings: Application settings.
+    """
+
     registry: "AppRegistry"
 
     def __init__(self, settings: Settings) -> None:
@@ -49,14 +59,37 @@ class Configurator:
             docs_url=None,
             redoc_url=None,
         )
+        FastlifeRoute.registry = self.registry
+        self._app.router.route_class = FastlifeRoute
         self.scanner = venusian.Scanner(fastlife=self)
         self.include("fastlife.views")
         self.include("fastlife.session")
 
     def get_app(self) -> FastAPI:
+        """
+        Get the app after configuration in order to start after beeing configured.
+
+        :return: FastAPI application
+        """
         return self._app
 
     def include(self, module: str | ModuleType) -> "Configurator":
+        """
+        Include a module in order to load its views.
+
+        Here is an example.
+
+        ::
+
+            from fastlife import Configurator, configure
+
+            @configure
+            def includeme(config: Configurator) -> None:
+                config.include(".views")
+
+
+        :param module: a module to include.
+        """
         if isinstance(module, str):
             package = None
             if module.startswith("."):
@@ -70,7 +103,10 @@ class Configurator:
     def add_middleware(
         self, middleware_class: Type[AbstractMiddleware], **options: Any
     ) -> Self:
-        self._app.add_middleware(middleware_class, **options)
+        """
+        Add a starlette middleware to the FastAPI app.
+        """
+        self._app.add_middleware(middleware_class, **options)  # type: ignore
         return self
 
     def add_route(
@@ -105,6 +141,7 @@ class Configurator:
         #     generate_unique_id
         # ),
     ) -> "Configurator":
+        """Add a route to the app."""
         dependencies: List[DependsType] = []
         if permission:
             dependencies.append(Depends(self.registry.check_permission(permission)))
@@ -140,13 +177,22 @@ class Configurator:
     def add_static_route(
         self, route_path: str, directory: Path, name: str = "static"
     ) -> "Configurator":
-        """Mount a directory to an http endpoint."""
+        """
+        Mount a directory to an http endpoint.
+
+        :param route_path: the root path for the statics
+        :param directory: the directory on the filesystem where the statics files are.
+        :param name: a name for the route in the starlette app.
+        :return: the configurator
+
+        """
         self._app.mount(route_path, StaticFiles(directory=directory), name=name)
         return self
 
     def add_exception_handler(
         self, status_code_or_exc: int | Type[Exception], handler: Any
     ) -> "Configurator":
+        """Add an exception handler the application."""
         self._app.add_exception_handler(status_code_or_exc, handler)
         return self
 
@@ -154,7 +200,9 @@ class Configurator:
 def configure(
     wrapped: Callable[[Configurator], None]
 ) -> Callable[[Configurator], None]:
-    """Decorator used to attach route in a submodule while using the confirator.scan"""
+    """
+    Decorator used to attach route in a submodule while using the configurator.include.
+    """
 
     def callback(
         scanner: venusian.Scanner, name: str, ob: Callable[[venusian.Scanner], None]

fastlife/configurator/registry.py

@@ -2,6 +2,7 @@ from typing import TYPE_CHECKING, Annotated
 
 from fastapi import Depends
 
+from fastlife.configurator.route_handler import FastlifeRequest
 from fastlife.security.policy import CheckPermission
 from fastlife.shared_utils.resolver import resolve
 
@@ -14,6 +15,11 @@ from .settings import Settings
 
 
 class AppRegistry:
+    """
+    The application registry got fastlife dependency injection.
+    It is initialized by the configurator and accessed by the `fastlife.Registry`.
+    """
+
     settings: Settings
     renderer: "AbstractTemplateRendererFactory"
     check_permission: CheckPermission
@@ -27,22 +33,17 @@ class AppRegistry:
         self.check_permission = resolve(settings.check_permission)
 
 
-DEFAULT_REGISTRY: AppRegistry = None  # type: ignore
-
-
 def initialize_registry(settings: Settings) -> AppRegistry:
-    global DEFAULT_REGISTRY
-    if DEFAULT_REGISTRY is not None:
-        raise ValueError("Registry is already set")
+    # global DEFAULT_REGISTRY
+    # if DEFAULT_REGISTRY is not None:  # type: ignore
+    #     raise ValueError("Registry is already set")
     AppRegistryCls = resolve(settings.registry_class)
-    DEFAULT_REGISTRY = AppRegistryCls(settings)  # type: ignore
-    return DEFAULT_REGISTRY
+    return AppRegistryCls(settings)  # type: ignore
 
 
-def cleanup_registry() -> None:
-    """ "Method to cleanup the registry, used for testing"""
-    global DEFAULT_REGISTRY
-    DEFAULT_REGISTRY = None  # type: ignore
+def get_registry(request: FastlifeRequest) -> AppRegistry:
+    return request.registry
 
 
-Registry = Annotated[AppRegistry, Depends(lambda: DEFAULT_REGISTRY)]
+Registry = Annotated[AppRegistry, Depends(get_registry)]
+"""FastAPI dependency to access to the registry."""

fastlife/configurator/route_handler.py

@@ -0,0 +1,30 @@
+from typing import TYPE_CHECKING, Any, Callable, Coroutine
+
+from fastapi import Request as BaseRequest
+from fastapi.routing import APIRoute
+from starlette.responses import Response
+from starlette.types import Receive, Scope
+
+if TYPE_CHECKING:
+    from .registry import AppRegistry  # coverage: ignore
+
+
+class FastlifeRequest(BaseRequest):
+    def __init__(self, registry: "AppRegistry", scope: Scope, receive: Receive) -> None:
+        super().__init__(scope, receive)
+        self.registry = registry
+
+
+class FastlifeRoute(APIRoute):
+    registry: "AppRegistry" = None  # type: ignore
+
+    def get_route_handler(  # type: ignore
+        self,
+    ) -> Callable[[FastlifeRequest], Coroutine[Any, Any, Response]]:
+        orig_route_handler = super().get_route_handler()
+
+        async def route_handler(request: BaseRequest) -> FastlifeRequest:
+            req = FastlifeRequest(self.registry, request.scope, request.receive)
+            return await orig_route_handler(req)  # type: ignore
+
+        return route_handler  # type: ignore

fastlife/configurator/settings.py

@@ -1,3 +1,4 @@
+"""Settings for the fastlife."""
 from datetime import timedelta
 from typing import Literal
 
@@ -6,31 +7,82 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class Settings(BaseSettings):
+    """
+    Settings based on pydantic settings to configure the app.
+
+    It can be overriden in order to inject application own settings.
+    """
+
     model_config = SettingsConfigDict(env_prefix="fastlife_")
+    """Set the prefix fastlife_ for configuration using operating system environment."""
 
     fastlife_route_prefix: str = Field(default="/_fl")
+    """Route prefix used for fastlife internal views."""
     template_search_path: str = Field(default="fastlife:templates")
+    """
+    list of directories where templates could be found by the template engine.
+
+    the list is a comma separated string. The directory resolution is made from
+    a python module name. for instance `fastlife:templates` is the direcotry templates
+    found in the fastlife package.
+    """
     registry_class: str = Field(default="fastlife.configurator.registry:AppRegistry")
+    """Implementation class for the application regitry."""
     template_renderer_class: str = Field(
         default="fastlife.templating.renderer:JinjaxTemplateRenderer"
     )
+    """
+    Implementation class for the :class:`fastlife.templatingAbstractTemplateRenderer`.
+    """
     form_data_model_prefix: str = Field(default="payload")
+    """
+    Pydantic form default model prefix for serialized field in www-urlencoded-form.
+    """
     csrf_token_name: str = Field(default="csrf_token")
+    """Name of the html input field for csrf token."""
 
     jinjax_use_cache: bool = Field(default=True)
+    """
+    JinjaX (the default template engine) setting use_cache.
+
+    Could be disabled while developping, leave value true for production.
+    """
     jinjax_auto_reload: bool = Field(default=False)
+    """
+    JinjaX (the default template engine) setting auto_reload.
+
+    Set to true while developing, set false for production.
+    """
 
     session_secret_key: str = Field(default="")
+    """
+    A secret key, that could not changes for life.
+
+    Used to securize the session with itsdangerous.
+    """
     session_cookie_name: str = Field(default="flsess")
+    """Cookie name for the session cookie."""
     session_cookie_domain: str = Field(default="")
+    """Cookie domain for the session cookie."""
     session_cookie_path: str = Field(default="/")
+    """Cookie path for the session cookie."""
     session_duration: timedelta = Field(default=timedelta(days=14))
+    """Cookie duration for the session cookie."""
     session_cookie_same_site: Literal["lax", "strict", "none"] = Field(default="lax")
+    """Cookie same-site for the session cookie."""
     session_cookie_secure: bool = Field(default=False)
+    """
+    Cookie secure for the session cookie,
+
+    should be true while using https on production.
+    """
     session_serializer: str = Field(
         default="fastlife.session.serializer:SignedSessionSerializer"
     )
+    """Cookie serializer for the session cookie."""
 
     domain_name: str = Field(default="", title="domain name where the app is served")
+    """Domain name whre the app is served."""
 
     check_permission: str = Field(default="fastlife.security.policy:check_permission")
+    """Handler for checking permission set on any views using the configurator."""

fastlife/routing/router.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+from fastapi import APIRouter
+
+from fastlife.configurator.route_handler import FastlifeRoute
+
+
+class FastLifeRouter(APIRouter):
+    """The router used split your app in many routes."""
+
+    def __init__(self, **kwargs: Any) -> None:
+        kwargs["route_class"] = FastlifeRoute
+        super().__init__(**kwargs)

fastlife/security/csrf.py

@@ -1,3 +1,8 @@
+"""
+Prevents CSRF attack using cookie and html hidden field comparaison.
+
+Fast life did not reinvent the wheel on CSRF Protection. It use the good old method.
+"""
 import secrets
 from typing import TYPE_CHECKING, Any, Callable, Coroutine
 
@@ -8,14 +13,24 @@ if TYPE_CHECKING:
 
 
 class CSRFAttack(Exception):
-    ...
+    """
+    An exception raised if the cookie and the csrf token hidden field did not match.
+    """
 
 
 def create_csrf_token() -> str:
+    """A helper that create a csrf token."""
     return secrets.token_urlsafe(5)
 
 
 def check_csrf(registry: "Registry") -> Callable[[Request], Coroutine[Any, Any, bool]]:
+    """
+    A global application dependency, that is always active.
+
+    If you don't want csrf token, its simple don't use the
+    application/x-www-form-urlencoded on a POST method.
+    """
+
     async def check_csrf(request: Request) -> bool:
         if (
             request.method != "POST"

fastlife/security/policy.py

@@ -1,3 +1,4 @@
+"""Security policy."""
 from typing import Any, Callable, Coroutine
 
 CheckPermissionHook = Callable[..., Coroutine[Any, Any, None]] | Callable[..., None]
@@ -6,10 +7,13 @@ CheckPermission = Callable[[str], CheckPermissionHook]
 
 def check_permission(permission_name: str) -> CheckPermissionHook:
     """
-    A closure that check that a user as the given username.
+    A closure that check that a user as the given permission_name.
 
     This method has to be overriden using the setting check_permission
     to implement it.
+
+    :param permission_name: a permission name set in a view to check access.
+    :return: a function that raise http exceptions or any configured exception here.
     """
 
     def depencency_injection() -> None:

fastlife/templates/Button.jinja

@@ -12,6 +12,8 @@ hx_get="",
 hx_select="",
 hx_after_request="",
 hx_vals="",
+hx_confirm="",
+hx_delete="",
 full_width=false,
 class_="""
 bg-primary-600
@@ -33,9 +35,10 @@ dark:hover:bg-primary-700
 #}
 <button type="{{type}}" {%if id %}id="{{id}}" {%endif%} name="{{name}}" value="{{value}}" {% if
   hx_target%}hx-target="{{hx_target}}" {% endif %} {% if hx_swap %}hx-swap="{{hx_swap}}" {% endif %} {% if hx_select
-  %}hx-select="{{hx_select}}" {% endif %} {% if hx_get %}hx-get="{{hx_get}}" {% endif %} {% if onclick %}onclick="{{onclick}}" {%
-  endif %}{% if hx_after_request %}hx-on::after-request="{{hx_after_request}}" {% endif %} {% if hx_vals
-  %}hx-vals='{{hx_vals|safe}}' {% endif %} {% if aria_label %}aria-label="{{aria_label}}" {% endif %}
+  %}hx-select="{{hx_select}}" {% endif %} {% if hx_get %}hx-get="{{hx_get}}" {% endif %} {% if onclick
+  %}onclick="{{onclick}}" {% endif %}{% if hx_after_request %}hx-on::after-request="{{hx_after_request}}" {% endif %} {%
+  if hx_vals %}hx-vals='{{hx_vals|safe}}' {% endif %} {% if hx_confirm %}hx-confirm="{{hx_confirm}}" {% endif %} {% if
+  hx_delete %}hx-delete="{{hx_delete}}" {% endif %} {% if aria_label %}aria-label="{{aria_label}}" {% endif %}
   class="{% if full_width %}w-full {% endif %}{{attrs.class or class_}}" {% if hidden %}hidden{% endif %}>
   {{- content -}}
 </button>

fastlife/templates/pydantic_form/Boolean.jinja

@@ -1,7 +1,12 @@
 {# def widget #}
 <pydantic_form.Widget widget={widget} removable={widget.removable}>
   <div class="pt-4">
-    <Label for={widget.id}>{{widget.title}}</Label>
-    <Checkbox name={widget.name} type="checkbox" id={widget.id} checked={widget.value} />
+    <div class="flex items-center">
+      <Checkbox name={widget.name} type="checkbox" id={widget.id} checked={widget.value} value="1" />
+      <Label for={widget.id} class="ms-2 text-base text-neutral-900 dark:text-white">
+        {{widget.title|safe}}
+      </Label>
+    </div>
+    <pydantic_form.Error text={widget.error} />
   </div>
 </pydantic_form.Widget>

fastlife/templates/pydantic_form/Checklist.jinja

@@ -7,12 +7,14 @@ widget,
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div>
         {% for value in widget.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>

fastlife/templates/pydantic_form/Dropdown.jinja

@@ -10,6 +10,7 @@
       </Option>
       {%- endfor -%}
     </Select>
+    <pydantic_form.Error text={widget.error} />
     <pydantic_form.Hint text={widget.hint} />
   </div>
 </pydantic_form.Widget>

fastlife/templates/pydantic_form/Model.jinja

@@ -5,6 +5,7 @@
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div>
         {% for child in children_widget %}

fastlife/templates/pydantic_form/Sequence.jinja

@@ -4,6 +4,7 @@
   <details id="{{widget.id}}" open>
     <summary class="justify-between items-center font-medium cursor-pointer">
       <H3>{{widget.title}}</H3>
+      <pydantic_form.Error text={widget.error} />
     </summary>
     <div>
       {% set fnGetName = "get" + widget.id.replace("-", "_") %}

fastlife/templates/pydantic_form/Union.jinja

@@ -5,20 +5,20 @@
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div hx-sync="this" id="{{widget.id}}-child">
         {% if child %}
         {{ child }}
         {% else %}
         {% for typ in types %}
-        <Button type="button" hx-target="closest div" hx-get={typ.url} hx-vals={typ.params|tojson}
-          id={typ.id}
+        <Button type="button" hx-target="closest div" hx-get={typ.url} hx-vals={typ.params|tojson} id={typ.id}
           onclick={"document.getElementById('" + widget.id +"-remove-btn').hidden=false"}>{{typ.title}}</Button>
         {% endfor %}
         {% endif %}
       </div>
-      <Button type="button" id={widget.id + "-remove-btn" } hx-target={"#" + widget.id} hx-vals={parent_type.params|tojson}
-        hx-get={parent_type.url} hidden={not child}>
+      <Button type="button" id={widget.id + "-remove-btn" } hx-target={"#" + widget.id}
+        hx-vals={parent_type.params|tojson} hx-get={parent_type.url} hidden={not child}>
         Remove
       </Button>
     </details>

fastlife/templating/__init__.py

@@ -1,3 +1,7 @@
+"""
+Utilities for rendering HTML templates for page and components.
+"""
+
 from .binding import Template, template
 from .renderer import AbstractTemplateRendererFactory, JinjaxTemplateRenderer
 

fastlife/templating/binding.py

@@ -38,4 +38,11 @@ def get_template(template: str, *, content_type: str = "text/html") -> TemplateE
 
 
 def template(template_path: str) -> Template:
+    """
+    Return a FastAPI dependency template engine ready to render the template.
+
+
+    :param template_path: path to template to render by the engine setup in the regitry.
+    :return: A callable accepting kwargs to pass as the context, returning a string.
+    """
     return Depends(get_template(template_path))

fastlife/templating/renderer/abstract.py

@@ -9,6 +9,11 @@ from fastlife.request.model_result import ModelResult
 
 
 class AbstractTemplateRenderer(abc.ABC):
+    """
+    An object that will be initialized by an AbstractTemplateRendererFactory,
+    passing the request to process.
+    """
+
     route_prefix: str
     """Used to buid pydantic form"""
 
@@ -27,18 +32,43 @@ class AbstractTemplateRenderer(abc.ABC):
         renderer and sent to every rendering made by the request.
         This is used by the pydantic form method that will render other templates
         for the request.
+        In traditional frameworks, only one template is rendered containing the whole
+        pages. But, while rendering a pydantic form, every field is rendered in its
+        distinct template. The template renderer keep the globals and git it back
+        to every templates. This can be used to fillout options in a select without
+        performing an ajax request for example.
+
+        :param template: name of the template to render
+        :param globals: some variable that will be passed to all rendered templates.
+        :param params: paramaters that are limited to the main rendered templates.
+        :return: The template rendering result.
         """
 
     @abc.abstractmethod
     def pydantic_form(
-        self,
-        model: ModelResult[Any],
-        *,
-        name: str | None = None,
-        token: str | None = None,
-        removable: bool = False,
-        field: FieldInfo | None = None,
+        self, model: ModelResult[Any], *, token: Optional[str] = None
     ) -> Markup:
+        """
+        Render an http form from a given model.
+
+        Because template post may be give back to users with errors,
+        the model is wrap in an object containing initial model, or validated model
+        and a set of errors.
+
+        this function is used inside the template directly. And it will not render the
+        <form> tag so the action/httpx post is not handled byu the method..
+        Somethinging like this
+
+        ::
+
+            <form action="" method="post">
+                {{ pydantic_form(model) }}
+            </form>
+
+
+        :param model: model to render
+        :param token: a random string that can be passed for testing purpose.
+        """
         ...
 
     @abc.abstractmethod
@@ -46,15 +76,32 @@ class AbstractTemplateRenderer(abc.ABC):
         self,
         model: Type[Any],
         *,
-        name: Optional[str] = None,
-        token: Optional[str] = None,
-        removable: bool = False,
-        field: FieldInfo | None = None,
+        name: str | None,
+        token: str | None,
+        removable: bool,
+        field: FieldInfo | None,
     ) -> Markup:
-        ...
+        """
+        Render a field of a model inside a pydantic_form.
+
+        Models that contains field of type Union, for instance may have
+        many types of children and the form have a user interaction to choose
+        which sub type to select. When the user choose the type, the sub model is
+        rendered using this helper under the hood.
+        """
 
 
 class AbstractTemplateRendererFactory(abc.ABC):
+    """
+    The template render factory.
+    """
+
     @abc.abstractmethod
     def __call__(self, request: Request) -> AbstractTemplateRenderer:
-        ...
+        """
+        While processing an HTTP Request, a renderer object is created giving
+        isolated context per request.
+
+        :param Request: the HTTP Request to process.
+        :return: The renderer object that will process that request.
+        """

fastlife/templating/renderer/jinjax.py

@@ -69,28 +69,18 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         )
 
     def pydantic_form(
-        self,
-        model: ModelResult[Any],
-        *,
-        name: Optional[str] = None,
-        token: Optional[str] = None,
-        removable: bool = False,
-        field: FieldInfo | None = None,
+        self, model: ModelResult[Any], *, token: Optional[str] = None
     ) -> Markup:
-        return WidgetFactory(self, token).get_markup(
-            model,
-            removable=removable,
-            field=field,
-        )
+        return WidgetFactory(self, token).get_markup(model)
 
     def pydantic_form_field(
         self,
         model: Type[Any],
         *,
-        name: Optional[str] = None,
-        token: Optional[str] = None,
-        removable: bool = False,
-        field: FieldInfo | None = None,
+        name: str | None,
+        token: str | None,
+        removable: bool,
+        field: FieldInfo | None,
     ) -> Markup:
         return (
             WidgetFactory(self, token)
@@ -107,6 +97,12 @@ class JinjaxRenderer(AbstractTemplateRenderer):
 
 
 class JinjaxTemplateRenderer(AbstractTemplateRendererFactory):
+    """
+    The default template renderer factory. Based on JinjaX.
+
+    :param settings: setting used to configure jinjax.
+    """
+
     route_prefix: str
     """Used to prefix url to fetch fast life widgets."""
 
@@ -123,6 +119,7 @@ class JinjaxTemplateRenderer(AbstractTemplateRendererFactory):
             self.catalog.add_folder(path)
 
     def __call__(self, request: Request) -> AbstractTemplateRenderer:
+        """Build the renderer to render request for template."""
         return JinjaxRenderer(
             self.catalog,
             request,

fastlife/templating/renderer/widgets/boolean.py

@@ -8,11 +8,17 @@ class BooleanWidget(Widget[bool]):
         *,
         title: str | None,
         value: bool = False,
+        error: str | None = None,
         removable: bool = False,
         token: str,
     ) -> None:
         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/checklist.py

@@ -1,6 +1,6 @@
 from typing import Sequence
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from .base import Widget
 
@@ -11,6 +11,7 @@ class Checkable(BaseModel):
     value: str
     token: str
     checked: bool
+    error: str | None = Field(default=None)
 
     @property
     def id(self) -> str:
@@ -29,11 +30,17 @@ class ChecklistWidget(Widget[Sequence[Checkable]]):
         *,
         title: str | None,
         value: Sequence[Checkable],
+        error: str | None = None,
         token: str,
         removable: bool,
     ) -> None:
         super().__init__(
-            name, value=value, token=token, title=title, removable=removable
+            name,
+            value=value,
+            error=error,
+            token=token,
+            title=title,
+            removable=removable,
         )
 
     def get_template(self) -> str:

fastlife/templating/renderer/widgets/dropdown.py

@@ -10,13 +10,19 @@ class DropDownWidget(Widget[str]):
         *,
         title: Optional[str],
         value: Optional[str] = None,
+        error: str | None = None,
         options: Sequence[Tuple[str, str]] | Sequence[str],
         removable: bool = False,
         token: Optional[str] = None,
         hint: Optional[str] = None,
     ) -> None:
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.options: list[dict[str, str]] = []
         for opt in options:

fastlife/templating/renderer/widgets/factory.py

@@ -35,7 +35,7 @@ class WidgetFactory:
         self,
         model: ModelResult[Any],
         *,
-        removable: bool,
+        removable: bool = False,
         field: FieldInfo | None = None,
     ) -> Markup:
         return self.get_widget(
@@ -88,6 +88,7 @@ class WidgetFactory:
                             title=field.title if field else "",
                             aria_label=field.description if field else None,
                             token=self.token,
+                            error=form_errors.get(name),
                         ),
                     )
 
@@ -175,6 +176,7 @@ class WidgetFactory:
             removable=removable,
             title=get_title(typ),
             token=self.token,
+            error=form_errors.get(field_name),
         )
 
     def build_union(
@@ -233,6 +235,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
         return widget
@@ -267,6 +270,7 @@ class WidgetFactory:
             item_type=typ,  # type: ignore
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_set(
@@ -291,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
                 ]
@@ -305,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
             ]
@@ -317,6 +323,7 @@ class WidgetFactory:
             token=self.token,
             value=choices,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_boolean(
@@ -334,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(
@@ -354,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(
@@ -374,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(
@@ -399,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(
@@ -418,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(

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/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

fastlife/testing/__init__.py

@@ -1,3 +1,4 @@
+"""Testing fastlife client."""
 from .testclient import WebTestClient
 
 __all__ = ["WebTestClient"]

fastlife/testing/testclient.py

@@ -342,6 +342,9 @@ class WebForm:
         """Test if a field exists in the form."""
         return key in self._formdata
 
+    def __repr__(self) -> str:
+        return repr(self._formdata)
+
 
 class WebResponse:
     """Represent an http response made by the WebTestClient browser."""
@@ -511,7 +514,7 @@ class WebTestClient:
 
     def request(
         self,
-        method: Literal["GET", "POST"],  # I am a browser
+        method: Literal["GET", "POST", "DELETE"],
         url: str,
         *,
         content: str | None = None,
@@ -562,6 +565,14 @@ class WebTestClient:
             max_redirects=int(follow_redirects) * 10,
         )
 
+    def delete(self, url: str, follow_redirects: bool = True) -> WebResponse:
+        """Perform http DELETE request."""
+        return self.request(
+            "DELETE",
+            url,
+            max_redirects=int(follow_redirects) * 10,
+        )
+
     def post(
         self,
         url: str,

fastlife/views/pydantic_form.py

@@ -17,6 +17,9 @@ async def show_widget(
     token: Optional[str] = Query(None),
     removable: bool = Query(False),
 ) -> Response:
+    """
+    This views is used by pydantic_form to generate a nested field asynchronously.
+    """
     model_cls = resolve_extended(typ)
     field = None
     if title:

{fastlifeweb-0.6.0.dist-info → fastlifeweb-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.6.0
+Version: 0.7.0
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived
@@ -19,12 +19,12 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: beautifulsoup4[testing] (>=4.12.2,<5.0.0)
 Requires-Dist: behave (>=1.2.6,<2.0.0)
-Requires-Dist: fastapi (>=0.110.0,<0.111.0)
+Requires-Dist: fastapi (>=0.112.0,<0.113.0)
 Requires-Dist: itsdangerous (>=2.1.2,<3.0.0)
-Requires-Dist: jinjax (>=0.34,<0.35)
+Requires-Dist: jinjax (>=0.37,<0.38)
 Requires-Dist: markupsafe (>=2.1.3,<3.0.0)
 Requires-Dist: multidict (>=6.0.5,<7.0.0)
-Requires-Dist: pydantic (==2.5.1)
+Requires-Dist: pydantic (>=2.5.3,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.3,<3.0.0)
 Requires-Dist: python-multipart (>=0.0.6,<0.0.7)
 Requires-Dist: venusian (>=3.0.0,<4.0.0)

{fastlifeweb-0.6.0.dist-info → fastlifeweb-0.7.0.dist-info}/RECORD

@@ -1,16 +1,19 @@
 fastlife/__init__.py,sha256=nAeweHnTvWHgDZYuPIWawZvT4juuhvMp4hzF2B-yCJU,317
-fastlife/configurator/__init__.py,sha256=2EPjM1o5iHJIViPwgJjaPQS3pMhE-9dik_mm53eX2DY,91
+fastlife/configurator/__init__.py,sha256=vMV25HEfuXjCL7DhZukhlB2JSfxwzX2lGbErcZ5b7N0,146
 fastlife/configurator/base.py,sha256=2ahvTudLmD99YQjnIeGN5JDPCSl3k-mauu7bsSEB5RE,216
-fastlife/configurator/configurator.py,sha256=6BaB7SR24Q4Qvs8NrCpatRkkZiPXf9mKLID6RxOKxDg,5740
-fastlife/configurator/registry.py,sha256=1sOicKvwIvLbrzRk9z8yb65YUXxxagJK9AK-2gGDpOQ,1463
-fastlife/configurator/settings.py,sha256=ftv5MkNXeyBrvcqxnt2WKtLuzo7ge2_BNx1gX4CcSOE,1489
+fastlife/configurator/configurator.py,sha256=yy7etOLqgm7KfybJMz0fFYwDSsbv81daV3W9wBugswA,7003
+fastlife/configurator/registry.py,sha256=FKXCxWlMMGNN1-l5H6QLTCoqP_tWENN84RjkConejWI,1580
+fastlife/configurator/route_handler.py,sha256=kFi-fPzt2t3NFZLtj-rY0219iSCpPzj4daeQ65wUcYU,1037
+fastlife/configurator/settings.py,sha256=uyIZFLqzbwDAUkl8LWNYdlPifMR3ZItyC4y9ci_3LrM,3376
 fastlife/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/request/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/request/form_data.py,sha256=mP8ilwRUY2WbktIkRgaJJ2EUjwUMPbSPg29GzwZgT18,3713
 fastlife/request/model_result.py,sha256=TRaVkyIE50IzVprncoWUUZd15-y4D3ywyZdx7eh6nFE,3237
+fastlife/routing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastlife/routing/router.py,sha256=hHK4NumgTTXI330ZxQeZBiEfGtBRn4_k_fIh_xaaVtg,338
 fastlife/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/security/csrf.py,sha256=47epJVJtr5X6j-Hog54WCGOoiRLQQHvgBU71iqR1N0A,1025
-fastlife/security/policy.py,sha256=5jV5nypy5O8XPFFRJ_bzG8Ltk5xcPWclkz23qiG1_I8,509
+fastlife/security/csrf.py,sha256=yDBF8X5jna-EZm7PPNvoaS_RJTYfTapwbghm506O9wM,1519
+fastlife/security/policy.py,sha256=7gnwooTz7iCDZ26hzulUK0vUz9Ncd7y1Lq_6Lr7CJ98,702
 fastlife/session/__init__.py,sha256=OnzRCYRzc1lw9JB0UdKi-aRLPNT2n8mM8kwY1P4w7uU,838
 fastlife/session/middleware.py,sha256=JgXdBlxlm9zIEgXcidbBrMAp5wJVPsZWtvCLVDk5h2s,3049
 fastlife/session/serializer.py,sha256=qpVnHQjYTxw3aOnoEOKIjOFJg2z45KjiX5sipWk2gws,1458
@@ -18,7 +21,7 @@ fastlife/shared_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fastlife/shared_utils/infer.py,sha256=0jNPY5vqKvDlNCmVPnRAXbTcQnmbuOIOIGAeGcxDPok,472
 fastlife/shared_utils/resolver.py,sha256=wXQQTB4jf86m4qENhMOkHkWpLJj_T4-_eND_ItTLnTE,1410
 fastlife/templates/A.jinja,sha256=q71nu4Rq874LG6SykCKv8W-EZeX13NMF0AsLc9FFAP0,677
-fastlife/templates/Button.jinja,sha256=535UIK4Prunj4f0YZXBmCI0rfOiTr5GJTQkM0XDmtNA,1137
+fastlife/templates/Button.jinja,sha256=sHJtgOTJmL2Ttpy-SNKdq3BcoTe6NI0MSKG2N44Z-iI,1283
 fastlife/templates/Checkbox.jinja,sha256=XdgtI7GTVjPkxTje9KMILzHqjMFRmTpubtKM8nL7K1o,447
 fastlife/templates/CsrfToken.jinja,sha256=X2-H0VmukyUV448blh9M8rhr_gN82ar51TnRAwfV3OY,59
 fastlife/templates/Form.jinja,sha256=h8Y2yrlrTRuLnwqCTDv8eeFgaej2eQiXDvFOx5eEcGg,367
@@ -36,38 +39,38 @@ fastlife/templates/P.jinja,sha256=xEcHIv9dJRpELu_SdqQcftvKrU8z1i_BHTEVO5Mu5dU,16
 fastlife/templates/Radio.jinja,sha256=51I5n1yjWQ_uLZfzuUUf3C8ngo-KT4dPw29-pjP9uSU,723
 fastlife/templates/Select.jinja,sha256=GoK2oh4Jl5dAfL2wN718RCwtHaQIslzDCN_nwy6a9oY,480
 fastlife/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/templates/pydantic_form/Boolean.jinja,sha256=tzEZpgv3t9vEuQr2_NzLvhqyusGm2w7kEkehCRJyG2c,281
-fastlife/templates/pydantic_form/Checklist.jinja,sha256=DbLYICI5maEc6hPmexBDut6DZluR8D3gQNHC32Cc7DM,670
-fastlife/templates/pydantic_form/Dropdown.jinja,sha256=JBkQp7LYtz6vvW6MyAXyW-6UDZ_xY0Fgd4mpDCQA-wM,500
+fastlife/templates/pydantic_form/Boolean.jinja,sha256=gf8j1Wyy8C95tYsjDjxKL_ivSJPsUHBoRaK-4AiBiBA,467
+fastlife/templates/pydantic_form/Checklist.jinja,sha256=s55FqHJGNryTT3h6VWFx6mEgR8lIVBoqo7NGYUTM_rE,775
+fastlife/templates/pydantic_form/Dropdown.jinja,sha256=_dBSf7-Ba1Yr4BPXu08yJBSZjUW4Jo8t-s3R6TgN-oc,548
 fastlife/templates/pydantic_form/Error.jinja,sha256=Wb5NnVRc4U7ZGKmYV7s4eGenWEug8WK9li48iTlX4cQ,121
 fastlife/templates/pydantic_form/Hidden.jinja,sha256=n6CbTSwZr2E_oY8TO2WPbnrLHBaWfe_CXVCYOYmCfts,83
 fastlife/templates/pydantic_form/Hint.jinja,sha256=O0ZsAQnATcG0a_qLQfrwM6VZHmAw3k1W33WYlEBUas8,123
-fastlife/templates/pydantic_form/Model.jinja,sha256=wxEKEO8Kktxkrz-LZ9m_v_NPjKV-C8RFQ9wyEyrRKsI,449
-fastlife/templates/pydantic_form/Sequence.jinja,sha256=eA8GYhJC1KokWbU3zqmqCIuG8mR-yhvlEAzt0ds2RTM,1380
+fastlife/templates/pydantic_form/Model.jinja,sha256=1t3eOxYjT_Kl85En_w27gmRuZ3xrET1x87UQfDw0Os4,501
+fastlife/templates/pydantic_form/Sequence.jinja,sha256=RU19X6FwNhoFhQ0fBpTrfRsS_gMPkhpDhzyhFShwoHQ,1430
 fastlife/templates/pydantic_form/Text.jinja,sha256=DCZNAly_YjYQcGdz-EiCbX5DThHHTDq66KySpiJe3Ik,450
-fastlife/templates/pydantic_form/Union.jinja,sha256=Ss4dwNoHqmdAa4O7cvS2vwuxBPspQINBxq4hnkm_GVY,950
+fastlife/templates/pydantic_form/Union.jinja,sha256=aH9Cj9IycCkMkL8j_yb5Ux5ysVZLVET9_AKTndQQX-Q,992
 fastlife/templates/pydantic_form/Widget.jinja,sha256=8raoMjtO4ARBfbz8EG-HKT112KkrWG82BbUfbXpAmZs,287
-fastlife/templating/__init__.py,sha256=QdrTmxt-K7UcJ_o9LY1n-QZAvk5foct5MNFt02zXr2w,234
-fastlife/templating/binding.py,sha256=n-MDg98Bne49BmWWWCopZsI6ef7h6PIdcszM_pRutYA,1378
+fastlife/templating/__init__.py,sha256=UY_hSTlJKDZnkSIK-BzRD4_AXOWgHbRuvJsKAS9ljgE,307
+fastlife/templating/binding.py,sha256=noY9QrArJGqB1X80Ny-0zk1Dg6T9mMXahjEcIiHvioo,1648
 fastlife/templating/renderer/__init__.py,sha256=UJUX3T9VYjPQUhS5Enz3P6OtwftimKoGGpoQEpewVFA,181
-fastlife/templating/renderer/abstract.py,sha256=Ljzll05kI9KIMRmBeZ9fIVs4PcIi6FE1DB_YmMiBGVY,1552
-fastlife/templating/renderer/jinjax.py,sha256=pCaBLqboFUuIKZcSuksNxJngzw8_zFLqLgBYuIEMytE,3977
+fastlife/templating/renderer/abstract.py,sha256=9eQgshUMiVTaMcICr-RtP3Zqpu7Bji_sLif2InrxMek,3519
+fastlife/templating/renderer/jinjax.py,sha256=Ue6YV1XQFT59qJBJsKwvBu9OZbVbEZWH8hvTskSvw9M,3925
 fastlife/templating/renderer/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/templating/renderer/widgets/base.py,sha256=XtD-NRacHMn9Xt_dSfWb1Emk3XEXz5jExglx23Rzzpw,2808
-fastlife/templating/renderer/widgets/boolean.py,sha256=UPQOxIpydP2NzDVUQuNau1DewS2FkRqx5WkWSwEu1kk,436
-fastlife/templating/renderer/widgets/checklist.py,sha256=gBDeZXi4JdD9jeVDlC-5GOrM5C9uYaQ-wQuWuCB6HYY,850
-fastlife/templating/renderer/widgets/dropdown.py,sha256=o3BfD9gDiRPsCPB93xCZSYRo50LRAb_tZOmK4x7zkzY,901
-fastlife/templating/renderer/widgets/factory.py,sha256=9s0DZ2FFdjy8DvaCMK3u9LW_5SCKcrMAxHhHqLWeO2E,14162
+fastlife/templating/renderer/widgets/boolean.py,sha256=1Cnrs6Sqf7CJURrCRkDL2NDQZWO9dvac350w0PcZtDg,544
+fastlife/templating/renderer/widgets/checklist.py,sha256=Qit-k4RnW9Y3xOyE9BevBRuFZ8XN5jH3x_sI5fWt43Y,1009
+fastlife/templating/renderer/widgets/dropdown.py,sha256=FyPZzrTprLff6YRqZ031J8-KZpBgidTw0BsKY1Qt7Ts,1009
+fastlife/templating/renderer/widgets/factory.py,sha256=iOBuxWlY1d9WfCqcm5f5Ck5NwoK9uDkioCSPyu5HsQo,14787
 fastlife/templating/renderer/widgets/hidden.py,sha256=2fsbTQKsACV0JVYpCjXaQAV7VnQTIBPCi4lJPdWCRHc,308
-fastlife/templating/renderer/widgets/model.py,sha256=L7tdmRj0cetM_UusaD2zk5YJtIGBYizCMBKQzFyN_Ko,986
-fastlife/templating/renderer/widgets/sequence.py,sha256=x6o1L_hOh3WRlW16ZQaeO6H_qtnIitALuK-w7ck0RAw,1347
+fastlife/templating/renderer/widgets/model.py,sha256=BNM6dPPN9jzM26LreeOw7wiCsZun1uSMMFXMNcO2hII,1094
+fastlife/templating/renderer/widgets/sequence.py,sha256=rYXsUZokV3wnKa-26BmgAu7sVCtFf8FdBmhvrnqR-gM,1455
 fastlife/templating/renderer/widgets/text.py,sha256=OWFFA0muZCznrlUrBRRUKVj60TdWtsdgw0bURdOA3lE,879
-fastlife/templating/renderer/widgets/union.py,sha256=GntHssMjcgpD6S5h0JVr9_aWy3pSbMhYZ9QU-ugBH-Y,1689
-fastlife/testing/__init__.py,sha256=KgTlRI0g8z7HRpL7mD5QgI__LT9Y4QDSzKMlxJG3wNk,67
-fastlife/testing/testclient.py,sha256=o7Yc-_At0S23lmV8-vbGGPm-s0xRTAV7OhBri2rqqrU,20220
+fastlife/templating/renderer/widgets/union.py,sha256=xNDctq0SRXfRyMHXL8FgRKyUOUreR1xENnt6onkZJ9I,1797
+fastlife/testing/__init__.py,sha256=vuqwoNUd3BuIp3fm7nkvmYkIGjIimf5zUGhDkeWrg2s,98
+fastlife/testing/testclient.py,sha256=wJtWXxn5cew8PlxweYvw7occnoD5Ktr_7IxEXi-Ieg0,20534
 fastlife/views/__init__.py,sha256=nn4B_8YTbTmhGPvSd20yyKK_9Dh1Pfh_Iq7z6iK8-CE,154
-fastlife/views/pydantic_form.py,sha256=uUSw9Wrpx2XAiep26L6fViXv9p6KYi-DFQTYymrbBMk,1158
-fastlifeweb-0.6.0.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
-fastlifeweb-0.6.0.dist-info/METADATA,sha256=uLb0u6q1O_ZiO0hgv9BMUV0OnNRObYQAaEVAe5ZlpS4,1826
-fastlifeweb-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastlifeweb-0.6.0.dist-info/RECORD,,
+fastlife/views/pydantic_form.py,sha256=KJtH_DK8em0czGPsv0XpzGUFhtycyXdeRldwiU7d_j4,1257
+fastlifeweb-0.7.0.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
+fastlifeweb-0.7.0.dist-info/METADATA,sha256=Of-0L69qHEgTqacKnSKduuEYiqho2RkH7OHjHUDgVKo,1833
+fastlifeweb-0.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastlifeweb-0.7.0.dist-info/RECORD,,