fastlifeweb 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

fastlife/config/configurator.py

@@ -14,11 +14,12 @@ phase.
 import importlib
 import inspect
 import logging
-from collections.abc import Mapping
+from collections import defaultdict
+from collections.abc import Mapping, Sequence
 from enum import Enum
 from pathlib import Path
 from types import ModuleType
-from typing import TYPE_CHECKING, Annotated, Any, Callable, Self, Tuple, Type, cast
+from typing import TYPE_CHECKING, Annotated, Any, Callable, Self, Tuple, Type
 
 import venusian
 from fastapi import Depends, FastAPI
@@ -48,6 +49,8 @@ if TYPE_CHECKING:
 log = logging.getLogger(__name__)
 VENUSIAN_CATEGORY = "fastlife"
 
+venusian_ignored_item = str | Callable[[str], bool]
+
 
 class ConfigurationError(Exception):
     """
@@ -102,18 +105,34 @@ class Configurator:
         self.api_description: str = ""
         self.api_summary: str | None = None
 
-        self.router = Router()
+        self._route_prefix: str = ""
+        self._routers: dict[str, Router] = defaultdict(Router)
+
         self.scanner = venusian.Scanner(fastlife=self)
         self.include("fastlife.views")
         self.include("fastlife.middlewares")
 
+    @property
+    def _current_router(self) -> Router:
+        return self._routers[self._route_prefix]
+
     def build_asgi_app(self) -> FastAPI:
         """
         Build the app after configuration in order to start after beeing configured.
 
         :return: FastAPI application.
         """
-        _app = FastAPI(
+
+        # register our main template renderer at then end, to ensure that
+        # if settings have been manipulated, everythins is taken into account.
+        self.add_renderer(
+            self.registry.settings.jinjax_file_ext,
+            resolve("fastlife.adapters.jinjax.renderer:JinjaxTemplateRenderer")(
+                self.registry.settings
+            ),
+        )
+
+        app = FastAPI(
             title=self.api_title,
             version=self.api_version,
             description=self.api_description,
@@ -125,48 +144,34 @@ class Configurator:
             if self.tags
             else None,
         )
-        _app.router.route_class = Route
-        for _route in self.router.routes:
-            route = cast(Route, _route)
-            _app.router.add_api_route(
-                path=route.path,
-                endpoint=route.endpoint,
-                response_model=route.response_model,
-                status_code=route.status_code,
-                tags=route.tags,
-                dependencies=route.dependencies,
-                summary=route.summary,
-                description=route.description,
-                response_description=route.response_description,
-                deprecated=route.deprecated,
-                methods=route.methods,
-                operation_id=route.operation_id,
-                response_model_include=route.response_model_include,
-                response_model_exclude=route.response_model_exclude,
-                response_model_by_alias=route.response_model_by_alias,
-                response_model_exclude_unset=route.response_model_exclude_unset,
-                response_model_exclude_defaults=route.response_model_exclude_defaults,
-                response_model_exclude_none=route.response_model_exclude_none,
-                include_in_schema=route.include_in_schema,
-                name=route.name,
-                openapi_extra=route.openapi_extra,
-            )
+        app.router.route_class = Route
+        for prefix, router in self._routers.items():
+            app.include_router(router, prefix=prefix)
 
         for middleware_class, options in self.middlewares:
-            _app.add_middleware(middleware_class, **options)  # type: ignore
+            app.add_middleware(middleware_class, **options)  # type: ignore
 
         for status_code_or_exc, exception_handler in self.exception_handlers:
-            _app.add_exception_handler(status_code_or_exc, exception_handler)
+            app.add_exception_handler(status_code_or_exc, exception_handler)
 
         for route_path, directory, name in self.mounts:
-            _app.mount(route_path, StaticFiles(directory=directory), name=name)
-        return _app
+            app.mount(route_path, StaticFiles(directory=directory), name=name)
+        return app
 
-    def include(self, module: str | ModuleType) -> Self:
+    def include(
+        self,
+        module: str | ModuleType,
+        route_prefix: str = "",
+        ignore: venusian_ignored_item | Sequence[venusian_ignored_item] | None = None,
+    ) -> Self:
         """
         Include a module in order to load its configuration.
 
-        It will load and include all the submodule as well.
+        It will scan and load all the submodule until you add an ignore rule.
+
+        The `ignore` argument allows you to ignore certain modules.
+        If it is a scrint, it can be an absolute module name or a relative
+        one, if starts with a dot.
 
         Here is an example.
 
