python-fasthtml 0.12.18__tar.gz → 0.12.20__tar.gz

{python_fasthtml-0.12.18/python_fasthtml.egg-info → python_fasthtml-0.12.20}/PKG-INFO

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

python_fasthtml-0.12.20/fasthtml/__init__.py

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

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/_modidx.py

@@ -47,6 +47,8 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.FastHTML.add_route': ('api/core.html#fasthtml.add_route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.devtools_json': ('api/core.html#fasthtml.devtools_json', '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'),
+                               'fasthtml.core.FastHTML.setup_ws': ('api/core.html#fasthtml.setup_ws', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.static_route': ('api/core.html#fasthtml.static_route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.static_route_exts': ('api/core.html#fasthtml.static_route_exts', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.ws': ('api/core.html#fasthtml.ws', 'fasthtml/core.py'),
@@ -118,7 +120,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.reg_re_param': ('api/core.html#reg_re_param', 'fasthtml/core.py'),
                                'fasthtml.core.respond': ('api/core.html#respond', 'fasthtml/core.py'),
                                'fasthtml.core.serve': ('api/core.html#serve', 'fasthtml/core.py'),
-                               'fasthtml.core.setup_ws': ('api/core.html#setup_ws', 'fasthtml/core.py'),
                                'fasthtml.core.signal_shutdown': ('api/core.html#signal_shutdown', 'fasthtml/core.py'),
                                'fasthtml.core.snake2hyphens': ('api/core.html#snake2hyphens', 'fasthtml/core.py'),
                                'fasthtml.core.unqid': ('api/core.html#unqid', 'fasthtml/core.py'),

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/components.py

@@ -19,7 +19,7 @@ __all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_evts', 'js_evts', 'hx_attrs_an
 # %% ../nbs/api/01_components.ipynb
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
 from bs4 import BeautifulSoup, Comment
-from typing import Literal, Optional
+from typing import Literal, Mapping, Optional
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -84,7 +84,7 @@ fh_cfg['auto_name']=True
 
 # %% ../nbs/api/01_components.ipynb
 def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs):
-    ds,c = partition(c, risinstance(dict))
+    ds,c = partition(c, risinstance(Mapping))
     for d in ds: kwargs = {**kwargs, **d}
     if ft_cls is None: ft_cls = fh_cfg.ft_cls
     if attrmap is None: attrmap=fh_cfg.attrmap
@@ -217,7 +217,8 @@ def html2ft(html, attr1st=False):
               for c in cts if str(c).strip()]
         attrs, exotic_attrs  = [], {}
         for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):
-            if isinstance(value,(tuple,list)): value = " ".join(value)
+            if value is None or value == True: value = True  # handle boolean attributes
+            elif isinstance(value,(tuple,list)): value = " ".join(value)
             key, value = rev_map.get(key, key), value or True
             if _re_h2x_attr_key.match(key): attrs.append(f'{key.replace("-", "_")}={value!r}')
             else: exotic_attrs[key] = value

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/components.pyi

@@ -2,7 +2,7 @@
 __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, Optional
+from typing import Literal, Mapping, Optional
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs, delegates

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/core.py

@@ -8,10 +8,10 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            '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', 'setup_ws']
+           'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb
-import json,uuid,inspect,types,signal,asyncio,threading,inspect
+import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -31,7 +31,7 @@ from warnings import warn
 from dateutil import parser as dtparse
 from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
-from uuid import uuid4
+from uuid import uuid4, UUID
 from base64 import b85encode,b64encode
 
 from .starlette import *
@@ -465,7 +465,7 @@ htmx_exts = {
     "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.2/ws.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"
 }
 
@@ -568,12 +568,14 @@ class FastHTML(Starlette):
         excs = {k:_wrap_ex(v, k, hdrs, ftrs, htmlkw, bodykw, body_wrap=body_wrap) for k,v in exception_handlers.items()}
         super().__init__(debug, routes, middleware=middleware, exception_handlers=excs, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan)
 
