fastlifeweb 0.16.3__py3-none-any.whl → 0.17.0__py3-none-any.whl

fastlife/adapters/jinjax/widget_factory/sequence_builder.py

@@ -0,0 +1,58 @@
+"""Handle Sequence type."""
+
+from collections.abc import Mapping, MutableSequence, Sequence
+from typing import Any
+
+from pydantic.fields import FieldInfo
+
+from fastlife.adapters.jinjax.widget_factory.base import BaseWidgetBuilder
+from fastlife.adapters.jinjax.widgets.base import Widget
+from fastlife.adapters.jinjax.widgets.sequence import SequenceWidget
+
+
+class SequenceBuilder(BaseWidgetBuilder[Sequence[Any]]):
+    """Builder for Sequence values."""
+
+    def accept(self, typ: type[Any], origin: type[Any] | None) -> bool:
+        """True for Sequence, MutableSequence or list"""
+        return origin is Sequence or origin is MutableSequence or origin is list
+
+    def build(
+        self,
+        *,
+        field_name: str,
+        field_type: type[Any],
+        field: FieldInfo | None,
+        value: Sequence[Any] | None,
+        form_errors: Mapping[str, Any],
+        removable: bool,
+    ) -> Widget[Sequence[Any]]:
+        """Build the widget."""
+        typ = field_type.__args__[0]  # type: ignore
+        value = value or []
+        items: Sequence[Any] = [
+            self.factory.build(
+                typ,  # type: ignore
+                name=f"{field_name}.{idx}",
+                value=v,
+                field=field,
+                form_errors=form_errors,
+                removable=True,
+            )
+            for idx, v in enumerate(value)
+        ]
+        return SequenceWidget(
+            field_name,
+            title=field.title if field else "",
+            hint=field.description if field else None,
+            aria_label=(
+                field.json_schema_extra.get("aria_label")  # type:ignore
+                if field and field.json_schema_extra
+                else None
+            ),
+            value=items,
+            item_type=typ,  # type: ignore
+            token=self.factory.token,
+            removable=removable,
+            error=form_errors.get(field_name),
+        )

fastlife/adapters/jinjax/widget_factory/set_builder.py

@@ -0,0 +1,80 @@
+"""Handle Set type."""
+
+from collections.abc import Mapping
+from enum import Enum
+from typing import Any, Literal, get_origin
+
+from pydantic.fields import FieldInfo
+
+from fastlife.adapters.jinjax.widget_factory.base import BaseWidgetBuilder
+from fastlife.adapters.jinjax.widgets.base import Widget
+from fastlife.adapters.jinjax.widgets.checklist import Checkable, ChecklistWidget
+
+
+class SetBuilder(BaseWidgetBuilder[set[Any]]):
+    """Builder for Set."""
+
+    def accept(self, typ: type[Any], origin: type[Any] | None) -> bool:
+        """True for Set"""
+        return origin is set
+
+    def build(
+        self,
+        *,
+        field_name: str,
+        field_type: type[Any],
+        field: FieldInfo | None,
+        value: set[Any] | None,
+        form_errors: Mapping[str, Any],
+        removable: bool,
+    ) -> Widget[Any]:
+        """Build the widget."""
+        choice_wrapper = field_type.__args__[0]
+        choices = []
+        choice_wrapper_origin = get_origin(choice_wrapper)
+        if choice_wrapper_origin:
+            if choice_wrapper_origin is Literal:
+                litchoice: list[str] = choice_wrapper.__args__  # type: ignore
+                choices = [
+                    Checkable(
+                        label=c,
+                        value=c,
+                        checked=c in value if value else False,  # type: ignore
+                        name=field_name,
+                        token=self.factory.token,
+                        error=form_errors.get(f"{field_name}-{c}"),
+                    )
+                    for c in litchoice
+                ]
+
+            else:
+                raise NotImplementedError  # coverage: ignore
+        elif issubclass(choice_wrapper, Enum):
+            choices = [
+                Checkable(
+                    label=e.value,
+                    value=e.name,
+                    checked=e.name in value if value else False,  # type: ignore
+                    name=field_name,
+                    token=self.factory.token,
+                    error=form_errors.get(f"{field_name}-{e.name}"),
+                )
+                for e in choice_wrapper
+            ]
+        else:
+            raise NotImplementedError  # coverage: ignore
+
+        return ChecklistWidget(
+            field_name,
+            title=field.title if field else "",
+            hint=field.description if field else None,
+            aria_label=(
+                field.json_schema_extra.get("aria_label")  # type:ignore
+                if field and field.json_schema_extra
+                else None
+            ),
+            token=self.factory.token,
+            value=choices,
+            removable=removable,
+            error=form_errors.get(field_name),
+        )

