fastlifeweb 0.4.0__tar.gz → 0.4.1__tar.gz

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/PKG-INFO

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

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.4.0"
+version = "0.4.1"
 
 [tool.poetry.dependencies]
 python = "^3.11"

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/src/fastlife/templates/Form.jinja

@@ -4,7 +4,7 @@ action=None,
 hx_post=None,
 class_="space-y-4 md:space-y-6"
 #}
-<form class="{{attrs.class or class_}}" {% if hx_post is not none %}hx-post="{{hx_post}}" {% endif %}{% if action is not
+<form class="{{attrs.class or class_}}" {% if hx_post is not none %}hx-post="{% if hx_post is not true %}{{hx_post}}{% endif%}" {% endif %}{% if action is not
   none %}action="{{action}}" {% endif %}{% if method %}method="{{method}}" {% endif %}>
   <CsrfToken />
   {{ content }}

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/src/fastlife/templates/Select.jinja

@@ -1,6 +1,7 @@
 {# def
 name,
 id,
+multiple=False,
 class_="""
 bg-neutral-50
 block
@@ -22,6 +23,6 @@ dark:text-white
 """
 #}
 
-<select name="{{name}}" id="{{id}}" class="{{attrs.class or class_}}">
+<select name="{{name}}" id="{{id}}" class="{{attrs.class or class_}}" {% if multiple %}multiple{% endif %}>
   {{- content -}}
 </select>

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/src/fastlife/templating/renderer/abstract.py

@@ -1,5 +1,5 @@
 import abc
-from typing import Any, Mapping, Type
+from typing import Any, Mapping, Optional, Type
 
 from fastapi import Request
 from markupsafe import Markup
@@ -11,8 +11,21 @@ class AbstractTemplateRenderer(abc.ABC):
     """Used to buid pydantic form"""
 
     @abc.abstractmethod
-    def render_template(self, template: str, **params: Any) -> str:
-        ...
+    def render_template(
+        self,
+        template: str,
+        *,
+        globals: Optional[Mapping[str, Any]] = None,
+        **params: Any,
+    ) -> str:
+        """
+        Render the given template with the given params.
+
+        While rendering templates, the globals parameter is keps by the instantiated
+        renderer and sent to every rendering made by the request.
+        This is used by the pydantic form method that will render other templates
+        for the request.
+        """
 
     @abc.abstractmethod
     def pydantic_form(

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/src/fastlife/templating/renderer/jinjax.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence, Type
+from typing import TYPE_CHECKING, Any, Mapping, MutableMapping, Optional, Sequence, Type
 
 from fastapi import Request
 from jinjax.catalog import Catalog
@@ -41,6 +41,7 @@ class JinjaxRenderer(AbstractTemplateRenderer):
         self.request = request
         self.csrf_token_name = csrf_token_name
         self.form_data_model_prefix = form_data_model_prefix
+        self.globals: MutableMapping[str, Any] = {}
 
     def build_globals(self) -> Mapping[str, Any]:
         return {
@@ -50,9 +51,18 @@ class JinjaxRenderer(AbstractTemplateRenderer):
                 "value": self.request.scope.get(self.csrf_token_name, ""),
             },
             "pydantic_form": self.pydantic_form,
+            **self.globals,
         }
 
-    def render_template(self, template: str, **params: Any) -> str:
+    def render_template(
+        self,
+        template: str,
+        *,
+        globals: Optional[Mapping[str, Any]] = None,
+        **params: Any,
+    ) -> str:
+        if globals:
+            self.globals.update(globals)
         return self.catalog.render(  # type: ignore
             template, __globals=self.build_globals(), **params
         )

{fastlifeweb-0.4.0 → fastlifeweb-0.4.1}/src/fastlife/templating/renderer/widgets/model.py

@@ -31,4 +31,6 @@ class ModelWidget(Widget[Sequence[Widget[Any]]]):
             "widget": self,
             "children_widget": children_widget,
         }
-        return Markup(renderer.render_template(self.get_template(), **kwargs))
+        return Markup(
+            renderer.render_template(self.get_template(), globals=None, **kwargs)
+        )