-    def add_route(self, route):
-        route.methods = [m.upper() for m in listify(route.methods)]
-        self.router.routes = [r for r in self.router.routes if not
-                       (r.path==route.path and r.name == route.name and
-                        ((route.methods is None) or (set(r.methods) == set(route.methods))))]
-        self.router.routes.append(route)
+# %% ../nbs/api/00_core.ipynb
+@patch
+def add_route(self:FastHTML, route):
+    route.methods = [m.upper() for m in listify(route.methods)]
+    self.router.routes = [r for r in self.router.routes if not
+                   (r.path==route.path and r.name == route.name and
+                    ((route.methods is None) or (set(r.methods) == set(route.methods))))]
+    self.router.routes.append(route)
 
 # %% ../nbs/api/00_core.ipynb
 all_meths = 'get post put delete patch head trace options'.split()
@@ -656,6 +658,12 @@ def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_sche
 
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
+# %% ../nbs/api/00_core.ipynb
+@patch
+def set_lifespan(self:FastHTML, value):
+    if inspect.isasyncgenfunction(value): value = contextlib.asynccontextmanager(value)
+    self.router.lifespan_context = value
+
 # %% ../nbs/api/00_core.ipynb
 def serve(
         appname=None, # Name of the module
@@ -810,8 +818,9 @@ class FtResponse:
         return self.cls(cts, status_code=self.status_code, headers=headers, media_type=self.media_type, background=tasks)
 
 # %% ../nbs/api/00_core.ipynb
-def unqid():
-    res = b64encode(uuid4().bytes)
+def unqid(seeded=False):
+    id4 = UUID(int=random.getrandbits(128), version=4) if seeded else uuid4()
+    res = b64encode(id4.bytes)
     return '_' + res.decode().rstrip('=').translate(str.maketrans('+/', '_-'))
 
 # %% ../nbs/api/00_core.ipynb
@@ -821,7 +830,8 @@ def _add_ids(s):
     for c in s.children: _add_ids(c)
 
 # %% ../nbs/api/00_core.ipynb
-def setup_ws(app, f=noop):
+@patch
+def setup_ws(app:FastHTML, f=noop):
     conns = {}
     async def on_connect(scope, send): conns[scope.client] = send
     async def on_disconnect(scope): conns.pop(scope.client)

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/core.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', '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', 'setup_ws']
-import json, uuid, inspect, types, signal, asyncio, threading, inspect
+import json, uuid, inspect, types, signal, asyncio, threading, inspect, random
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs_dict
@@ -18,7 +18,7 @@ from warnings import warn
 from dateutil import parser as dtparse
 from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
-from uuid import uuid4
+from uuid import uuid4, UUID
 from base64 import b85encode, b64encode
 from .starlette import *
 
@@ -242,7 +242,7 @@ iframe_scr = Script(NotStr("\n    function sendmsg() {\n        window.parent.po
 
 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, **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, canonical=True, **bodykw):
         ...
 
     def add_route(self, route):
@@ -365,7 +365,7 @@ class FtResponse:
     def __response__(self, req):
         ...
 
-def unqid():
+def unqid(seeded=False):
     ...
 
 def _add_ids(s):

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/fasthtml/fastapp.py

@@ -36,6 +36,7 @@ def fast_app(
         middleware:Optional[tuple]=None, # Standard Starlette middleware
         live:bool=False, # Enable live reloading
         debug:bool=False, # Passed to Starlette, indicating if debug tracebacks should be returned on errors
+        title:str="FastHTML page", # Default page title
         routes:Optional[tuple]=None, # Passed to Starlette
         exception_handlers:Optional[dict]=None, # Passed to Starlette
         on_startup:Optional[callable]=None, # Passed to Starlette
@@ -67,7 +68,7 @@ def fast_app(
     h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
 
-    app = _app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, routes=routes, exception_handlers=exception_handlers,
+    app = _app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, title=title, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key, canonical=canonical,
                   session_cookie=session_cookie, max_age=max_age, sess_path=sess_path, same_site=same_site, sess_https_only=sess_https_only,
                   sess_domain=sess_domain, key_fname=key_fname, exts=exts, surreal=surreal, htmx=htmx, htmlkw=htmlkw,

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20/python_fasthtml.egg-info}/PKG-INFO

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

{python_fasthtml-0.12.18 → python_fasthtml-0.12.20}/settings.ini

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

python_fasthtml-0.12.18/fasthtml/__init__.py

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