python-fasthtml 0.14.3__tar.gz → 0.14.5__tar.gz

{python_fasthtml-0.14.3/python_fasthtml.egg-info → python_fasthtml-0.14.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.3
+Version: 0.14.5
 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.45
+Requires-Dist: fastcore>=1.14.2
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib

python_fasthtml-0.14.5/fasthtml/__init__.py

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

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/_modidx.py

@@ -15,7 +15,6 @@ d = { 'settings': { 'branch': 'main',
                                      'fasthtml.components.FT.__radd__': ('api/components.html#ft.__radd__', 'fasthtml/components.py'),
                                      'fasthtml.components.FT.__str__': ('api/components.html#ft.__str__', 'fasthtml/components.py'),
                                      'fasthtml.components.File': ('api/components.html#file', 'fasthtml/components.py'),
-                                     'fasthtml.components.__getattr__': ('api/components.html#__getattr__', 'fasthtml/components.py'),
                                      'fasthtml.components._fill_item': ('api/components.html#_fill_item', 'fasthtml/components.py'),
                                      'fasthtml.components.attrmap_x': ('api/components.html#attrmap_x', 'fasthtml/components.py'),
                                      'fasthtml.components.fill_dataclass': ('api/components.html#fill_dataclass', 'fasthtml/components.py'),
@@ -131,6 +130,7 @@ d = { 'settings': { 'branch': 'main',
                                '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'),
                                'fasthtml.core._url_for': ('api/core.html#_url_for', 'fasthtml/core.py'),
+                               'fasthtml.core._wait_disconnect': ('api/core.html#_wait_disconnect', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_call': ('api/core.html#_wrap_call', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_ex': ('api/core.html#_wrap_ex', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_req': ('api/core.html#_wrap_req', 'fasthtml/core.py'),
@@ -138,6 +138,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._ws_endp': ('api/core.html#_ws_endp', 'fasthtml/core.py'),
                                'fasthtml.core._xt_cts': ('api/core.html#_xt_cts', 'fasthtml/core.py'),
                                'fasthtml.core.add_sig_param': ('api/core.html#add_sig_param', 'fasthtml/core.py'),
+                               'fasthtml.core.cancel_on_disconnect': ('api/core.html#cancel_on_disconnect', 'fasthtml/core.py'),
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
                                'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
                                'fasthtml.core.def_hdrs': ('api/core.html#def_hdrs', 'fasthtml/core.py'),
@@ -160,6 +161,7 @@ d = { 'settings': { 'branch': 'main',
                                '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'),
+                               'fasthtml.core.until_disconnect': ('api/core.html#until_disconnect', 'fasthtml/core.py'),
                                'fasthtml.core.uri': ('api/core.html#uri', 'fasthtml/core.py')},
             'fasthtml.fastapp': {},
             'fasthtml.ft': {},
@@ -339,4 +341,5 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.sitemap_url': ('api/xtend.html#sitemap_url', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.sitemap_xml': ('api/xtend.html#sitemap_xml', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.undouble_braces': ('api/xtend.html#undouble_braces', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.upload_pb_attrs': ('api/xtend.html#upload_pb_attrs', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.with_sid': ('api/xtend.html#with_sid', 'fasthtml/xtend.py')}}}

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/components.py

@@ -1,6 +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
 
-Docs: https://www.fastht.ml/docsapi/components.html.md"""
+Docs: https://www.fastht.ml/docs/api/components.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_components.ipynb.
 
@@ -195,11 +195,7 @@ def find_inputs(e, tags='input', **kw):
     return inputs
 
 # %% ../nbs/api/01_components.ipynb #1d8a28b1
-def __getattr__(tag):
-    if tag.startswith('_') or tag[0].islower(): raise AttributeError
-    tag = tag.replace("_", "-")
-    def _f(*c, target_id=None, **kwargs): return ft_hx(tag, *c, target_id=target_id, **kwargs)
-    return _f
+__getattr__ = mk_getattr(ft_hx)
 
 # %% ../nbs/api/01_components.ipynb #afb0f65c
 _re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/core.py

@@ -1,6 +1,6 @@
 """The `FastHTML` subclass of `Starlette`.
 
-Docs: https://www.fastht.ml/docsapi/core.html.md"""
+Docs: https://www.fastht.ml/docs/api/core.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
@@ -10,15 +10,16 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'DEF_MAXPART', 'htmx_ex
            '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']
+           'HostRoute', 'nested_name', 'serve', 'until_disconnect', 'cancel_on_disconnect', 'Client', 'RouteFuncs',
+           'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache', 'add_sig_param', 'into', 'MiddlewareBase',
+           'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
 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,delegates
+from fastcore.meta import use_kwargs_dict,delegates,splice_sig
 from fastcore.style import S
 
 from types import UnionType, SimpleNamespace as ns, GenericAlias
@@ -157,7 +158,7 @@ DEF_MAXPART = 100*1024*1024
 
 # %% ../nbs/api/00_core.ipynb #42c9cea0
 async def parse_form(req: Request) -> FormData:
-    "Starlette errors on empty multipart forms, so this checks for that situation"
+    "Starlette errors on empty multipart/json forms, so this checks for that situation"
     ctype = req.headers.get("Content-Type", "")
     maxpart = getattr(req, "max_part_size", DEF_MAXPART)
     if ctype.startswith("multipart/form-data"):
@@ -165,8 +166,9 @@ async def parse_form(req: Request) -> FormData:
         except IndexError: raise HTTPException(400, "Invalid form-data: no boundary")
         if int(req.headers.get("Content-Length", "0")) <= len(boundary) + 6: return FormData()
         return await req.form(max_part_size=maxpart)
-    await req.body()  # Cache body for non-multipart request types
-    return await req.json() if ctype == 'application/json' else await req.form(max_part_size=maxpart)
+    body = await req.body()  # Cache body for non-multipart request types
+    if ctype == 'application/json': return await req.json() if body else {}
+    return await req.form(max_part_size=maxpart)
 
 # %% ../nbs/api/00_core.ipynb #0caedd04
 async def _from_body(conn, p, data):
@@ -458,7 +460,7 @@ def _is_ft_resp(resp):
 # %% ../nbs/api/00_core.ipynb #968d9245
 def _resp(req, resp, cls=empty, status_code=200):
     "Create appropriate HTTP response from request and response data"
-    if not resp: resp=''
+    if resp is None: resp=''
     if hasattr(resp, '__response__'): resp = resp.__response__(req)
     if not (isinstance(cls, type) and issubclass(cls, Response)): cls=empty
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
@@ -818,6 +820,35 @@ def serve(
         print('Link: '+ S.light_red.bold(link))
         run(f'{appname}:{app}', host=host, port=port, reload=reload, **kwargs)
 
+# %% ../nbs/api/00_core.ipynb #c5220a0e
+async def _wait_disconnect(req):
+    while (await req.receive())["type"] != "http.disconnect": pass
+
+async def until_disconnect(req, coro):
+    "Await `coro`, cancelling it (and returning an empty response) if the client disconnects first"
+    work,watch = asyncio.ensure_future(coro),asyncio.ensure_future(_wait_disconnect(req))
+    try:
+        done,_ = await asyncio.wait({work,watch}, return_when=asyncio.FIRST_COMPLETED)
+        if work in done: return work.result()
+        return Response(status_code=204)
+    finally:
+        watch.cancel()
+        if not work.done(): work.cancel()
+
+# %% ../nbs/api/00_core.ipynb #c5721d76
+def cancel_on_disconnect(
+    f=None, # Async route handler to wrap
+    *,
+    timeout=None, # Also cancel the handler after this many seconds
+):
+    "Route decorator: cancel the handler when the client disconnects"
+    if f is None: return partial(cancel_on_disconnect, timeout=timeout)
+    assert is_async_callable(f), "cancel_on_disconnect requires an async handler"
+    async def _f(__req: Request, *args, **kw):
+        c = until_disconnect(__req, f(**kw))
+        return await (asyncio.wait_for(c, timeout) if timeout is not None else c)
+    return splice_sig(_f, f)
+
 # %% ../nbs/api/00_core.ipynb #8121968a
 class Client:
     "A simple httpx ASGI client that doesn't require `async`"
@@ -916,14 +947,14 @@ reg_re_param("static", '|'.join(_static_exts))
 @patch
 def static_route_exts(self:FastHTML, prefix='/', static_path='.', exts='static'):
     "Add a static route at URL path `prefix` with files from `static_path` and `exts` defined by `reg_re_param()`"
-    @self.route(f"{prefix}{{fname:path}}.{{ext:{exts}}}")
+    @self.get(f"{prefix}{{fname:path}}.{{ext:{exts}}}")
     async def get(fname:str, ext:str): return FileResponse(f'{static_path}/{fname}.{ext}')
 
 # %% ../nbs/api/00_core.ipynb #b31de65a
 @patch
 def static_route(self:FastHTML, ext='', prefix='/', static_path='.'):
     "Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')"
-    @self.route(f"{prefix}{{fname:path}}{ext}")
+    @self.get(f"{prefix}{{fname:path}}{ext}")
     async def get(fname:str): return FileResponse(f'{static_path}/{fname}{ext}')
 
 # %% ../nbs/api/00_core.ipynb #f63b7a03

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/js.py

@@ -1,6 +1,6 @@
 """Basic external Javascript lib wrappers
 
-Docs: https://www.fastht.ml/docsapi/js.html.md"""
+Docs: https://www.fastht.ml/docs/api/js.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/03_js.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/jupyter.py

@@ -1,6 +1,6 @@
 """Use FastHTML in Jupyter notebooks
 
-Docs: https://www.fastht.ml/docsapi/jupyter.html.md"""
+Docs: https://www.fastht.ml/docs/api/jupyter.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/06_jupyter.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/oauth.py

@@ -1,6 +1,6 @@
 """Basic scaffolding for handling OAuth
 
-Docs: https://www.fastht.ml/docsapi/oauth.html.md"""
+Docs: https://www.fastht.ml/docs/api/oauth.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/08_oauth.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/pico.py

@@ -1,6 +1,6 @@
 """Basic components for generating Pico CSS tags
 
-Docs: https://www.fastht.ml/docsapi/pico.html.md"""
+Docs: https://www.fastht.ml/docs/api/pico.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/04_pico.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/stripe_otp.py

@@ -1,4 +1,4 @@
-"""Docs: https://www.fastht.ml/docsexplains/stripe.html.md"""
+"""Docs: https://www.fastht.ml/docs/explains/stripe.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/explains/Stripe.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/svg.py

@@ -1,6 +1,6 @@
 """Simple SVG FT elements
 
-Docs: https://www.fastht.ml/docsapi/svg.html.md"""
+Docs: https://www.fastht.ml/docs/api/svg.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/05_svg.ipynb.
 

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/fasthtml/xtend.py

@@ -1,6 +1,6 @@
 """Simple extensions to standard HTML components, such as adding sensible defaults
 
-Docs: https://www.fastht.ml/docsapi/xtend.html.md"""
+Docs: https://www.fastht.ml/docs/api/xtend.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/02_xtend.ipynb.
 
@@ -9,7 +9,7 @@ __all__ = ['sid_scr', 'A', 'AX', 'Form', 'Hidden', 'CheckboxX', 'Script', 'Style
            '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']
+           'sitemap_url', 'sitemap_xml', 'upload_pb_attrs']
 
 # %% ../nbs/api/02_xtend.ipynb #8e2d405b
 from dataclasses import dataclass, asdict
@@ -349,3 +349,10 @@ def sitemap_xml(app, urls, loc_base=""):
     def get():
         urlset = [sitemap_url(url_info, loc_base) for url_info in urls]
         return Urlset(*urlset, xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
+
+# %% ../nbs/api/02_xtend.ipynb #6a1990ed
+def upload_pb_attrs(id='uploadprog'):
+    "Form `hx_on` progress attr that reveals and updates a hidden `upload_pb` of matching `id`"
+    js = """{ const p=document.getElementById('%s');
+        if(event.detail.total) {p.classList.remove('hidden'); p.value=event.detail.loaded/event.detail.total*100} }""" % id
+    return {'hx-on::xhr:progress': js}

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/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.45', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx2', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
+dependencies = ['fastcore>=1.14.2', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx2', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fasthtml"
@@ -41,3 +41,6 @@ allowed_cell_metadata_keys = ['solveit_ai']
 jupyter_hooks = true
 custom_sidebar = false
 lib_path = "fasthtml"
+
+[tool.chkstyle]
+skip_paths = ["_modidx.py"]

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.3
+Version: 0.14.5
 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.45
+Requires-Dist: fastcore>=1.14.2
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib

{python_fasthtml-0.14.3 → python_fasthtml-0.14.5}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.12.45
+fastcore>=1.14.2
 python-dateutil
 starlette>=1.0.1
 oauthlib

python_fasthtml-0.14.3/fasthtml/__init__.py

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