fastlifeweb 0.16.2__py3-none-any.whl → 0.16.4__py3-none-any.whl

fastlife/adapters/jinjax/renderer.py

@@ -6,16 +6,11 @@ import ast
 import logging
 import re
 import textwrap
+from collections.abc import Iterator, Mapping, MutableMapping, Sequence
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Iterator,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Type,
     cast,
 )
 
@@ -108,7 +103,7 @@ def generate_docstring(
     kwonlyargs = func_def.args.kwonlyargs
     kw_defaults = func_def.args.kw_defaults
 
-    for arg, default in zip(kwonlyargs, kw_defaults):
+    for arg, default in zip(kwonlyargs, kw_defaults, strict=False):
         process_arg(arg, default)
 
     if add_content:
@@ -342,7 +337,7 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         self,
         template: str,
         *,
-        globals: Optional[Mapping[str, Any]] = None,
+        globals: Mapping[str, Any] | None = None,
         **params: Any,
     ) -> str:
         # Jinja template does accept the file extention while rendering the template
@@ -360,13 +355,13 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         )
 
     def pydantic_form(
-        self, model: FormModel[Any], *, token: Optional[str] = None
+        self, model: FormModel[Any], *, token: str | None = None
     ) -> Markup:
         return WidgetFactory(self, token).get_markup(model)
 
     def pydantic_form_field(
         self,
-        model: Type[Any],
+        model: type[Any],
         *,
         name: str | None,
         token: str | None,

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/factory.py

@@ -3,12 +3,12 @@ Transform.
 """
 
 import secrets
-from collections.abc import MutableSequence, Sequence
+from collections.abc import Mapping, MutableSequence, Sequence
 from decimal import Decimal
 from enum import Enum
 from inspect import isclass
 from types import NoneType
-from typing import Any, Literal, Mapping, Type, cast, get_origin
+from typing import Any, Literal, cast, get_origin
 from uuid import UUID
 
 from markupsafe import Markup
@@ -59,7 +59,7 @@ class WidgetFactory:
 
     def get_widget(
         self,
-        base: Type[Any],
+        base: type[Any],
         form_data: Mapping[str, Any],
         form_errors: Mapping[str, Any],
         *,
@@ -78,7 +78,7 @@ class WidgetFactory:
 
     def build(
         self,
-        typ: Type[Any],
+        typ: type[Any],
         *,
         name: str = "",
         value: Any,
@@ -152,7 +152,7 @@ class WidgetFactory:
                 name, typ, field, value or "", form_errors, removable
             )
 
-        if issubclass(typ, (int, str, float, Decimal, UUID)):
+        if issubclass(typ, int | str | float | Decimal | UUID):
             return self.build_simpletype(
                 name, typ, field, value or "", form_errors, removable
             )
@@ -162,7 +162,7 @@ class WidgetFactory:
     def build_model(
         self,
         field_name: str,
-        typ: Type[BaseModel],
+        typ: type[BaseModel],
         field: FieldInfo | None,
         value: Mapping[str, Any],
         form_errors: Mapping[str, Any],
@@ -204,13 +204,13 @@ class WidgetFactory:
     def build_union(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Any,
         form_errors: Mapping[str, Any],
         removable: bool,
     ) -> Widget[Any]:
-        types: list[Type[Any]] = []
+        types: list[type[Any]] = []
         # required = True
         for typ in field_type.__args__:  # type: ignore
             if typ is NoneType:
@@ -271,7 +271,7 @@ class WidgetFactory:
     def build_sequence(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Sequence[Any] | None,
         form_errors: Mapping[str, Any],
@@ -309,7 +309,7 @@ class WidgetFactory:
     def build_set(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: Sequence[Any] | None,
         form_errors: Mapping[str, Any],
@@ -368,7 +368,7 @@ class WidgetFactory:
     def build_boolean(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: bool,
         form_errors: Mapping[str, Any],
@@ -392,7 +392,7 @@ class WidgetFactory:
     def build_emailtype(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -418,7 +418,7 @@ class WidgetFactory:
     def build_secretstr(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: SecretStr | str,
         form_errors: Mapping[str, Any],
@@ -444,7 +444,7 @@ class WidgetFactory:
     def build_literal(
         self,
         field_name: str,
-        field_type: Type[Any],  # a literal actually
+        field_type: type[Any],  # a literal actually
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -476,7 +476,7 @@ class WidgetFactory:
     def build_enum(
         self,
         field_name: str,
-        field_type: Type[Any],  # an enum subclass
+        field_type: type[Any],  # an enum subclass
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],
@@ -502,7 +502,7 @@ class WidgetFactory:
     def build_simpletype(
         self,
         field_name: str,
-        field_type: Type[Any],
+        field_type: type[Any],
         field: FieldInfo | None,
         value: str | int | float,
         form_errors: Mapping[str, Any],

fastlife/adapters/jinjax/widgets/model.py

@@ -1,4 +1,5 @@
-from typing import Any, Sequence
+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/config/configurator.py

@@ -15,16 +15,15 @@ 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
 
 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
@@ -127,9 +126,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 +141,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()
@@ -310,7 +309,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 +521,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,

fastlife/config/exceptions.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+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
 
 

fastlife/config/resources.py

@@ -8,7 +8,8 @@ API Resources declaration using a decorator.
 
 """
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 from fastapi.types import IncEx
@@ -91,29 +92,21 @@ def resource(
                     endpoint=endpoint,
                     tags=[tag],
                     methods=[method.split("_").pop()],
-                    permission=getattr(endpoint, "permission"),
-                    status_code=getattr(endpoint, "status_code"),
-                    summary=getattr(endpoint, "summary"),
-                    description=getattr(endpoint, "description"),
-                    response_description=getattr(endpoint, "response_description"),
-                    deprecated=getattr(endpoint, "deprecated"),
-                    operation_id=getattr(endpoint, "operation_id"),
-                    response_model_include=getattr(endpoint, "response_model_include"),
-                    response_model_exclude=getattr(endpoint, "response_model_exclude"),
-                    response_model_by_alias=getattr(
-                        endpoint, "response_model_by_alias"
-                    ),
-                    response_model_exclude_unset=getattr(
-                        endpoint, "response_model_exclude_unset"
-                    ),
-                    response_model_exclude_defaults=getattr(
-                        endpoint, "response_model_exclude_defaults"
-                    ),
-                    response_model_exclude_none=getattr(
-                        endpoint, "response_model_exclude_none"
-                    ),
-                    include_in_schema=getattr(endpoint, "include_in_schema"),
-                    openapi_extra=getattr(endpoint, "openapi_extra"),
+                    permission=endpoint.permission,
+                    status_code=endpoint.status_code,
+                    summary=endpoint.summary,
+                    description=endpoint.description,
+                    response_description=endpoint.response_description,
+                    deprecated=endpoint.deprecated,
+                    operation_id=endpoint.operation_id,
+                    response_model_include=endpoint.response_model_include,
+                    response_model_exclude=endpoint.response_model_exclude,
+                    response_model_by_alias=endpoint.response_model_by_alias,
+                    response_model_exclude_unset=endpoint.response_model_exclude_unset,
+                    response_model_exclude_defaults=endpoint.response_model_exclude_defaults,
+                    response_model_exclude_none=endpoint.response_model_exclude_none,
+                    include_in_schema=endpoint.include_in_schema,
+                    openapi_extra=endpoint.openapi_extra,
                 )
 
             for method in dir(ob):
@@ -131,7 +124,13 @@ def resource(
                             config, method, collection_path, getattr(api, method)
                         )
                     case (
-                        "get" | "post" | "put" | "patch" | "delete" | "head" | "options"
+                        "get"
+                        | "post"
+                        | "put"
+                        | "patch"
+                        | "delete"
+                        | "head"
+                        | "options"
                     ):
                         bind_config(config, method, path, getattr(api, method))
                     case _:

fastlife/config/views.py

@@ -17,7 +17,9 @@ async def hello_world(
     return template()
 ```
 """
-from typing import Any, Callable
+
+from collections.abc import Callable
+from typing import Any
 
 import venusian
 

fastlife/middlewares/reverse_proxy/x_forwarded.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, Sequence, Tuple
+from collections.abc import Sequence
 
 from starlette.types import ASGIApp, Receive, Scope, Send
 
@@ -8,13 +8,24 @@ from fastlife.middlewares.base import AbstractMiddleware
 log = logging.getLogger(__name__)
 
 
-def get_header(headers: Sequence[Tuple[bytes, bytes]], key: bytes) -> Optional[str]:
+def get_header(headers: Sequence[tuple[bytes, bytes]], key: bytes) -> str | None:
     for hdr in headers:
         if hdr[0].lower() == key:
             return hdr[1].decode("latin1")
     return None
 
 
+def get_header_int(headers: Sequence[tuple[bytes, bytes]], key: bytes) -> int | None:
+    for hdr in headers:
+        if hdr[0].lower() == key:
+            ret = hdr[1].decode("latin1")
+            try:
+                return int(ret)
+            except ValueError:
+                pass
+    return None
+
+
 class XForwardedStar(AbstractMiddleware):
     def __init__(
         self,
@@ -25,8 +36,19 @@ class XForwardedStar(AbstractMiddleware):
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         if scope["type"] in ("http", "websocket"):
             headers = scope["headers"]
+            x_real_ip = get_header(headers, b"x-real-ip")
+            client = (
+                (
+                    x_real_ip,
+                    get_header_int(headers, b"x-real-port")
+                    or get_header_int(headers, b"x-forwarded-port")
+                    or 0,
+                )
+                if x_real_ip
+                else None
+            )
             new_vals = {
-                "client": get_header(headers, b"x-real-ip"),
+                "client": client,
                 "host": get_header(headers, b"x-forwarded-host"),
                 "scheme": get_header(headers, b"x-forwarded-proto"),
             }

fastlife/middlewares/session/middleware.py

@@ -1,7 +1,7 @@
 """Deal with http session."""
 
 from datetime import timedelta
-from typing import Literal, Type
+from typing import Literal
 
 from starlette.datastructures import MutableHeaders
 from starlette.requests import HTTPConnection
@@ -25,7 +25,7 @@ class SessionMiddleware(AbstractMiddleware):
         cookie_same_site: Literal["lax", "strict", "none"] = "lax",
         cookie_secure: bool = False,
         cookie_domain: str = "",
-        serializer: Type[AbsractSessionSerializer] = SignedSessionSerializer,
+        serializer: type[AbsractSessionSerializer] = SignedSessionSerializer,
     ) -> None:
         self.app = app
         self.max_age = int(duration.total_seconds())

fastlife/middlewares/session/serializer.py

@@ -1,8 +1,10 @@
 """Serialize session."""
+
 import abc
 import json
 from base64 import b64decode, b64encode
-from typing import Any, Mapping, Tuple
+from collections.abc import Mapping
+from typing import Any
 
 import itsdangerous
 
@@ -11,8 +13,7 @@ class AbsractSessionSerializer(abc.ABC):
     """Session serializer base class"""
 
     @abc.abstractmethod
-    def __init__(self, secret_key: str, max_age: int) -> None:
-        ...
+    def __init__(self, secret_key: str, max_age: int) -> None: ...
 
     @abc.abstractmethod
     def serialize(self, data: Mapping[str, Any]) -> bytes:
@@ -20,7 +21,7 @@ class AbsractSessionSerializer(abc.ABC):
         ...
 
     @abc.abstractmethod
-    def deserialize(self, data: bytes) -> Tuple[Mapping[str, Any], bool]:
+    def deserialize(self, data: bytes) -> tuple[Mapping[str, Any], bool]:
         """Derialize the session raw bytes content and return it as a mapping."""
         ...
 
@@ -47,7 +48,7 @@ class SignedSessionSerializer(AbsractSessionSerializer):
         signed = self.signer.sign(encoded)
         return signed
 
-    def deserialize(self, data: bytes) -> Tuple[Mapping[str, Any], bool]:
+    def deserialize(self, data: bytes) -> tuple[Mapping[str, Any], bool]:
         """Deserialize the session.
 
         If the signature is incorect, the session restart from the begining.

fastlife/request/form.py

@@ -1,6 +1,7 @@
 """HTTP Form serialization."""
 
-from typing import Any, Callable, Generic, Mapping, Type, TypeVar, get_origin
+from collections.abc import Callable, Mapping
+from typing import Any, Generic, TypeVar, get_origin
 
 from fastapi import Depends
 from pydantic import BaseModel, ValidationError
@@ -28,7 +29,7 @@ class FormModel(Generic[T]):
         self.is_valid = is_valid
 
     @classmethod
-    def default(cls, prefix: str, pydantic_type: Type[T]) -> "FormModel[T]":
+    def default(cls, prefix: str, pydantic_type: type[T]) -> "FormModel[T]":
         return cls(prefix, pydantic_type.model_construct(), {})
 
     def edit(self, pydantic_type: T) -> None:
@@ -47,7 +48,7 @@ class FormModel(Generic[T]):
 
     @classmethod
     def from_payload(
-        cls, prefix: str, pydantic_type: Type[T], data: Mapping[str, Any]
+        cls, prefix: str, pydantic_type: type[T], data: Mapping[str, Any]
     ) -> "FormModel[T]":
         try:
             return cls(prefix, pydantic_type(**data.get(prefix, {})), {}, True)
@@ -68,12 +69,12 @@ class FormModel(Generic[T]):
                                         continue
 
                             else:
-                                raise NotImplementedError
+                                raise NotImplementedError from exc  # coverage: ignore
                         elif issubclass(typ, BaseModel):
                             typ = typ.model_fields[part].annotation
                             loc = f"{loc}.{part}"
                         else:
-                            raise NotImplementedError
+                            raise NotImplementedError from exc  # coverage: ignore
 
                     else:
                         # it is an integer and it part of the list
@@ -88,7 +89,7 @@ class FormModel(Generic[T]):
 
 
 def form_model(
-    cls: Type[T], name: str | None = None
+    cls: type[T], name: str | None = None
 ) -> Callable[[Mapping[str, Any]], FormModel[T]]:
     """
     Build a model, a class of type T based on Pydandic Base Model from a form payload.

fastlife/request/form_data.py

@@ -2,14 +2,10 @@
 Set of functions to unserialize www-form-urlencoded format to python simple types.
 """
 
+from collections.abc import Mapping, MutableMapping, MutableSequence, Sequence
 from typing import (
     Annotated,
     Any,
-    Mapping,
-    MutableMapping,
-    MutableSequence,
-    Optional,
-    Sequence,
 )
 
 from fastapi import Depends
@@ -22,7 +18,7 @@ def unflatten_struct(
     unflattened_output: MutableMapping[str, Any] | MutableSequence[Any],
     level: int = 0,
     *,
-    csrf_token_name: Optional[str] = None,
+    csrf_token_name: str | None = None,
 ) -> Mapping[str, Any] | Sequence[Any]:
     """
     Take a flatten_input map, with key segmented by `.` and build a nested dict.

fastlife/routing/route.py

@@ -1,5 +1,7 @@
 """HTTP Route."""
-from typing import TYPE_CHECKING, Any, Callable, Coroutine
+
+from collections.abc import Callable, Coroutine
+from typing import TYPE_CHECKING, Any
 
 from fastapi.routing import APIRoute
 from starlette.requests import Request as StarletteRequest

fastlife/routing/router.py

@@ -4,6 +4,7 @@ FastApi router for fastlife application.
 The aim of this router is get {class}`fastlife.routing.route.Route`
 available in the FastApi request depency injection.
 """
+
 from typing import Any
 
 from fastapi import APIRouter

fastlife/security/csrf.py

@@ -19,7 +19,8 @@ no way to prevent to set the cookie in the request.
 """
 
 import secrets
-from typing import Any, Callable, Coroutine
+from collections.abc import Callable, Coroutine
+from typing import Any
 
 from fastlife.request import Request
 

fastlife/security/policy.py

@@ -2,7 +2,8 @@
 
 import abc
 import logging
-from typing import Annotated, Any, Callable, Coroutine, Generic, Literal, TypeVar
+from collections.abc import Callable, Coroutine
+from typing import Annotated, Any, Generic, Literal, TypeVar
 from uuid import UUID
 
 from fastapi import Depends, HTTPException

fastlife/services/locale_negociator.py

@@ -1,6 +1,7 @@
 """Find the localization gor the given request."""
 
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from fastlife.config.settings import Settings
 

fastlife/services/policy.py

@@ -1,6 +1,7 @@
 """Security policy."""
 
-from typing import Any, Callable, Coroutine
+from collections.abc import Callable, Coroutine
+from typing import Any
 
 CheckPermissionHook = Callable[..., Coroutine[Any, Any, None]] | Callable[..., None]
 CheckPermission = Callable[[str], CheckPermissionHook]

fastlife/services/templates.py

@@ -10,7 +10,8 @@ In that case, those base classes have to be implemented.
 """
 
 import abc
-from typing import Any, Callable, Mapping
+from collections.abc import Callable, Mapping
+from typing import Any
 
 from fastlife import Request, Response
 from fastlife.security.csrf import create_csrf_token

fastlife/services/translations.py

@@ -1,5 +1,6 @@
 import pathlib
-from typing import TYPE_CHECKING, Iterator, Tuple
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
 from babel.support import NullTranslations, Translations
 
@@ -11,7 +12,7 @@ if TYPE_CHECKING:
 locale_name = str
 
 
-def find_mo_files(root_path: str) -> Iterator[Tuple[str, str, pathlib.Path]]:
+def find_mo_files(root_path: str) -> Iterator[tuple[str, str, pathlib.Path]]:
     root = pathlib.Path(root_path)
 
     # Walk through the directory structure and match the pattern

fastlife/shared_utils/infer.py

@@ -1,11 +1,12 @@
 """Type inference."""
+
 from types import UnionType
-from typing import Any, Type, Union, get_origin
+from typing import Any, Union, get_origin
 
 from pydantic import BaseModel
 
 
-def is_complex_type(typ: Type[Any]) -> bool:
+def is_complex_type(typ: type[Any]) -> bool:
     """
     Used to detect complex type such as Mapping, Sequence and pydantic BaseModel.
 
@@ -14,7 +15,7 @@ def is_complex_type(typ: Type[Any]) -> bool:
     return bool(get_origin(typ) or issubclass(typ, BaseModel))
 
 
-def is_union(typ: Type[Any]) -> bool:
+def is_union(typ: type[Any]) -> bool:
     """Used to detect unions like Optional[T], Union[T, U] or T | U."""
     type_origin = get_origin(typ)
     if type_origin:

fastlife/shared_utils/resolver.py

@@ -1,4 +1,5 @@
 """Resolution of python objects for dependency injection and more."""
+
 import importlib.util
 from pathlib import Path
 from types import UnionType
@@ -20,8 +21,10 @@ def resolve(value: str) -> Any:
 
     try:
         attr = getattr(module, attr_name)
-    except AttributeError:
-        raise ValueError(f"Attribute {attr_name} not found in module {module_name}")
+    except AttributeError as exc:
+        raise ValueError(
+            f"Attribute {attr_name} not found in module {module_name}"
+        ) from exc
 
     return attr
 
@@ -32,7 +35,7 @@ def resolve_extended(value: str) -> UnionType:
     if len(values) == 1:
         return resolve(value)
     types = [resolve(t) for t in values if t != "builtins:NoneType"]
-    return Union[tuple(types)]  # type: ignore
+    return Union[tuple(types)]  # type: ignore # noqa: UP007
 
 
 def resolve_path(value: str) -> str:

fastlife/templates/binding.py

@@ -2,7 +2,8 @@
 Bind template to the view in order to build an html response.
 """
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from fastapi import Depends, Response
 

fastlife/testing/__init__.py

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

fastlife/testing/testclient.py

@@ -2,9 +2,9 @@
 
 import re
 import time
-from collections.abc import MutableMapping
+from collections.abc import Iterator, Mapping, MutableMapping, Sequence
 from http.cookiejar import Cookie
-from typing import Any, Iterator, Literal, Mapping, Optional, Sequence
+from typing import Any, Literal
 from urllib.parse import urlencode
 
 import bs4
@@ -76,7 +76,7 @@ class Element:
         return Element(self._client, self._tag.form) if self._tag.form else None
 
     @property
-    def hx_target(self) -> Optional[str]:
+    def hx_target(self) -> str | None:
         """
         Return the hx-target of the element.
 
@@ -251,7 +251,7 @@ class WebForm:
             raise ValueError(f'"{fieldname}" does not exists')
         field = self._formfields[fieldname]
         if field.node_name != "select":
-            raise ValueError(f"{fieldname} is a {repr(field)}, " "use set() instead")
+            raise ValueError(f"{fieldname} is a {field!r}, " "use set() instead")
 
         for option in field.by_node_name("option"):
             if option.text == value.strip():
@@ -273,7 +273,7 @@ class WebForm:
 
         if field.node_name != "select":
             raise ValueError(
-                f"{fieldname} is a {repr(self._formfields[fieldname])}, "
+                f"{fieldname} is a {self._formfields[fieldname]!r}, "
                 "use unset() for checkbox instead"
             )
         if "multiple" not in field.attrs:
@@ -392,7 +392,7 @@ class WebResponse:
     def html_body(self) -> Element:
         """The body element of the html response."""
         body = self.html.by_node_name("body")
-        assert len(body) == 1
+        assert len(body) == 1, "body element not found or multiple body found"
         return body[0]
 
     @property
@@ -400,7 +400,7 @@ class WebResponse:
         """The form element of the html response."""
         if self._form is None:
             form = self.html.form
-            assert form is not None
+            assert form is not None, "form element not found"
             self._form = WebForm(self._client, self._origin, form)
         return self._form
 

fastlife/views/pydantic_form.py

@@ -1,4 +1,4 @@
-from typing import Optional, cast
+from typing import cast
 
 from fastapi import Query
 from pydantic.fields import FieldInfo
@@ -11,9 +11,9 @@ from fastlife.shared_utils.resolver import resolve_extended
 async def show_widget(
     typ: str,
     request: Request,
-    title: Optional[str] = Query(None),
-    name: Optional[str] = Query(None),
-    token: Optional[str] = Query(None),
+    title: str | None = Query(None),
+    name: str | None = Query(None),
+    token: str | None = Query(None),
     removable: bool = Query(False),
 ) -> Response:
     """

{fastlifeweb-0.16.2.dist-info → fastlifeweb-0.16.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.16.2
+Version: 0.16.4
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived

{fastlifeweb-0.16.2.dist-info → fastlifeweb-0.16.4.dist-info}/RECORD

@@ -1,18 +1,18 @@
 fastlife/__init__.py,sha256=fokakuhI0fdAjHP5w6GWi-YfCx7iTnrVzjSyZ11Cdgg,676
 fastlife/adapters/__init__.py,sha256=WYjEN8gp4r7LCHqmIO5VzzvsT8QGRE3w4G47UwYDtAo,94
 fastlife/adapters/jinjax/__init__.py,sha256=jy88zyqk7nFlaY-0lmgAoe0HyO5r_NKckQb3faQiUv4,137
-fastlife/adapters/jinjax/renderer.py,sha256=rj2KI4GB8tZstJwImdDYHuswxjdbGri2f8H6YuByaLo,13046
+fastlife/adapters/jinjax/renderer.py,sha256=_8k4a4R4ExjJrKiG5m5bFOxYqOFa3_TtmZ7iU1rd-p8,13041
 fastlife/adapters/jinjax/widgets/__init__.py,sha256=HERnX9xiXUbTDz3XtlnHWABTBjhIq_kkBgWs5E6ZIMY,42
-fastlife/adapters/jinjax/widgets/base.py,sha256=JoB1bLI97ZW2ycfBcHgrPxiOszE9t_SFFK5L1bR-cSo,4015
+fastlife/adapters/jinjax/widgets/base.py,sha256=3bBThRMnsdCi6Q_Dm73ep5pNOqgpSXsvAIBbHshfY7I,4037
 fastlife/adapters/jinjax/widgets/boolean.py,sha256=w4hZMo_8xDoThStlIUR4eVfLm8JwUp0-TaGCjGSyCbA,1145
-fastlife/adapters/jinjax/widgets/checklist.py,sha256=VIIfJ8JB7ZAISwFFiGZ7jfGuNJ9sjkhRSVFqDTr-RR4,1655
-fastlife/adapters/jinjax/widgets/dropdown.py,sha256=x2Y9BOfHfSuzWD_HNrvCkiJtKDxl8Vs05Uk8QKvRxyY,1622
-fastlife/adapters/jinjax/widgets/factory.py,sha256=XH-S1aucdPiujCWHdP_YyP1Tks7XzVKughMcL8eQhxk,17558
+fastlife/adapters/jinjax/widgets/checklist.py,sha256=8fgOrdxy1xpyQ6p3_mbRMd2vx6EU2WT5jI7QF27Y5EQ,1664
+fastlife/adapters/jinjax/widgets/dropdown.py,sha256=3Kc7i0z-7d6HrQchSHFCO5-xOh3bSEePo_pjXrIkvSE,1599
+fastlife/adapters/jinjax/widgets/factory.py,sha256=42cadaEzQb5vrwdOJRpv8JATz97EHa6YZo2EIbDx36o,17554
 fastlife/adapters/jinjax/widgets/hidden.py,sha256=pkMKxKhBKSGNf1Su81Jr-n8BJ45X5Qjsd1xXnJ7prPI,699
-fastlife/adapters/jinjax/widgets/model.py,sha256=XAvf125LAGmWOyIf7jMFzmGb6oRW_fb6Hg90tR_irTw,1272
-fastlife/adapters/jinjax/widgets/sequence.py,sha256=Xs3qic1pJLq-w7P7EXpa5taWnt5gWciK80gbhYG4rZM,1512
-fastlife/adapters/jinjax/widgets/text.py,sha256=fmbMwksgUpEImD8AExKCSp4g7LBD9F77dDU-2zWC8Qg,3260
-fastlife/adapters/jinjax/widgets/union.py,sha256=9u6AG9KzSQAT8ae9MmCniz0FJ8yGF12oRhwH5oWpWxE,2526
+fastlife/adapters/jinjax/widgets/model.py,sha256=xdgY--K4GNo5IIWTLjSAnNRDHq2bt81mh9O5J23y0gg,1299
+fastlife/adapters/jinjax/widgets/sequence.py,sha256=60rgz4LgE_TQQwajiZhn6EhY-s-HXOiIdQiQoKlUCvQ,1533
+fastlife/adapters/jinjax/widgets/text.py,sha256=KtUieF-q_BigG5AcL-4Sdr6LrIOQdWPwlaVW-2p-KPQ,3205
+fastlife/adapters/jinjax/widgets/union.py,sha256=CO6Q4_U8DieVsS5NzMp6TAbVXrBljfcjSARycEKYPDY,2540
 fastlife/components/A.jinja,sha256=rjnOFNpM2SUeJ0P8FDe3jzc_1WlsL65Kv-tb6KMCEpw,1389
 fastlife/components/Button.jinja,sha256=COtCjDpzGLNqtBUYsHw7gdUay4kff3KdLJFAzrEnMmo,2310
 fastlife/components/Checkbox.jinja,sha256=47_E9uPdr3QKUvRVhNQA7VE0uh5FVslQM26cdF0WCtY,753
@@ -1666,48 +1666,48 @@ fastlife/components/pydantic_form/Textarea.jinja,sha256=NzfCi5agRUSVcb5RXw0QamM8
 fastlife/components/pydantic_form/Union.jinja,sha256=czTska54z9KCZKu-FaycLmOvtH6y6CGUFQ8DHnkjrJk,1461
 fastlife/components/pydantic_form/Widget.jinja,sha256=EXskDqt22D5grpGVwlZA3ndve2Wr_6yQH4qVE9c31Og,397
 fastlife/config/__init__.py,sha256=ThosRIPZ_fpD0exZu-kUC_f8ZNa5KyDlleWMmEHkjEo,448
-fastlife/config/configurator.py,sha256=-U-se932t95YiIfPD6N-CElWuuqbKP2AKTjJXoajCKE,22385
-fastlife/config/exceptions.py,sha256=2MS2MFgb3mDbtdHEwnC-QYubob3Rl0v8O8y615LY0ds,1180
-fastlife/config/openapiextra.py,sha256=_9rBYeTqB7nVuzvUHMwZU387bTfYFHYLlP05NP0vEDs,513
+fastlife/config/configurator.py,sha256=keVPDTiCVko8Ncn1yYAnhG0x9Zp5J9yxMKEeyXZYP1E,22351
+fastlife/config/exceptions.py,sha256=M45w7ZNAj4KPPHNYiCtRHulRRb08rkOGtJ2I8WoXNHI,1207
+fastlife/config/openapiextra.py,sha256=rYoerrn9sni2XwnO3gIWqaz7M0aDZPhVLjzqhDxue0o,514
 fastlife/config/registry.py,sha256=dGcNm7E6WY0x5HZNzo1gBFvGFCWeJj6JFXsJtLax5NU,1347
-fastlife/config/resources.py,sha256=pM0j5VKVbVak4Z5mFRHBjAjUqORP4TAtCnZM3res5o8,8776
+fastlife/config/resources.py,sha256=XJIJxNtB5DAxXvDOU3xbJFa7_n-rAy9MXXjwekvj6p8,8583
 fastlife/config/settings.py,sha256=7oggPOucyJwQYI97q8vs3kPXjFIVpQu1q6BK25h-uFs,3789
-fastlife/config/views.py,sha256=Dxi6lO4gFs6GriAW7Rh5GDvebwbrpS2HzYhf30pXJiE,2058
+fastlife/config/views.py,sha256=V-P53GSnvqEPzkvEWNuI4ofcdbFur2Dl-s6BeKXObwI,2086
 fastlife/middlewares/__init__.py,sha256=C3DUOzR5EhlAv5Zq7h-Abyvkd7bUsJohTRSB2wpRYQE,220
 fastlife/middlewares/base.py,sha256=9OYqByRuVoIrLt353NOedPQTLdr7LSmxhb2BZcp20qk,638
 fastlife/middlewares/reverse_proxy/__init__.py,sha256=g1SoVDmenKzpAAPYHTEsWgdBByOxtLg9fGx6RV3i0ok,846
-fastlife/middlewares/reverse_proxy/x_forwarded.py,sha256=WC4xV3i6_Ogqsf_Zgt1ESml8zfnPbJJJkPlC2gTEqW8,1095
+fastlife/middlewares/reverse_proxy/x_forwarded.py,sha256=sGX7b4hOAgsG2KmtL3xlrZt61_IpF1exf6x_33F_QXE,1733
 fastlife/middlewares/session/__init__.py,sha256=3XgXcIO6yQls5G7x8K2T8b7a_enA_7rQptWZcp3j2Ak,1400
-fastlife/middlewares/session/middleware.py,sha256=AlRIFXfn3JesKJzMAFUHDOo22mfuwDHkyecDHo9jCdA,3172
-fastlife/middlewares/session/serializer.py,sha256=fTdZCop0y4VkCMyOIo6GEbo5fVWrwsBXaSWfConPL8E,2144
+fastlife/middlewares/session/middleware.py,sha256=R48x3MJ-tu8siy8G12hDHa83sMcZz6E1eEb0xwk77E4,3166
+fastlife/middlewares/session/serializer.py,sha256=wpaktDP5v1spmbD-D3Q68EK9A0KInE4DT8mkogBJ3Fc,2157
 fastlife/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/request/__init__.py,sha256=-wrh12uWM7ysmIUE6FszBit2H6iI5LWVEnHxQJ_23ZE,157
-fastlife/request/form.py,sha256=Ln9TySvAccYhFY9zc49P6YGE9cQSi_o3mByxvcuCIKY,3516
-fastlife/request/form_data.py,sha256=DNKpXUxeDMYb43zSBnSPTBjAB8OhsYlNjERSsLgFdvI,4454
+fastlife/request/form.py,sha256=BiuvbV85NkvnJECSxqabfq3PhMfdKMPVobS35PhxSFA,3595
+fastlife/request/form_data.py,sha256=JZmKbKZz8nnspvCHYHQrz-xsFVJFaWHkTilUWk7Fx-M,4448
 fastlife/request/localizer.py,sha256=9MXAcsod-Po5qeg4lttD3dyumiI0y5vGHCwSSmt9or8,349
 fastlife/request/request.py,sha256=h4Ji0GElWJ3W2hHgOwjSKHQcxUjjPuOk09v-oyfjEd0,2568
 fastlife/routing/__init__.py,sha256=8EMnQE5n8oA4J9_c3nxzwKDVt3tefZ6fGH0d2owE8mo,195
-fastlife/routing/route.py,sha256=O0gwPtP7ur2EHRf76kBASgoLMQciGHXcrJkW8zEPFJA,1413
-fastlife/routing/router.py,sha256=bLZ4k2aDs4L423znwGnw-X2LnM36O8fjhDWc8q1WewI,481
+fastlife/routing/route.py,sha256=vqjfMsHAVO0l2B8fuB8t19CKMtE7WoBkG4kvi4lUonM,1441
+fastlife/routing/router.py,sha256=ho9TvTkX2iUW6GEh99FgclZVFKkCCCxYG4pPHeUtGn8,482
 fastlife/security/__init__.py,sha256=QYDcJ3oXQzqXQxoDD_6biGAtercFrtePttoifiL1j34,25
-fastlife/security/csrf.py,sha256=PvC9Fqdb6c0IzzsnaMx2quQdjjKrb-nOPoAHfcwoAe8,2141
-fastlife/security/policy.py,sha256=8FWtjcOjkK5UvnjKluVkJIZdec2bfXbkKx7ouiiyjBs,5115
+fastlife/security/csrf.py,sha256=PIKG83LPqKz4kDALnZxIyPdYVwbNqsIryi7JPqRPQag,2168
+fastlife/security/policy.py,sha256=ECNEyZXjizK2kz61v5eU7xFNd_M6tIlr9JEwcdyjuj8,5142
 fastlife/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/services/locale_negociator.py,sha256=b1Fsx-r_zIZe0GD8WH1gmslMb0mNrvxuacxD4LNX63o,819
-fastlife/services/policy.py,sha256=ZK4K3fVGT1fUeBdo5sSWnEcJg49CZuaI3z2gyg3KguQ,1653
-fastlife/services/templates.py,sha256=7gPJxGWD-XqputbZpy_Icsz3WHKJaWg2JgkVOeKrjfA,3840
-fastlife/services/translations.py,sha256=Bo5CIjdbQ3g_ihbv4Bz60hzd8VOtqEEPOyhJEbGcvP4,4363
+fastlife/services/locale_negociator.py,sha256=Np2O8s7xnYTpf5eCG7LvcfFJ2LV7p_k86NNrU9Lju88,846
+fastlife/services/policy.py,sha256=bHe49EiD2ExQpFJxOsno6WyjxNrn8pf0wWDixkToHn0,1680
+fastlife/services/templates.py,sha256=-dIt8zrgiRsjMblS174Rx_2xRZkQQRIATYhaA2vbIAk,3867
+fastlife/services/translations.py,sha256=0MD6R4xCJM40JxvLyCg5laXEPJlyKvzjhVRkjE5l010,4383
 fastlife/shared_utils/__init__.py,sha256=i66ytuf-Ezo7jSiNQHIsBMVIcB-tDX0tg28-pUOlhzE,26
-fastlife/shared_utils/infer.py,sha256=CJjsL_F5OQRG7-0_89MQiZhyd7IcMGyirlQhjtcaIT4,728
-fastlife/shared_utils/resolver.py,sha256=BRU88Ej4oA1iDIyG4Z6T7Q9WFvPHiMm6zuSh623312A,1725
+fastlife/shared_utils/infer.py,sha256=3G_u6q2aWzeiVlAyGaWIlnAcz90m4bFNwpPYd5JIqfE,723
+fastlife/shared_utils/resolver.py,sha256=Nnva8D_BM_REFxH1sXZYKUZ5Ryx6o6vjqBSgvA7qWLY,1778
 fastlife/templates/__init__.py,sha256=QrP_5UAOgxqC-jOu5tcjd-l6GOYrS4dka6vmWMxWqfo,184
-fastlife/templates/binding.py,sha256=00rAbPHttCOgY-Nl9TbwiM2iFtSoH7xcBlj9kbNLzrE,1437
+fastlife/templates/binding.py,sha256=0pE2btOwLf4xOEgBXVOyz_dIX9tBCYCaJ7RhZI3knbs,1464
 fastlife/templates/constants.py,sha256=MGdUjkF9hsPMN8rOS49eWbAApcb8FL-FAeFvJU8k90M,8387
-fastlife/testing/__init__.py,sha256=vuqwoNUd3BuIp3fm7nkvmYkIGjIimf5zUGhDkeWrg2s,98
-fastlife/testing/testclient.py,sha256=BC7lLQ_jc59UmknAKzgRtW9a3cpX_V_QLp9Mg2ScLA8,20546
+fastlife/testing/__init__.py,sha256=VpxkS3Zp3t_hH8dBiLaGFGhsvt511dhBS_8fMoFXdmU,99
+fastlife/testing/testclient.py,sha256=3s0CguxV3AePBRQ5XccutS0sMZtUkxvkt3C7z6IJbz0,20600
 fastlife/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/views/pydantic_form.py,sha256=ZYOXKudmSqtRvFn5ZY75DOXZVunGXJBKpjh9FJcqu6k,1386
-fastlifeweb-0.16.2.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
-fastlifeweb-0.16.2.dist-info/METADATA,sha256=KIJVtDej45kFERanabt_3BzlEywJ274ZpWAHj3BGJm0,3345
-fastlifeweb-0.16.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastlifeweb-0.16.2.dist-info/RECORD,,
+fastlife/views/pydantic_form.py,sha256=4dv37JORLpvkgCgMGZfUN_qy7wme040GLZAzOTFqdnU,1367
+fastlifeweb-0.16.4.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
+fastlifeweb-0.16.4.dist-info/METADATA,sha256=pFRnHJnvWXf7-ZucfCFAqkdPQ_VPE9u3MdjeH5RQSJo,3345
+fastlifeweb-0.16.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastlifeweb-0.16.4.dist-info/RECORD,,