fastlifeweb 0.23.0__tar.gz → 0.23.1__tar.gz

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.23.1  - Released on 2025-01-14
+* Fix typing issue
+* Update docs
+
 ## 0.23.0  - Released on 2024-12-04
 * Update Request type.
   * Breaking changes: Request[TUser, TRegistry] -> Request[TRegistry, TIdentity, TClaimedIdentity].

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/PKG-INFO

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

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/pyproject.toml

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

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/__init__.py

@@ -48,6 +48,7 @@ from .service.security_policy import (
     AbstractSecurityPolicy,
     InsecurePolicy,
 )
+from .service.translations import TranslatableStringFactory
 from .settings import Settings
 
 __all__ = [
@@ -97,4 +98,5 @@ __all__ = [
     "JinjaXTemplate",
     # i18n
     "Localizer",
+    "TranslatableStringFactory",
 ]

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/adapters/fastapi/localizer.py

@@ -8,7 +8,7 @@ from fastlife.service.translations import Localizer as RequestLocalizer
 
 def get_localizer(request: Request) -> RequestLocalizer:
     """Return the localizer for the given request."""
-    return request.registry.localizer(request)
+    return request.registry.localizer(request.locale_name)
 
 
 Localizer = Annotated[RequestLocalizer, Depends(get_localizer)]

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/config/configurator.py

@@ -473,7 +473,7 @@ class GenericConfigurator(Generic[TRegistry]):
         * `gettext`, `ngettext`, `dgettext`, `dngettext`, `pgettext`, `dpgettext`,
         `npgettext`, `dnpgettext` methods are installed for i18n purpose.
         """
-        lczr = request.registry.localizer(request)
+        lczr = request.registry.localizer(request.locale_name)
         custom_globals = {}
         for key, (val, evaluate) in self._renderer_globals.items():
             if evaluate and callable(val):

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/service/registry.py

@@ -22,7 +22,7 @@ class GenericRegistry(Generic[TSettings]):
     It is initialized by the configurator and accessed by the `fastlife.Registry`.
     """
 
-    settings: Settings
+    settings: TSettings
     """Application settings."""
     renderers: Mapping[str, "AbstractTemplateRendererFactory"]
     """Registered template engine."""
@@ -31,7 +31,7 @@ class GenericRegistry(Generic[TSettings]):
     localizer: "LocalizerFactory"
     """Used to localized message."""
 
-    def __init__(self, settings: Settings) -> None:
+    def __init__(self, settings: TSettings) -> None:
         from fastlife.service.locale_negociator import default_negociator
         from fastlife.service.translations import LocalizerFactory
 

fastlifeweb-0.23.1/src/fastlife/service/translatablestring.py

@@ -0,0 +1 @@
+

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/service/translations.py

@@ -3,18 +3,52 @@ from collections import defaultdict
 from collections.abc import Callable, Iterator
 from gettext import GNUTranslations
 from io import BufferedReader
-from typing import TYPE_CHECKING
 
 from fastlife.shared_utils.resolver import resolve_path
 
-if TYPE_CHECKING:
-    from fastlife import Request  # coverage: ignore
-
 LocaleName = str
 Domain = str
 CONTEXT_ENCODING = "%s\x04%s"
 
 
+class TranslatableString(str):
+    """
+    Create a string made for translation associated to a domain.
+    This class is instanciated by the
+    :class:`fastlife.service.translations.TranslatableStringFactory` class.
+    """
+
+    __slots__ = ("domain",)
+
+    def __new__(cls, msgid: str, domain: str) -> "TranslatableString":
+        self = str.__new__(cls, msgid)
+        self.domain = domain  # type: ignore
+        return self
+
+
+class TranslatableStringFactory:
+    """Create a catalog of string associated to a domain."""
+
+    def __init__(self, domain: str):
+        self.domain = domain
+
+    def __call__(self, msgid: str) -> str:
+        """
+        Use to generate the translatable string.
+
+        usually:
+
+        ```python
+        _ = TranslatableStringFactory("mydomain")
+        mymessage = _("translatable")
+        ```
+
+        Note that the string is associated to mydomain, so the babel extraction has
+        to be initialized with that particular domain.
+        """
+        return TranslatableString(msgid, self.domain)
+
+
 def find_mo_files(root_path: str) -> Iterator[tuple[LocaleName, Domain, pathlib.Path]]:
     """
     Find .mo files in a locales directory.
@@ -68,7 +102,10 @@ class Localizer:
         return self.gettext(message, mapping)
 
     def gettext(self, message: str, mapping: dict[str, str] | None = None) -> str:
-        ret = self.global_translations.gettext(message)
+        if isinstance(message, TranslatableString):
+            ret = self.translations[message.domain].gettext(message)  # type: ignore
+        else:
+            ret = self.global_translations.gettext(message)
         if mapping:
             ret = ret.format(**mapping)
         return ret
@@ -177,8 +214,8 @@ class LocalizerFactory:
         root_path = resolve_path(path)
         self._translations.load(root_path)
 
-    def __call__(self, request: "Request") -> Localizer:
+    def __call__(self, locale_name: LocaleName) -> Localizer:
         """Create the translation context for the given request."""
-        if request.locale_name not in self._translations:
+        if locale_name not in self._translations:
             return self.null_localizer
-        return self._translations.get(request.locale_name)
+        return self._translations.get(locale_name)

{fastlifeweb-0.23.0 → fastlifeweb-0.23.1}/src/fastlife/testing/testclient.py

@@ -126,7 +126,7 @@ class WebTestClient:
 
     @property
     def session(self) -> MutableMapping[str, Any]:
-        """Session shared between the server and the client."""
+        """Server session stored in a cookies."""
         return Session(self)
 
     def request(