fastlifeweb 0.4.1__py3-none-any.whl → 0.5.1__py3-none-any.whl

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
 

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_}}" />

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>

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>

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,

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"

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.1.dist-info → fastlifeweb-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.4.1
+Version: 0.5.1
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived
@@ -21,7 +21,7 @@ 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.32,<0.33)
+Requires-Dist: jinjax (>=0.34,<0.35)
 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)

{fastlifeweb-0.4.1.dist-info → fastlifeweb-0.5.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ fastlife/configurator/registry.py,sha256=1sOicKvwIvLbrzRk9z8yb65YUXxxagJK9AK-2gG
 fastlife/configurator/settings.py,sha256=ftv5MkNXeyBrvcqxnt2WKtLuzo7ge2_BNx1gX4CcSOE,1489
 fastlife/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/request/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/request/form_data.py,sha256=gKXo92ZwsMX6UpMkf4BlNYDiOfwxyzDzItc_lpplAzY,3642
+fastlife/request/form_data.py,sha256=A1mowwOrsQ0yPvfMwh_m9Mw6yoYTgqayibiXNyyOGLM,4049
 fastlife/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/security/csrf.py,sha256=47epJVJtr5X6j-Hog54WCGOoiRLQQHvgBU71iqR1N0A,1025
 fastlife/security/policy.py,sha256=5jV5nypy5O8XPFFRJ_bzG8Ltk5xcPWclkz23qiG1_I8,509
@@ -18,7 +18,7 @@ fastlife/shared_utils/infer.py,sha256=_hmGzu84VlZAkdw_owkW8eHknULqH3MLDBlXj7LkEs
 fastlife/shared_utils/resolver.py,sha256=wXQQTB4jf86m4qENhMOkHkWpLJj_T4-_eND_ItTLnTE,1410
 fastlife/templates/A.jinja,sha256=q71nu4Rq874LG6SykCKv8W-EZeX13NMF0AsLc9FFAP0,677
 fastlife/templates/Button.jinja,sha256=535UIK4Prunj4f0YZXBmCI0rfOiTr5GJTQkM0XDmtNA,1137
-fastlife/templates/Checkbox.jinja,sha256=EbKJ9KmfexegcocxeMtoG1kt-x4bP8Tq3odh8prbJoQ,366
+fastlife/templates/Checkbox.jinja,sha256=XdgtI7GTVjPkxTje9KMILzHqjMFRmTpubtKM8nL7K1o,447
 fastlife/templates/CsrfToken.jinja,sha256=X2-H0VmukyUV448blh9M8rhr_gN82ar51TnRAwfV3OY,59
 fastlife/templates/Form.jinja,sha256=h8Y2yrlrTRuLnwqCTDv8eeFgaej2eQiXDvFOx5eEcGg,367
 fastlife/templates/H1.jinja,sha256=fetjIhZvgw5gm6xJhl_-cnHvrPwuLYE4S1rVYgbqNl8,196
@@ -35,7 +35,8 @@ fastlife/templates/P.jinja,sha256=xEcHIv9dJRpELu_SdqQcftvKrU8z1i_BHTEVO5Mu5dU,16
 fastlife/templates/Radio.jinja,sha256=51I5n1yjWQ_uLZfzuUUf3C8ngo-KT4dPw29-pjP9uSU,723
 fastlife/templates/Select.jinja,sha256=GoK2oh4Jl5dAfL2wN718RCwtHaQIslzDCN_nwy6a9oY,480
 fastlife/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastlife/templates/pydantic_form/Boolean.jinja,sha256=XE3NM4vhwQwRUIbjv10t9dI70MzWhicyQ_l6FAOs8-k,298
+fastlife/templates/pydantic_form/Boolean.jinja,sha256=tzEZpgv3t9vEuQr2_NzLvhqyusGm2w7kEkehCRJyG2c,281
+fastlife/templates/pydantic_form/Checklist.jinja,sha256=wv224DG6X-XTpiU0hQl5AjuAsb-MMS7TaMdVaYhEkq4,665
 fastlife/templates/pydantic_form/Dropdown.jinja,sha256=JBkQp7LYtz6vvW6MyAXyW-6UDZ_xY0Fgd4mpDCQA-wM,500
 fastlife/templates/pydantic_form/Hidden.jinja,sha256=n6CbTSwZr2E_oY8TO2WPbnrLHBaWfe_CXVCYOYmCfts,83
 fastlife/templates/pydantic_form/Hint.jinja,sha256=O0ZsAQnATcG0a_qLQfrwM6VZHmAw3k1W33WYlEBUas8,123
@@ -51,9 +52,10 @@ fastlife/templating/renderer/abstract.py,sha256=ksWrz25bmsN4MQJK08OYzoZfiYvAg39Z
 fastlife/templating/renderer/jinjax.py,sha256=bgHgu6VLA4S8fS7Evu68iPaODdev6v0s6Z79TX8c6Mo,3458
 fastlife/templating/renderer/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastlife/templating/renderer/widgets/base.py,sha256=_MMtrhYvtQgX1EQNku0NSBYwhCDvQ5y8TjnCC2b4CAw,2769
-fastlife/templating/renderer/widgets/boolean.py,sha256=bk9bExUDp73is6tvbpC28ploIVjyMecFsxPN8NxnOd8,468
+fastlife/templating/renderer/widgets/boolean.py,sha256=UPQOxIpydP2NzDVUQuNau1DewS2FkRqx5WkWSwEu1kk,436
+fastlife/templating/renderer/widgets/checklist.py,sha256=lR6A1nui6iYnx9E4cNEaxsgNPsZWtEEofh2l3C9qWos,770
 fastlife/templating/renderer/widgets/dropdown.py,sha256=o3BfD9gDiRPsCPB93xCZSYRo50LRAb_tZOmK4x7zkzY,901
-fastlife/templating/renderer/widgets/factory.py,sha256=uEYaxHYygLQ-5eWWjsOlvPM6GmhHW7Nu_w-1l2HRihA,10335
+fastlife/templating/renderer/widgets/factory.py,sha256=59BfKpNIB8T71vZ0RjjcjNjdP0TfSm-WHgXmelyIziY,12850
 fastlife/templating/renderer/widgets/hidden.py,sha256=2fsbTQKsACV0JVYpCjXaQAV7VnQTIBPCi4lJPdWCRHc,308
 fastlife/templating/renderer/widgets/model.py,sha256=L7tdmRj0cetM_UusaD2zk5YJtIGBYizCMBKQzFyN_Ko,986
 fastlife/templating/renderer/widgets/sequence.py,sha256=x6o1L_hOh3WRlW16ZQaeO6H_qtnIitALuK-w7ck0RAw,1347
@@ -63,7 +65,7 @@ fastlife/testing/__init__.py,sha256=KgTlRI0g8z7HRpL7mD5QgI__LT9Y4QDSzKMlxJG3wNk,
 fastlife/testing/testclient.py,sha256=JhWgruKDeIn0QFmEAXKhUXXsZpTpPi_JWIHhWbWIXg0,16404
 fastlife/views/__init__.py,sha256=nn4B_8YTbTmhGPvSd20yyKK_9Dh1Pfh_Iq7z6iK8-CE,154
 fastlife/views/pydantic_form.py,sha256=TyZbVfhOGy3en1a7o4wcRp11War7sqVHxyEjOsRMht0,1092
-fastlifeweb-0.4.1.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
-fastlifeweb-0.4.1.dist-info/METADATA,sha256=yGbsMj4GuWSO4lRUXOfE01wTMS2KYfMh04qBpu7iL1s,1833
-fastlifeweb-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastlifeweb-0.4.1.dist-info/RECORD,,
+fastlifeweb-0.5.1.dist-info/LICENSE,sha256=F75xSseSKMwqzFj8rswYU6NWS3VoWOc_gY3fJYf9_LI,1504
+fastlifeweb-0.5.1.dist-info/METADATA,sha256=kQIE0LHEi25Hg1PXXdYTN-bHE59TB5Www7GwDyRBLF0,1833
+fastlifeweb-0.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastlifeweb-0.5.1.dist-info/RECORD,,