fastlife/adapters/jinjax/widget_factory/simpletype_builder.py

@@ -0,0 +1,47 @@
+"""Handle simple types (str, int, float, ...)."""
+
+from collections.abc import Mapping
+from decimal import Decimal
+from typing import Any
+from uuid import UUID
+
+from pydantic.fields import FieldInfo
+
+from fastlife.adapters.jinjax.widget_factory.base import BaseWidgetBuilder
+from fastlife.adapters.jinjax.widgets.base import Widget
+from fastlife.adapters.jinjax.widgets.text import TextWidget
+
+
+class SimpleTypeBuilder(BaseWidgetBuilder[str | int | str | float | Decimal | UUID]):
+    """Builder for simple types."""
+
+    def accept(self, typ: type[Any], origin: type[Any] | None) -> bool:
+        """True for simple types: int, str, float, Decimal, UUID"""
+        return issubclass(typ, int | str | float | Decimal | UUID)
+
+    def build(
+        self,
+        *,
+        field_name: str,
+        field_type: type[Any],
+        field: FieldInfo | None,
+        value: int | str | float | Decimal | UUID | None,
+        form_errors: Mapping[str, Any],
+        removable: bool,
+    ) -> Widget[int | str | float | Decimal | UUID]:
+        """Build the widget."""
+        return TextWidget(
+            field_name,
+            placeholder=str(field.examples[0]) if field and field.examples else None,
+            title=field.title if field else "",
+            hint=field.description if field else None,
+            aria_label=(
+                field.json_schema_extra.get("aria_label")  # type:ignore
+                if field and field.json_schema_extra
+                else None
+            ),
+            removable=removable,
+            token=self.factory.token,
+            value=str(value) if value else "",
+            error=form_errors.get(field_name),
+        )

fastlife/adapters/jinjax/widget_factory/union_builder.py

@@ -0,0 +1,90 @@
+"""Handle Union type."""
+
+from collections.abc import Mapping
+from types import NoneType
+from typing import Any
+
+from pydantic import ValidationError
+from pydantic.fields import FieldInfo
+
+from fastlife.adapters.jinjax.widget_factory.base import BaseWidgetBuilder
+from fastlife.adapters.jinjax.widgets.base import Widget
+from fastlife.adapters.jinjax.widgets.union import UnionWidget
+from fastlife.shared_utils.infer import is_complex_type, is_union
+
+
+class UnionBuilder(BaseWidgetBuilder[Any]):
+    """Builder for Union."""
+
+    def accept(self, typ: type[Any], origin: type[Any] | None) -> bool:
+        """True for unions Union[A,B], A | B or event Optional[A], A | None"""
+        return is_union(typ)
+
+    def build(
+        self,
+        *,
+        field_name: str,
+        field_type: type[Any],
+        field: FieldInfo | None,
+        value: Any | None,
+        form_errors: Mapping[str, Any],
+        removable: bool,
+    ) -> Widget[Any]:
+        """Build the widget."""
+        types: list[type[Any]] = []
+        # required = True
+        for typ in field_type.__args__:  # type: ignore
+            if typ is NoneType:
+                # required = False
+                continue
+            types.append(typ)  # type: ignore
+
+        if (
+            not removable
+            and len(types) == 1
+            # if the optional type is a complex type,
+            and not is_complex_type(types[0])
+        ):
+            return self.factory.build(  # coverage: ignore
+                types[0],
+                name=field_name,
+                field=field,
+                value=value,
+                form_errors=form_errors,
+                removable=False,
+            )
+        child = None
+        if value:
+            for typ in types:
+                try:
+                    typ(**value)
+                except ValidationError:
+                    pass
+                else:
+                    child = self.factory.build(
+                        typ,
+                        name=field_name,
+                        field=field,
+                        value=value,
+                        form_errors=form_errors,
+                        removable=False,
+                    )
+
+        widget = UnionWidget(
+            field_name,
+            # we assume those types are BaseModel
+            value=child,
+            children_types=types,  # type: ignore
+            title=field.title if field else "",
+            hint=field.description if field else None,
+            aria_label=(
+                field.json_schema_extra.get("aria_label")  # type:ignore
+                if field and field.json_schema_extra
+                else None
+            ),
+            token=self.factory.token,
+            removable=removable,
+            error=form_errors.get(field_name),
+        )
+
+        return widget

