python-fasthtml 0.1.6__tar.gz → 0.1.8__tar.gz

{python_fasthtml-0.1.6/python_fasthtml.egg-info → python_fasthtml-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.1.6
+Version: 0.1.8
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.6"
+__version__ = "0.1.8"
 from .core import *
 from .authmw import *
 from .components import *

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/_modidx.py

@@ -49,6 +49,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._get_htmx': ('core.html#_get_htmx', 'fasthtml/core.py'),
                                'fasthtml.core._is_body': ('core.html#_is_body', 'fasthtml/core.py'),
                                'fasthtml.core._list': ('core.html#_list', 'fasthtml/core.py'),
+                               'fasthtml.core._mk_list': ('core.html#_mk_list', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('core.html#_send_ws', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_ep': ('core.html#_wrap_ep', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_req': ('core.html#_wrap_req', 'fasthtml/core.py'),
@@ -85,6 +86,7 @@ d = { 'settings': { 'branch': 'main',
             'fasthtml.starlette': {},
             'fasthtml.svg': {},
             'fasthtml.toaster': {},
+            'fasthtml.xt': {},
             'fasthtml.xtend': { 'fasthtml.xtend.A': ('xtend.html#a', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.AX': ('xtend.html#ax', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Card': ('xtend.html#card', 'fasthtml/xtend.py'),

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/cli.py

@@ -3,7 +3,7 @@
 # %% auto 0
 __all__ = ['railway_link', 'railway_deploy']
 
-# %% ../nbs/04_cli.ipynb 1
+# %% ../nbs/04_cli.ipynb 2
 from fastcore.utils import *
 from fastcore.script import call_parse, bool_arg
 from subprocess import check_output, run
@@ -34,6 +34,7 @@ def railway_deploy(
     name:str, # The project name to deploy
     mount:bool_arg=True # Create a mounted volume at /app/data?
 ):
+    """Deploy a FastHTML app to Railway"""
     cp = run("railway status --json".split(), capture_output=True)
     if not cp.returncode: return print("This project is already deployed. Run `railway open`.")
     reqs = Path('requirements.txt')

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/components.py

@@ -15,7 +15,7 @@ __all__ = ['voids', 'named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx
 
 # %% ../nbs/01_components.ipynb 2
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Comment
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -120,10 +120,12 @@ def __getattr__(tag):
     return _f
 
 # %% ../nbs/01_components.ipynb 24
+_re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')
 def html2xt(html):
+    """Convert HTML to an `xt` expression"""
     rev_map = {'class': 'cls', 'for': 'fr'}
     
-    def _parse(elm, lvl=0):
+    def _parse(elm, lvl=0, indent=4):
         if isinstance(elm, str): return repr(elm.strip()) if elm.strip() else ''
         if isinstance(elm, list): return '\n'.join(_parse(o, lvl) for o in elm)
         tag_name = elm.name.capitalize()
@@ -132,14 +134,17 @@ def html2xt(html):
         cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)
               for c in cts if str(c).strip()]
         attrs = []
-        for key, value in elm.attrs.items():
+        for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):
             if isinstance(value,(tuple,list)): value = " ".join(value)
-            attrs.append(f'{rev_map.get(key, key).replace("-", "_")}={value!r}')
-        spc = " "*lvl*2
+            key = rev_map.get(key, key)
+            attrs.append(f'{key.replace("-", "_")}={value!r}' if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
+        spc = " "*lvl*indent
         onlychild = not cts or (len(cts)==1 and isinstance(cts[0],str))
         j = ', ' if onlychild else f',\n{spc}'
         inner = j.join(filter(None, cs+attrs))
         if onlychild: return f'{tag_name}({inner})'
-        return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*2})'
+        return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})'
 
-    return _parse(BeautifulSoup(html.strip(), 'html.parser'), 1)
+    soup = BeautifulSoup(html.strip(), 'html.parser')
+    for c in soup.find_all(string=risinstance(Comment)): c.extract()
+    return _parse(soup, 1)

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/components.pyi

@@ -49,8 +49,10 @@ def find_inputs(e, tags='input', **kw):
 
 def __getattr__(tag):
     ...
+_re_h2x_attr_key = re.compile('^[A-Za-z_-][\\w-]*$')
 
 def html2xt(html):
+    """Convert HTML to an `xt` expression"""
     ...
 def xt_html(tag: str, *c, id:str|None=None, cls:str|None=None, title:str|None=None, style:str|None=None, accesskey:str|None=None, contenteditable:str|None=None, dir:str|None=None, draggable:str|None=None, enterkeyhint:str|None=None, hidden:str|None=None, inert:str|None=None, inputmode:str|None=None, lang:str|None=None, popover:str|None=None, spellcheck:str|None=None, tabindex:str|None=None, translate:str|None=None, id:str|None=None, cls:str|None=None, title:str|None=None, style:str|None=None, accesskey:str|None=None, contenteditable:str|None=None, dir:str|None=None, draggable:str|None=None, enterkeyhint:str|None=None, hidden:str|None=None, inert:str|None=None, inputmode:str|None=None, lang:str|None=None, popover:str|None=None, spellcheck:str|None=None, tabindex:str|None=None, translate:str|None=None, hx_get:str|None=None, hx_post:str|None=None, hx_put:str|None=None, hx_delete:str|None=None, hx_patch:str|None=None, hx_trigger:str|None=None, hx_target:str|None=None, hx_swap:str|None=None, hx_include:str|None=None, hx_select:str|None=None, hx_indicator:str|None=None, hx_push_url:str|None=None, hx_confirm:str|None=None, hx_disable:str|None=None, hx_replace_url:str|None=None, hx_on:str|None=None, **kwargs): ...
 def xt_hx(tag: str, *c, id:str|None=None, cls:str|None=None, title:str|None=None, style:str|None=None, accesskey:str|None=None, contenteditable:str|None=None, dir:str|None=None, draggable:str|None=None, enterkeyhint:str|None=None, hidden:str|None=None, inert:str|None=None, inputmode:str|None=None, lang:str|None=None, popover:str|None=None, spellcheck:str|None=None, tabindex:str|None=None, translate:str|None=None, id:str|None=None, cls:str|None=None, title:str|None=None, style:str|None=None, accesskey:str|None=None, contenteditable:str|None=None, dir:str|None=None, draggable:str|None=None, enterkeyhint:str|None=None, hidden:str|None=None, inert:str|None=None, inputmode:str|None=None, lang:str|None=None, popover:str|None=None, spellcheck:str|None=None, tabindex:str|None=None, translate:str|None=None, hx_get:str|None=None, hx_post:str|None=None, hx_put:str|None=None, hx_delete:str|None=None, hx_patch:str|None=None, hx_trigger:str|None=None, hx_target:str|None=None, hx_swap:str|None=None, hx_include:str|None=None, hx_select:str|None=None, hx_indicator:str|None=None, hx_push_url:str|None=None, hx_confirm:str|None=None, hx_disable:str|None=None, hx_replace_url:str|None=None, hx_on:str|None=None, **kwargs): ...

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/core.py

@@ -6,14 +6,14 @@ __all__ = ['empty', 'htmx_hdrs', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc',
            'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'cookie',
            'reg_re_param', 'MiddlewareBase']
 
-# %% ../nbs/00_core.ipynb 3
+# %% ../nbs/00_core.ipynb 4
 import json,dateutil,uuid,inspect,types
 
 from fastcore.utils import *
 from fastcore.xml import *
 from .xtend import *
 
-from types import UnionType, SimpleNamespace as ns
+from types import UnionType, SimpleNamespace as ns, GenericAlias
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List
 from datetime import datetime
 from dataclasses import dataclass,fields,is_dataclass,MISSING,asdict
@@ -26,29 +26,29 @@ from .starlette import *
 
 empty = Parameter.empty
 
-# %% ../nbs/00_core.ipynb 5
+# %% ../nbs/00_core.ipynb 6
 def is_typeddict(cls:type)->bool:
     "Check if `cls` is a `TypedDict`"
     attrs = 'annotations', 'required_keys', 'optional_keys'
     return isinstance(cls, type) and all(hasattr(cls, f'__{attr}__') for attr in attrs)
 
-# %% ../nbs/00_core.ipynb 7
+# %% ../nbs/00_core.ipynb 8
 def is_namedtuple(cls):
     "`True` is `cls` is a namedtuple type"
     return issubclass(cls, tuple) and hasattr(cls, '_fields')
 
-# %% ../nbs/00_core.ipynb 9
+# %% ../nbs/00_core.ipynb 10
 def date(s:str):
     "Convert `s` to a datetime"
     return dateutil.parser.parse(s)
 
-# %% ../nbs/00_core.ipynb 11
+# %% ../nbs/00_core.ipynb 12
 def snake2hyphens(s:str):
     "Convert `s` from snake case to hyphenated and capitalised"
     s = snake2camel(s)
     return camel2words(s, '-')
 
-# %% ../nbs/00_core.ipynb 13
+# %% ../nbs/00_core.ipynb 14
 htmx_hdrs = dict(
     boosted="HX-Boosted",
     current_url="HX-Current-URL",
@@ -69,7 +69,7 @@ def _get_htmx(h):
     res = {k:h.get(v.lower(), None) for k,v in htmx_hdrs.items()}
     return HtmxHeaders(**res)
 
-# %% ../nbs/00_core.ipynb 16
+# %% ../nbs/00_core.ipynb 17
 def str2int(s)->int:
     "Convert `s` to an `int`"
     s = s.lower()
@@ -77,7 +77,10 @@ def str2int(s)->int:
     if s=='none': return 0
     return 0 if not s else int(s)
 
-# %% ../nbs/00_core.ipynb 20
+# %% ../nbs/00_core.ipynb 19
+def _mk_list(t, v): return [t(o) for o in v]
+
+# %% ../nbs/00_core.ipynb 21
 def _fix_anno(t):
     "Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"
     origin = get_origin(t)
@@ -88,7 +91,7 @@ def _fix_anno(t):
     if origin in (list,List): res = partial(_mk_list, res)
     return res
 
-# %% ../nbs/00_core.ipynb 25
+# %% ../nbs/00_core.ipynb 26
 def _form_arg(k, v, d):
     "Get type by accessing key `k` from `d`, and use to cast `v`"
     if v is None: return
@@ -97,45 +100,47 @@ def _form_arg(k, v, d):
     if not anno: return v
     return _fix_anno(anno)(v)
 
-# %% ../nbs/00_core.ipynb 29
+# %% ../nbs/00_core.ipynb 30
 @dataclass
 class HttpHeader: k:str;v:str
 
-# %% ../nbs/00_core.ipynb 30
+# %% ../nbs/00_core.ipynb 31
 def _annotations(anno):
     "Same as `get_annotations`, but also works on namedtuples"
     if is_namedtuple(anno): return {o:str for o in anno._fields}
     return get_annotations(anno)
 
-# %% ../nbs/00_core.ipynb 31
+# %% ../nbs/00_core.ipynb 32
 def _is_body(anno): return issubclass(anno, (dict,ns)) or _annotations(anno)
 
-# %% ../nbs/00_core.ipynb 32
+# %% ../nbs/00_core.ipynb 33
 def _formitem(form, k):
     "Return single item `k` from `form` if len 1, otherwise return list"
     o = form.getlist(k)
     return o[0] if len(o) == 1 else o if o else None
 
-# %% ../nbs/00_core.ipynb 33
+# %% ../nbs/00_core.ipynb 34
 def form2dict(form: FormData) -> dict:
     "Convert starlette form data to a dict"
     return {k: _formitem(form, k) for k in form}
 
-# %% ../nbs/00_core.ipynb 35
+# %% ../nbs/00_core.ipynb 36
 async def _from_body(req, p):
     form = await req.form()
     anno = p.annotation
     # Get the fields and types of type `anno`, if available
     d = _annotations(anno)
-    cargs = {k:_form_arg(k, v, d) for k,v in form2dict(form).items()}
+    cargs = {k:_form_arg(k, v, d) for k,v in form2dict(form).items() if not d or k in d}
     return anno(**cargs)
 
-# %% ../nbs/00_core.ipynb 37
+# %% ../nbs/00_core.ipynb 38
 async def _find_p(req, arg:str, p:Parameter):
     "In `req` find param named `arg` of type in `p` (`arg` is ignored for body types)"
     anno = p.annotation
     # If there's an annotation of special types, return object of that type
-    if isinstance(anno, type):
+    # GenericAlias is a type of typing for iterators like list[int] that is not a class
+    if isinstance(anno, type) and not isinstance(anno, GenericAlias):
+        if issubclass(anno, Request): return req
         if issubclass(anno, Request): return req
         if issubclass(anno, HtmxHeaders): return _get_htmx(req.headers)
         if issubclass(anno, Starlette): return req.scope['app']
@@ -150,15 +155,17 @@ async def _find_p(req, arg:str, p:Parameter):
         return None
     # Look through path, cookies, headers, session, query, and body in that order
     res = req.path_params.get(arg, None)
-    if res is empty or res is None: res = req.cookies.get(arg, None)
-    if res is empty or res is None: res = req.headers.get(snake2hyphens(arg), None)
-    if res is empty or res is None: res = nested_idx(req.scope, 'session', arg) or None
-    if res is empty or res is None: res = req.query_params.get(arg, None)
-    if res is empty or res is None:
+    if res in (empty,None): res = req.cookies.get(arg, None)
+    if res in (empty,None): res = req.headers.get(snake2hyphens(arg), None)
+    if res in (empty,None): res = nested_idx(req.scope, 'session', arg) or None
+    if res in (empty,None): res = req.query_params.get(arg, None)
+    if res in (empty,None):
         frm = await req.form()
         res = _formitem(frm, arg)
-    # Use default param if needed
-    if res is empty or res is None: res = p.default
+    # Raise 400 error if the param does not include a default
+    if (res in (empty,None)) and p.default is empty: raise HTTPException(400, f"Missing required field: {arg}")
+    # If we have a default, return that if we have no value
+    if res in (empty,None): res = p.default
     # We can cast str and list[str] to types; otherwise just return what we have
     if not isinstance(res, (list,str)) or anno is empty: return res
     anno = _fix_anno(anno)
@@ -168,7 +175,7 @@ async def _find_p(req, arg:str, p:Parameter):
 async def _wrap_req(req, params):
     return [await _find_p(req, arg, p) for arg,p in params.items()]
 
-# %% ../nbs/00_core.ipynb 39
+# %% ../nbs/00_core.ipynb 40
 def flat_xt(lst):
     "Flatten lists, except for `XT`s"
     result = []
@@ -177,8 +184,8 @@ def flat_xt(lst):
         else: result.append(item)
     return result
 
-# %% ../nbs/00_core.ipynb 41
-def _xt_resp(req, resp, hdrs, **bodykw):
+# %% ../nbs/00_core.ipynb 42
+def _xt_resp(req, resp, hdrs, ftrs, **bodykw):
     if not isinstance(resp, tuple): resp = (resp,)
     resp = resp + tuple(req.injects)
     http_hdrs,resp = partition(resp, risinstance(HttpHeader))
@@ -186,16 +193,17 @@ def _xt_resp(req, resp, hdrs, **bodykw):
     titles,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in ('title','meta'))
     if resp and 'hx-request' not in req.headers and not any(getattr(o, 'tag', '')=='html' for o in resp):
         if not titles: titles = [Title('FastHTML page')]
-        resp = Html(Head(*titles, *flat_xt(hdrs)), Body(bdy, **bodykw))
+        resp = Html(Head(*titles, *flat_xt(hdrs)), Body(bdy, *flat_xt(ftrs), **bodykw))
     return HTMLResponse(to_xml(resp), headers=http_hdrs)
 
-# %% ../nbs/00_core.ipynb 42
-def _wrap_resp(req, resp, cls, hdrs, **bodykw):
+# %% ../nbs/00_core.ipynb 43
+def _wrap_resp(req, resp, cls, hdrs, ftrs, **bodykw):
     if not resp: resp=()
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
     if isinstance(resp, Response): return resp
     if cls is not empty: return cls(resp)
-    if isinstance(resp, (list,tuple,HttpHeader)) or hasattr(resp, '__xt__'): return _xt_resp(req, resp, hdrs, **bodykw)
+    if isinstance(resp, (list,tuple,HttpHeader)) or hasattr(resp, '__xt__'):
+        return _xt_resp(req, resp, hdrs=hdrs, ftrs=ftrs, **bodykw)
     if isinstance(resp, str): cls = HTMLResponse
     elif isinstance(resp, Mapping): cls = JSONResponse
     else:
@@ -203,12 +211,12 @@ def _wrap_resp(req, resp, cls, hdrs, **bodykw):
         cls = HTMLResponse
     return cls(resp)
 
-# %% ../nbs/00_core.ipynb 43
+# %% ../nbs/00_core.ipynb 44
 class Beforeware:
     def __init__(self, f, skip=None): self.f,self.skip = f,skip or []
 
-# %% ../nbs/00_core.ipynb 44
-def _wrap_ep(f, hdrs, before, after, **bodykw):
+# %% ../nbs/00_core.ipynb 45
+def _wrap_ep(f, hdrs, ftrs, before, after, **bodykw):
     if not (isfunction(f) or ismethod(f)): return f
     sig = signature(f)
     params = sig.parameters
@@ -233,10 +241,10 @@ def _wrap_ep(f, hdrs, before, after, **bodykw):
             _,*wreq = await _wrap_req(req, signature(a).parameters)
             nr = a(resp, *wreq)
             if nr: resp = nr
-        return _wrap_resp(req, resp, cls, hdrs, **bodykw)
+        return _wrap_resp(req, resp, cls, hdrs=hdrs, ftrs=ftrs, **bodykw)
     return _f
 
-# %% ../nbs/00_core.ipynb 46
+# %% ../nbs/00_core.ipynb 47
 def _find_wsp(ws, data, hdrs, arg:str, p:Parameter):
     "In `data` find param named `arg` of type in `p` (`arg` is ignored for body types)"
     anno = p.annotation
@@ -262,7 +270,7 @@ def _wrap_ws(ws, data, params):
     hdrs = data.pop('HEADERS', {})
     return [_find_wsp(ws, data, hdrs, arg, p) for arg,p in params.items()]
 
-# %% ../nbs/00_core.ipynb 47
+# %% ../nbs/00_core.ipynb 48
 async def _send_ws(ws, resp):
     if not resp: return
     res = to_xml(resp) if isinstance(resp, (list,tuple)) or hasattr(resp, '__xt__') else resp
@@ -289,37 +297,37 @@ def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None, **bodykw):
     cls.on_receive = _recv
     return cls
 
-# %% ../nbs/00_core.ipynb 50
+# %% ../nbs/00_core.ipynb 51
 class WS_RouteX(WebSocketRoute):
     def __init__(self, path:str, recv, conn:callable=None, disconn:callable=None, *,
                  name=None, middleware=None, hdrs=None, before=None, **bodykw):
         super().__init__(path, _ws_endp(recv, conn, disconn, hdrs, before, **bodykw), name=name, middleware=middleware)
 
-# %% ../nbs/00_core.ipynb 51
+# %% ../nbs/00_core.ipynb 52
 class RouteX(Route):
     def __init__(self, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None,
-                hdrs=None, before=None, after=None, **bodykw):
-        ep = _wrap_ep(endpoint, hdrs, before=before, after=after, **bodykw)
+                hdrs=None, ftrs=None, before=None, after=None, **bodykw):
+        ep = _wrap_ep(endpoint, hdrs, ftrs=ftrs, before=before, after=after, **bodykw)
         super().__init__(path, ep, methods=methods, name=name, include_in_schema=include_in_schema, middleware=middleware)
 
