fastlifeweb 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

fastlife/__init__.py

@@ -1,4 +1,6 @@
 from .configurator import Configurator, configure
+from .configurator.registry import Registry
+from .request.form_data import model
 from .templating import Template, template
 
 __all__ = [
@@ -7,4 +9,7 @@ __all__ = [
     "Configurator",
     "template",
     "Template",
+    "Registry",
+    # Model
+    "model",
 ]

fastlife/configurator/configurator.py

@@ -2,8 +2,8 @@
 The configurator is here to register routes in a fastapi app,
 with dependency injection.
 """
-import inspect
 import importlib
+import inspect
 import logging
 from enum import Enum
 from pathlib import Path
@@ -31,7 +31,7 @@ from fastlife.security.csrf import check_csrf
 from .settings import Settings
 
 if TYPE_CHECKING:
-    from .registry import AppRegistry
+    from .registry import AppRegistry  # coverage: ignore
 
 log = logging.getLogger(__name__)
 VENUSIAN_CATEGORY = "fastlife"

fastlife/configurator/registry.py

@@ -1,17 +1,21 @@
-from typing import Annotated
+from typing import TYPE_CHECKING, Annotated
 
 from fastapi import Depends
 
 from fastlife.security.policy import CheckPermission
 from fastlife.shared_utils.resolver import resolve
-from fastlife.templating.renderer import AbstractTemplateRenderer
+
+if TYPE_CHECKING:
+    from fastlife.templating.renderer import (  # coverage: ignore
+        AbstractTemplateRenderer,  # coverage: ignore
+    )  # coverage: ignore
 
 from .settings import Settings
 
 
 class AppRegistry:
     settings: Settings
-    renderer: AbstractTemplateRenderer
+    renderer: "AbstractTemplateRenderer"
     check_permission: CheckPermission
 
     def __init__(self, settings: Settings) -> None:

fastlife/configurator/settings.py

@@ -12,7 +12,7 @@ class Settings(BaseSettings):
     template_search_path: str = Field(default="fastlife:templates")
     registry_class: str = Field(default="fastlife.configurator.registry:AppRegistry")
     template_renderer_class: str = Field(
-        default="fastlife.templating.renderer.jinja2:Jinja2TemplateRenderer"
+        default="fastlife.templating.renderer:JinjaxTemplateRenderer"
     )
     form_data_model_prefix: str = Field(default="payload")
     csrf_token_name: str = Field(default="csrf_token")

fastlife/request/form_data.py

@@ -26,7 +26,6 @@ def unflatten_struct(
 ) -> Mapping[str, Any] | Sequence[Any]:
     # we sort to ensure that list index are ordered
     formkeys = sorted(flatten_input.keys())
-
     for key in formkeys:
         if csrf_token_name is not None and key == csrf_token_name:
             continue
@@ -39,15 +38,11 @@ def unflatten_struct(
                     raise ValueError(f"{flatten_input}: Not a list")
                 while int(key) != len(unflattened_output):
                     unflattened_output.append(None)
-                if not int(key) == len(unflattened_output):
-                    raise ValueError(
-                        f"{flatten_input}: Missing index {len(unflattened_output)}"
-                    )
                 unflattened_output.append(flatten_input[key])
             elif isinstance(unflattened_output, dict):
                 unflattened_output[key] = flatten_input[key]
             else:
-                raise ValueError(type(unflattened_output))
+                raise TypeError(type(unflattened_output))
             continue
 
         child_is_list = rest.partition(".")[0].isdigit()
@@ -74,7 +69,7 @@ def unflatten_struct(
                 level + 1,
             )
         else:
-            raise ValueError(type(unflattened_output))
+            raise TypeError(type(unflattened_output))
 
     return unflattened_output
 

fastlife/security/csrf.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, Callable, Coroutine
 from fastapi import Request
 
 if TYPE_CHECKING:
-    from fastlife.configurator.registry import Registry
+    from fastlife.configurator.registry import Registry  # coverage: ignore
 
 
 class CSRFAttack(Exception):

fastlife/session/middleware.py

@@ -39,7 +39,6 @@ class SessionMiddleware(AbstractMiddleware):
         if scope["type"] not in ("http", "websocket"):  # pragma: no cover
             await self.app(scope, receive, send)
             return
-
         connection = HTTPConnection(scope)
         existing_session = self.cookie_name in connection.cookies
         if existing_session:

fastlife/shared_utils/resolver.py

@@ -8,16 +8,18 @@ def resolve(value: str) -> Any:
     module_name, attr_name = value.split(":", 2)
     spec = importlib.util.find_spec(module_name)
     if spec is None:
-        raise ValueError(f"Module {module_name} not found.")
+        raise ValueError(f"Module {module_name} not found")
     module = importlib.util.module_from_spec(spec)
     if spec.loader is None:
-        raise ValueError("No loader on spec")
+        # I can't figure out when the spec.loader is None,
+        # just relying on typing here
+        raise ValueError("No loader on spec")  # coverage: ignore
     spec.loader.exec_module(module)
 
     try:
         attr = getattr(module, attr_name)
     except AttributeError:
-        raise ValueError(f"Attribute {attr_name} not found in module {module_name}.")
+        raise ValueError(f"Attribute {attr_name} not found in module {module_name}")
 
     return attr
 

fastlife/templates/A.jinja

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

fastlife/templates/Button.jinja

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

fastlife/templates/Checkbox.jinja

@@ -0,0 +1,2 @@
+{# def name, value, id #}
+<input name="{{name}}" value="{{value}}" type="checkbox" id="{{id}}" />

fastlife/templates/CsrfToken.jinja

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

fastlife/templates/Form.jinja

@@ -0,0 +1,5 @@
+{# def csrf_token #}
+<form class="space-y-4 md:space-y-6" hx-post="" method="post">
+  <CsrfToken csrf_token={csrf_token}/>
+  {{ content }}
+</form>

fastlife/templates/H1.jinja

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

fastlife/templates/H2.jinja

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

fastlife/templates/Hidden.jinja

@@ -0,0 +1,6 @@
+{# def
+name,
+value,
+id="",
+#}
+<input name="{{name}}" value="{{value}}" type="hidden" {%if id %}id="{{id}}" {%endif%} />

fastlife/templates/Input.jinja

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

fastlife/templates/Label.jinja

@@ -0,0 +1,3 @@
+{%- set css ="block mb-2 text-base font-bold text-neutral-900 dark:text-white" -%}
+
+<label for="{{attrs.for}}" class="{{css}}">{{content}}</label>

fastlife/templates/Option.jinja

@@ -0,0 +1,2 @@
+{# def value #}
+<option value="{{value}}">{{ content }}</option>

fastlife/templates/Radio.jinja

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

fastlife/templates/Select.jinja

@@ -0,0 +1,8 @@
+{# def name, id #}
+{% set css = "bg-neutral-50 border border-neutral-300 text-neutral-900 text-base rounded-lg focus:ring-primary-500
+focus:border-primary-500 block w-full p-2.5 dark:bg-neutral-700 dark:border-neutral-600 dark:placeholder-neutral-400
+dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500" %}
+
+<select name="{{name}}" id="{{id}}" class="{{css}}">
+  {{content}}
+</select>

fastlife/templates/pydantic_form/Boolean.jinja

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

fastlife/templates/pydantic_form/Dropdown.jinja

@@ -0,0 +1,17 @@
+{# def widget #}
+
+<pydantic_form.Widget widget={widget} removable={widget.removable}>
+  <div class="pt-4">
+    <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>
+      {%- endfor -%}
+    </Select>
+    {%- if widget.help_text -%}
+    <span class="mt-2 text-sm text-neutral-500 dark:text-neutral-400">{{widget.help_text}}</span>
+    {%- endif %}
+  </div>
+</pydantic_form.Widget>

fastlife/templates/pydantic_form/Hidden.jinja

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

fastlife/templates/pydantic_form/Model.jinja

@@ -0,0 +1,16 @@
+{# def widget, children_widget #}
+
+<pydantic_form.Widget widget={widget} removable={widget.removable}>
+  <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>
+      </summary>
+      <div>
+        {% for child in children_widget %}
+        {{ child }}
+        {% endfor %}
+      </div>
+    </details>
+  </div>
+</pydantic_form.Widget>

fastlife/templates/pydantic_form/Sequence.jinja

@@ -0,0 +1,37 @@
+{# def widget, children_widgets, type #}
+
+<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>
+    </summary>
+    <div>
+      {% set fnGetName = "get" + widget.id.replace("-", "_") %}
+      <script>
+        function {{fnGetName}}() {
+          const el = document.getElementById("{{widget.id}}-content");
+          const len = el.dataset.length;
+          el.dataset.length = parseInt(len) + 1;
+          return "{{type.name}}." + len;
+        }
+      </script>
+
+      <div id="{{widget.id}}-content" class="m-4" data-length="{{children_widgets|length|string}}">
+        {% for child in children_widgets %}
+        {% set container_id = widget.id + "-container" %}
+        <div id="{{container_id}}">
+          {{ child }}
+        </div>
+        {% endfor%}
+      </div>
+      <div>
+        {% 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}>
+          Add
+        </Button>
+      </div>
+    </div>
+  </details>
+</pydantic_form.Widget>

fastlife/templates/pydantic_form/Text.jinja

@@ -0,0 +1,12 @@
+{# def widget #}
+
+<pydantic_form.Widget widget={widget} removable={widget.removable}>
+  <div class="pt-4">
+    <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 %}
+  </div>
+</pydantic_form.Widget>

fastlife/templates/pydantic_form/Union.jinja

@@ -0,0 +1,26 @@
+{# def widget, child, types, parent_type #}
+
+<pydantic_form.Widget widget={widget}>
+  <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>
+      </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}
+          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}>
+        Remove
+      </Button>
+    </details>
+  </div>
+</pydantic_form.Widget>

fastlife/templates/pydantic_form/Widget.jinja

@@ -0,0 +1,10 @@
+{# def widget, removable=false #}
+{% set container_id = widget.id + "-container" %}
+<div id="{{container_id}}">
+  {{ content }}
+  {% if removable %}
+  <Button type="button" onclick={"document.getElementById('" + container_id + "').remove()"}>
+    Remove
+  </Button>
+  {% endif %}
+</div>

fastlife/templating/__init__.py

@@ -1,9 +1,9 @@
 from .binding import Template, template
-from .renderer import AbstractTemplateRenderer, Jinja2TemplateRenderer
+from .renderer import AbstractTemplateRenderer, JinjaxTemplateRenderer
 
 __all__ = [
     "AbstractTemplateRenderer",
-    "Jinja2TemplateRenderer",
+    "JinjaxTemplateRenderer",
     "Template",
     "template",
 ]

fastlife/templating/binding.py

@@ -1,12 +1,11 @@
-from typing import Any, Callable, Coroutine
+from typing import Any, Callable
 
 from fastapi import Depends, Request, Response
 
 from fastlife.configurator.registry import Registry
 from fastlife.security.csrf import create_csrf_token
 
-TemplateEngineHandler = Coroutine[Any, Any, Response]
-Template = Callable[..., TemplateEngineHandler]
+Template = Callable[..., Response]
 TemplateEngine = Callable[["Registry", Request], Template]
 
 
@@ -19,12 +18,12 @@ def get_page_template(
         *,
         _create_csrf_token: Callable[..., str] = create_csrf_token,
     ) -> Template:
-        async def parametrizer(**kwargs: Any) -> Response:
+        def parametrizer(**kwargs: Any) -> Response:
             request.scope[reg.settings.csrf_token_name] = (
                 request.cookies.get(reg.settings.csrf_token_name)
                 or _create_csrf_token()
             )
-            data = await reg.renderer.render_page(request, template, **kwargs)
+            data = reg.renderer.render_page(request, template, **kwargs)
             resp = Response(data, headers={"Content-Type": content_type})
             resp.set_cookie(
                 reg.settings.csrf_token_name,
@@ -44,8 +43,8 @@ def get_template(
     template: str, *, content_type: str = "text/html"
 ) -> Callable[["Registry"], Template]:
     def render_template(reg: "Registry") -> Template:
-        async def parametrizer(**kwargs: Any) -> Response:
-            data = await reg.renderer.render_template(template, **kwargs)
+        def parametrizer(**kwargs: Any) -> Response:
+            data = reg.renderer.render_template(template, **kwargs)
             resp = Response(data, headers={"Content-Type": content_type})
             return resp
 

fastlife/templating/renderer/__init__.py

@@ -1,4 +1,4 @@
 from .abstract import AbstractTemplateRenderer
-from .jinja2 import Jinja2TemplateRenderer
+from .jinjax import JinjaxTemplateRenderer
 
-__all__ = ["AbstractTemplateRenderer", "Jinja2TemplateRenderer"]
+__all__ = ["AbstractTemplateRenderer", "JinjaxTemplateRenderer"]

fastlife/templating/renderer/abstract.py

@@ -1,8 +1,9 @@
 import abc
-from typing import Any, Mapping, Optional, Type
+from typing import Any, Mapping, Type
 
 from fastapi import Request
 from markupsafe import Markup
+from pydantic.fields import FieldInfo
 
 
 class AbstractTemplateRenderer(abc.ABC):
@@ -10,20 +11,21 @@ class AbstractTemplateRenderer(abc.ABC):
     """Used to prefix url to fetch fast life widgets."""
 
     @abc.abstractmethod
-    async def render_page(self, request: Request, template: str, **params: Any) -> str:
+    def render_page(self, request: Request, template: str, **params: Any) -> str:
         ...
 
     @abc.abstractmethod
-    async def render_template(self, template: str, **params: Any) -> str:
+    def render_template(self, template: str, **params: Any) -> str:
         ...
 
     @abc.abstractmethod
-    async def pydantic_form(
+    def pydantic_form(
         self,
         model: Type[Any],
-        form_data: Optional[Mapping[str, Any]] = None,
-        name: Optional[str] = None,
-        token: Optional[str] = None,
+        form_data: Mapping[str, Any] | None = None,
+        name: str | None = None,
+        token: str | None = None,
         removable: bool = False,
+        field: FieldInfo | None = None,
     ) -> Markup:
         ...

fastlife/templating/renderer/jinjax.py

@@ -0,0 +1,73 @@
+from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence, Type
+
+from fastapi import Request
+from jinjax.catalog import Catalog
+from markupsafe import Markup
+from pydantic.fields import FieldInfo
+
+from fastlife.templating.renderer.widgets.factory import WidgetFactory
+
+if TYPE_CHECKING:
+    from fastlife.configurator.settings import Settings  # coverage: ignore
+
+from fastlife.shared_utils.resolver import resolve_path
+
+from .abstract import AbstractTemplateRenderer
+
+
+def build_searchpath(template_search_path: str) -> Sequence[str]:
+    searchpath: list[str] = []
+    paths = template_search_path.split(",")
+
+    for path in paths:
+        if ":" in path:
+            searchpath.append(resolve_path(path))
+        else:
+            searchpath.append(path)
+    return searchpath
+
+
+class JinjaxTemplateRenderer(AbstractTemplateRenderer):
+    route_prefix: str
+    """Used to prefix url to fetch fast life widgets."""
+
+    def __init__(self, settings: "Settings") -> None:
+        self.route_prefix = settings.fastlife_route_prefix
+        self.form_data_model_prefix = settings.form_data_model_prefix
+        self.csrf_token_name = settings.csrf_token_name
+
+        self.catalog = Catalog()
+        for path in build_searchpath(settings.template_search_path):
+            self.catalog.add_folder(path)
+
+    def render_page(self, request: Request, template: str, **params: Any) -> str:
+        return self.catalog.render(  # type:ignore
+            template,
+            request=request,
+            csrf_token={
+                "name": self.csrf_token_name,
+                "value": request.scope.get(self.csrf_token_name, ""),
+            },
+            pydantic_form=self.pydantic_form,
+            **params
+        )
+
+    def render_template(self, template: str, **params: Any) -> str:
+        return self.catalog.render(template, **params)  # type:ignore
+
+    def pydantic_form(
+        self,
+        model: Type[Any],
+        form_data: Optional[Mapping[str, Any]] = None,
+        name: Optional[str] = None,
+        token: Optional[str] = None,
+        removable: bool = False,
+        field: FieldInfo | None = None,
+    ) -> Markup:
+        return WidgetFactory(self, token).get_markup(
+            model,
+            form_data or {},
+            prefix=(name or self.form_data_model_prefix),
+            removable=removable,
+            field=field,
+        )

fastlife/templating/renderer/widgets/base.py

@@ -42,18 +42,15 @@ class Widget(abc.ABC):
         self.aria_label = aria_label or ""
         self.token = token or secrets.token_urlsafe(4).replace("_", "-")
         self.removable = removable
-
-    @property
-    def id(self) -> str:
-        return f"{self.name}-{self.token}".replace("_", "-").replace(".", "-")
+        self.id = f"{self.name}-{self.token}".replace("_", "-").replace(".", "-")
 
     @abc.abstractmethod
     def get_template(self) -> str:
         ...
 
-    async def to_html(self, renderer: AbstractTemplateRenderer) -> Markup:
+    def to_html(self, renderer: AbstractTemplateRenderer) -> Markup:
         """Return the html version"""
-        return Markup(await renderer.render_template(self.get_template(), widget=self))
+        return Markup(renderer.render_template(self.get_template(), widget=self))
 
 
 def _get_fullname(typ: Type[Any]) -> str:
@@ -64,11 +61,18 @@ def _get_fullname(typ: Type[Any]) -> str:
 
 
 class TypeWrapper:
-    def __init__(self, typ: Type[Any], route_prefix: str, name: str, token: str):
+    def __init__(
+        self,
+        typ: Type[Any],
+        route_prefix: str,
+        name: str,
+        token: str,
+        title: str | None = None,
+    ):
         self.typ = typ
         self.route_prefix = route_prefix
         self.name = name
-        self.title = get_title(typ)
+        self.title = title or get_title(typ)
         self.token = token
 
     @property
@@ -77,12 +81,9 @@ class TypeWrapper:
 
     @property
     def params(self) -> Mapping[str, str]:
-        return {"name": self.name, "token": self.token}
+        return {"name": self.name, "token": self.token, "title": self.title}
 
     @property
     def url(self) -> str:
-        ret = (
-            f"{self.route_prefix}/pydantic-form/widgets/{self.fullname}"
-            # f"?name={self.name}&token={self.token}"
-        )
+        ret = f"{self.route_prefix}/pydantic-form/widgets/{self.fullname}"
         return ret

fastlife/templating/renderer/widgets/boolean.py

@@ -17,4 +17,4 @@ class BooleanWidget(Widget):
         self.value = value
 
     def get_template(self) -> str:
-        return "pydantic_form/boolean.jinja2"
+        return "pydantic_form.Boolean"