fastlifeweb 0.22.0__py3-none-any.whl → 0.22.1__py3-none-any.whl

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.

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",

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."""
 
 

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

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

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]

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

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.

{fastlifeweb-0.22.0.dist-info → fastlifeweb-0.22.1.dist-info}/METADATA

@@ -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.dist-info → fastlifeweb-0.22.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-CHANGELOG.md,sha256=gtRawAWGc5B7HSVjRWA2eng5K_1jDm-AZrioc2niKWw,6987
-fastlife/__init__.py,sha256=vccDwPrkKjB4N-yBdqWN5fCaUJzUnFyNAE35pcIz9kU,1664
+CHANGELOG.md,sha256=iMVndHirSKsb0IAqVoiHUmMU4uYt7fwML0j96qwPYUc,7049
+fastlife/__init__.py,sha256=cPPHF7zBVBkUt6KsJyVNiamuRRjUeERQsPVoS6AB-YE,1779
 fastlife/adapters/__init__.py,sha256=imPD1hImpgrYkvUJRhHA5kVyGAua7VbP2WGkhSWKJT8,93
 fastlife/adapters/fastapi/__init__.py,sha256=1goV1FGFP04TGyskJBLKZam4Gvt1yoAvLMNs4ekWSSQ,243
 fastlife/adapters/fastapi/form.py,sha256=csxsDI6RK-g41pMwFhaVQCLDhF7dAZzgUp-VcrC3NFY,823
 fastlife/adapters/fastapi/form_data.py,sha256=2DQ0o-RvY6iROUKQjS-UJdNYEVSsNPd-AjpergI3w54,4473
 fastlife/adapters/fastapi/localizer.py,sha256=XD1kCJuAlkGevivmvAJEcGMCBWMef9rAfTOGmt3PVWU,436
-fastlife/adapters/fastapi/request.py,sha256=oyAZ1QKW2mh-9CadQdOdn_BqnVVjaZ6aG4eTNK2R2j0,1095
+fastlife/adapters/fastapi/request.py,sha256=hvJS7qxH7ZyKRdwDalVXGU8ZH84NtSQuljnAZPyqogU,1100
 fastlife/adapters/fastapi/routing/__init__.py,sha256=8EMnQE5n8oA4J9_c3nxzwKDVt3tefZ6fGH0d2owE8mo,195
-fastlife/adapters/fastapi/routing/route.py,sha256=g-MlXFvyRzVsNO_bBYDQQHD03fmRXEOm9KHxIHFZmug,1461
+fastlife/adapters/fastapi/routing/route.py,sha256=Y4LTTTgQAR5zPMV3hKBP-YYjEQC41UUIa5ZuPCPf2aY,1471
 fastlife/adapters/fastapi/routing/router.py,sha256=jzrnU_Lyywu21e3spPaWQw8ujZh_Yy_EJOojcCi6ew4,499
 fastlife/adapters/itsdangerous/__init__.py,sha256=7ocGY7v0cxooZBKQYjA2JkmzRqiBvcU1uzA84UsTVAI,84
 fastlife/adapters/itsdangerous/session.py,sha256=9h_WRsXqZbytHZOv5B_K3OWD5mbfYzxHulXoOf6D2MI,1685
@@ -1686,7 +1686,7 @@ fastlife/components/pydantic_form/FatalError.jinja,sha256=lFVlNrXzBR6ExMahq77h0t
 fastlife/components/pydantic_form/Hint.jinja,sha256=8leBpfMGDmalc_KAjr2paTojr_rwq-luS6m_1BGj7Tw,202
 fastlife/components/pydantic_form/Widget.jinja,sha256=PgguUpvhG6CY9AW6H8qQMjKqjlybjDCAaFFAOHzrzVQ,418
 fastlife/config/__init__.py,sha256=5qpuaVYqi-AS0GgsfggM6rFsSwXgrqrLBo9jH6dVroc,407
-fastlife/config/configurator.py,sha256=nxowUriGj_MYcBlcBLB49HepDIbHiF4gG3baC_V3mFM,24702
+fastlife/config/configurator.py,sha256=AC4s4iM_DPDkKDs7DP6GJFwMt-HFqFtAHUcBnr1BGkY,24707
 fastlife/config/exceptions.py,sha256=9MdBnbfy-Aw-KaIFzju0Kh8Snk41-v9LqK2w48Tdy1s,1169
 fastlife/config/openapiextra.py,sha256=rYoerrn9sni2XwnO3gIWqaz7M0aDZPhVLjzqhDxue0o,514
 fastlife/config/resources.py,sha256=u6OgnbHfGkC5idH-YPNkIPf8GJnZpJoGVZ-Ym022BCo,8533
@@ -1696,7 +1696,7 @@ fastlife/domain/model/__init__.py,sha256=aoBjaSpDscuFXvtknJHwiNyoJRUpE-v4X54h_wN
 fastlife/domain/model/asgi.py,sha256=RSTnfTsofOmCaWzHNuRGowjlyHYmoDCrXFbvNY_B55k,129
 fastlife/domain/model/csrf.py,sha256=BUiWK-S7rVciWHO1qTkM8e_KxzpF6gGC4MMJK1v6iDo,414
 fastlife/domain/model/form.py,sha256=WriBT1qUUIbf5x5iewo9ChEcr6k0en8jMTD0iaei5Pk,3253
-fastlife/domain/model/request.py,sha256=K0_pSOboKw5IRL8SCIsEuPZlPPe3h0F5cugZEVFdfoo,2531
+fastlife/domain/model/request.py,sha256=hMbp1OWY1BIWmqFe-kEvwOOXBB6t1ylVaHR30UbQ0_Y,2596
 fastlife/domain/model/security_policy.py,sha256=iYBKXOYaXxM_n-rsyB25lO6RblSx9icTx1Bg-s3Iz9k,2942
 fastlife/domain/model/template.py,sha256=z9oxdKme1hMPuvk7mBiKR_tuVY8TqH77aTYqMgvEGl8,876
 fastlife/domain/model/types.py,sha256=64jJKFAi5x0e3vr8naHU1m_as0Qy8MS-s9CG0z6K1qc,381
@@ -1711,9 +1711,9 @@ fastlife/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/service/check_permission.py,sha256=-XD9qA11dLwen0bNCTy2Id_dCjzTJ0j7xuwB9IOtEY0,1695
 fastlife/service/csrf.py,sha256=wC1PaKOmZ3il0FF_kevxnlg9PxDqruRdLrNnOA3ZHrU,1886
-fastlife/service/locale_negociator.py,sha256=wXgQR8jCtPd5XtM-vvGZ4OrVnBQlt0deSoE2nInNfb0,770
+fastlife/service/locale_negociator.py,sha256=Dq0k7lvUWOmd0o2xJFneymOu-H9z-RpSYU_AZ2IYF-g,780
 fastlife/service/registry.py,sha256=B6n5b_b0RgxJj0qFOpnrJFmG7_MPtvShwV6yH9V6vi0,2098
-fastlife/service/security_policy.py,sha256=Ytl8hgXtytvBNoBRHRmqVD96fJMnERnaL90q6XG7yI8,3036
+fastlife/service/security_policy.py,sha256=fOyhaLNI3EzW5p_s3ZcrDaf7cX-KEWb7fQANoQSk6yg,3050
 fastlife/service/templates.py,sha256=QPAIUbbZiekazz_jV3q4JCwQd6Q4KA6a4RDek2RWuhE,2548
 fastlife/service/translations.py,sha256=D-1D3pVNytEcps1u-0K7FmgQ8Wo6Yu4XVHvZrPhBmAI,5795
 fastlife/settings.py,sha256=q-rz4CEF2RQGow5-m-yZJOvdh3PPb2c1Q_ZLJGnu4VQ,3647
@@ -1728,9 +1728,9 @@ fastlife/testing/session.py,sha256=LEFFbiR67_x_g-ioudkY0C7PycHdbDfaIaoo_G7GXQ8,2
 fastlife/testing/testclient.py,sha256=JTIgeMKooA8L4gEodeC3gy4Lo27y3WNswSEIKLlVVPs,6745
 fastlife/views/__init__.py,sha256=zG8gveL8e2zBdYx6_9jtZfpQ6qJT-MFnBY3xXkLwHZI,22
 fastlife/views/pydantic_form.py,sha256=o7EUItciAGL1OSaGNHo-3BTrYAk34GuWE7zGikjiAGY,1486
-fastlifeweb-0.22.0.dist-info/METADATA,sha256=8ual_JaeNHufsRyP5pdCPu2yHuVpzMzR53aitRbHmjo,3663
-fastlifeweb-0.22.0.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-fastlifeweb-0.22.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-fastlifeweb-0.22.0.dist-info/licenses/LICENSE,sha256=NlRX9Z-dcv8X1VFW9odlIQBbgNN9pcO94XzvKp2R16o,1075
+fastlifeweb-0.22.1.dist-info/METADATA,sha256=UO41tIM5bFp2QZF-GO1aXFa-k6FN85JShOEsFUsCuZA,3663
+fastlifeweb-0.22.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+fastlifeweb-0.22.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+fastlifeweb-0.22.1.dist-info/licenses/LICENSE,sha256=NlRX9Z-dcv8X1VFW9odlIQBbgNN9pcO94XzvKp2R16o,1075
 tailwind.config.js,sha256=EN3EahBDmQBbmJvkw3SdGWNOkfkzw0cg-QvBikOhkrw,1348
-fastlifeweb-0.22.0.dist-info/RECORD,,
+fastlifeweb-0.22.1.dist-info/RECORD,,