fastlifeweb 0.4.0__tar.gz → 0.5.0__tar.gz

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

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

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

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

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/src/fastlife/request/form_data.py

@@ -25,8 +25,8 @@ def unflatten_struct(
     csrf_token_name: Optional[str] = None,
 ) -> Mapping[str, Any] | Sequence[Any]:
     # we sort to ensure that list index are ordered
-    formkeys = sorted(flatten_input.keys())
-    for key in formkeys:
+    # formkeys = sorted(flatten_input.keys())
+    for key in flatten_input:
         if csrf_token_name is not None and key == csrf_token_name:
             continue
         lkey, sep, rest = key.partition(".")
@@ -78,8 +78,17 @@ async def unflatten_mapping_form_data(
     request: Request, reg: Registry
 ) -> Mapping[str, Any]:
     form_data = await request.form()
+    form_data_decode_list: MutableMapping[str, Any] = {}
+    for key, val in form_data.multi_items():
+        if key in form_data_decode_list:
+            if not isinstance(form_data_decode_list, list):
+                form_data_decode_list[key] = [form_data_decode_list[key]]
+            form_data_decode_list[key].append(val)
+        else:
+            form_data_decode_list[key] = val
+
     ret = unflatten_struct(
-        form_data, {}, csrf_token_name=reg.settings.csrf_token_name
+        form_data_decode_list, {}, csrf_token_name=reg.settings.csrf_token_name
     )  # type: ignore
     return ret  # type: ignore
 

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/src/fastlife/templates/Checkbox.jinja

@@ -1,7 +1,8 @@
 {# def
 name,
-value,
 id,
+value=None,
+checked=False,
 class_="""
 bg-neutral-100
 border-neutral-300
@@ -17,4 +18,5 @@ focus:ring-2
 focus:ring-primary-500
 """
 #}
-<input name="{{name}}" {% if value%}checked{% endif %} type="checkbox" id="{{id}}" class="{{attrs.class or class_}}" />
+<input name="{{name}}" {% if value is not none %}value="{{value}}" {% endif %} {% if checked %}checked{% endif %}
+  type="checkbox" id="{{id}}" class="{{attrs.class or class_}}" />

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/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.5.0}/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.5.0}/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} type="checkbox" id={widget.id} {% if widget.value %}checked{% endif %} />
+    <Checkbox name={widget.name} type="checkbox" id={widget.id} checked={widget.value} />
   </div>
 </pydantic_form.Widget>

fastlifeweb-0.5.0/src/fastlife/templates/pydantic_form/Checklist.jinja

@@ -0,0 +1,20 @@
+{# def
+widget,
+#}
+
+<pydantic_form.Widget widget={widget} removable={widget.removable}>
+  <div class="pt-4">
+    <details open>
+      <summary class="justify-between items-center font-medium cursor-pointer">
+        <H3>{{widget.title}}</H3>
+      </summary>
+      <div>
+        {% for value in widget.value %}
+        <div class="flex items-center mb-4">
+          <Checkbox name={widget.name} type="checkbox" id={value.id} value={value.value} checked={value.checked} />
+          <Label for={value.id} class="ms-2 text-base text-neutral-900 dark:text-white">{{value.label}}</Label>
+        </div>
+        {% endfor %}
+      </div>
+  </div>
+</pydantic_form.Widget>

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/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.5.0}/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.5.0}/src/fastlife/templating/renderer/widgets/boolean.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from .base import Widget
 
 
@@ -8,7 +6,7 @@ class BooleanWidget(Widget[bool]):
         self,
         name: str,
         *,
-        title: Optional[str],
+        title: str | None,
         value: bool = False,
         removable: bool = False,
         token: str,

fastlifeweb-0.5.0/src/fastlife/templating/renderer/widgets/checklist.py

