python-fasthtml 0.13.3__tar.gz → 0.14.0__tar.gz

{python_fasthtml-0.13.3/python_fasthtml.egg-info → python_fasthtml-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.3
+Version: 0.14.0
 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>=1.12.16
+Requires-Dist: fastcore>=1.12.45
 Requires-Dist: python-dateutil
 Requires-Dist: starlette~=1.0
 Requires-Dist: oauthlib

python_fasthtml-0.14.0/fasthtml/__init__.py

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

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/_modidx.py

@@ -48,13 +48,16 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.FastHTML': ('api/core.html#fasthtml', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.__init__': ('api/core.html#fasthtml.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML._add_route': ('api/core.html#fasthtml._add_route', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML._add_routes': ('api/core.html#fasthtml._add_routes', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML._add_ws': ('api/core.html#fasthtml._add_ws', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML._endp': ('api/core.html#fasthtml._endp', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.add_route': ('api/core.html#fasthtml.add_route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.add_websocket_route': ( 'api/core.html#fasthtml.add_websocket_route',
                                                                                'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.decode_session': ('api/core.html#fasthtml.decode_session', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.devtools_json': ('api/core.html#fasthtml.devtools_json', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.get_client': ('api/core.html#fasthtml.get_client', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.get_testclient': ('api/core.html#fasthtml.get_testclient', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.on_event': ('api/core.html#fasthtml.on_event', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.route': ('api/core.html#fasthtml.route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.set_lifespan': ('api/core.html#fasthtml.set_lifespan', 'fasthtml/core.py'),
@@ -104,7 +107,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._LifespanCtx.__init__': ('api/core.html#_lifespanctx.__init__', 'fasthtml/core.py'),
                                'fasthtml.core._add_ids': ('api/core.html#_add_ids', 'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
-                               'fasthtml.core._apply_ft': ('api/core.html#_apply_ft', 'fasthtml/core.py'),
                                'fasthtml.core._canonical': ('api/core.html#_canonical', 'fasthtml/core.py'),
                                'fasthtml.core._check_anno': ('api/core.html#_check_anno', 'fasthtml/core.py'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
@@ -124,6 +126,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._params': ('api/core.html#_params', 'fasthtml/core.py'),
                                'fasthtml.core._part_resp': ('api/core.html#_part_resp', 'fasthtml/core.py'),
                                'fasthtml.core._resp': ('api/core.html#_resp', 'fasthtml/core.py'),
+                               'fasthtml.core._route_pn': ('api/core.html#_route_pn', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('api/core.html#_send_ws', 'fasthtml/core.py'),
                                'fasthtml.core._to_htmx_header': ('api/core.html#_to_htmx_header', 'fasthtml/core.py'),
                                'fasthtml.core._to_xml': ('api/core.html#_to_xml', 'fasthtml/core.py'),

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/common.py

@@ -1,14 +1,10 @@
-import uvicorn
 from dataclasses import dataclass
 from typing import Any
 
 from .starlette import *
 from fastcore.utils import *
 from fastcore.xml import *
-from apswutils import Database
-from fastlite import *
 from .basics import *
-from .pico import *
 from .authmw import *
 from .live_reload import *
 from .toaster import *

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/components.py

@@ -18,7 +18,6 @@ __all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_evts', 'js_evts', 'hx_attrs_an
 
 # %% ../nbs/api/01_components.ipynb #8e2d405b
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
-from bs4 import BeautifulSoup, Comment
 from typing import Literal, Mapping, Optional
 
 from fastcore.utils import *
@@ -29,9 +28,6 @@ from .core import fh_cfg, unqid
 
 import types, json
 
-try: from IPython import display
-except ImportError: display=None
-
 # %% ../nbs/api/01_components.ipynb #dc101f0f
 @patch
 def __str__(self:FT): return self.id if self.id else to_xml(self, indent=False)
@@ -127,6 +123,7 @@ def File(fname):
 # %% ../nbs/api/01_components.ipynb #7861dfe6
 def show(ft, *rest, iframe=False, height='auto', style=None):
     "Renders FT Components into HTML within a Jupyter notebook."
+    from IPython import display
     if isinstance(ft, str): ft = Safe(ft)
     if rest: ft = (ft,)+rest
     res = to_xml(ft)
@@ -206,6 +203,7 @@ def __getattr__(tag):
 _re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')
 def html2ft(html, attr1st=False):
     """Convert HTML to an `ft` expression"""
+    from bs4 import BeautifulSoup, Comment
     rev_map = {'class': 'cls', 'for': 'fr'}
 
     def _parse(elm, lvl=0, indent=4):

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/components.pyi

@@ -1,7 +1,6 @@
 """`ft_html` and `ft_hx` functions to add some conveniences to `ft`, along with a full set of basic HTML components, and functions to work with forms and `FT` conversion"""
 __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']
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
-from bs4 import BeautifulSoup, Comment
 from typing import Literal, Mapping, Optional
 from fastcore.utils import *
 from fastcore.xml import *
@@ -9,10 +8,6 @@ from fastcore.meta import use_kwargs, delegates
 from fastcore.test import *
 from .core import fh_cfg, unqid
 import types, json
-try:
-    from IPython import display
-except ImportError:
-    display = None
 
 @patch
 def __str__(self: FT):

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/core.py

@@ -12,7 +12,7 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'add_sig_param', 'into', 'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
-import json,uuid,inspect,types,asyncio,inspect,random,contextlib,httpx,itsdangerous,uvicorn
+import json,uuid,inspect,types,asyncio,inspect,random,contextlib,itsdangerous
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -20,7 +20,7 @@ from fastcore.meta import use_kwargs_dict,delegates
 from fastcore.style import S
 
 from types import UnionType, SimpleNamespace as ns, GenericAlias
-from typing import get_args, get_origin, Union, Mapping, List, Any
+from typing import get_args, get_origin, Union, Mapping, List, Any, Callable
 from datetime import datetime,date
 from dataclasses import dataclass
 from inspect import Parameter,get_annotations
@@ -32,7 +32,7 @@ from warnings import warn
 from dateutil import parser as dtparse
 from anyio import from_thread
 from uuid import uuid4, UUID
-from base64 import b64encode
+from base64 import b64encode,b64decode
 from email.utils import format_datetime
 
 from .starlette import *
@@ -167,6 +167,8 @@ async def parse_form(req: Request) -> FormData:
 async def _from_body(conn, p, data):
     "Create an instance of the annotated type from pre-parsed `data`"
     anno = p.annotation
+    # param params take precedence
+    data = dict(data) | getattr(conn, 'path_params', {})
     ctor = getattr(anno, '__from_request__', None)
     if ctor:
         ps = {k:v for k,v in _params(ctor).items() if k != 'cls'}
@@ -187,10 +189,12 @@ class ApiReturn:
 # %% ../nbs/api/00_core.ipynb #7cc39ba9
 class JSONResponse(JSONResponseOrig):
     "Same as starlette's version, but auto-stringifies non serializable types"
-    def render(self, content: Any) -> bytes:
-        res = json.dumps(content, ensure_ascii=False, allow_nan=False, indent=None, separators=(",", ":"), default=str)
+    def render(self, content:Any)->bytes:
+        def _default(o): return list(o) if is_listy(o) else str(o)
+        res = json.dumps(content, ensure_ascii=False, allow_nan=False, indent=None, separators=(",",":"), default=_default)
         return res.encode("utf-8")
 
+
 # %% ../nbs/api/00_core.ipynb #5fa96e3a
 async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     "In `data` find param named `arg` of type in `p` (`arg` is ignored for body types)"
@@ -210,7 +214,7 @@ async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     if anno is empty:
         if arg.lower()=='ws' or 'request'.startswith(arg.lower()): return conn
         if 'session'.startswith(arg.lower()): return conn.scope.get('session', {})
-        if arg.lower()=='scope': return dict2obj(conn.scope)
+        if arg.lower()=='scope': return conn.scope
         if arg.lower()=='data': return data
         if arg.lower()=='htmx': return _get_htmx(hdrs)
         if arg.lower()=='app': return conn.scope['app']
@@ -369,16 +373,8 @@ def _find_targets(req, resp):
             t = resp.attrs.pop(k, None)
             if t: resp.attrs[v] = _url_for(req, t)
 
-def _apply_ft(o):
-    "Apply FastTag transformation recursively to object `o`"
-    if isinstance(o, tuple): o = tuple(_apply_ft(c) for c in o)
-    if hasattr(o, '__ft__'): o = o.__ft__()
-    if isinstance(o, FT): o.children = tuple(_apply_ft(c) for c in o.children)
-    return o
-
 def _to_xml(req, resp, indent):
     "Convert response to XML string with target URL resolution"
-    resp = _apply_ft(resp)
     _find_targets(req, resp)
     return to_xml(resp, indent=indent)
 
@@ -670,7 +666,7 @@ all_meths = 'get post put delete patch head trace options'.split()
 
 # %% ../nbs/api/00_core.ipynb #26b147ba
 @patch
-def _endp(self:FastHTML, f, body_wrap):
+def _endp(self:FastHTML, f, body_wrap, before:Optional[Callable|tuple]=None):
     "Create endpoint wrapper with before/after middleware processing"
     sig = signature_ex(f, True)
     for n,p in sig.parameters.items(): (msg:=_check_anno(n,p.annotation)) and warn(msg)
@@ -685,6 +681,8 @@ def _endp(self:FastHTML, f, body_wrap):
                 else: bf,skip = b,[]
                 if not any(re.fullmatch(r, req.url.path) for r in skip):
                     resp = await _wrap_call(bf, req, _params(bf))
+        for b in listify(before):
+            if not resp: resp = await _wrap_call(b, req, _params(b))
         req.body_wrap = body_wrap
         if not resp: resp = await _wrap_call(f, req, sig.parameters)
         for a in self.after:
@@ -737,17 +735,37 @@ def nested_name(f):
     "Get name of function `f` using '_' to join nested function names"
     return f.__qualname__.replace('.<locals>.', '_')
 
-# %% ../nbs/api/00_core.ipynb #72760b09
+# %% ../nbs/api/00_core.ipynb #daafe4fc
+@patch
+def _add_routes(self:FastHTML, cls, path, methods, name, include_in_schema, body_wrap, host=None, before:Optional[Callable|tuple]=None):
+    "Add HTTP routes from methods on endpoint class `cls`"
+    assert not methods, '`methods` is not supported for class route groups; define HTTP methods as class methods instead'
+    lf = _mk_locfunc(cls, path, app=self)
+    lf.__routename__ = name
+    for meth in all_meths:
+        handler = getattr(cls, meth, None)
+        if handler: self._add_route(handler, path, meth, name, include_in_schema, body_wrap, host=host, before=before)
+    return lf
+
+# %% ../nbs/api/00_core.ipynb #3710e48b
+def _route_pn(func, path, name):
+    "Infer route name/function name/path from an endpoint or endpoint class"
+    fn = nested_name(func)
+    if isinstance(func, type): fn = fn[0].lower()+fn[1:]
+    p = None if callable(path) else path
+    if not name: name = fn
+    if not p: p = '/'+('' if fn=='index' else fn)
+    return name,fn,p
+
 @patch
-def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body_wrap, host=None):
+def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body_wrap, host=None, before:Optional[Callable|tuple]=None):
     "Add HTTP route to FastHTML app with automatic method detection"
-    n,fn,p = name,nested_name(func),None if callable(path) else path
+    n,fn,p = _route_pn(func, path, name)
+    if isinstance(func, type): return self._add_routes(func, p, methods, n, include_in_schema, body_wrap, host=host, before=before)
     if methods: m = [methods] if isinstance(methods,str) else methods
     elif fn in all_meths and p is not None: m = [fn]
     else: m = ['get','post']
-    if not n: n = fn
-    if not p: p = '/'+('' if fn=='index' else fn)
-    endp = self._endp(func, body_wrap or self.body_wrap)
+    endp = self._endp(func, body_wrap or self.body_wrap, before=before)
     route = HostRoute(p, endpoint=endp, methods=m, name=n, include_in_schema=include_in_schema, host=host)
     self.add_route(route)
     lf = _mk_locfunc(func, p, app=self)
@@ -756,10 +774,10 @@ def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body
 
 # %% ../nbs/api/00_core.ipynb #f5cb2c2b
 @patch
-def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=None, host=None):
+def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=None, host=None, before:Optional[Callable|tuple]=None):
     "Add a route at `path`"
     def f(func):
-        return self._add_route(func, path, methods, name=name, include_in_schema=include_in_schema, body_wrap=body_wrap, host=host)
+        return self._add_route(func, path, methods, name=name, include_in_schema=include_in_schema, body_wrap=body_wrap, host=host, before=before)
     return f(path) if callable(path) else f
 
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
@@ -772,7 +790,6 @@ def set_lifespan(self:FastHTML, value):
     self.router.lifespan_context = value
 
 # %% ../nbs/api/00_core.ipynb #3a348474
-@delegates(uvicorn.run)
 def serve(
         appname=None, # Name of the module
         app='app', # App instance to be served
@@ -782,6 +799,7 @@ def serve(
         **kwargs
     ):
     "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
@@ -798,6 +816,7 @@ def serve(
 class Client:
     "A simple httpx ASGI client that doesn't require `async`"
     def __init__(self, app, url="http://testserver"):
+        import httpx
         self.cli = httpx.AsyncClient(transport=httpx.ASGITransport(app), base_url=url)
 
     def _sync(self, method, url, **kwargs):
@@ -825,20 +844,20 @@ class APIRouter:
         self.prefix = prefix if prefix else ""
         self.body_wrap = body_wrap
 
-    def _wrap_func(self, func, path=None):
-        name = func.__name__
+    def _wrap_func(self, func, path=None, name=None):
         wrapped = _mk_locfunc(func, path)
         wrapped.__routename__ = name
-        # If you are using the def get or def post method names, this approach is not supported
+        # If you are using def get/post/etc method names, this approach is not supported
         if name not in all_meths: setattr(self.rt_funcs, name, wrapped)
         return wrapped
 
     def __call__(self, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         "Add a route at `path`"
         def f(func):
-            p = self.prefix + ("/" + ('' if path.__name__=='index' else func.__name__) if callable(path) else path)
-            wrapped = self._wrap_func(func, p)
-            self.routes.append((func, p, methods, name, include_in_schema, body_wrap or self.body_wrap))
+            n,_,p = _route_pn(func, path, name)
+            p = self.prefix + p
+            wrapped = self._wrap_func(func, p, n)
+            self.routes.append((func, p, methods, n, include_in_schema, body_wrap or self.body_wrap))
             return wrapped
         return f(path) if callable(path) else f
 
@@ -1007,9 +1026,34 @@ def devtools_json(self:FastHTML, path=None, uuid=None):
 @patch
 def get_client(self:FastHTML, asink=False, **kw):
     "Get an httpx client with session cookes set from `**kw`"
+    import httpx
     signer = itsdangerous.TimestampSigner(self.secret_key)
     data = b64encode(dumps(kw).encode())
     data = signer.sign(data)
     client = httpx.AsyncClient() if asink else httpx.Client()
     client.cookies.update({self.session_cookie: data.decode()})
     return client
+
+# %% ../nbs/api/00_core.ipynb #c845f437
+@patch
+def decode_session(self:FastHTML, cookie):
+    "Decode a signed session cookie"
+    if not cookie or cookie == 'null': return {}
+    unsigned = itsdangerous.TimestampSigner(self.secret_key).unsign(cookie, max_age=None)
+    return loads(b64decode(unsigned).decode())
+
+# %% ../nbs/api/00_core.ipynb #49260e9b
+@patch
+def get_testclient(self:FastHTML, **kw):
+    "Get a Starlette `TestClient` with session cookies set from `**kw`"
+    from starlette.testclient import TestClient
+    
+    class FastHTMLTestClient(TestClient):
+        "A Starlette TestClient with a `session` property"
+        @property
+        def session(self):
+            cookie = next((c.value for c in reversed(list(self.cookies.jar))
+                if c.name == self.app.session_cookie), None)
+            return self.app.decode_session(cookie)
+
+    return FastHTMLTestClient(self, cookies=self.get_client(**kw).cookies)

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/core.pyi

@@ -1,25 +1,25 @@
-"""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', 'devtools_loc', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'JSONResponse', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid']
-import json, uuid, inspect, types, signal, asyncio, threading, inspect, random, contextlib
+"""The `FastHTML` subclass of `Starlette`."""
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', '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', 'HostRoute', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache', 'add_sig_param', 'into', 'MiddlewareBase', 'FtResponse', 'unqid']
+import json, uuid, inspect, types, asyncio, inspect, random, contextlib, itsdangerous
 from fastcore.utils import *
 from fastcore.xml import *
-from fastcore.meta import use_kwargs_dict
+from fastcore.meta import use_kwargs_dict, delegates
+from fastcore.style import S
 from types import UnionType, SimpleNamespace as ns, GenericAlias
-from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
+from typing import get_args, get_origin, Union, Mapping, List, Any, Callable
 from datetime import datetime, date
-from dataclasses import dataclass, fields
-from collections import namedtuple
-from inspect import isfunction, ismethod, Parameter, get_annotations
-from functools import wraps, partialmethod, update_wrapper
+from dataclasses import dataclass
+from inspect import Parameter, get_annotations
+from functools import partialmethod, update_wrapper
 from http import cookies
 from urllib.parse import urlencode, parse_qs, quote, unquote
-from copy import copy, deepcopy
+from copy import deepcopy
 from warnings import warn
 from dateutil import parser as dtparse
-from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
 from uuid import uuid4, UUID
-from base64 import b85encode, b64encode
+from base64 import b64encode, b64decode
+from email.utils import format_datetime
 from .starlette import *
 
 def _params(f):
@@ -55,6 +55,11 @@ def _get_htmx(h):
 def _mk_list(t, v):
     ...
 fh_cfg = AttrDict(indent=True)
+_special_names = {'ws', 'request', 'session', 'scope', 'data', 'htmx', 'app', 'state', 'auth', 'send', 'api', 'body', 'hdrs', 'ftrs', 'bodykw', 'htmlkw', 'resp', 'self'}
+
+def _check_anno(arg, anno):
+    """Check for common annotation issues; returns warning string or None"""
+    ...
 
 def _fix_anno(t, o):
     """Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"""
@@ -97,17 +102,36 @@ async def parse_form(req: Request) -> FormData:
     """Starlette errors on empty multipart forms, so this checks for that situation"""
     ...
 
-async def _from_body(req, p):
+async def _from_body(conn, p, data):
+    """Create an instance of the annotated type from pre-parsed `data`"""
     ...
 
+class ApiReturn:
+
+    @classmethod
+    async def __from_request__(cls, data, req):
+        ...
+
+    def __init__(self, isapi=False):
+        ...
+
+    def __call__(self, norm=None, **kw):
+        ...
+
+    def __bool__(self):
+        ...
+
 class JSONResponse(JSONResponseOrig):
     """Same as starlette's version, but auto-stringifies non serializable types"""
 
     def render(self, content: Any) -> bytes:
         ...
 
-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)"""
+async def _find_p(conn, data, hdrs, arg: str, p: Parameter):
+    """In `data` find param named `arg` of type in `p` (`arg` is ignored for body types)"""
+    ...
+
+async def _find_ps(conn, data, hdrs, params):
     ...
 
 async def _wrap_req(req, params):
@@ -122,14 +146,13 @@ class Beforeware:
     def __init__(self, f, skip=None):
         ...
 
-async def _handle(f, args, **kwargs):
-    ...
+    def __repr__(self):
+        ...
 
-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)"""
+async def _handle(f, *args, **kwargs):
     ...
 
-def _wrap_ws(ws, data, params):
+async def _wrap_ws(ws, data, params):
     ...
 
 async def _send_ws(ws, resp):
@@ -146,9 +169,11 @@ def signal_shutdown():
     ...
 
 def uri(_arg, **kwargs):
+    """Create a URI by URL-encoding `_arg` and appending query parameters from `kwargs`"""
     ...
 
 def decode_uri(s):
+    """Decode a URI created by `uri()` back into argument and keyword dict"""
     ...
 from starlette.convertors import StringConvertor
 StringConvertor.regex = '[^/]*'
@@ -160,23 +185,23 @@ def to_string(self: StringConvertor, value: str) -> str:
 @patch
 def url_path_for(self: HTTPConnection, name: str, **path_params):
     ...
-_verbs = dict(get='hx-get', post='hx-post', put='hx-post', delete='hx-delete', patch='hx-patch', link='href')
+_verbs = dict(get='hx-get', post='hx-post', put='hx-put', delete='hx-delete', patch='hx-patch', link='href')
 
 def _url_for(req, t):
+    """Generate URL for route `t` using request `req`"""
     ...
 
 def _find_targets(req, resp):
-    ...
-
-def _apply_ft(o):
+    """Find and convert route targets in response attributes to URLs"""
     ...
 
 def _to_xml(req, resp, indent):
+    """Convert response to XML string with target URL resolution"""
     ...
 _iter_typs = (tuple, list, map, filter, range, types.GeneratorType)
 
 def flat_tuple(o):
-    """Flatten lists"""
+    """Flatten nested iterables into a single tuple"""
     ...
 
 def noop_body(c, req):
@@ -188,18 +213,26 @@ def respond(req, heads, bdy):
     ...
 
 def is_full_page(req, resp):
+    """Check if response should be rendered as full page or fragment"""
     ...
 
 def _part_resp(req, resp):
+    """Partition response into HTTP headers, background tasks, and content"""
+    ...
+
+def _canonical(req):
     ...
 
 def _xt_cts(req, resp):
+    """Extract content and headers, render as full page or fragment"""
     ...
 
 def _is_ft_resp(resp):
+    """Check if response is a FastTag-compatible type"""
     ...
 
 def _resp(req, resp, cls=empty, status_code=200):
+    """Create appropriate HTTP response from request and response data"""
     ...
 
 class Redirect:
@@ -212,9 +245,10 @@ class Redirect:
         ...
 
 async def _wrap_call(f, req, params):
+    """Wrap function call with request parameter injection"""
     ...
-htmx_exts = {'morph': 'https://cdn.jsdelivr.net/npm/idiomorph@0.7.3/dist/idiomorph-ext.min.js', 'head-support': 'https://cdn.jsdelivr.net/npm/htmx-ext-head-support@2.0.3/head-support.js', 'preload': 'https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.0/preload.js', 'class-tools': 'https://cdn.jsdelivr.net/npm/htmx-ext-class-tools@2.0.1/class-tools.js', 'loading-states': 'https://cdn.jsdelivr.net/npm/htmx-ext-loading-states@2.0.0/loading-states.js', 'multi-swap': 'https://cdn.jsdelivr.net/npm/htmx-ext-multi-swap@2.0.0/multi-swap.js', 'path-deps': 'https://cdn.jsdelivr.net/npm/htmx-ext-path-deps@2.0.0/path-deps.js', 'remove-me': 'https://cdn.jsdelivr.net/npm/htmx-ext-remove-me@2.0.0/remove-me.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'}
-htmxsrc = Script(src='https://cdn.jsdelivr.net/npm/htmx.org@2.0.4/dist/htmx.min.js')
+htmx_exts = {'morph': 'https://cdn.jsdelivr.net/npm/idiomorph@0.7.3/dist/idiomorph-ext.min.js', 'head-support': 'https://cdn.jsdelivr.net/npm/htmx-ext-head-support@2.0.4/head-support.js', 'preload': 'https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.1/preload.js', 'class-tools': 'https://cdn.jsdelivr.net/npm/htmx-ext-class-tools@2.0.1/class-tools.js', 'loading-states': 'https://cdn.jsdelivr.net/npm/htmx-ext-loading-states@2.0.1/loading-states.js', 'multi-swap': 'https://cdn.jsdelivr.net/npm/htmx-ext-multi-swap@2.0.0/multi-swap.js', 'path-deps': 'https://cdn.jsdelivr.net/npm/htmx-ext-path-deps@2.0.0/path-deps.js', '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'}
+htmxsrc = Script(src='https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/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')
@@ -222,12 +256,15 @@ viewport = Meta(name='viewport', content='width=device-width, initial-scale=1, v
 charset = Meta(charset='utf-8')
 
 def get_key(key=None, fname='.sesskey'):
+    """Get session key from `key` param or read/create from file `fname`"""
     ...
 
 def _list(o):
+    """Wrap non-list item in a list, returning empty list if None"""
     ...
 
 def _wrap_ex(f, status_code, hdrs, ftrs, htmlkw, bodykw, body_wrap):
+    """Wrap exception handler with FastHTML request processing"""
     ...
 
 def qp(p: str, **kw) -> str:
@@ -240,32 +277,79 @@ def def_hdrs(htmx=True, surreal=True):
 cors_allow = Middleware(CORSMiddleware, allow_credentials=True, allow_origins=['*'], allow_methods=['*'], allow_headers=['*'])
 iframe_scr = Script(NotStr("\n    function sendmsg() {\n        window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');\n    }\n    window.onload = function() {\n        sendmsg();\n        document.body.addEventListener('htmx:afterSettle',    sendmsg);\n        document.body.addEventListener('htmx:wsAfterMessage', sendmsg);\n    };"))
 
+class _LifespanCtx:
+
+    def __init__(self, gen):
+        ...
+
+    async def __aenter__(self):
+        ...
+
+    async def __aexit__(self, *_):
+        ...
+
+    def __aiter__(self):
+        ...
+
+    async def __anext__(self):
+        ...
+
+class Lifespan:
+
+    def __init__(self, startup=None, shutdown=None, ls=None):
+        ...
+
+    def __call__(self, app):
+        ...
+
+    async def _run(self, app):
+        ...
+
+    def on_event(self, event_type):
+        ...
+
 class FastHTML(Starlette):
 
     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, canonical=True, **bodykw):
         ...
 
+    def on_event(self, event_type):
+        ...
+
     def add_route(self, route):
+        """Add or replace a route in the FastHTML app"""
         ...
 
-    def _endp(self, f, body_wrap):
+    def _endp(self, f, body_wrap, before: Optional[Callable | tuple]=None):
+        """Create endpoint wrapper with before/after middleware processing"""
         ...
 
     def _add_ws(self, func, path, conn, disconn, name, middleware):
+        """Add websocket route to FastHTML app"""
         ...
 
     def ws(self, path: str, conn=None, disconn=None, name=None, middleware=None):
         """Add a websocket route at `path`"""
         ...
 
-    def _add_route(self, func, path, methods, name, include_in_schema, body_wrap):
+    def add_websocket_route(self, path, func, conn=None, disconn=None, name=None, middleware=None):
+        """Add a websocket route at `path` (Starlette-compatible API)"""
+        ...
+
+    def _add_routes(self, cls, path, methods, name, include_in_schema, body_wrap, host=None, before: Optional[Callable | tuple]=None):
+        """Add HTTP routes from methods on endpoint class `cls`"""
         ...
 
-    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
+    def _add_route(self, func, path, methods, name, include_in_schema, body_wrap, host=None, before: Optional[Callable | tuple]=None):
+        """Add HTTP route to FastHTML app with automatic method detection"""
+        ...
+
+    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None, host=None, before: Optional[Callable | tuple]=None):
         """Add a route at `path`"""
         ...
 
     def set_lifespan(self, value):
+        """Set the lifespan context manager for the FastHTML app"""
         ...
 
     def static_route_exts(self, prefix='/', static_path='.', exts='static'):
@@ -281,18 +365,47 @@ class FastHTML(Starlette):
 
     def devtools_json(self, path=None, uuid=None):
         ...
+
+    def get_client(self, asink=False, **kw):
+        """Get an httpx client with session cookes set from `**kw`"""
+        ...
+
+    def decode_session(self, cookie):
+        """Decode a signed session cookie"""
+        ...
+
+    def get_testclient(self, **kw):
+        """Get a Starlette `TestClient` with session cookies set from `**kw`"""
+        ...
+
+class HostRoute(Route):
+    """Route with optional host-header constraint using Starlette's {param} pattern syntax"""
+
+    def __init__(self, path, endpoint, *, host=None, **kwargs):
+        ...
+
+    def matches(self, scope):
+        ...
+
+    def __repr__(self) -> str:
+        ...
 all_meths = 'get post put delete patch head trace options'.split()
 
-def _mk_locfunc(f, p):
+def _mk_locfunc(f, p, app=None):
+    """Create a location function wrapper with route path and to() method"""
     ...
 
 def nested_name(f):
     """Get name of function `f` using '_' to join nested function names"""
     ...
+
+def _route_pn(func, path, name):
+    """Infer route name/function name/path from an endpoint or endpoint class"""
+    ...
 for o in all_meths:
     setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
-def serve(appname=None, app='app', host='0.0.0.0', port=None, reload=True, reload_includes: list[str] | str | None=None, reload_excludes: list[str] | str | None=None):
+def serve(appname=None, app='app', host='0.0.0.0', port=None, reload=True, **kwargs):
     """Run the app in an async server, with live reload set as the default."""
     ...
 
@@ -327,7 +440,7 @@ class APIRouter:
     def __init__(self, prefix: str | None=None, body_wrap=noop_body):
         ...
 
-    def _wrap_func(self, func, path=None):
+    def _wrap_func(self, func, path=None, name=None):
         ...
 
     def __call__(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
@@ -357,6 +470,26 @@ reg_re_param('path', '.*?')
 _static_exts = 'ico gif jpg jpeg webm css js woff png svg mp4 webp ttf otf eot woff2 txt html map pdf zip tgz gz csv mp3 wav ogg flac aac doc docx xls xlsx ppt pptx epub mobi bmp tiff avi mov wmv mkv xml yaml yml rar 7z tar bz2 htm xhtml apk dmg exe msi swf iso'.split()
 reg_re_param('static', '|'.join(_static_exts))
 
+class StaticNoCache(StaticFiles):
+
+    def file_response(self, *args, **kwargs):
+        ...
+from functools import wraps
+from inspect import signature, isawaitable
+
+def add_sig_param(f, name, typ=NoneType, kind=Parameter.KEYWORD_ONLY, default=Parameter.empty):
+    """Add a parameter to a function's signature"""
+    ...
+
+class into:
+    """Decorator to pass a route's return value into `func`, with keyword params added to the route signature"""
+
+    def __init__(self, func):
+        ...
+
+    def __call__(self, f):
+        ...
+
 class MiddlewareBase:
 
     async def __call__(self, scope, receive, send) -> None:

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/fastapp.py

@@ -1,12 +1,9 @@
 """The `fast_app` convenience wrapper"""
 
-import inspect,uvicorn
+import inspect
 from fastcore.utils import *
-from fastlite import *
 from .basics import *
-from .pico import *
 from .starlette import *
-from .live_reload import FastHTMLWithLiveReload
 
 __all__ = ['fast_app']
 
@@ -19,8 +16,9 @@ def _get_tbl(dt, nm, schema):
     if render: dc.__ft__ = render
     return tbl,dc
 
-def _app_factory(*args, **kwargs) -> FastHTML | FastHTMLWithLiveReload:
+def _app_factory(*args, **kwargs):
     "Creates a FastHTML or FastHTMLWithLiveReload app instance"
+    from .live_reload import FastHTMLWithLiveReload
     if kwargs.pop('live', False): return FastHTMLWithLiveReload(*args, **kwargs)
     kwargs.pop('reload_attempts', None)
     kwargs.pop('reload_interval', None)
@@ -65,6 +63,7 @@ def fast_app(
         nb_hdrs:bool=False, # If in notebook include headers inject headers in notebook DOM?
         **kwargs):
     "Create a FastHTML or FastHTMLWithLiveReload app."
+    from .pico import picolink
     h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
 
@@ -76,6 +75,7 @@ def fast_app(
     app.static_route_exts(static_path=static_path)
     if not db_file: return app,app.route
 
+    from fastlite import database
     db = database(db_file)
     if not tbls: tbls={}
     if kwargs:

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/jupyter.py

@@ -18,12 +18,11 @@ try: from IPython.display import HTML,Markdown,display
 except ImportError: pass
 
 # %% ../nbs/api/06_jupyter.ipynb #a5d3a8f7
-def nb_serve(app, log_level="error", port=8000, host='0.0.0.0', **kwargs):
-    "Start a Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
+def nb_serve(app, log_level="error", port=8000, host='0.0.0.0', daemon=False, **kwargs):
+    "Start a Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`; use `daemon=True` for notebook tests so failed runs don't block process shutdown"
     server = uvicorn.Server(uvicorn.Config(app, log_level=log_level, host=host, port=port, **kwargs))
-    async def async_run_server(server): await server.serve()
-    @startthread
-    def run_server(): asyncio.run(async_run_server(server))
+    @startthread(daemon=daemon)
+    def run_server(): asyncio.run(server.serve())
     while not server.started: time.sleep(0.01)
     return server
 
@@ -83,7 +82,7 @@ document.body.addEventListener('htmx:configRequest', (event) => {
 # %% ../nbs/api/06_jupyter.ipynb #29a834a5
 class JupyUvi:
     "Start and stop a Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
-    def __init__(self, app, log_level="error", host='0.0.0.0', port=8000, start=True, **kwargs):
+    def __init__(self, app, log_level="error", host='0.0.0.0', port=8000, start=True, daemon=False, **kwargs):
         self.kwargs = kwargs
         store_attr(but='start')
         self.server = None
@@ -91,7 +90,7 @@ class JupyUvi:
         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, **self.kwargs)
+        self.server = nb_serve(self.app, log_level=self.log_level, host=self.host, port=self.port,daemon=self.daemon, **self.kwargs)
 
     async def start_async(self):
         self.server = await nb_serve_async(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
@@ -100,6 +99,7 @@ class JupyUvi:
         self.server.should_exit = True
         wait_port_free(self.port)
 
+
 # %% ../nbs/api/06_jupyter.ipynb #9134035e
 class JupyUviAsync(JupyUvi):
     "Start and stop an async Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/xtend.py

@@ -20,9 +20,6 @@ from fastcore.meta import use_kwargs, delegates
 from .core import *
 from .components import *
 
-try: from IPython import display
-except ImportError: display=None
-
 # %% ../nbs/api/02_xtend.ipynb #254f4744
 @delegates(ft_hx, keep=True)
 def A(*c, hx_get=None, target_id=None, hx_swap=None, href='#', **kwargs)->FT:

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/fasthtml/xtend.pyi

@@ -1,5 +1,5 @@
 """Simple extensions to standard HTML components, such as adding sensible defaults"""
-__all__ = ['sid_scr', 'A', 'AX', 'Form', 'Hidden', 'CheckboxX', 'Script', 'Style', 'double_braces', 'undouble_braces', 'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'Nbsp', 'Surreal', 'On', 'Prev', 'Now', 'AnyNow', 'run_js', 'HtmxOn', 'jsd', 'Fragment', 'Titled', 'Socials', 'YouTubeEmbed', 'Favicon', 'clear', 'with_sid']
+__all__ = ['sid_scr', 'A', 'AX', 'Form', 'Hidden', 'CheckboxX', 'Script', 'Style', 'double_braces', 'undouble_braces', 'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'Nbsp', 'Surreal', 'On', 'Prev', 'Now', 'AnyNow', 'run_js', 'HtmxOn', 'jsd', 'Fragment', 'Titled', 'Socials', 'YouTubeEmbed', 'Favicon', 'clear', 'with_sid', 'LdJson', 'LdContactPoint', 'LdOrg', 'LdWebsite', 'LdCourseInstance', 'LdCourse', 'robots_txt', 'sitemap_url', 'sitemap_xml']
 from dataclasses import dataclass, asdict
 from typing import Any
 from fastcore.utils import *
@@ -8,10 +8,6 @@ from fastcore.xml import *
 from fastcore.meta import use_kwargs, delegates
 from .core import *
 from .components import *
-try:
-    from IPython import display
-except ImportError:
-    display = None
 
 def A(*c, hx_get=None, target_id=None, hx_swap=None, href='#', hx_vals=None, hx_target=None, id=None, cls=None, title=None, style=None, accesskey=None, contenteditable=None, dir=None, draggable=None, enterkeyhint=None, hidden=None, inert=None, inputmode=None, lang=None, popover=None, spellcheck=None, tabindex=None, translate=None, hx_post=None, hx_put=None, hx_delete=None, hx_patch=None, hx_trigger=None, hx_swap_oob=None, hx_include=None, hx_select=None, hx_select_oob=None, hx_indicator=None, hx_push_url=None, hx_confirm=None, hx_disable=None, hx_replace_url=None, hx_disabled_elt=None, hx_ext=None, hx_headers=None, hx_history=None, hx_history_elt=None, hx_inherit=None, hx_params=None, hx_preserve=None, hx_prompt=None, hx_request=None, hx_sync=None, hx_validate=None, hx_on_blur=None, hx_on_change=None, hx_on_contextmenu=None, hx_on_focus=None, hx_on_input=None, hx_on_invalid=None, hx_on_reset=None, hx_on_select=None, hx_on_submit=None, hx_on_keydown=None, hx_on_keypress=None, hx_on_keyup=None, hx_on_click=None, hx_on_dblclick=None, hx_on_mousedown=None, hx_on_mouseenter=None, hx_on_mouseleave=None, hx_on_mousemove=None, hx_on_mouseout=None, hx_on_mouseover=None, hx_on_mouseup=None, hx_on_wheel=None, hx_on__abort=None, hx_on__after_on_load=None, hx_on__after_process_node=None, hx_on__after_request=None, hx_on__after_settle=None, hx_on__after_swap=None, hx_on__before_cleanup_element=None, hx_on__before_on_load=None, hx_on__before_process_node=None, hx_on__before_request=None, hx_on__before_swap=None, hx_on__before_send=None, hx_on__before_transition=None, hx_on__config_request=None, hx_on__confirm=None, hx_on__history_cache_error=None, hx_on__history_cache_miss=None, hx_on__history_cache_miss_error=None, hx_on__history_cache_miss_load=None, hx_on__history_restore=None, hx_on__before_history_save=None, hx_on__load=None, hx_on__no_sse_source_error=None, hx_on__on_load_error=None, hx_on__oob_after_swap=None, hx_on__oob_before_swap=None, hx_on__oob_error_no_target=None, hx_on__prompt=None, hx_on__pushed_into_history=None, hx_on__replaced_in_history=None, hx_on__response_error=None, hx_on__send_abort=None, hx_on__send_error=None, hx_on__sse_error=None, hx_on__sse_open=None, hx_on__swap_error=None, hx_on__target_error=None, hx_on__timeout=None, hx_on__validation_validate=None, hx_on__validation_failed=None, hx_on__validation_halted=None, hx_on__xhr_abort=None, hx_on__xhr_loadend=None, hx_on__xhr_loadstart=None, hx_on__xhr_progress=None, **kwargs) -> FT:
     """An A tag; `href` defaults to '#' for more concise use with HTMX"""
@@ -127,4 +123,41 @@ def clear(id):
 sid_scr = Script('\nfunction uuid() {\n    return [...crypto.getRandomValues(new Uint8Array(10))].map(b=>b.toString(36)).join(\'\');\n}\n\nsessionStorage.setItem("sid", sessionStorage.getItem("sid") || uuid());\n\nhtmx.on("htmx:configRequest", (e) => {\n    const sid = sessionStorage.getItem("sid");\n    if (sid) {\n        const url = new URL(e.detail.path, window.location.origin);\n        url.searchParams.set(\'sid\', sid);\n        e.detail.path = url.pathname + url.search;\n    }\n});\n')
 
 def with_sid(app, dest, path='/'):
+    ...
+
+def LdJson(typ, data: dict, script=False, extra=None, **kwargs) -> FT:
+    """A script tag containing JSON-LD structured data"""
+    ...
+
+def LdContactPoint(contact_type: str, email: str=None, phone: str=None, script=False, **extra) -> dict:
+    """Create a ContactPoint for JSON-LD"""
+    ...
+
+def LdOrg(name: str, url: str=None, logo: str=None, alt_name: str=None, same_as: list=None, contact_points: list=None, script=False, **extra) -> dict:
+    """JSON-LD Organization structured data"""
+    ...
+
+def LdWebsite(name: str, url: str, script=False, **extra) -> dict:
+    """Create JSON-LD WebSite structured data"""
+    ...
+
+def LdCourseInstance(course_mode: str='Online', start_date: str=None, end_date: str=None, location: dict=None, instructor: dict=None, script=False, **extra) -> dict:
+    """Create a CourseInstance for JSON-LD"""
+    ...
+
+def LdCourse(name: str, description: str, provider: dict, course_instance: dict=None, script=False, **extra) -> dict:
+    """Create JSON-LD Course structured data"""
+    ...
+
+def robots_txt(app, allow_all=True, disallow_paths=None, sitemap_url=None, crawl_delay=None):
+    """Add a /robots.txt route to the app"""
+    ...
+from fastcore.xml import Url, Loc, Lastmod, Changefreq, Priority, Urlset
+
+def sitemap_url(url_info, loc_base=''):
+    """Create a sitemap URL element from url_info (string or dict)"""
+    ...
+
+def sitemap_xml(app, urls, loc_base=''):
+    """Add a /sitemap.xml route to the app with list of URLs"""
     ...

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/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>=1.12.16', 'python-dateutil', 'starlette~=1.0', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
+dependencies = ['fastcore>=1.12.45', 'python-dateutil', 'starlette~=1.0', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fasthtml"
@@ -36,8 +36,8 @@ version = {attr = "fasthtml.__version__"}
 include = ["fasthtml"]
 
 [tool.nbdev]
-allowed_metadata_keys = ['solveit_dialog_mode', 'solveit_ver']
-allowed_cell_metadata_keys = ["solveit_ai"]
+allowed_metadata_keys = ['solveit']
+allowed_cell_metadata_keys = ['solveit_ai']
 jupyter_hooks = true
 custom_sidebar = false
 lib_path = "fasthtml"

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.3
+Version: 0.14.0
 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>=1.12.16
+Requires-Dist: fastcore>=1.12.45
 Requires-Dist: python-dateutil
 Requires-Dist: starlette~=1.0
 Requires-Dist: oauthlib

{python_fasthtml-0.13.3 → python_fasthtml-0.14.0}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.12.16
+fastcore>=1.12.45
 python-dateutil
 starlette~=1.0
 oauthlib

python_fasthtml-0.13.3/fasthtml/__init__.py

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