python-fasthtml 0.14.11__tar.gz → 0.14.12__tar.gz

{python_fasthtml-0.14.11/python_fasthtml.egg-info → python_fasthtml-0.14.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.11
+Version: 0.14.12
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.1.2
+Requires-Dist: fastcore>=2.2.7
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib
@@ -128,7 +128,6 @@ The capabilities of FastHTML are vast and growing, and not all the features and
 Then explore the small but growing third-party ecosystem of FastHTML tutorials, notebooks, libraries, and components:
 
 - [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal examples of components (ie chat bubbles, click-to-edit, infinite scroll, etc)
-- [Creating Custom FastHTML Tags for Markdown Rendering](https://isaac-flath.github.io/website/posts/boots/FasthtmlTutorial.html) by Isaac Flath
 - [How to Build a Simple Login System in FastHTML](https://blog.mariusvach.com/posts/login-fasthtml) by Marius Vach
 - Your tutorial here!
 

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/README.md

@@ -93,7 +93,6 @@ The capabilities of FastHTML are vast and growing, and not all the features and
 Then explore the small but growing third-party ecosystem of FastHTML tutorials, notebooks, libraries, and components:
 
 - [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal examples of components (ie chat bubbles, click-to-edit, infinite scroll, etc)
-- [Creating Custom FastHTML Tags for Markdown Rendering](https://isaac-flath.github.io/website/posts/boots/FasthtmlTutorial.html) by Isaac Flath
 - [How to Build a Simple Login System in FastHTML](https://blog.mariusvach.com/posts/login-fasthtml) by Marius Vach
 - Your tutorial here!
 

python_fasthtml-0.14.12/fasthtml/__init__.py

@@ -0,0 +1,8 @@
+"""The fastest way to create an HTML app
+
+Modules:
+
+- `fasthtml.core`: The `FastHTML` subclass of `Starlette`."""
+
+__version__ = "0.14.12"
+from .core import *

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/components.py

@@ -5,18 +5,18 @@ Docs: https://www.fastht.ml/docs/api/components.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_components.ipynb.
 
 # %% auto #0
-__all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_evts', 'js_evts', 'hx_attrs_annotations', 'hx_evt_attrs', 'js_evt_attrs',
-           'evt_attrs', 'attrmap_x', 'ft_html', 'ft_hx', 'File', 'show', 'fill_form', 'fill_dataclass', 'find_inputs',
-           'html2ft', 'sse_message', 'A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi',
-           'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data',
-           'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog', 'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe',
-           'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header',
-           'Hgroup', 'Hr', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li', 'Link', 'Main', 'Map',
-           'Mark', 'Menu', 'Meta', 'Meter', 'Nav', 'Noscript', 'Object', 'Ol', 'Optgroup', 'Option', 'Output', 'P',
-           'Picture', 'PortalExperimental', 'Pre', 'Progress', 'Q', 'Rp', 'Rt', 'Ruby', 'S', 'Samp', 'Script', 'Search',
-           'Section', 'Select', 'Slot', 'Small', 'Source', 'Span', 'Strong', 'Style', 'Sub', 'Summary', 'Sup', 'Table',
-           'Tbody', 'Td', 'Template', 'Textarea', 'Tfoot', 'Th', 'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul',
-           'Var', 'Video', 'Wbr']
+__all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_4only', 'hx_evts', 'hx_evts_4only', 'js_evts', 'hx_attrs_annotations',
+           'hx_evt_attrs', 'js_evt_attrs', 'evt_attrs', 'HxPartial', 'attrmap_x', 'ft_html', 'ft_hx', 'File', 'show',
+           'fill_form', 'fill_dataclass', 'find_inputs', 'html2ft', 'sse_message', 'A', 'Abbr', 'Address', 'Area',
+           'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi', 'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas',
+           'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data', 'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog',
+           'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe', 'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form', 'H1',
+           'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header', 'Hgroup', 'Hr', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd',
+           'Label', 'Legend', 'Li', 'Link', 'Main', 'Map', 'Mark', 'Menu', 'Meta', 'Meter', 'Nav', 'Noscript', 'Object',
+           'Ol', 'Optgroup', 'Option', 'Output', 'P', 'Picture', 'PortalExperimental', 'Pre', 'Progress', 'Q', 'Rp',
+           'Rt', 'Ruby', 'S', 'Samp', 'Script', 'Search', 'Section', 'Select', 'Slot', 'Small', 'Source', 'Span',
+           'Strong', 'Style', 'Sub', 'Summary', 'Sup', 'Table', 'Tbody', 'Td', 'Template', 'Textarea', 'Tfoot', 'Th',
+           'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul', 'Var', 'Video', 'Wbr']
 
 # %% ../nbs/api/01_components.ipynb #8e2d405b
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
@@ -46,10 +46,13 @@ def __add__(self:FT, b): return f'{self}{b}'
 named = set('a button form frame iframe img input map meta object param select textarea'.split())
 html_attrs = 'id cls title style accesskey contenteditable dir draggable enterkeyhint hidden inert inputmode lang popover spellcheck tabindex translate'.split()
 hx_attrs = 'get post put delete patch trigger target swap swap_oob include select select_oob indicator push_url confirm disable replace_url vals disabled_elt ext headers history history_elt inherit params preserve prompt request sync validate'
+hx_attrs_4only = 'action method config ignore' # https://four.htmx.org/docs/get-started/migration#attributes
 
 hx_evts = 'abort afterOnLoad afterProcessNode afterRequest afterSettle afterSwap beforeCleanupElement beforeOnLoad beforeProcessNode beforeRequest beforeSwap beforeSend beforeTransition configRequest confirm historyCacheError historyCacheMiss historyCacheMissError historyCacheMissLoad historyRestore beforeHistorySave load noSSESourceError onLoadError oobAfterSwap oobBeforeSwap oobErrorNoTarget prompt pushedIntoHistory replacedInHistory responseError sendAbort sendError sseError sseOpen swapError targetError timeout validation:validate validation:failed validation:halted xhr:abort xhr:loadend xhr:loadstart xhr:progress'
+# https://four.htmx.org/docs/get-started/migration#renamed-events
+hx_evts_4only = 'after:init before:cleanup before:history:update before:init before:process before:history:restore after:history:push after:history:replace error'
 js_evts = "blur change contextmenu focus input invalid reset select submit keydown keypress keyup click dblclick mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup wheel"
-hx_attrs = [f'hx_{o}' for o in hx_attrs.split()]
+hx_attrs = [f'hx_{o}' for o in hx_attrs.split() + hx_attrs_4only.split()]
 hx_attrs_annotations = {
     "hx_swap": Literal["innerHTML", "outerHTML", "afterbegin", "beforebegin", "beforeend", "afterend", "delete", "none"] | str,
     "hx_swap_oob": Literal["true", "innerHTML", "outerHTML", "afterbegin", "beforebegin", "beforeend", "afterend", "delete", "none"] | str,
@@ -64,7 +67,7 @@ hx_attrs_annotations |= {o: str for o in set(hx_attrs) - set(hx_attrs_annotation
 hx_attrs_annotations = {k: Optional[v] for k,v in hx_attrs_annotations.items()} 
 hx_attrs = html_attrs + hx_attrs
 
-hx_evt_attrs = ['hx_on__'+camel2snake(o).replace(':','_') for o in hx_evts.split()]
+hx_evt_attrs = ['hx_on__'+camel2snake(o).replace(':','_') for o in hx_evts.split() + hx_evts_4only.split()]
 js_evt_attrs = ['hx_on_'+o for o in js_evts.split()]
 evt_attrs = js_evt_attrs+hx_evt_attrs
 
@@ -117,6 +120,10 @@ _all_ = [
     'Td', 'Template', 'Textarea', 'Tfoot', 'Th', 'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul', 'Var', 'Video', 'Wbr']
 for o in _all_: _g[o] = partial(ft_hx, o.lower())
 
+# %% ../nbs/api/01_components.ipynb #dfa8f01c
+HxPartial = partial(ft_hx, 'hx-partial') # For hx v4, manually mapping because Python doesn't allow hyphens
+
+
 # %% ../nbs/api/01_components.ipynb #fab04fb3
 def File(fname):
     "Use the unescaped text in file `fname` directly"
@@ -243,4 +250,6 @@ def html2ft(html, attr1st=False):
 def sse_message(elm, event='message'):
     "Convert element `elm` into a format suitable for SSE streaming"
     data = '\n'.join(f'data: {o}' for o in to_xml(elm).splitlines())
+    # SSE delivers a message with no event field as type 'message', so the line is redundant for the default (and htmx v4 requires its absence for plain swaps)
+    if event=='message': return f'{data}\n\n'
     return f'event: {event}\n{data}\n\n'

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/core.py

@@ -1,12 +1,52 @@
 """The `FastHTML` subclass of `Starlette`.
 
+Create an app with `app = FastHTML()`. The `@rt` decorator adds routes (`rt = app.route`), inferring what it can from the function:
+
+    @rt
+    def index(): ...      # GET,POST /
+    @rt
+    def foo(): ...        # GET,POST /foo
+    @rt('/hi')
+    def get(): ...        # GET /hi (function named after a verb handles just that verb)
+    @rt('/cards/{id}')
+    class Cards: ...      # class route group: each verb-named method (get, patch, ...) becomes a handler
+
+The decorated function doubles as a URL builder, so links never need hardcoded paths:
+
+    A('More', href=foo.to(a=1))   # <a href="/foo?a=1"> `.to()` fills path params; the rest become query params.
+    Div('...', hx_get=foo)        # route functions work directly as htmx attr values: hx-get="/foo"
+
+Handlers return FT trees (from `fastcore.xml`), rendered as HTML automatically: a full page for regular requests, a bare fragment for HTMX requests. In a full page, top-level `Title`, `Meta`, `Link`, and `Style` items go in `<head>`; the rest goes in `<body>`. Strings are sent as HTML, dicts as JSON, and a Starlette `Response` is sent untouched. A return tuple may mix content with special items: any `HttpHeader` (e.g. from `cookie()` or `HtmxResponseHeaders()`) becomes a response header, any `BackgroundTask` runs after the response is sent, and the rest renders as content. `Redirect` picks the right redirect mechanism for HTMX vs regular requests, and `FtResponse` wraps FT content when you need the status code or headers.
+
+Handler parameters are filled from the request: each is looked up in path, cookie, header (snake_case names match Hyphen-Case headers), query, then form data, and cast by calling its annotation on the value. `bool`, `int`, and `date` get smart string parsing; `UploadFile` passes through. Repeated params take the last value unless annotated `list[T]`, which collects them all. A param with no annotation and no special name is ignored, with a warning. A dataclass, TypedDict, namedtuple, or any annotated class collects the whole form body; a `__from_request__` classmethod customizes construction. A missing required param is a 400, a failed cast a 404. These special names need no annotation:
+
+    req, ws   the Request / WebSocket connection
+    sess      session dict
+    app       the FastHTML app
+    state     app.state
+    scope     ASGI scope
+    auth      scope['auth']
+    htmx      HtmxHeaders (parsed HX-* request headers)
+    body      raw body text
+    data      parsed form data as a dict
+    api       ApiReturn (API vs browser dual responses)
+    send      websocket send function
+    hdrs,ftrs the per-request copies of the app's `hdrs`/`ftrs` (head and footer content)
+    htmlkw    the per-request copy of the app's `<html>` attrs
+    bodykw    the per-request copy of the app's `<body>` attrs
+    resp      the handler's response (injected into `after` functions)
+
+`before`/`after` functions (app-level, with `Beforeware` skip patterns, or per-route `before=`) get the same param injection as handlers. A `before` returning a value responds with it and skips the handler (the usual auth-guard pattern).
+
+See the [Handling Handlers tutorial](https://www.fastht.ml/docs/ref/handlers.html.md) for worked examples of the above.
+
 Docs: https://www.fastht.ml/docs/api/core.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
 # %% auto #0
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'DEF_MAXPART', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc',
-           'viewport', 'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'devtools_loc', 'parsed_date',
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'DEF_MAXPART', 'htmx_exts', 'htmxsrc', 'htmx4src', 'fhjsscr', 'surrsrc',
+           'scopesrc', 'viewport', 'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'devtools_loc', 'parsed_date',
            'snake2hyphens', 'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'ApiReturn',
            'JSONResponse', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple',
            'noop_body', 'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'Lifespan', 'FastHTML',
@@ -64,14 +104,18 @@ htmx_hdrs = dict(
     history_restore_request="HX-History-Restore-Request",
     prompt="HX-Prompt",
     request="HX-Request",
+    request_type="HX-Request-Type", # v4: partial or full update
+    source="HX-Source", # v4: replaces v2 HX-Trigger but with tag#id instead just id
     target="HX-Target",
     trigger_name="HX-Trigger-Name",
     trigger="HX-Trigger")
 
 @dataclass
 class HtmxHeaders:
+    "Parsed HX-* request headers"
     boosted:str|None=None; current_url:str|None=None; history_restore_request:str|None=None; prompt:str|None=None
-    request:str|None=None; target:str|None=None; trigger_name:str|None=None; trigger:str|None=None
+    request:str|None=None; request_type:str|None=None; source:str|None=None; target:str|None=None; 
+    trigger_name:str|None=None; trigger:str|None=None
     def __bool__(self): return any(hasattr(self,o) for o in htmx_hdrs)
 
 def _get_htmx(h):
@@ -117,7 +161,9 @@ def _form_arg(k, v, d):
 
 # %% ../nbs/api/00_core.ipynb #5fc04751
 @dataclass
-class HttpHeader: k:str;v:str
+class HttpHeader:
+    "A response header as a k,v pair"
+    k:str;v:str
 
 # %% ../nbs/api/00_core.ipynb #94e18161
 def _to_htmx_header(s): return 'HX-' + s.replace('_', '-').title()
@@ -188,6 +234,7 @@ async def _from_body(conn, p, data):
 
 # %% ../nbs/api/00_core.ipynb #88b6da3f
 class ApiReturn:
+    "Request param: call with browser and API responses; returns kwargs as JSON if the client accepts `application/json`, else `norm`"
     @classmethod
     async def __from_request__(cls, data, req): return cls(req.headers.get('accept')=='application/json')
     def __init__(self, isapi=False): self.isapi = isapi
@@ -242,6 +289,7 @@ async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     if res in (empty,None): res = conn.query_params.getlist(arg)
     if res==[]: res = None
     if res in (empty,None): res = data.get(arg, None)
+    if res in (empty,None) and isinstance(vals := data.get('values'), dict): res = vals.get(arg)  # htmx v4 nests form data under `values`
     if res in (empty,None):
         if p.default is empty:
             if isinstance(conn, Request): raise HTTPException(400, f"Missing required field: {arg}")
@@ -274,16 +322,18 @@ def flat_xt(lst):
 
 # %% ../nbs/api/00_core.ipynb #aacff5ac
 class Beforeware:
+    "Wrap a `before` function with `skip` path patterns that bypass it"
     def __init__(self, f, skip=None): self.f,self.skip = f,skip or []
     def __repr__(self): return f'Beforeware({self.f}, skip={self.skip})'
 
 # %% ../nbs/api/00_core.ipynb #78c3c357
-async def _handle(f, *args, **kwargs):
+async def _handle(f, /, *args, **kwargs):
     return (await f(*args, **kwargs)) if is_async_callable(f) else await run_in_threadpool(f, *args, **kwargs)
 
 # %% ../nbs/api/00_core.ipynb #ad0f0e87
 async def _wrap_ws(ws, data, params):
-    hdrs = Headers({k.lower():v for k,v in data.pop('HEADERS', {}).items() if v is not None})
+    raw = data.pop('HEADERS', {}) or (data.pop('headers') if isinstance(data.get('headers'), dict) else {})  # htmx v4 sends lowercase `headers`
+    hdrs = Headers({k.lower():v for k,v in raw.items() if v is not None})
     return await _find_ps(ws, data, hdrs, params)
 
 # %% ../nbs/api/00_core.ipynb #dcc15129
@@ -321,6 +371,7 @@ def EventStream(s):
 
 # %% ../nbs/api/00_core.ipynb #0dd0a414
 def signal_shutdown():
+    "Return an `asyncio.Event` set when uvicorn receives a shutdown signal"
     from uvicorn.main import Server
     event = asyncio.Event()
     @patch
@@ -504,11 +555,16 @@ htmx_exts = {
     "remove-me": "https://cdn.jsdelivr.net/npm/htmx-ext-remove-me@2.0.0/remove-me.js",
     "debug": "https://unpkg.com/htmx.org@1.9.12/dist/ext/debug.js",
     "ws": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.3/ws.js",
-    "chunked-transfer": "https://cdn.jsdelivr.net/npm/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js"
+    "ws4": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-ws.js",
+    "chunked-transfer": "https://cdn.jsdelivr.net/npm/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js",
+    "sse4": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-sse.js",
+    "live": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-live.js",
+    "multipart": "https://cdn.jsdelivr.net/gh/bigskysoftware/htmx@four/src/ext/hx-multipart.min.js"
 }
 
 # %% ../nbs/api/00_core.ipynb #60cb52ea
 htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.js")
+htmx4src  = Script(src="https://unpkg.com/htmx.org@4.0.0-beta6/dist/htmx.js")
 fhjsscr   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@1.0.12/fasthtml.js")
 surrsrc   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js")
 scopesrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js")
@@ -553,11 +609,17 @@ def qp(p:str, **kw) -> str:
     return p + ('?' + urlencode({k:'' if v in (False,None) else v for k,v in kw.items()},doseq=True) if kw else '')
 
 # %% ../nbs/api/00_core.ipynb #f86690c4
-def def_hdrs(htmx=True, surreal=True):
+def def_hdrs(htmx=True, htmx4=False, surreal=True):
     "Default headers for a FastHTML app"
     hdrs = []
     if surreal: hdrs = [surrsrc,scopesrc] + hdrs
-    if htmx: hdrs = [htmxsrc,fhjsscr] + hdrs
+    if htmx4: 
+        # metaCharacter="-" makes htmx4 use dashes instead of colons
+        meta_cfg = Meta(name="htmx-config", content=json.dumps({"metaCharacter": "-"}))
+        hdrs = [meta_cfg, htmx4src,fhjsscr] + hdrs 
+        # TODO: Check if fhjsscr works with htmx4
+    elif htmx:
+        hdrs = [htmxsrc,fhjsscr] + hdrs
     return [charset, viewport] + hdrs
 
 # %% ../nbs/api/00_core.ipynb #2c5285ae
@@ -568,11 +630,24 @@ iframe_scr = Script(NotStr("""
     function sendmsg() {
         window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');
     }
+
     window.onload = function() {
         sendmsg();
-        document.body.addEventListener('htmx:afterSettle',    sendmsg);
-        document.body.addEventListener('htmx:wsAfterMessage', sendmsg);
-    };"""))
+
+        const ver = window.htmx?.version || '';
+        const isV4 = ver.startsWith('4.');
+        const mc = window.htmx?.config?.metaCharacter || ':';
+
+        if (isV4) {
+            document.body.addEventListener(`htmx${mc}after${mc}swap`, sendmsg);
+            document.body.addEventListener(`htmx${mc}after${mc}ws${mc}message`, sendmsg);
+        } else {
+            document.body.addEventListener('htmx:afterSettle', sendmsg);
+            document.body.addEventListener('htmx:wsAfterMessage', sendmsg);
+        }
+    };
+"""))
+
 
 # %% ../nbs/api/00_core.ipynb #17ced9a3
 class _LifespanCtx:
@@ -585,6 +660,7 @@ class _LifespanCtx:
     async def __anext__(self): return await self.gen.__anext__()
 
 class Lifespan:
+    "Combine `on_startup`/`on_shutdown` callbacks and an optional lifespan generator into one context manager"
     def __init__(self, startup=None, shutdown=None, ls=None):
         startup,shutdown = listify(startup),listify(shutdown)
         store_attr()
@@ -603,21 +679,24 @@ class Lifespan:
 
 # %% ../nbs/api/00_core.ipynb #3327a1e9
 class FastHTML(Starlette):
+    "An HTML-first Starlette app: handler params filled from the request, FT returns rendered as pages or HTMX fragments"
     def __init__(self, debug=False, routes=None, middleware=None, title: str = "FastHTML page", exception_handlers=None,
                  on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, ftrs=None, exts=None,
-                 before=None, after=None, surreal=True, htmx=True, default_hdrs=True, sess_cls=SessionMiddleware,
+                 before=None, after=None, surreal=True, htmx=True, htmx4=False, default_hdrs=True, sess_cls=SessionMiddleware,
                  secret_key=None, session_cookie='session_', max_age=365*24*3600, sess_path='/',
                  same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey',
                  body_wrap=noop_body, htmlkw=None, nb_hdrs=False, canonical=True, max_part_size=DEF_MAXPART, **bodykw):
         middleware,before,after = map(_list, (middleware,before,after))
         self.title,self.canonical,self.session_cookie,self.key_fname = title,canonical,session_cookie,key_fname
         hdrs,ftrs,exts = map(listify, (hdrs,ftrs,exts))
+        if htmx4 and exts:
+            exts = ['ws4' if e in ('ws', 'ws4') else e for e in exts]
         exts = {k:htmx_exts[k] for k in exts}
         htmlkw = htmlkw or {}
-        if default_hdrs: hdrs = def_hdrs(htmx, surreal=surreal) + hdrs
+        if default_hdrs: hdrs = def_hdrs(htmx, htmx4, surreal=surreal) + hdrs
         hdrs += [Script(src=ext) for ext in exts.values()]
         if IN_NOTEBOOK:
-            hdrs.append(iframe_scr)
+            hdrs.append(iframe_scr) # TODO: check iframe_scr work with htmx4
             from IPython.display import display,HTML
             if nb_hdrs: display(HTML(to_xml(tuple(hdrs))))
             middleware.append(cors_allow)
@@ -627,8 +706,8 @@ class FastHTML(Starlette):
         self.secret_key = get_key(secret_key, key_fname)
         if sess_cls:
             sess = Middleware(sess_cls, secret_key=self.secret_key,session_cookie=session_cookie,
-                              max_age=max_age, path=sess_path, same_site=same_site,
-                              https_only=sess_https_only, domain=sess_domain)
+                                max_age=max_age, path=sess_path, same_site=same_site,
+                                https_only=sess_https_only, domain=sess_domain)
             middleware.append(sess)
         exception_handlers = ifnone(exception_handlers, {})
         if 404 not in exception_handlers:
@@ -810,11 +889,10 @@ def serve(
     "Run the app in an async server, with live reload set as the default."
     from uvicorn import run
     bk = inspect.currentframe().f_back
-    glb = bk.f_globals
-    code = bk.f_code
+    glb,back = bk.f_globals,bk.f_back
     if not appname:
         if glb.get('__name__')=='__main__': appname = Path(glb.get('__file__', '')).stem
-        elif code.co_name=='main' and bk.f_back.f_globals.get('__name__')=='__main__': appname = inspect.getmodule(bk).__name__
+        elif back and back.f_globals.get('__name__')=='__main__': appname = inspect.getmodule(bk).__name__
     if appname:
         if not port: port=int(os.getenv("PORT", default=5001))
         link = f'http://{"localhost" if host=="0.0.0.0" else host}:{port}'
@@ -865,6 +943,7 @@ for o in ('get', 'post', 'delete', 'put', 'patch', 'options'): setattr(Client, o
 
 # %% ../nbs/api/00_core.ipynb #d5223a9a
 class RouteFuncs:
+    "Attr-access store of named route functions (HTTP verb names excluded)"
     def __init__(self): super().__setattr__('_funcs', {})
     def __setattr__(self, name, value): self._funcs[name] = value
     def __getattr__(self, name):
@@ -936,6 +1015,7 @@ def cookie(key: str, value="", max_age=None, expires=None, path="/", domain=None
 
 # %% ../nbs/api/00_core.ipynb #8816f277
 def reg_re_param(m, s):
+    "Register a Starlette URL convertor named `m` matching regex `s`"
     cls = get_class(f'{m}Conv', sup=StringConvertor, regex=s)
     register_url_convertor(m, cls())
 
@@ -960,6 +1040,7 @@ def static_route(self:FastHTML, ext='', prefix='/', static_path='.'):
 
 # %% ../nbs/api/00_core.ipynb #f63b7a03
 class StaticNoCache(StaticFiles):
+    "StaticFiles that sends `Cache-Control: no-cache`, so browsers revalidate on every use"
     def file_response(self, *args, **kwargs):
         resp = super().file_response(*args, **kwargs)
         resp.headers.setdefault("Cache-Control", "no-cache")
@@ -995,7 +1076,7 @@ def add_sig_param(f, name, typ=NoneType, kind=Parameter.KEYWORD_ONLY, default=Pa
     sig = signature(f)
     if name in sig.parameters: return f
     kw = {} if default is Parameter.empty else {'default': default}
-    new_params = list(sig.parameters.values()) + [Parameter(name, kind, **kw)]
+    new_params = list(sig.parameters.values()) + [Parameter(name, kind, annotation=typ, **kw)]
     f.__signature__ = sig.replace(parameters=new_params)
     f.__annotations__[name] = typ
     return f
@@ -1024,11 +1105,11 @@ class into:
 
 # %% ../nbs/api/00_core.ipynb #1960d7ff
 class MiddlewareBase:
+    "Base for middleware: passes non-http/ws scopes through, else returns the `HTTPConnection`"
     async def __call__(self, scope, receive, send) -> None:
-        if scope["type"] not in ["http", "websocket"]:
-            await self._app(scope, receive, send)
-            return
-        return HTTPConnection(scope)
+        if scope["type"] in ("http", "websocket"): return HTTPConnection(scope)
+        await self._app(scope, receive, send)
+        
 
 # %% ../nbs/api/00_core.ipynb #83a20f93
 class FtResponse:
@@ -1047,6 +1128,7 @@ class FtResponse:
 
 # %% ../nbs/api/00_core.ipynb #9dc1025e
 def unqid(seeded=False):
+    "Random unique id, base64-encoded and prefixed with '_' so it's usable as an HTML id"
     id4 = UUID(int=random.getrandbits(128), version=4) if seeded else uuid4()
     res = b64encode(id4.bytes)
     return '_' + res.decode().rstrip('=').translate(str.maketrans('+/', '_-'))

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/fastapp.py

@@ -44,6 +44,7 @@ def fast_app(
         pico:Optional[bool]=None, # Include PicoCSS header?
         surreal:Optional[bool]=True, # Include surreal.js/scope headers?
         htmx:Optional[bool]=True, # Include HTMX header?
+        htmx4:Optional[bool]=False,
         exts:Optional[list|str]=None, # HTMX extension names to include
         canonical:bool=True, # Automatically include canonical link?
         secret_key:Optional[str]=None, # Signing key for sessions
@@ -70,7 +71,7 @@ def fast_app(
     app = _app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, title=title, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key, canonical=canonical,
                   session_cookie=session_cookie, max_age=max_age, sess_path=sess_path, same_site=same_site, sess_https_only=sess_https_only,
-                  sess_domain=sess_domain, key_fname=key_fname, exts=exts, surreal=surreal, htmx=htmx, htmlkw=htmlkw,
+                  sess_domain=sess_domain, key_fname=key_fname, exts=exts, surreal=surreal, htmx=htmx, htmx4=htmx4, htmlkw=htmlkw,
                   reload_attempts=reload_attempts, reload_interval=reload_interval, body_wrap=body_wrap, nb_hdrs=nb_hdrs, **(bodykw or {}))
     app.static_route_exts(static_path=static_path)
     if not db_file: return app,app.route
@@ -86,4 +87,3 @@ def fast_app(
     dbtbls = [_get_tbl(db.t, k, v) for k,v in tbls.items()]
     if len(dbtbls)==1: dbtbls=dbtbls[0]
     return app,app.route,*dbtbls
-

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/jupyter.py

@@ -55,13 +55,17 @@ def render_ft(**kw):
 def htmx_config_port(port=8000):
     display(HTML('''
 <script>
-document.body.addEventListener('htmx:configRequest', (event) => {
-    if(event.detail.path.includes('://')) return;
-    htmx.config.selfRequestsOnly=false;
-    event.detail.path = `${location.protocol}//${location.hostname}:%s${event.detail.path}`;
-});
+["htmx:configRequest","htmx-config-request"].forEach(evt => document.body.addEventListener(evt, (event) => {
+    const ctx = event.detail.ctx;
+    const path = ctx ? ctx.request.action : event.detail.path;
+    if (path.includes('://')) return;
+    const full = `${location.protocol}//${location.hostname}:%s${path}`;
+    if (ctx) { ctx.request.mode = "cors"; ctx.request.action = full; }
+    else { htmx.config.selfRequestsOnly = false; event.detail.path = full; }
+}));
 </script>''' % port))
 
+
 # %% ../nbs/api/06_jupyter.ipynb #79406618
 class JupyUvi:
     "Start and stop a Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
@@ -73,7 +77,7 @@ class JupyUvi:
         if live: self._setup_live(app)
         if start: self.start()
         if not os.environ.get('IN_SOLVEIT'): htmx_config_port(port)
-            
+
     def start(self):
         self.server = nb_serve(self.app, log_level=self.log_level, host=self.host, port=self.port,daemon=self.daemon, **self.kwargs)
 

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/pico.py

@@ -21,10 +21,10 @@ try: from IPython import display
 except ImportError: display=None
 
 # %% ../nbs/api/04_pico.ipynb #100414ae
-picocss = "https://cdn.jsdelivr.net/npm/@picocss/pico@latest/css/pico.min.css"
+picocss = "https://cdn.jsdelivr.net/npm/@anyblades/pico@latest/css/pico.min.css"
 picolink = (Link(rel="stylesheet", href=picocss),
             Style(":root { --pico-font-size: 100%; }"))
-picocondcss = "https://cdn.jsdelivr.net/npm/@picocss/pico@latest/css/pico.conditional.min.css"
+picocondcss = "https://cdn.jsdelivr.net/npm/@anyblades/pico@latest/css/pico.conditional.min.css"
 picocondlink = (Link(rel="stylesheet", href=picocondcss),
                 Style(":root { --pico-font-size: 100%; }"))
 
@@ -37,8 +37,7 @@ new MutationObserver(ms => {
   ms.forEach(m => {
     m.addedNodes.forEach(n => {
       if (n.nodeType === 1) {
-        var nc = n.classList;
-        if (nc && (nc.contains('cell-output') || nc.contains('output_area'))) nc.add('pico');
+        if (n.matches(sel)) n.classList.add('pico');
         n.querySelectorAll(sel).forEach(e => e.classList.add('pico'));
       }
     });
@@ -86,7 +85,8 @@ def Container(*args, **kwargs)->FT:
     "A PicoCSS Container, implemented as a Main with class 'container'"
     return Main(*args, cls="container", **kwargs)
 
-# %% ../nbs/api/04_pico.ipynb #138dc298
+# %% ../nbs/api/04_pico.ipynb #b8c98614
 def PicoBusy():
-    return (HtmxOn('beforeRequest', "event.detail.elt.setAttribute('aria-busy', 'true' )"),
-            HtmxOn('afterRequest',  "event.detail.elt.setAttribute('aria-busy', 'false')"))
+    elt = "(event.detail.ctx?.sourceElement || event.detail.elt)"
+    return (HtmxOn('beforeRequest', f"{elt}.setAttribute('aria-busy', 'true' )"),
+            HtmxOn('afterRequest',  f"{elt}.setAttribute('aria-busy', 'false')"))

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/fasthtml/xtend.py

@@ -167,9 +167,10 @@ def run_js(js, id=None, **kw):
 
 # %% ../nbs/api/02_xtend.ipynb #365f57a8
 def HtmxOn(eventname:str, code:str):
+    "Run `code` on htmx event `eventname`; both the v2 (`htmx:camelCase`) and v4 (`htmx-dash-case`) spellings are bound, and only the loaded version's fires"
     return Script('''domReadyExecute(function() {
-document.body.addEventListener("htmx:%s", function(event) { %s })
-})''' % (eventname, code))
+["htmx:%s","htmx-%s"].forEach(evt => document.body.addEventListener(evt, function(event) { %s }))
+})''' % (to_camel(eventname), to_kebab(eventname), code))
 
 # %% ../nbs/api/02_xtend.ipynb #39f20784
 def jsd(org, repo, root, path, prov='gh', typ='script', ver=None, esm=False, **kwargs)->FT:
@@ -242,23 +243,24 @@ def Favicon(light_icon, dark_icon):
 # %% ../nbs/api/02_xtend.ipynb #50444181
 def clear(id): return Div(hx_swap_oob='innerHTML', id=id)
 
-# %% ../nbs/api/02_xtend.ipynb #09b2e3a5
-sid_scr = Script('''
+# %% ../nbs/api/02_xtend.ipynb #f46160fb
+sid_scr = Script("""
 function uuid() {
     return [...crypto.getRandomValues(new Uint8Array(10))].map(b=>b.toString(36)).join('');
 }
-
 sessionStorage.setItem("sid", sessionStorage.getItem("sid") || uuid());
 
-htmx.on("htmx:configRequest", (e) => {
-    const sid = sessionStorage.getItem("sid");
-    if (sid) {
-        const url = new URL(e.detail.path, window.location.origin);
-        url.searchParams.set('sid', sid);
-        e.detail.path = url.pathname + url.search;
-    }
-});
-''')
+function addSid(url, sid) {
+    const u = new URL(url, window.location.origin);
+    u.searchParams.set('sid', sid);
+    return u.pathname + u.search;
+}
+                 
+const mc = htmx.config?.metaCharacter || ':';
+
+htmx.on("htmx:configRequest",  (e) => { const sid = sessionStorage.getItem("sid"); if (sid) e.detail.path = addSid(e.detail.path, sid); }); // htmx v2
+htmx.on(`htmx${mc}config${mc}request`, (e) => { const sid = sessionStorage.getItem("sid"); if (sid) e.detail.ctx.request.action = addSid(e.detail.ctx.request.action, sid); }); // htmx v4
+""")
 
 # %% ../nbs/api/02_xtend.ipynb #579e1f33
 def with_sid(app, dest, path='/'):

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/pyproject.toml

@@ -12,7 +12,7 @@ license = {text = "Apache-2.0"}
 authors = [{name = "Jeremy Howard and contributors", email = "github@jhoward.fastmail.fm"}]
 keywords = ['nbdev', 'jupyter', 'notebook', 'python']
 classifiers = ["Natural Language :: English", "Intended Audience :: Developers", "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only"]
-dependencies = ['fastcore>=2.1.2', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx2', 'python-multipart', 'beautifulsoup4']
+dependencies = ['fastcore>=2.2.7', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx2', 'python-multipart', 'beautifulsoup4']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fasthtml"
@@ -45,4 +45,3 @@ lib_path = "fasthtml"
 [tool.chkstyle]
 skip_paths = ["_modidx.py"]
 ignore = ["closing-bracket", "inefficient-multiline-signature", "inefficient-multiline-expression"]
-

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.11
+Version: 0.14.12
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=2.1.2
+Requires-Dist: fastcore>=2.2.7
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib
@@ -128,7 +128,6 @@ The capabilities of FastHTML are vast and growing, and not all the features and
 Then explore the small but growing third-party ecosystem of FastHTML tutorials, notebooks, libraries, and components:
 
 - [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal examples of components (ie chat bubbles, click-to-edit, infinite scroll, etc)
-- [Creating Custom FastHTML Tags for Markdown Rendering](https://isaac-flath.github.io/website/posts/boots/FasthtmlTutorial.html) by Isaac Flath
 - [How to Build a Simple Login System in FastHTML](https://blog.mariusvach.com/posts/login-fasthtml) by Marius Vach
 - Your tutorial here!
 

{python_fasthtml-0.14.11 → python_fasthtml-0.14.12}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=2.1.2
+fastcore>=2.2.7
 python-dateutil
 starlette>=1.0.1
 oauthlib

python_fasthtml-0.14.11/fasthtml/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.14.11"
-from .core import *