@@ -0,0 +1,36 @@
+from typing import Sequence
+
+from pydantic import BaseModel
+
+from .base import Widget
+
+
+class Checkable(BaseModel):
+    label: str
+    name: str
+    value: str
+    token: str
+    checked: bool
+
+    @property
+    def id(self) -> str:
+        id = f"{self.name}-{self.value}-{self.token}"
+        return id.replace(".", "-").replace("_", "-")
+
+
+class ChecklistWidget(Widget[Sequence[Checkable]]):
+    def __init__(
+        self,
+        name: str,
+        *,
+        title: str | None,
+        value: Sequence[Checkable],
+        token: str,
+        removable: bool,
+    ) -> None:
+        super().__init__(
+            name, value=value, token=token, title=title, removable=removable
+        )
+
+    def get_template(self) -> str:
+        return "pydantic_form.Checklist"

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/src/fastlife/templating/renderer/widgets/factory.py

@@ -1,6 +1,7 @@
 import secrets
 from collections.abc import MutableSequence, Sequence
 from decimal import Decimal
+from enum import Enum
 from types import NoneType
 from typing import Any, Literal, Mapping, Optional, Type, cast, get_origin
 from uuid import UUID
@@ -12,6 +13,7 @@ from pydantic.fields import FieldInfo
 from fastlife.shared_utils.infer import is_complex_type, is_union
 from fastlife.templating.renderer.abstract import AbstractTemplateRenderer
 from fastlife.templating.renderer.widgets.boolean import BooleanWidget
+from fastlife.templating.renderer.widgets.checklist import Checkable, ChecklistWidget
 from fastlife.templating.renderer.widgets.dropdown import DropDownWidget
 from fastlife.templating.renderer.widgets.hidden import HiddenWidget
 from fastlife.templating.renderer.widgets.sequence import SequenceWidget
@@ -96,6 +98,12 @@ class WidgetFactory:
             if type_origin is Literal:
                 return self.build_literal(name, typ, field, value, removable)
 
+            if type_origin is set:
+                return self.build_set(name, typ, field, value, removable)
+
+        if issubclass(typ, Enum):  # if it raises here, the type_origin is unknown
+            return self.build_enum(name, typ, field, value, removable)
+
         if issubclass(typ, BaseModel):  # if it raises here, the type_origin is unknown
             return self.build_model(name, typ, field, value or {}, removable)
 
@@ -228,6 +236,55 @@ class WidgetFactory:
             removable=removable,
         )
 
+    def build_set(
+        self,
+        field_name: str,
+        field_type: Type[Any],
+        field: Optional[FieldInfo],
+        value: Optional[Sequence[Any]],
+        removable: bool,
+    ) -> Widget[Any]:
+        choice_wrapper = field_type.__args__[0]
+        choices = []
+        choice_wrapper_origin = get_origin(choice_wrapper)
+        if choice_wrapper_origin:
+            if choice_wrapper_origin is Literal:
+                litchoice: list[str] = choice_wrapper.__args__  # type: ignore
+                choices = [
+                    Checkable(
+                        label=c,
+                        value=c,
+                        checked=c in value if value else False,  # type: ignore
+                        name=field_name,
+                        token=self.token,
+                    )
+                    for c in litchoice
+                ]
+
+            else:
+                raise NotImplementedError
+        elif issubclass(choice_wrapper, Enum):
+            choices = [
+                Checkable(
+                    label=e.value,
+                    value=e.name,
+                    checked=e.name in value if value else False,  # type: ignore
+                    name=field_name,
+                    token=self.token,
+                )
+                for e in choice_wrapper
+            ]
+        else:
+            raise NotImplementedError
+
+        return ChecklistWidget(
+            field_name,
+            title=field.title if field else "",
+            token=self.token,
+            value=choices,
+            removable=removable,
+        )
+
     def build_boolean(
         self,
         field_name: str,
@@ -306,6 +363,24 @@ class WidgetFactory:
             value=str(value),
         )
 
+    def build_enum(
+        self,
+        field_name: str,
+        field_type: Type[Any],  # an enum subclass
+        field: FieldInfo | None,
+        value: str | int | float,
+        removable: bool,
+    ) -> Widget[Any]:
+        options = [(item.name, item.value) for item in field_type]  # type: ignore
+        return DropDownWidget(
+            field_name,
+            options=options,  # type: ignore
+            removable=removable,
+            title=field.title if field else "",
+            token=self.token,
+            value=str(value),
+        )
+
     def build_simpletype(
         self,
         field_name: str,

{fastlifeweb-0.4.0 → fastlifeweb-0.5.0}/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)
+        )