fixes #634

Author: jph00

fasthtml/components.py

@@ -8,10 +8,10 @@
            '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', 'Html', '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',
+           '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']
 
@@ -110,7 +110,7 @@ def ft_hx(tag: str, *c, target_id=None, hx_vals=None, hx_target=None, **kwargs):
     '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', 'Html', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li',
+    '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',

fasthtml/components.pyi

@@ -1,6 +1,6 @@
 """The `FastHTML` subclass of `Starlette`, along with the `RouterX` and `RouteX` classes it automatically uses."""
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond', 'Redirect', 'get_key', 'def_hdrs', 'FastHTML', 'serve', 'Client', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
-import json, uuid, inspect, types, uvicorn, signal, asyncio, threading
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
+import json, uuid, inspect, types, uvicorn, signal, asyncio, threading, inspect
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs_dict
@@ -167,6 +167,7 @@ def _apply_ft(o):
 
 def _to_xml(req, resp, indent):
     ...
+_iter_typs = (tuple, list, map, filter, range, types.GeneratorType)
 
 def flat_tuple(o):
     """Flatten lists"""
@@ -203,9 +204,9 @@ class Redirect:
 
 async def _wrap_call(f, req, params):
     ...
-htmx_exts = {'head-support': 'https://unpkg.com/[email protected].1/head-support.js', 'preload': 'https://unpkg.com/htmx-ext-preload@2.0.1/preload.js', 'class-tools': 'https://unpkg.com/[email protected]/class-tools.js', 'loading-states': 'https://unpkg.com/[email protected]/loading-states.js', 'multi-swap': 'https://unpkg.com/[email protected]/multi-swap.js', 'path-deps': 'https://unpkg.com/[email protected]/path-deps.js', 'remove-me': 'https://unpkg.com/[email protected]/remove-me.js', 'ws': 'https://unpkg.com/htmx-ext-ws/ws.js', 'chunked-transfer': 'https://unpkg.com/htmx-ext-transfer-encoding-chunked/transfer-encoding-chunked.js'}
-htmxsrc = Script(src='https://unpkg.com/htmx.org@next/dist/htmx.min.js')
-fhjsscr = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/[email protected].4/fasthtml.js')
+htmx_exts = {'head-support': 'https://unpkg.com/[email protected].3/head-support.js', 'preload': 'https://unpkg.com/htmx-ext-preload@2.1.0/preload.js', 'class-tools': 'https://unpkg.com/[email protected]/class-tools.js', 'loading-states': 'https://unpkg.com/[email protected]/loading-states.js', 'multi-swap': 'https://unpkg.com/[email protected]/multi-swap.js', 'path-deps': 'https://unpkg.com/[email protected]/path-deps.js', 'remove-me': 'https://unpkg.com/[email protected]/remove-me.js', 'ws': 'https://unpkg.com/htmx-ext-ws@2.0.2/ws.js', 'chunked-transfer': 'https://unpkg.com/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js'}
+htmxsrc = Script(src='https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js')
+fhjsscr = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/[email protected].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')
 viewport = Meta(name='viewport', content='width=device-width, initial-scale=1, viewport-fit=cover')
@@ -220,7 +221,8 @@ def _list(o):
 def _wrap_ex(f, hdrs, ftrs, htmlkw, bodykw, body_wrap):
     ...
 
-def _mk_locfunc(f, p):
+def qp(p: str, **kw) -> str:
+    """Add query parameters to path p"""
     ...
 
 def def_hdrs(htmx=True, surreal=True):
@@ -231,7 +233,7 @@ iframe_scr = Script(NotStr("\n    function sendmsg() {\n        window.parent.po
 
 class FastHTML(Starlette):
 
-    def __init__(self, debug=False, routes=None, middleware=None, 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, 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=True, **bodykw):
+    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, 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, **bodykw):
         ...
 
     def add_route(self, route):
@@ -250,7 +252,7 @@ class FastHTML(Starlette):
     def _add_route(self, func, path, methods, name, include_in_schema, body_wrap):
         ...
 
-    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):
+    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         """Add a route at `path`"""
         ...
 
@@ -262,6 +264,13 @@ class FastHTML(Starlette):
         """Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')"""
         ...
 all_meths = 'get post put delete patch head trace options'.split()
