fastlifeweb 0.22.0__tar.gz → 0.22.1__tar.gz

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.22.1  - Released on 2024-11-27
+* Improve Request typing
+
 ## 0.22.0  - Released on 2024-11-23
 * Add a way to add fatal errors on form in order to display an error block.
 * The localizer can be called gettext in the depency in order to simple translation.

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.22.0
+Version: 0.22.1
 Summary: High-level web framework
 Author-Email: Guillaume Gauvrit <guillaume@gauvr.it>
 License: MIT License

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.22.0"
+version = "0.22.1"
 requires-python = ">=3.11"
 dependencies = [
     "fastapi[standard] >=0.115.0,<1",

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/__init__.py

@@ -7,7 +7,13 @@ from fastapi.responses import RedirectResponse
 
 from .adapters.fastapi.form import form_model
 from .adapters.fastapi.localizer import Localizer
-from .adapters.fastapi.request import AnyRequest, Registry, Request, get_request
+from .adapters.fastapi.request import (
+    AnyRequest,
+    Registry,
+    Request,
+    get_registry,
+    get_request,
+)
 from .config import (
     Configurator,
     GenericConfigurator,
@@ -30,7 +36,7 @@ from .domain.model.security_policy import (
 from .domain.model.template import JinjaXTemplate
 
 # from .request.form_data import model
-from .service.registry import DefaultRegistry, GenericRegistry
+from .service.registry import DefaultRegistry, GenericRegistry, TRegistry, TSettings
 from .service.security_policy import AbstractSecurityPolicy, InsecurePolicy
 from .settings import Settings
 
@@ -47,6 +53,9 @@ __all__ = [
     "resource_view",
     "Configurator",
     "DefaultRegistry",
+    "TSettings",
+    "TRegistry",
+    "get_registry",
     # Form
     "FormModel",
     "form_model",

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/adapters/fastapi/request.py

@@ -9,18 +9,18 @@ from fastlife.domain.model.request import GenericRequest
 from fastlife.service.registry import DefaultRegistry
 
 
-def get_request(request: FastAPIRequest) -> GenericRequest[Any]:
+def get_request(request: FastAPIRequest) -> GenericRequest[Any, Any]:
     """Return the Fastlife Request object."""
     return request  # type: ignore
 
 
-Request = Annotated[GenericRequest[DefaultRegistry], Depends(get_request)]
+Request = Annotated[GenericRequest[Any, DefaultRegistry], Depends(get_request)]
 """A request that is associated to the default registry."""
 # FastAPI handle its Request objects using a lenient_issubclass,
-# basically a issubclass(Request), doe to the Generic[T], it does not work.
+# basically a issubclass(Request), does not work with Generic[T].
 
 
-AnyRequest = Annotated[GenericRequest[Any], Depends(get_request)]
+AnyRequest = Annotated[GenericRequest[Any, Any], Depends(get_request)]
 """A request version that is associated to the any registry."""
 
 

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/adapters/fastapi/routing/route.py

@@ -41,7 +41,7 @@ class Route(APIRoute):
         orig_route_handler = super().get_route_handler()
 
         async def route_handler(request: StarletteRequest) -> Response:
-            req = GenericRequest(self._registry, request)
+            req = GenericRequest[Any, Any](self._registry, request)
             return await orig_route_handler(req)
 
         return route_handler

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/config/configurator.py

@@ -594,7 +594,7 @@ class GenericConfigurator(Generic[TRegistry]):
             # class is wrong.
             # Until we store a security policy per rooter, we rebuild an
             # incomplete request here.
-            req = GenericRequest[DefaultRegistry](self.registry, request)
+            req = GenericRequest[Any, DefaultRegistry](self.registry, request)
             resp = handler(req, exc)
             if isinstance(resp, Response):
                 return resp

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/domain/model/request.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING, Any, Generic
 from starlette.requests import Request as BaseRequest
 
 from fastlife.domain.model.csrf import CSRFToken, create_csrf_token
+from fastlife.domain.model.security_policy import TUser
 from fastlife.service.registry import TRegistry
 
 if TYPE_CHECKING:
@@ -14,7 +15,7 @@ if TYPE_CHECKING:
     )
 
 
-class GenericRequest(BaseRequest, Generic[TRegistry]):
+class GenericRequest(BaseRequest, Generic[TUser, TRegistry]):
     """HTTP Request representation."""
 
     registry: TRegistry
@@ -22,7 +23,7 @@ class GenericRequest(BaseRequest, Generic[TRegistry]):
     locale_name: str
     """Request locale used for the i18n of the response."""
 
-    security_policy: "AbstractSecurityPolicy[Any, TRegistry] | None"
+    security_policy: "AbstractSecurityPolicy[TUser, TRegistry] | None"
     """Request locale used for the i18n of the response."""
 
     renderer_globals: dict[str, Any]

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/service/locale_negociator.py

@@ -10,14 +10,14 @@ LocaleName = str
 
 from fastlife.adapters.fastapi.request import GenericRequest  # coverage: ignore
 
-LocaleNegociator = Callable[[GenericRequest[Any]], LocaleName]  # coverage: ignore
+LocaleNegociator = Callable[[GenericRequest[Any, Any]], LocaleName]  # coverage: ignore
 """Interface to implement to negociate a locale"""  # coverage: ignore
 
 
 def default_negociator(settings: Settings) -> LocaleNegociator:
     """The default local negociator return the locale set in the conf."""
 
-    def locale_negociator(request: "GenericRequest[Any]") -> str:
+    def locale_negociator(request: "GenericRequest[Any, Any]") -> str:
         return settings.default_locale
 
     return locale_negociator

{fastlifeweb-0.22.0 → fastlifeweb-0.22.1}/src/fastlife/service/security_policy.py

@@ -25,11 +25,11 @@ class AbstractSecurityPolicy(abc.ABC, Generic[TUser, TRegistry]):
     Unauthorized = Unauthorized
     """The exception raised if no user has been identified."""
 
-    request: GenericRequest[TRegistry]
+    request: GenericRequest[TUser, TRegistry]
     """Request where the security policy is applied."""
 
     def __init__(
-        self, request: Annotated[GenericRequest[TRegistry], Depends(get_request)]
+        self, request: Annotated[GenericRequest[TUser, TRegistry], Depends(get_request)]
     ):
         """
         Build the security policy.