-# %% ../nbs/00_core.ipynb 52
+# %% ../nbs/00_core.ipynb 53
 class RouterX(Router):
     def __init__(self, routes=None, redirect_slashes=True, default=None, on_startup=None, on_shutdown=None,
-                 lifespan=None, *, middleware=None, hdrs=None, before=None, after=None, **bodykw):
+                 lifespan=None, *, middleware=None, hdrs=None, ftrs=None, before=None, after=None, **bodykw):
         super().__init__(routes, redirect_slashes, default, on_startup, on_shutdown,
                  lifespan=lifespan, middleware=middleware)
-        self.hdrs,self.bodykw,self.before,self.after = hdrs,bodykw,before,after
+        self.hdrs,self.ftrs,self.bodykw,self.before,self.after = hdrs,ftrs,bodykw,before,after
 
     def add_route( self, path: str, endpoint: callable, methods=None, name=None, include_in_schema=True):
         route = RouteX(path, endpoint=endpoint, methods=methods, name=name, include_in_schema=include_in_schema,
-                       hdrs=self.hdrs, before=self.before, after=self.after, **self.bodykw)
+                       hdrs=self.hdrs, ftrs=self.ftrs, before=self.before, after=self.after, **self.bodykw)
         self.routes.append(route)
 
     def add_ws( self, path: str, recv: callable, conn:callable=None, disconn:callable=None, name=None):
         route = WS_RouteX(path, recv=recv, conn=conn, disconn=disconn, name=name, hdrs=self.hdrs, before=self.before, **self.bodykw)
         self.routes.append(route)
 