fastlife/adapters/jinjax/widgets/base.py

@@ -1,7 +1,9 @@
 """Widget base class."""
+
 import abc
 import secrets
-from typing import Any, Generic, Mapping, Type, TypeVar
+from collections.abc import Mapping
+from typing import Any, Generic, TypeVar
 
 from markupsafe import Markup
 
@@ -11,7 +13,7 @@ from fastlife.shared_utils.infer import is_union
 T = TypeVar("T")
 
 
-def get_title(typ: Type[Any]) -> str:
+def get_title(typ: type[Any]) -> str:
     return getattr(
         getattr(typ, "__meta__", None),
         "title",
@@ -81,7 +83,7 @@ class Widget(abc.ABC, Generic[T]):
         return Markup(renderer.render_template(self.get_template(), widget=self))
 
 
-def _get_fullname(typ: Type[Any]) -> str:
+def _get_fullname(typ: type[Any]) -> str:
     if is_union(typ):
         typs = [_get_fullname(t) for t in typ.__args__]  # type: ignore
         return "|".join(typs)  # type: ignore
@@ -102,7 +104,7 @@ class TypeWrapper:
 
     def __init__(
         self,
-        typ: Type[Any],
+        typ: type[Any],
         route_prefix: str,
         name: str,
         token: str,

fastlife/adapters/jinjax/widgets/checklist.py

@@ -2,7 +2,7 @@
 Widget for field of type Set.
 """
 
-from typing import Sequence
+from collections.abc import Sequence
 
 from pydantic import BaseModel, Field
 

fastlife/adapters/jinjax/widgets/dropdown.py

@@ -2,7 +2,7 @@
 Widget for field of type Enum or Literal.
 """
 
-from typing import Optional, Sequence, Tuple
+from collections.abc import Sequence
 
 from .base import Widget
 
@@ -26,14 +26,14 @@ class DropDownWidget(Widget[str]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        value: Optional[str] = None,
+        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],
+        options: Sequence[tuple[str, str]] | Sequence[str],
         removable: bool = False,
-        token: Optional[str] = None,
+        token: str | None = None,
     ) -> None:
         super().__init__(
             name,

fastlife/adapters/jinjax/widgets/hidden.py

@@ -1,3 +1,5 @@
+"""Hidden fields"""
+
 from typing import Any
 
 from .base import Widget

fastlife/adapters/jinjax/widgets/model.py

@@ -1,4 +1,7 @@
-from typing import Any, Sequence
+"""Pydantic models"""
+
+from collections.abc import Sequence
+from typing import Any
 
 from markupsafe import Markup
 

fastlife/adapters/jinjax/widgets/sequence.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence, Type
+from collections.abc import Sequence
+from typing import Any
 
 from markupsafe import Markup
 
@@ -17,7 +18,7 @@ class SequenceWidget(Widget[Sequence[Widget[Any]]]):
         aria_label: str | None = None,
         value: Sequence[Widget[Any]] | None,
         error: str | None = None,
-        item_type: Type[Any],
+        item_type: type[Any],
         token: str,
         removable: bool,
     ):

fastlife/adapters/jinjax/widgets/text.py

@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from typing import Optional
 
 from .base import Widget
 
@@ -23,10 +22,10 @@ class TextWidget(Widget[str]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        placeholder: Optional[str] = None,
+        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",
@@ -87,12 +86,12 @@ class TextareaWidget(Widget[Sequence[str]]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        placeholder: Optional[str] = None,
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        placeholder: str | None = None,
         error: str | None = None,
-        value: Optional[Sequence[str]] = None,
+        value: Sequence[str] | None = None,
         removable: bool = False,
         token: str,
     ) -> None:

fastlife/adapters/jinjax/widgets/union.py

@@ -1,7 +1,9 @@
 """
 Widget for field of type Union.
 """
-from typing import Any, Optional, Sequence, Type, Union
+
+from collections.abc import Sequence
+from typing import Any, Union
 
 from markupsafe import Markup
 from pydantic import BaseModel
@@ -31,12 +33,12 @@ class UnionWidget(Widget[Widget[Any]]):
         self,
         name: str,
         *,
-        title: Optional[str],
-        hint: Optional[str] = None,
-        aria_label: Optional[str] = None,
-        value: Optional[Widget[Any]],
+        title: str | None,
+        hint: str | None = None,
+        aria_label: str | None = None,
+        value: Widget[Any] | None,
         error: str | None = None,
-        children_types: Sequence[Type[BaseModel]],
+        children_types: Sequence[type[BaseModel]],
         removable: bool = False,
         token: str,
     ):
@@ -72,7 +74,7 @@ class UnionWidget(Widget[Widget[Any]]):
                 widget=self,
                 types=self.build_types(renderer.route_prefix),
                 parent_type=TypeWrapper(
-                    Union[tuple(self.children_types)],  # type: ignore
+                    Union[tuple(self.children_types)],  # type: ignore # noqa: UP007
                     renderer.route_prefix,
                     self.parent_name,
                     self.token,

fastlife/components/Form.jinja

@@ -22,6 +22,15 @@
   ] = None,
   method: Annotated[Literal["get", "post"] | None, "Http method used"] = None,
   action: Annotated[str | None, "url where the form will be submitted"] = None,
+  hx_target: Annotated[
+    str | None,
+    "target the element for swapping than the one issuing the AJAX request."
+  ] = None,
+  hx_select: Annotated[str | None, "select the content swapped from response of the AJAX request."] = None,
+  hx_swap: Annotated[
+    str | None,
+    "specify how the response will be swapped in relative to the target of an AJAX request."
+  ] = None,
   hx_post: Annotated[
     str | Literal[True] | None,
     "url where the form will be submitted using htmx. if ``True``, the current url is used."\
@@ -40,6 +49,9 @@
       {%- if hx_post is not none %}
         hx-post="{% if hx_post is not true %}{{hx_post}}{% endif %}"
       {%- endif %}
+      {%- if hx_select %} hx-select="{{ hx_select }}" {%- endif %}
+      {%- if hx_swap %} hx-swap="{{ hx_swap }}" {%- endif %}
+      {%- if hx_target %} hx-target="{{ hx_target }}" {%- endif %}
     {%- endif %}
     {%- if action is not none %} action="{{action}}" {%- endif %}
     {%- if method %} method="{{method}}" {%- endif -%}

fastlife/config/configurator.py

@@ -11,32 +11,29 @@ The configurator is designed to handle the setup during the configuration
 phase.
 """
 
-import importlib
-import inspect
 import logging
 from collections import defaultdict
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from enum import Enum
 from pathlib import Path
 from types import ModuleType
-from typing import TYPE_CHECKING, Annotated, Any, Callable, Generic, Self, Tuple, Type
+from typing import TYPE_CHECKING, Annotated, Any, Generic, Self, TypeVar
 
 import venusian
-from fastapi import Depends, FastAPI
+from fastapi import Depends, FastAPI, Response
 from fastapi import Request as BaseRequest
-from fastapi import Response
 from fastapi.params import Depends as DependsType
 from fastapi.staticfiles import StaticFiles
 from fastapi.types import IncEx
 
 from fastlife.config.openapiextra import OpenApiTag
 from fastlife.middlewares.base import AbstractMiddleware
-from fastlife.request.request import Request
+from fastlife.request.request import GenericRequest, Request
 from fastlife.routing.route import Route
 from fastlife.routing.router import Router
 from fastlife.security.csrf import check_csrf
 from fastlife.services.policy import check_permission
-from fastlife.shared_utils.resolver import resolve
+from fastlife.shared_utils.resolver import resolve, resolve_maybe_relative
 
 from .registry import DefaultRegistry, TRegistry
 from .settings import Settings
@@ -127,9 +124,9 @@ class GenericConfigurator(Generic[TRegistry]):
         self.registry = registry_cls(settings)
         Route._registry = self.registry  # type: ignore
 
-        self.middlewares: list[Tuple[Type[AbstractMiddleware], Any]] = []
-        self.exception_handlers: list[Tuple[int | Type[Exception], Any]] = []
-        self.mounts: list[Tuple[str, Path, str]] = []
+        self.middlewares: list[tuple[type[AbstractMiddleware], Any]] = []
+        self.exception_handlers: list[tuple[int | type[Exception], Any]] = []
+        self.mounts: list[tuple[str, Path, str]] = []
         self.tags: dict[str, OpenApiTag] = {}
 
         self.api_title = "OpenAPI"
@@ -142,7 +139,7 @@ class GenericConfigurator(Generic[TRegistry]):
         self._route_prefix: str = ""
         self._routers: dict[str, Router] = defaultdict(Router)
         self._security_policies: dict[
-            str, "type[AbstractSecurityPolicy[Any, TRegistry]]"
+            str, type[AbstractSecurityPolicy[Any, TRegistry]]
         ] = {}
 
         self._registered_permissions: set[str] = set()
@@ -239,12 +236,11 @@ class GenericConfigurator(Generic[TRegistry]):
         :param ignore: ignore submodules
         """
         if isinstance(module, str):
-            package = None
-            if module.startswith("."):
-                caller_module = inspect.getmodule(inspect.stack()[1][0])
-                package = caller_module.__name__ if caller_module else "__main__"
+            try:
+                module = resolve_maybe_relative(module, stack_depth=2)
+            except ModuleNotFoundError as exc:
+                raise ConfigurationError(f"Can't resolve {module}") from exc
 
-            module = importlib.import_module(module, package)
         old, self._route_prefix = self._route_prefix, route_prefix
         try:
             self.scanner.scan(  # type: ignore
@@ -302,7 +298,7 @@ class GenericConfigurator(Generic[TRegistry]):
         self.api_redoc_url = redoc_url
         return self
 
-    def add_open_tag(self, tag: OpenApiTag) -> Self:
+    def add_openapi_tag(self, tag: OpenApiTag) -> Self:
         """Register a tag description in the documentation."""
         if tag.name in self.tags:
             raise ConfigurationError(f"Tag {tag.name} can't be registered twice.")
@@ -310,7 +306,7 @@ class GenericConfigurator(Generic[TRegistry]):
         return self
 
     def add_middleware(
-        self, middleware_class: Type[AbstractMiddleware], **options: Any
+        self, middleware_class: type[AbstractMiddleware], **options: Any
     ) -> Self:
         """
         Add a starlette middleware to the FastAPI app.
@@ -522,7 +518,7 @@ class GenericConfigurator(Generic[TRegistry]):
 
     def add_exception_handler(
         self,
-        status_code_or_exc: int | Type[Exception],
+        status_code_or_exc: int | type[Exception],
         handler: Any,
         *,
         template: str | None = None,
@@ -539,8 +535,8 @@ class GenericConfigurator(Generic[TRegistry]):
             # class is wrong.
             # Until we store a security policy per rooter, we rebuild an
             # incomplete request here.
-            request = Request(self.registry, request)
-            resp = handler(request, exc)
+            req = GenericRequest[DefaultRegistry](self.registry, request)
+            resp = handler(req, exc)
             if isinstance(resp, Response):
                 return resp
 
@@ -552,7 +548,7 @@ class GenericConfigurator(Generic[TRegistry]):
                     "did not return a Response"
                 )
 
-            return request.registry.get_renderer(template)(request).render(
+            return req.registry.get_renderer(template)(req).render(
                 template,
                 params=resp,
                 status_code=status_code,
@@ -594,8 +590,11 @@ class Configurator(GenericConfigurator[DefaultRegistry]):
     """
 
 
+TConfigurator = TypeVar("TConfigurator", bound=GenericConfigurator[Any])
+
+
 def configure(
-    wrapped: Callable[[Configurator], None],
+    wrapped: Callable[[TConfigurator], None],
 ) -> Callable[[Any], None]:
     """
     Decorator used to attach route in a submodule while using the configurator.include.

fastlife/config/exceptions.py

@@ -1,4 +1,7 @@
-from typing import Any, Callable
+"""Customize error pages."""
+
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 

fastlife/config/openapiextra.py

@@ -1,4 +1,5 @@
 """Types for OpenAPI documentation."""
+
 from pydantic import BaseModel, Field