fastlifeweb 0.3.1__tar.gz → 0.4.1__tar.gz

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

@@ -1,7 +1,8 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.3.1
+Version: 0.4.1
 Summary: High-level web framework
+Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived
 Author: Guillaume Gauvrit
 Author-email: guillaume@gauvr.it
@@ -20,12 +21,14 @@ Requires-Dist: beautifulsoup4[testing] (>=4.12.2,<5.0.0)
 Requires-Dist: behave (>=1.2.6,<2.0.0)
 Requires-Dist: fastapi (>=0.110.0,<0.111.0)
 Requires-Dist: itsdangerous (>=2.1.2,<3.0.0)
-Requires-Dist: jinjax (>=0.31,<0.32)
+Requires-Dist: jinjax (>=0.32,<0.33)
 Requires-Dist: markupsafe (>=2.1.3,<3.0.0)
+Requires-Dist: multidict (>=6.0.5,<7.0.0)
 Requires-Dist: pydantic (>=2.3.0,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.3,<3.0.0)
 Requires-Dist: python-multipart (>=0.0.6,<0.0.7)
 Requires-Dist: venusian (>=3.0.0,<4.0.0)
+Project-URL: Repository, https://github.com/mardiros/fastlife
 Description-Content-Type: text/markdown
 
 # Fastlife
@@ -44,5 +47,3 @@ Under heavy development.
 
 The package is available on pypi with the name fastlifeweb.
 
-The name fastlife is squatted and I am tired of PEP 541 requests.
-

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/README.md

@@ -13,5 +13,3 @@ Under heavy development.
 
 
 The package is available on pypi with the name fastlifeweb.
-
-The name fastlife is squatted and I am tired of PEP 541 requests.

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

@@ -4,6 +4,8 @@ description = "High-level web framework"
 name = "fastlifeweb"
 license = "BSD-derived"
 packages = [{include = "fastlife", from = "src"}]