-# %% ../nbs/00_core.ipynb 53
+# %% ../nbs/00_core.ipynb 54
 htmxscr   = Script(src="https://unpkg.com/htmx.org@next/dist/htmx.min.js")
 htmxwsscr = Script(src="https://unpkg.com/htmx-ext-ws/ws.js")
 surrsrc   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/surreal@1.3.0/surreal.js")
@@ -327,7 +335,7 @@ scopesrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/s
 viewport  = Meta(name="viewport", content="width=device-width, initial-scale=1, viewport-fit=cover")
 charset   = Meta(charset="utf-8")
 
-# %% ../nbs/00_core.ipynb 54
+# %% ../nbs/00_core.ipynb 55
 def get_key(key=None, fname='.sesskey'):
     if key: return key
     fname = Path(fname)
@@ -336,13 +344,14 @@ def get_key(key=None, fname='.sesskey'):
     fname.write_text(key)
     return key
 
-# %% ../nbs/00_core.ipynb 56
+# %% ../nbs/00_core.ipynb 57
 def _list(o): return [] if not o else list(o) if isinstance(o, (tuple,list)) else [o]
 
-# %% ../nbs/00_core.ipynb 57
+# %% ../nbs/00_core.ipynb 58
 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, before=None, after=None, default_hdrs=True,