@@ -182,6 +187,8 @@ class Configurator:
         ```
 
         :param module: a module to include.
+        :param route_prefix: prepend all included route with a prefix
+        :param ignore: ignore submodules
         """
         if isinstance(module, str):
             package = None
@@ -190,7 +197,15 @@ class Configurator:
                 package = caller_module.__name__ if caller_module else "__main__"
 
             module = importlib.import_module(module, package)
-        self.scanner.scan(module, categories=[VENUSIAN_CATEGORY])  # type: ignore
+        old, self._route_prefix = self._route_prefix, route_prefix
+        try:
+            self.scanner.scan(  # type: ignore
+                module,
+                categories=[VENUSIAN_CATEGORY],
+                ignore=ignore,
+            )
+        finally:
+            self._route_prefix = old
         return self
 
     def set_locale_negociator(self, locale_negociator: "LocaleNegociator") -> Self:
@@ -326,7 +341,7 @@ class Configurator:
         if permission:
             dependencies.append(Depends(self.registry.check_permission(permission)))
 
-        self.router.add_api_route(
+        self._current_router.add_api_route(
             path,
             endpoint,
             # response_model=response_model,
@@ -404,7 +419,7 @@ class Configurator:
 
             endpoint = render
 
-        self.router.add_api_route(
+        self._current_router.add_api_route(
             path,
             endpoint,
             status_code=status_code,
@@ -479,6 +494,17 @@ class Configurator:
         self.registry.renderers[f".{file_ext.lstrip('.')}"] = renderer  # type: ignore
         return self
 
+    def add_template_search_path(self, path: str) -> Self:
+        """
+        Add a template search path directly from the code.
+
+        :param path: template path.
+        """
+        self.registry.settings.template_search_path = (
+            f"{self.registry.settings.template_search_path},{path}"
+        )
+        return self
+
 
 def configure(
     wrapped: Callable[[Configurator], None],

fastlife/config/registry.py

@@ -42,11 +42,7 @@ class AppRegistry:
         self.settings = settings
         self.check_permission = resolve(settings.check_permission)
         self.locale_negociator = _default_negociator(self.settings)
-        self.renderers = {
-            f".{settings.jinjax_file_ext}": resolve(
-                "fastlife.adapters.jinjax.renderer:JinjaxTemplateRenderer"
-            )(settings),
-        }
+        self.renderers = {}
         self.localizer = LocalizerFactory()
 
     def get_renderer(self, template: str) -> "AbstractTemplateRendererFactory":

fastlife/services/translations.py

@@ -114,10 +114,10 @@ class LocalizerFactory:
         for locale_name, domain, file_ in find_mo_files(root_path):
             with file_.open("rb") as f:
                 t = Translations(f, domain)
-                if locale_name in self._translations:
-                    self._translations[locale_name].merge(t)
-                else:
-                    self._translations[locale_name] = t
+                if locale_name not in self._translations:
+                    self._translations[locale_name] = Translations()
+                self._translations[locale_name].add(t)
+                self._translations[locale_name].merge(t)
 
     def __call__(self, request: "Request") -> Localizer:
         """Create the translation context for the given request."""

{fastlifeweb-0.13.0.dist-info → fastlifeweb-0.14.0.dist-info}/METADATA

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

{fastlifeweb-0.13.0.dist-info → fastlifeweb-0.14.0.dist-info}/RECORD

@@ -1666,9 +1666,9 @@ 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=O_Mw2XOxo55SArHdGKRhlTrroRN8ymwfzYKlHG0eV_s,418
-fastlife/config/configurator.py,sha256=gfHCnPzxXJGnZ6rTbBy2lkGSGRZOEyGjJnVWbMCDrdo,18048
+fastlife/config/configurator.py,sha256=LNLFLyuqhoz6y6ORX6qeU0ZycPBSKu0KVZYcARAge7k,18540
 fastlife/config/exceptions.py,sha256=2MS2MFgb3mDbtdHEwnC-QYubob3Rl0v8O8y615LY0ds,1180
-fastlife/config/registry.py,sha256=pqOnbUPP7Boc42nndvweturuA5X61yhC2bbe8G08T4o,2120
+fastlife/config/registry.py,sha256=rwCS_vyu1Hli8-4Cs6Z-Jxn7N7ZXWSyZqnXIIV0EJ5I,1958
 fastlife/config/resources.py,sha256=Db183g_CC0Voa6IblaNSzcv7XBH1S3s2nTAFNXtz9Cg,8732
 fastlife/config/settings.py,sha256=ZMjfx_XQhu6mPE5q3eI9dG5disnbGUcALUqNYDCknhk,4199
 fastlife/config/views.py,sha256=Dxi6lO4gFs6GriAW7Rh5GDvebwbrpS2HzYhf30pXJiE,2058
@@ -1693,7 +1693,7 @@ fastlife/security/csrf.py,sha256=PvC9Fqdb6c0IzzsnaMx2quQdjjKrb-nOPoAHfcwoAe8,214
 fastlife/security/policy.py,sha256=MYNPQlvnTBe1XsYNJoIwiGW2DFb8vciU3XyUi9ZlLt0,945
 fastlife/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/services/templates.py,sha256=7gPJxGWD-XqputbZpy_Icsz3WHKJaWg2JgkVOeKrjfA,3840
-fastlife/services/translations.py,sha256=R0KXVrm4leUu6p1zJp0QvLUwrQNW5mO88cQ5CZ2mlCE,4317
+fastlife/services/translations.py,sha256=Bo5CIjdbQ3g_ihbv4Bz60hzd8VOtqEEPOyhJEbGcvP4,4363
 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
@@ -1704,7 +1704,7 @@ fastlife/testing/__init__.py,sha256=vuqwoNUd3BuIp3fm7nkvmYkIGjIimf5zUGhDkeWrg2s,
 fastlife/testing/testclient.py,sha256=BC7lLQ_jc59UmknAKzgRtW9a3cpX_V_QLp9Mg2ScLA8,20546
 fastlife/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/views/pydantic_form.py,sha256=fvjk_5-JAugpBPxwD5GkxxsQiz9eAxzWeCSU9kiyc6s,1438
-fastlifeweb-0.13.0.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
-fastlifeweb-0.13.0.dist-info/METADATA,sha256=yhn48LhvuV19WZhJI4HykIgEjmd85Mu3n3Tv_GqkpQo,3278
-fastlifeweb-0.13.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastlifeweb-0.13.0.dist-info/RECORD,,
+fastlifeweb-0.14.0.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
+fastlifeweb-0.14.0.dist-info/METADATA,sha256=fvjfxD3v-keA5bZ1agcr4wjeJ3VxhBwwtR0Gs7yHamk,3278
+fastlifeweb-0.14.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastlifeweb-0.14.0.dist-info/RECORD,,