fastlifeweb 0.6.0__tar.gz → 0.6.1__tar.gz

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.6.0
+Version: 0.6.1
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived
@@ -24,7 +24,7 @@ Requires-Dist: itsdangerous (>=2.1.2,<3.0.0)
 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.5.1)
+Requires-Dist: pydantic (>=2.5.3,<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)

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.6.0"
+version = "0.6.1"
 
 [tool.poetry.dependencies]
 python = "^3.11"
@@ -26,7 +26,7 @@ itsdangerous = "^2.1.2"
 jinjax = "^0.34"
 markupsafe = "^2.1.3"
 multidict = "^6.0.5"
-pydantic = "2.5.1"
+pydantic = "^2.5.3"
 pydantic-settings = "^2.0.3"
 python-multipart = "^0.0.6"
 venusian = "^3.0.0"

fastlifeweb-0.6.1/src/fastlife/templates/pydantic_form/Boolean.jinja

@@ -0,0 +1,12 @@
+{# def widget #}
+<pydantic_form.Widget widget={widget} removable={widget.removable}>
+  <div class="pt-4">
+    <div class="flex items-center">
+      <Checkbox name={widget.name} type="checkbox" id={widget.id} checked={widget.value} value="1" />
+      <Label for={widget.id} class="ms-2 text-base text-neutral-900 dark:text-white">
+        {{widget.title|safe}}
+      </Label>
+    </div>
+    <pydantic_form.Error text={widget.error} />
+  </div>
+</pydantic_form.Widget>

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templates/pydantic_form/Checklist.jinja

@@ -7,12 +7,14 @@ widget,
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div>
         {% for value in widget.value %}
         <div class="flex items-center mb-4">
           <Checkbox name={value.field_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>
+          <pydantic_form.Error text={value.error} />
         </div>
         {% endfor %}
       </div>

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templates/pydantic_form/Dropdown.jinja

@@ -10,6 +10,7 @@
       </Option>
       {%- endfor -%}
     </Select>
+    <pydantic_form.Error text={widget.error} />
     <pydantic_form.Hint text={widget.hint} />
   </div>
 </pydantic_form.Widget>

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templates/pydantic_form/Model.jinja

@@ -5,6 +5,7 @@
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div>
         {% for child in children_widget %}

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templates/pydantic_form/Sequence.jinja

@@ -4,6 +4,7 @@
   <details id="{{widget.id}}" open>
     <summary class="justify-between items-center font-medium cursor-pointer">
       <H3>{{widget.title}}</H3>
+      <pydantic_form.Error text={widget.error} />
     </summary>
     <div>
       {% set fnGetName = "get" + widget.id.replace("-", "_") %}

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templates/pydantic_form/Union.jinja

@@ -5,20 +5,20 @@
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
+        <pydantic_form.Error text={widget.error} />
       </summary>
       <div hx-sync="this" id="{{widget.id}}-child">
         {% if child %}
         {{ child }}
         {% else %}
         {% for typ in types %}
-        <Button type="button" hx-target="closest div" hx-get={typ.url} hx-vals={typ.params|tojson}
-          id={typ.id}
+        <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" } hx-target={"#" + widget.id} hx-vals={parent_type.params|tojson}
-        hx-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.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/boolean.py

@@ -8,11 +8,17 @@ class BooleanWidget(Widget[bool]):
         *,
         title: str | None,
         value: bool = False,
+        error: str | None = None,
         removable: bool = False,
         token: str,
     ) -> None:
         super().__init__(
-            name, title=title, value=value, removable=removable, token=token
+            name,
+            title=title,
+            value=value,
+            error=error,
+            removable=removable,
+            token=token,
         )
 
     def get_template(self) -> str:

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/checklist.py

@@ -1,6 +1,6 @@
 from typing import Sequence
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from .base import Widget
 
@@ -11,6 +11,7 @@ class Checkable(BaseModel):
     value: str
     token: str
     checked: bool
+    error: str | None = Field(default=None)
 
     @property
     def id(self) -> str:
@@ -29,11 +30,17 @@ class ChecklistWidget(Widget[Sequence[Checkable]]):
         *,
         title: str | None,
         value: Sequence[Checkable],
+        error: str | None = None,
         token: str,
         removable: bool,
     ) -> None:
         super().__init__(
-            name, value=value, token=token, title=title, removable=removable
+            name,
+            value=value,
+            error=error,
+            token=token,
+            title=title,
+            removable=removable,
         )
 
     def get_template(self) -> str:

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/dropdown.py