+                 on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, ftrs=None,
+                 before=None, after=None, default_hdrs=True,
                  secret_key=None, session_cookie='session_', max_age=365*24*3600, ws_hdr=False, sess_path='/',
                  same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey', **bodykw):
         middleware,before,after = _list(middleware),_list(before),_list(after)
@@ -353,10 +362,11 @@ class FastHTML(Starlette):
         middleware.append(sess)
         super().__init__(debug, routes, middleware, exception_handlers, on_startup, on_shutdown, lifespan=lifespan)
         hdrs = list([] if hdrs is None else hdrs)
+        ftrs = list([] if ftrs is None else ftrs)
         if default_hdrs: hdrs = [charset, viewport, htmxscr,surrsrc,scopesrc] + hdrs
         if ws_hdr: hdrs.append(htmxwsscr)
-        self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, hdrs=hdrs,
-                              before=before, after=after, **bodykw)
+        self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan,
+                              hdrs=hdrs, ftrs=ftrs, before=before, after=after, **bodykw)
 
     def route(self, path:str, methods=None, name=None, include_in_schema=True):
         def f(func):
@@ -374,7 +384,7 @@ class FastHTML(Starlette):
 all_meths = 'get post put delete patch head trace options'.split()
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
-# %% ../nbs/00_core.ipynb 59
+# %% ../nbs/00_core.ipynb 60
 def cookie(key: str, value="", max_age=None, expires=None, path="/", domain=None, secure=False, httponly=False, samesite="lax",):
     "Create a 'set-cookie' `HttpHeader`"
     cookie = cookies.SimpleCookie()