+
+def _mk_locfunc(f, p):
+    ...
+
+def nested_name(f):
+    """Get name of function `f` using '_' to join nested function names"""
+    ...
 for o in all_meths:
     setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
@@ -280,21 +289,41 @@ class Client:
 for o in ('get', 'post', 'delete', 'put', 'patch', 'options'):
     setattr(Client, o, partialmethod(Client._sync, o))
 
+class RouteFuncs:
+
+    def __init__(self):
+        ...
+
+    def __setattr__(self, name, value):
+        ...
+
+    def __getattr__(self, name):
+        ...
+
+    def __dir__(self):
+        ...
+
 class APIRouter:
     """Add routes to an app"""
 
-    def __init__(self):
+    def __init__(self, prefix: str | None=None, body_wrap=noop_body):
         ...
 
-    def __call__(self: FastHTML, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):
+    def _wrap_func(self, func, path=None):
+        ...
+
+    def __call__(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         """Add a route at `path`"""
         ...
 
+    def __getattr__(self, name):
+        ...
+
     def to_app(self, app):
         """Add routes to `app`"""
         ...
 
-    def ws(self: FastHTML, path: str, conn=None, disconn=None, name=None, middleware=None):
+    def ws(self, path: str, conn=None, disconn=None, name=None, middleware=None):
         """Add a websocket route at `path`"""
         ...
 for o in all_meths:
@@ -307,7 +336,7 @@ def cookie(key: str, value='', max_age=None, expires=None, path='/', domain=None
 def reg_re_param(m, s):
     ...
 reg_re_param('path', '.*?')
-reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map')
+reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map|pdf')
 
 class MiddlewareBase:
 

fasthtml/core.pyi

@@ -33,11 +33,11 @@ def CheckboxX(checked: bool=False, label=None, value='1', id=None, name=None, *,
     """A Checkbox optionally inside a Label, preceded by a `Hidden` with matching name"""
     ...
 
-def Script(code: str='', *, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, auto_id=None, **kwargs) -> FT:
+def Script(code: str='', *, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs) -> FT:
     """A Script tag that doesn't escape its code"""
     ...
 
-def Style(*c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, auto_id=None, **kwargs) -> FT:
+def Style(*c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs) -> FT:
     """A Style tag that doesn't escape its code"""
     ...
 

fasthtml/xtend.pyi

@@ -543,7 +543,7 @@
     "    'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data', 'Datalist', 'Dd', 'Del', 'Details', 'Dfn',\n",
     "    'Dialog', 'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe', 'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form',\n",
     "    'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header',\n",
-    "    'Hgroup', 'Hr', 'Html', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li',\n",
+    "    'Hgroup', 'Hr', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li',\n",
     "    'Link', 'Main', 'Map', 'Mark', 'Menu', 'Meta', 'Meter', 'Nav', 'Noscript', 'Object', 'Ol', 'Optgroup', 'Option', 'Output',\n",
     "    'P', 'Picture', 'PortalExperimental', 'Pre', 'Progress', 'Q', 'Rp', 'Rt', 'Ruby', 'S', 'Samp', 'Script', 'Search',\n",
     "    'Section', 'Select', 'Slot', 'Small', 'Source', 'Span', 'Strong', 'Style', 'Sub', 'Summary', 'Sup', 'Table', 'Tbody',\n",

nbs/api/01_components.ipynb

@@ -90,16 +90,22 @@
     - `def __init__(self, loc)`
     - `def __response__(self, req)`
 
+- `def qp(p, **kw)`
+    Add query parameters to path p
+
 - `def def_hdrs(htmx, surreal)`
     Default headers for a FastHTML app
 
 - `class FastHTML`
-    - `def __init__(self, debug, routes, middleware, exception_handlers, on_startup, on_shutdown, lifespan, hdrs, ftrs, exts, before, after, surreal, htmx, default_hdrs, sess_cls, secret_key, session_cookie, max_age, sess_path, same_site, sess_https_only, sess_domain, key_fname, body_wrap, htmlkw, nb_hdrs, **bodykw)`
+    - `def __init__(self, debug, routes, middleware, title, exception_handlers, on_startup, on_shutdown, lifespan, hdrs, ftrs, exts, before, after, surreal, htmx, default_hdrs, sess_cls, secret_key, session_cookie, max_age, sess_path, same_site, sess_https_only, sess_domain, key_fname, body_wrap, htmlkw, nb_hdrs, **bodykw)`
     - `def add_route(self, route)`
 
 - `@patch def ws(self, path, conn, disconn, name, middleware)`
     Add a websocket route at `path`
 
+- `def nested_name(f)`
+    Get name of function `f` using '_' to join nested function names
+
 - `@patch def route(self, path, methods, name, include_in_schema, body_wrap)`
     Add a route at `path`
 
@@ -111,13 +117,20 @@
 
     - `def __init__(self, app, url)`
 
+- `class RouteFuncs`
+    - `def __init__(self)`
+    - `def __setattr__(self, name, value)`
+    - `def __getattr__(self, name)`
+    - `def __dir__(self)`
+
 - `class APIRouter`
     Add routes to an app
 
-    - `def __init__(self)`
+    - `def __init__(self, prefix, body_wrap)`
     - `def __call__(self, path, methods, name, include_in_schema, body_wrap)`
         Add a route at `path`
 
+    - `def __getattr__(self, name)`
     - `def to_app(self, app)`
         Add routes to `app`
 
@@ -147,7 +160,7 @@
 
 > The `fast_app` convenience wrapper
 
-- `def fast_app(db_file, render, hdrs, ftrs, tbls, before, middleware, live, debug, routes, exception_handlers, on_startup, on_shutdown, lifespan, default_hdrs, pico, surreal, htmx, exts, secret_key, key_fname, session_cookie, max_age, sess_path, same_site, sess_https_only, sess_domain, htmlkw, bodykw, reload_attempts, reload_interval, static_path, body_wrap, **kwargs)`
+- `def fast_app(db_file, render, hdrs, ftrs, tbls, before, middleware, live, debug, routes, exception_handlers, on_startup, on_shutdown, lifespan, default_hdrs, pico, surreal, htmx, exts, secret_key, key_fname, session_cookie, max_age, sess_path, same_site, sess_https_only, sess_domain, htmlkw, bodykw, reload_attempts, reload_interval, static_path, body_wrap, nb_hdrs, **kwargs)`
     Create a FastHTML or FastHTMLWithLiveReload app.
 
 ## fasthtml.js
@@ -158,7 +171,7 @@
     Render light media for day mode views
 
 - `def dark_media(css)`
-    Render dark media for nught mode views
+    Render dark media for night mode views
 
 - `def MarkdownJS(sel)`
     Implements browser-based markdown rendering.
@@ -192,7 +205,7 @@
     - `def start(self)`
     - `def stop(self)`
 
-- `def HTMX(path, host, port, iframe_height)`
+- `def HTMX(path, app, host, port, height, link, iframe)`
     An iframe which displays the HTMX application in a notebook.
 
 ## fasthtml.live_reload
@@ -249,6 +262,12 @@
     - `def login_link(self)`
     - `def parse_response(self, code)`
 
+- `class Auth0AppClient`
+    A `WebApplicationClient` for Auth0 OAuth2
+
+    - `def __init__(self, domain, client_id, client_secret, code, scope, redirect_uri, **kwargs)`
+    - `def login_link(self, req)`
+
 - `@patch def login_link(self, redirect_uri, scope, state)`
     Get a login link for this client
 
@@ -268,12 +287,13 @@
     Call `retr_info` and then return id/subscriber value
 
 - `class OAuth`
-    - `def __init__(self, app, cli, skip, redir_path, logout_path, login_path, https, http_patterns)`
+    - `def __init__(self, app, cli, skip, redir_path, error_path, logout_path, login_path, https, http_patterns)`
+    - `def redir_login(self, session)`
     - `def redir_url(self, req)`
     - `def login_link(self, req, scope, state)`
-    - `def login(self, info, state)`
+    - `def check_invalid(self, req, session, auth)`
     - `def logout(self, session)`
-    - `def chk_auth(self, info, ident, session)`
+    - `def get_auth(self, info, ident, session, state)`
 
 ## fasthtml.pico