+homepage = "https://github.com/mardiros/fastlife"
+repository = "https://github.com/mardiros/fastlife"
 readme = "README.md"
 classifiers = [
   "Development Status :: 4 - Beta",
@@ -13,13 +15,13 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.3.1"
+version = "0.4.1"
 
 [tool.poetry.dependencies]
 python = "^3.11"
 beautifulsoup4 = {version = "^4.12.2", extras = ["testing"]}
 fastapi = "^0.110.0"
-jinjax = "^0.31"
+jinjax = "^0.32"
 pydantic = "^2.3.0"
 pydantic-settings = "^2.0.3"
 python-multipart = "^0.0.6"
@@ -27,6 +29,7 @@ venusian = "^3.0.0"
 markupsafe = "^2.1.3"
 behave = "^1.2.6"
 itsdangerous = "^2.1.2"
+multidict = "^6.0.5"
 
 [tool.poetry.group.dev.dependencies]
 beautifulsoup4 = "^4.12.2"

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/configurator/registry.py

@@ -7,7 +7,7 @@ from fastlife.shared_utils.resolver import resolve
 
 if TYPE_CHECKING:
     from fastlife.templating.renderer import (  # coverage: ignore
-        AbstractTemplateRenderer,  # coverage: ignore
+        AbstractTemplateRendererFactory,  # coverage: ignore
     )  # coverage: ignore
 
 from .settings import Settings
@@ -15,7 +15,7 @@ from .settings import Settings
 
 class AppRegistry:
     settings: Settings
-    renderer: "AbstractTemplateRenderer"
+    renderer: "AbstractTemplateRendererFactory"
     check_permission: CheckPermission
 
     def __init__(self, settings: Settings) -> None:

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/configurator/settings.py

@@ -17,6 +17,9 @@ class Settings(BaseSettings):
     form_data_model_prefix: str = Field(default="payload")
     csrf_token_name: str = Field(default="csrf_token")
 
+    jinjax_use_cache: bool = Field(default=True)
+    jinjax_auto_reload: bool = Field(default=False)
+
     session_secret_key: str = Field(default="")
     session_cookie_name: str = Field(default="flsess")
     session_cookie_domain: str = Field(default="")

fastlifeweb-0.4.1/src/fastlife/templates/A.jinja

@@ -0,0 +1,31 @@
+{# def
+href,
+disable_htmx=false,
+hx_target="#maincontent",
+hx_select=None,
+hx_swap="innerHTML show:body:top",
+hx_push_url=true,
+class_="""
+bg-neutral-200
+px-5
+py-2.5
+rounded-lg
+text-center
+text-neutral-900
+text-sm
+font-medium
+focus:outline-none
+focus:ring-4
+focus:ring-primary-300
+hover:bg-neutral-50
+dark:bg-neutral-400
+dark:focus:ring-neutral-100
+dark:hover:bg-neutral-300
+"""
+#}
+
+<a href="{{href}}" {% if not disable_htmx %} hx-get="{{href}}" hx-target="{{hx_target}}" hx-swap="{{hx_swap}}" {% if
+  hx_push_url %} hx-push-url="true" {%- endif %}{% if hx_select %} hx-select="{{hx_select}}" {%- endif %}{%- endif
+  %}class="{{attrs.class or class_}}">
+  {{- content -}}
+</a>

fastlifeweb-0.4.1/src/fastlife/templates/Button.jinja

@@ -0,0 +1,41 @@
+{# def
+type="submit",
+id="",
+name="action",
+value="submit",
+hidden=false,
+aria_label="",
+onclick="",
+hx_target="",
+hx_swap="",
+hx_get="",
+hx_select="",
+hx_after_request="",
+hx_vals="",
+full_width=false,
+class_="""
+bg-primary-600
+font-medium
+px-5
+py-2.5
+rounded-lg
+text-center
+text-sm
+text-white
+hover:bg-primary-700
+focus:outline-none
+focus:ring-4
+focus:ring-primary-300
+dark:bg-primary-600
+dark:focus:ring-primary-800
+dark:hover:bg-primary-700
+"""
+#}
+<button type="{{type}}" {%if id %}id="{{id}}" {%endif%} name="{{name}}" value="{{value}}" {% if
+  hx_target%}hx-target="{{hx_target}}" {% endif %} {% if hx_swap %}hx-swap="{{hx_swap}}" {% endif %} {% if hx_select
+  %}hx-select="{{hx_select}}" {% endif %} {% if hx_get %}hx-get="{{hx_get}}" {% endif %} {% if onclick %}onclick="{{onclick}}" {%
+  endif %}{% if hx_after_request %}hx-on::after-request="{{hx_after_request}}" {% endif %} {% if hx_vals
+  %}hx-vals='{{hx_vals|safe}}' {% endif %} {% if aria_label %}aria-label="{{aria_label}}" {% endif %}
+  class="{% if full_width %}w-full {% endif %}{{attrs.class or class_}}" {% if hidden %}hidden{% endif %}>
+  {{- content -}}
+</button>

fastlifeweb-0.4.1/src/fastlife/templates/Checkbox.jinja

@@ -0,0 +1,20 @@
+{# def
+name,
+value,
+id,
+class_="""
+bg-neutral-100
+border-neutral-300
+h-4
+rounded
+text-primary-600
+w-4
+dark:bg-neutral-700
+dark:border-neutral-600
+dark:focus:ring-primary-600
+dark:ring-offset-neutral-800
+focus:ring-2
+focus:ring-primary-500
+"""
+#}
+<input name="{{name}}" {% if value%}checked{% endif %} type="checkbox" id="{{id}}" class="{{attrs.class or class_}}" />

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/CsrfToken.jinja

@@ -1,2 +1 @@
-{# def csrf_token #}
 <Hidden name={csrf_token.name} value={csrf_token.value} />

fastlifeweb-0.4.1/src/fastlife/templates/Form.jinja

@@ -0,0 +1,11 @@
+{# def
+method="",
+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="{% 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 }}
+</form>

fastlifeweb-0.4.1/src/fastlife/templates/H1.jinja

@@ -0,0 +1,15 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-5xl
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-4xl
+"""
+#}
+<h1 class="{{attrs.class or class_}}">{{ content }}</h1>

fastlifeweb-0.4.1/src/fastlife/templates/H2.jinja

@@ -0,0 +1,15 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-4xl
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-4xl
+"""
+#}
+<h2 class="{{attrs.class or class_}}">{{ content }}</h2>

fastlifeweb-0.4.1/src/fastlife/templates/H3.jinja

@@ -0,0 +1,14 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-3xl
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-3xl"""
+#}
+<h3 class="{{attrs.class or class_}}">{{ content }}</h3>

fastlifeweb-0.4.1/src/fastlife/templates/H4.jinja

@@ -0,0 +1,14 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-2xl
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-2xl"""
+#}
+<h4 class="{{attrs.class or class_}}">{{ content }}</h4>

fastlifeweb-0.4.1/src/fastlife/templates/H5.jinja

@@ -0,0 +1,14 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-xl
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-xl"""
+#}
+<h5 class="{{attrs.class or class_}}">{{ content }}</h5>

fastlifeweb-0.4.1/src/fastlife/templates/H6.jinja

@@ -0,0 +1,14 @@
+{# def
+class_="""
+block
+font-bold
+font-sans
+leading-tight
+pb-4
+text-l
+text-neutral-900
+tracking-tight
+dark:text-white
+md:text-l"""
+#}
+<h6 class="{{attrs.class or class_}}">{{ content }}</h6>

fastlifeweb-0.4.1/src/fastlife/templates/Input.jinja

@@ -0,0 +1,31 @@
+{# def
+name,
+value="",
+type="text",
+id="",
+aria_label="",
+placeholder="",
+class_="""
+bg-neutral-50
+block
+border
+border-neutral-300
+p-2.5
+rounded-lg
+text-base
+text-neutral-900
+w-full
+dark:bg-neutral-700
+dark:border-neutral-600
+dark:focus:border-primary-500
+dark:focus:ring-primary-500
+dark:placeholder-neutral-400
+dark:text-white
+focus:border-primary-500
+focus:ring-primary-500
+"""
+#}
+
+<input name="{{name}}" value="{{value}}" type="{{type}}" {% if id %}id="{{id}}" {% endif %}{% if aria_label
+  %}aria-label="{{aria_label}}" {% endif %} {% if placeholder %}placeholder="{{placeholder}}" {% endif %}
+  class="{{attrs.class or class_}}" />

fastlifeweb-0.4.1/src/fastlife/templates/Label.jinja

@@ -0,0 +1,11 @@
+{#def
+class_="""
+block
+font-bold
+mb-2
+text-base
+text-neutral-900
+dark:text-white
+""" #}
+
+<label for="{{attrs.for}}" class="{{attrs.class or class_}}">{{content}}</label>

fastlifeweb-0.4.1/src/fastlife/templates/Option.jinja

@@ -0,0 +1,4 @@
+{# def value, selected=False #}
+<option value="{{value}}" {%if selected%}selected{% endif%}>
+  {{- content -}}
+</option>

fastlifeweb-0.4.1/src/fastlife/templates/P.jinja

@@ -0,0 +1,9 @@
+{# def
+id="",
+class_="""
+text-base
+text-neutral-900
+dark:text-white
+"""
+#}
+<p {% if id %}id="{{id}}" {% endif %} class="{{ attrs.class or class_}}">{{content}}</p>

fastlifeweb-0.4.1/src/fastlife/templates/Radio.jinja

@@ -0,0 +1,30 @@
+{# def
+label,
+name,
+id,
+value,
+checked=false,
+disabled=false,
+onclick="",
+class_="""
+bg-neutral-100
+border-neutral-300
+w-4
+h-4
+text-primary-600
+focus:ring-2
+focus:ring-primary-500
+dark:bg-neutral-700
+dark:border-neutral-600
+dark:focus:ring-primary-600
+dark:ring-offset-neutral-800
+""",
+label_class="ms-2 text-sm font-medium text-neutral-900 dark:text-neutral-300",
+div_class="flex items-center mb-4"
+#}
+<div class="{{div_class}}">
+  <input type="radio" name="{{name}}" id="{{id}}" value="{{value}}" {% if checked %}checked{% endif %}
+    class="{{attrs.class or class_}}" {% if onclick %}onclick="{{onclick}}" {% endif %} {%if
+    disabled%}disabled{%endif%}>
+  <Label for={id} class={label_class}>{{label}}</Label>
+</div>

fastlifeweb-0.4.1/src/fastlife/templates/Select.jinja

@@ -0,0 +1,28 @@
+{# def
+name,
+id,
+multiple=False,
+class_="""
+bg-neutral-50
+block
+border
+border-neutral-300
+p-2.5
+rounded-lg
+text-base
+text-neutral-900
+w-full
+focus:border-primary-500
+focus:ring-primary-500
+dark:bg-neutral-700
+dark:border-neutral-600
+dark:focus:border-primary-500
+dark:focus:ring-primary-500
+dark:placeholder-neutral-400
+dark:text-white
+"""
+#}
+
+<select name="{{name}}" id="{{id}}" class="{{attrs.class or class_}}" {% if multiple %}multiple{% endif %}>
+  {{- content -}}
+</select>

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Boolean.jinja

@@ -2,6 +2,6 @@
 <pydantic_form.Widget widget={widget} removable={widget.removable}>
   <div class="pt-4">
     <Label for={widget.id}>{{widget.title}}</Label>
-    <Checkbox name={widget.name} value={widget.value} type="checkbox" id={widget.id} />
+    <Checkbox name={widget.name} type="checkbox" id={widget.id} {% if widget.value %}checked{% endif %} />
   </div>
 </pydantic_form.Widget>

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Dropdown.jinja

@@ -5,13 +5,11 @@
     <Label for={widget.id}>{{widget.title}}</Label>
     <Select name={widget.name} id={widget.id}>
       {%- for opt in widget.options -%}
-        <Option value={opt.value}>
-          {{ opt.text }}
-        </Option>
+      <Option value={opt.value} id={widget.id + "-" + opt.value} selected={widget.value==opt.value}>
+        {{ opt.text }}
+      </Option>
       {%- endfor -%}
     </Select>
-    {%- if widget.help_text -%}
-    <span class="mt-2 text-sm text-neutral-500 dark:text-neutral-400">{{widget.help_text}}</span>
-    {%- endif %}
+    <pydantic_form.Hint text={widget.hint} />
   </div>
 </pydantic_form.Widget>

fastlifeweb-0.4.1/src/fastlife/templates/pydantic_form/Hint.jinja

@@ -0,0 +1,4 @@
+{# def text #}
+{% if text %}
+<span class="mt-2 text-sm text-neutral-500 dark:text-neutral-400">{{text}}</span>
+{% endif %}

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Model.jinja

@@ -4,7 +4,7 @@
   <div id="{{widget.id}}" class="m-4">
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
-        <h4 class="inline font-sans text-3xl font-bold">{{widget.title}}</h4>
+        <H3>{{widget.title}}</H3>
       </summary>
       <div>
         {% for child in children_widget %}

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Sequence.jinja

@@ -3,12 +3,12 @@
 <pydantic_form.Widget widget={widget} removable={widget.removable}>
   <details id="{{widget.id}}" open>
     <summary class="justify-between items-center font-medium cursor-pointer">
-      <h4 class="inline font-sans text-3xl font-bold">{{widget.title}}</h4>
+      <H3>{{widget.title}}</H3>
     </summary>
     <div>
       {% set fnGetName = "get" + widget.id.replace("-", "_") %}
       <script>
-        function {{fnGetName}}() {
+        function {{ fnGetName }} () {
           const el = document.getElementById("{{widget.id}}-content");
           const len = el.dataset.length;
           el.dataset.length = parseInt(len) + 1;
@@ -28,7 +28,7 @@
         {% set container_id = "#" + widget.id + "-container" %}
         {% set add_id = widget.id + "-add" %}
         {% set vals = 'js:{"name": '+ fnGetName + '(), "token": "' + type.token + '", "removable": true}' %}
-        <Button type="button" target={container_id} swap="beforeend" id={add_id} vals={vals} get={type.url}>
+        <Button type="button" hx-target={container_id} hx-swap="beforeend" id={add_id} hx-vals={vals} hx-get={type.url}>
           Add
         </Button>
       </div>

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Text.jinja

@@ -5,8 +5,6 @@
     <Label for={widget.id}>{{widget.title}}</Label>
     <Input name={widget.name} value={widget.value} type={widget.input_type} id={widget.id}
       aria-label={widget.aria_label} placeholder={widget.placeholder} />
-    {%- if widget.help_text -%}
-    <span class="mt-2 text-sm text-neutral-500 dark:text-neutral-400">{{widget.help_text}}</span>
-    {%- endif %}
+    <pydantic_form.Hint text={widget.hint} />
   </div>
 </pydantic_form.Widget>

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templates/pydantic_form/Union.jinja

@@ -4,21 +4,21 @@
   <div id="{{widget.id}}">
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
-        <h4 class="inline font-sans text-3xl font-bold">{{widget.title}}</h4>
+        <H3>{{widget.title}}</H3>
       </summary>
       <div hx-sync="this" id="{{widget.id}}-child">
         {% if child %}
         {{ child }}
         {% else %}
         {% for typ in types %}
-        <Button type="button" target="closest div" get={typ.url} vals={typ.params|tojson}
-          id={typ.fullname + "-" + widget.token}
+        <Button type="button" hx-target="closest div" hx-get={typ.url} hx-vals={typ.params|tojson}
+          id={typ.id}
           onclick={"document.getElementById('" + widget.id +"-remove-btn').hidden=false"}>{{typ.title}}</Button>
         {% endfor %}
         {% endif %}
       </div>
-      <Button type="button" id={widget.id + "-remove-btn" } target={"#" + widget.id} vals={parent_type.params|tojson}
-        get={parent_type.url} hidden={not child}>
+      <Button type="button" id={widget.id + "-remove-btn" } hx-target={"#" + widget.id} hx-vals={parent_type.params|tojson}
+        hx-get={parent_type.url} hidden={not child}>
         Remove
       </Button>
     </details>

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templating/__init__.py

@@ -1,8 +1,8 @@
 from .binding import Template, template
-from .renderer import AbstractTemplateRenderer, JinjaxTemplateRenderer
+from .renderer import AbstractTemplateRendererFactory, JinjaxTemplateRenderer
 
 __all__ = [
-    "AbstractTemplateRenderer",
+    "AbstractTemplateRendererFactory",
     "JinjaxTemplateRenderer",
     "Template",
     "template",

{fastlifeweb-0.3.1 → fastlifeweb-0.4.1}/src/fastlife/templating/binding.py

@@ -9,9 +9,7 @@ Template = Callable[..., Response]
 TemplateEngine = Callable[["Registry", Request], Template]
 
 
-def get_page_template(
-    template: str, *, content_type: str = "text/html"
-) -> TemplateEngine:
+def get_template(template: str, *, content_type: str = "text/html") -> TemplateEngine:
     def render_template(
         reg: "Registry",
         request: Request,
@@ -23,7 +21,7 @@ def get_page_template(
                 request.cookies.get(reg.settings.csrf_token_name)
                 or _create_csrf_token()
             )
-            data = reg.renderer.render_page(request, template, **kwargs)
+            data = reg.renderer(request).render_template(template, **kwargs)
             resp = Response(data, headers={"Content-Type": content_type})
             resp.set_cookie(
                 reg.settings.csrf_token_name,
@@ -39,21 +37,5 @@ def get_page_template(
     return render_template
 
 
-def get_template(
-    template: str, *, content_type: str = "text/html"
-) -> Callable[["Registry"], Template]:
-    def render_template(reg: "Registry") -> Template:
-        def parametrizer(**kwargs: Any) -> Response:
-            data = reg.renderer.render_template(template, **kwargs)
-            resp = Response(data, headers={"Content-Type": content_type})
-            return resp
-
-        return parametrizer
-
-    return render_template
-
-
-def template(template_path: str, page: bool = True) -> Template:
-    return Depends(
-        get_page_template(template_path) if page else get_template(template_path)
-    )
+def template(template_path: str) -> Template:
+    return Depends(get_template(template_path))

fastlifeweb-0.4.1/src/fastlife/templating/renderer/__init__.py

@@ -0,0 +1,7 @@
+from .abstract import AbstractTemplateRendererFactory
+from .jinjax import JinjaxTemplateRenderer
+
+__all__ = [
+    "AbstractTemplateRendererFactory",
+    "JinjaxTemplateRenderer",
+]

fastlifeweb-0.4.1/src/fastlife/templating/renderer/abstract.py

@@ -0,0 +1,46 @@
+import abc
+from typing import Any, Mapping, Optional, Type
+
+from fastapi import Request
+from markupsafe import Markup
+from pydantic.fields import FieldInfo
+
+
+class AbstractTemplateRenderer(abc.ABC):
+    route_prefix: str
+    """Used to buid pydantic form"""
+
+    @abc.abstractmethod
+    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(
+        self,
+        model: Type[Any],
+        form_data: Mapping[str, Any] | None = None,
+        name: str | None = None,
+        token: str | None = None,
+        removable: bool = False,
+        field: FieldInfo | None = None,
+    ) -> Markup:
+        ...
+
+
+class AbstractTemplateRendererFactory(abc.ABC):
+    @abc.abstractmethod
+    def __call__(self, request: Request) -> AbstractTemplateRenderer:
+        ...