@@ -392,17 +402,17 @@ def cookie(key: str, value="", max_age=None, expires=None, path="/", domain=None
     cookie_val = cookie.output(header="").strip()
     return HttpHeader("set-cookie", cookie_val)
 
-# %% ../nbs/00_core.ipynb 60
+# %% ../nbs/00_core.ipynb 61
 def reg_re_param(m, s):
     cls = get_class(f'{m}Conv', sup=StringConvertor, regex=s)
     register_url_convertor(m, cls())
 
-# %% ../nbs/00_core.ipynb 61
+# %% ../nbs/00_core.ipynb 62
 # Starlette doesn't have the '?', so it chomps the whole remaining URL
 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|xml|html")
 
-# %% ../nbs/00_core.ipynb 62
+# %% ../nbs/00_core.ipynb 63
 class MiddlewareBase:
     async def __call__(self, scope, receive, send) -> None:
         if scope["type"] not in ["http", "websocket"]:

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/fastapp.py

@@ -12,18 +12,17 @@ def get_tbl(dt, nm, schema):
     if render: dc.__xt__ = render
     return tbl,dc
 
-def fast_app(db=None, render=None, hdrs=None, tbls=None, before=None, middleware=None, live=False, debug=False, routes=None, exception_handlers=None,
+def fast_app(db=None, render=None, hdrs=None, ftrs=None, tbls=None, before=None, middleware=None, live=False, debug=False, routes=None, exception_handlers=None,
              on_startup=None, on_shutdown=None, lifespan=None, default_hdrs=True, 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', **kwargs):
+             pico=None, sess_path='/', same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey', bodykw=None, **kwargs):
 
-    h = ()
-    if default_hdrs: h += (picolink, )
+    h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
     app_cls = FastHTMLWithLiveReload if live else FastHTML
-    app = app_cls(hdrs=h, before=before, middleware=middleware, debug=debug, routes=routes, exception_handlers=exception_handlers,
+    app = app_cls(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, debug=debug, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key,
                   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)
+                  sess_domain=sess_domain, key_fname=key_fname, **(bodykw or {}))
     @app.route("/{fname:path}.{ext:static}")
     async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
     if not db: return app,app.route
@@ -50,4 +49,3 @@ def run_uv(fname=None, app='app', host='0.0.0.0', port=None, reload=True):
 def clear(id): return Div(hx_swap_oob='innerHTML', id=id)
 def ContainerX(*cs, **kwargs): return Main(*cs, **kwargs, cls='container', hx_push_url='true', hx_swap_oob='true', id='main')
 def Page(title, *con): return Title(title), ContainerX(H1(title), *con)
-

python_fasthtml-0.1.8/fasthtml/xt.py

@@ -0,0 +1,4 @@
+from fastcore.xml import *
+from .components import *
+from .xtend import *
+

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/xtend.py

@@ -184,8 +184,11 @@ def Titled(title:str="FastHTML app", *args, **kwargs)->XT:
     return Title(title), Main(H1(title), *args, cls="container", **kwargs)
 
 # %% ../nbs/02_xtend.ipynb 39
-def Socials(title, site_name, description, image, url, w=1200, h=630, twitter_site=None, creator=None, card='summary'):
+def Socials(title, site_name, description, image, url=None, w=1200, h=630, twitter_site=None, creator=None, card='summary'):
     "OG and Twitter social card headers"
+    if not url: url=site_name
+    if not url.startswith('http'): url = f'https://{url}'
+    if not image.startswith('http'): image = f'{url}{image}'
     res = [Meta(property='og:image', content=image),
         Meta(property='og:site_name', content=site_name),
         Meta(property='og:image:type', content='image/png'),

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/fasthtml/xtend.pyi

@@ -101,7 +101,7 @@ def Titled(title: str='FastHTML app', *args, target_id=None, id=None, cls=None,
     """An HTML partial containing a `Title`, and `H1`, and any provided children"""
     ...
 
-def Socials(title, site_name, description, image, url, w=1200, h=630, twitter_site=None, creator=None, card='summary'):
+def Socials(title, site_name, description, image, url=None, w=1200, h=630, twitter_site=None, creator=None, card='summary'):
     """OG and Twitter social card headers"""
     ...
 

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.1.6
+Version: 0.1.8
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/python_fasthtml.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ fasthtml/oauth.py
 fasthtml/starlette.py
 fasthtml/svg.py
 fasthtml/toaster.py
+fasthtml/xt.py
 fasthtml/xtend.py
 fasthtml/xtend.pyi
 python_fasthtml.egg-info/PKG-INFO

{python_fasthtml-0.1.6 → python_fasthtml-0.1.8}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.1.6
+version = 0.1.8
 min_python = 3.10
 license = apache2
 requirements = fastcore>=1.5.46 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4