@@ -10,13 +10,19 @@ class DropDownWidget(Widget[str]):
         *,
         title: Optional[str],
         value: Optional[str] = None,
+        error: str | None = None,
         options: Sequence[Tuple[str, str]] | Sequence[str],
         removable: bool = False,
         token: Optional[str] = None,
         hint: Optional[str] = None,
     ) -> None:
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.options: list[dict[str, str]] = []
         for opt in options:

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/factory.py

@@ -88,6 +88,7 @@ class WidgetFactory:
                             title=field.title if field else "",
                             aria_label=field.description if field else None,
                             token=self.token,
+                            error=form_errors.get(name),
                         ),
                     )
 
@@ -175,6 +176,7 @@ class WidgetFactory:
             removable=removable,
             title=get_title(typ),
             token=self.token,
+            error=form_errors.get(field_name),
         )
 
     def build_union(
@@ -233,6 +235,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
         return widget
@@ -267,6 +270,7 @@ class WidgetFactory:
             item_type=typ,  # type: ignore
             token=self.token,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_set(
@@ -291,6 +295,7 @@ class WidgetFactory:
                         checked=c in value if value else False,  # type: ignore
                         name=field_name,
                         token=self.token,
+                        error=form_errors.get(f"{field_name}-{c}"),
                     )
                     for c in litchoice
                 ]
@@ -305,6 +310,7 @@ class WidgetFactory:
                     checked=e.name in value if value else False,  # type: ignore
                     name=field_name,
                     token=self.token,
+                    error=form_errors.get(f"{field_name}-{e.name}"),
                 )
                 for e in choice_wrapper
             ]
@@ -317,6 +323,7 @@ class WidgetFactory:
             token=self.token,
             value=choices,
             removable=removable,
+            error=form_errors.get(field_name),
         )
 
     def build_boolean(
@@ -334,6 +341,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=value,
+            error=form_errors.get(field_name),
         )
 
     def build_emailtype(
@@ -354,6 +362,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_secretstr(
@@ -374,6 +383,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=value.get_secret_value() if isinstance(value, SecretStr) else value,
+            error=form_errors.get(field_name),
         )
 
     def build_literal(
@@ -399,6 +409,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_enum(
@@ -418,6 +429,7 @@ class WidgetFactory:
             title=field.title if field else "",
             token=self.token,
             value=str(value),
+            error=form_errors.get(field_name),
         )
 
     def build_simpletype(

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/model.py

@@ -13,12 +13,18 @@ class ModelWidget(Widget[Sequence[Widget[Any]]]):
         name: str,
         *,
         value: Sequence[Widget[Any]],
+        error: str | None = None,
         removable: bool,
         title: str,
         token: str,
     ):
         super().__init__(
-            name, title=title, value=value, removable=removable, token=token
+            name,
+            title=title,
+            value=value,
+            error=error,
+            removable=removable,
+            token=token,
         )
 
     def get_template(self) -> str:

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/sequence.py

@@ -15,12 +15,18 @@ class SequenceWidget(Widget[Sequence[Widget[Any]]]):
         title: Optional[str],
         hint: Optional[str],
         value: Optional[Sequence[Widget[Any]]],
+        error: str | None = None,
         item_type: Type[Any],
         token: str,
         removable: bool,
     ):
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.item_type = item_type
         self.hint = hint

{fastlifeweb-0.6.0 → fastlifeweb-0.6.1}/src/fastlife/templating/renderer/widgets/union.py

@@ -15,12 +15,18 @@ class UnionWidget(Widget[Widget[Any]]):
         *,
         title: Optional[str],
         value: Optional[Widget[Any]],
+        error: str | None = None,
         children_types: Sequence[Type[BaseModel]],
         token: str,
         removable: bool,
     ):
         super().__init__(
-            name, value=value, title=title, token=token, removable=removable
+            name,
+            value=value,
+            error=error,
+            title=title,
+            token=token,
+            removable=removable,
         )
         self.children_types = children_types
         self.parent_name = name

fastlifeweb-0.6.0/src/fastlife/templates/pydantic_form/Boolean.jinja

@@ -1,7 +0,0 @@
-{# def widget #}
-<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} checked={widget.value} />
-  </div>
-</pydantic_form.Widget>