python-fasthtml 0.14.12__tar.gz → 0.14.14__tar.gz

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14}/CONTRIBUTING.md

@@ -3,15 +3,15 @@
 Make sure you have read the [doc on code style](
 https://docs.fast.ai/dev/style.html) first. (Note that we don't follow PEP8, but instead follow a coding style designed specifically for numerical and interactive programming.)
 
-This project uses [nbdev](https://nbdev.fast.ai/getting_started.html) for development. Before beginning, make sure that nbdev and a jupyter-compatible client such as jupyterlab or nbclassic are installed. To make changes to the codebase, update the notebooks in the `nbs` folder, not the .py files directly. Then, run `nbdev_export`. For more details, have a look at the [nbdev tutorial](https://nbdev.fast.ai/tutorials/tutorial.html). Depending on the code changes, you might also need to run `tools/update.sh` to update python interface modules and [LLM reference material](https://github.com/AnswerDotAI/llms-txt).
+This project uses [nbdev](https://nbdev.fast.ai/getting_started.html) for development. Before beginning, make sure that nbdev and a jupyter-compatible client such as jupyterlab or nbclassic are installed. To make changes to the codebase, update the notebooks in the `nbs` folder, not the .py files directly. Then, run `nbdev-export`. For more details, have a look at the [nbdev tutorial](https://nbdev.fast.ai/tutorials/tutorial.html). Depending on the code changes, you might also need to run `tools/update.sh` to update python interface modules and [LLM reference material](https://github.com/AnswerDotAI/llms-txt).
 
 You may want to set up a `prep` alias in `~/.zshrc` or other shell startup file:
 
 ```sh
-alias prep='nbdev_export && nbdev_clean && nbdev_trust'
+alias prep='nbdev-export && nbdev-clean && nbdev-trust'
 ```
 
-Run `prep` before each commit to ensure your python files are up to date, and you notebooks cleaned of metadata and notarized.
+Run `prep` before each commit to ensure your python files are up to date, and your notebooks cleaned of metadata and notarized.
 
 ## Updating README.md
 
@@ -26,13 +26,13 @@ pip install -e '.[dev]'
 And install quarto too:
 
 ```
-nbdev_install_quarto
+nbdev-install-quarto
 ```
 
 Then, after you make subsequent changes to `nbs/index.ipynb`, run the following from the repo's root directory to (re)build `README.md`:
 
 ```
-nbdev_readme
+nbdev-readme
 ```
 
 ## Did you find a bug?

{python_fasthtml-0.14.12/python_fasthtml.egg-info → python_fasthtml-0.14.14}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.12
+Version: 0.14.14
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Repository, https://github.com/AnswerDotAI/fasthtml
 Project-URL: Documentation, https://www.fastht.ml/docs/
 Keywords: nbdev,jupyter,notebook,python

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14}/fasthtml/__init__.py

@@ -4,5 +4,5 @@ Modules:
 
 - `fasthtml.core`: The `FastHTML` subclass of `Starlette`."""
 
-__version__ = "0.14.12"
+__version__ = "0.14.14"
 from .core import *

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14}/fasthtml/_modidx.py

@@ -5,12 +5,9 @@ d = { 'settings': { 'branch': 'main',
                 'doc_host': 'https://www.fastht.ml',
                 'git_url': 'https://github.com/AnswerDotAI/fasthtml',
                 'lib_path': 'fasthtml'},
-  'syms': { 'fasthtml.authmw': {},
-            'fasthtml.basics': {},
-            'fasthtml.cli': { 'fasthtml.cli._run': ('api/cli.html#_run', 'fasthtml/cli.py'),
+  'syms': { 'fasthtml.cli': { 'fasthtml.cli._run': ('api/cli.html#_run', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_deploy': ('api/cli.html#railway_deploy', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_link': ('api/cli.html#railway_link', 'fasthtml/cli.py')},
-            'fasthtml.common': {},
             'fasthtml.components': { 'fasthtml.components.FT.__add__': ('api/components.html#ft.__add__', 'fasthtml/components.py'),
                                      'fasthtml.components.FT.__radd__': ('api/components.html#ft.__radd__', 'fasthtml/components.py'),
                                      'fasthtml.components.FT.__str__': ('api/components.html#ft.__str__', 'fasthtml/components.py'),
@@ -130,6 +127,7 @@ d = { 'settings': { 'branch': 'main',
                                '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._spawn': ('api/core.html#_spawn', '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'),
                                'fasthtml.core._url_for': ('api/core.html#_url_for', 'fasthtml/core.py'),
@@ -168,8 +166,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.until_disconnect': ('api/core.html#until_disconnect', 'fasthtml/core.py'),
                                'fasthtml.core.uri': ('api/core.html#uri', 'fasthtml/core.py'),
                                'fasthtml.core.vurl': ('api/core.html#vurl', 'fasthtml/core.py')},
-            'fasthtml.fastapp': {},
-            'fasthtml.ft': {},
             'fasthtml.js': { 'fasthtml.js.HighlightJS': ('api/js.html#highlightjs', 'fasthtml/js.py'),
                              'fasthtml.js.KatexMarkdownJS': ('api/js.html#katexmarkdownjs', 'fasthtml/js.py'),
                              'fasthtml.js.MarkdownJS': ('api/js.html#markdownjs', 'fasthtml/js.py'),
@@ -195,7 +191,6 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.render_ft': ('api/jupyter.html#render_ft', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.show': ('api/jupyter.html#show', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.ws_client': ('api/jupyter.html#ws_client', 'fasthtml/jupyter.py')},
-            'fasthtml.live_reload': {},
             'fasthtml.oauth': { 'fasthtml.oauth.AppleAppClient': ('api/oauth.html#appleappclient', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.AppleAppClient.__init__': ('api/oauth.html#appleappclient.__init__', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.AppleAppClient.client_secret': ( 'api/oauth.html#appleappclient.client_secret',
@@ -264,7 +259,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.pico.PicoBusy': ('api/pico.html#picobusy', 'fasthtml/pico.py'),
                                'fasthtml.pico.Search': ('api/pico.html#search', 'fasthtml/pico.py'),
                                'fasthtml.pico.set_pico_cls': ('api/pico.html#set_pico_cls', 'fasthtml/pico.py')},
-            'fasthtml.starlette': {},
             'fasthtml.stripe_otp': { 'fasthtml.stripe_otp.Payment': ('explains/stripe.html#payment', 'fasthtml/stripe_otp.py'),
                                      'fasthtml.stripe_otp._search_app': ('explains/stripe.html#_search_app', 'fasthtml/stripe_otp.py'),
                                      'fasthtml.stripe_otp.account_management': ( 'explains/stripe.html#account_management',
@@ -304,7 +298,6 @@ d = { 'settings': { 'branch': 'main',
                               'fasthtml.svg.Text': ('api/svg.html#text', 'fasthtml/svg.py'),
                               'fasthtml.svg.ft_svg': ('api/svg.html#ft_svg', 'fasthtml/svg.py'),
                               'fasthtml.svg.transformd': ('api/svg.html#transformd', 'fasthtml/svg.py')},
-            'fasthtml.toaster': {},
             'fasthtml.xtend': { 'fasthtml.xtend.A': ('api/xtend.html#a', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.AX': ('api/xtend.html#ax', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.AnyNow': ('api/xtend.html#anynow', 'fasthtml/xtend.py'),

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14}/fasthtml/core.py

@@ -18,7 +18,7 @@ The decorated function doubles as a URL builder, so links never need hardcoded p
 
 Handlers return FT trees (from `fastcore.xml`), rendered as HTML automatically: a full page for regular requests, a bare fragment for HTMX requests. In a full page, top-level `Title`, `Meta`, `Link`, and `Style` items go in `<head>`; the rest goes in `<body>`. Strings are sent as HTML, dicts as JSON, and a Starlette `Response` is sent untouched. A return tuple may mix content with special items: any `HttpHeader` (e.g. from `cookie()` or `HtmxResponseHeaders()`) becomes a response header, any `BackgroundTask` runs after the response is sent, and the rest renders as content. `Redirect` picks the right redirect mechanism for HTMX vs regular requests, and `FtResponse` wraps FT content when you need the status code or headers.
 
-Handler parameters are filled from the request: each is looked up in path, cookie, header (snake_case names match Hyphen-Case headers), query, then form data, and cast by calling its annotation on the value. `bool`, `int`, and `date` get smart string parsing; `UploadFile` passes through. Repeated params take the last value unless annotated `list[T]`, which collects them all. A param with no annotation and no special name is ignored, with a warning. A dataclass, TypedDict, namedtuple, or any annotated class collects the whole form body; a `__from_request__` classmethod customizes construction. A missing required param is a 400, a failed cast a 404. These special names need no annotation:
+Handler parameters are filled from the request: each is looked up in path, cookie, header (snake_case names match Hyphen-Case headers), query, then form data, and cast by calling its annotation on the value. Hyphens in form/query names match underscores in handler parameters and typed body fields. Exact names take precedence within each source. Dictionary and request access retain the original keys. `bool`, `int`, and `date` get smart string parsing; `UploadFile` passes through. Repeated params take the last value unless annotated `list[T]`, which collects them all. A param with no annotation and no special name is ignored, with a warning. A dataclass, TypedDict, namedtuple, or any annotated class collects the whole form body; a `__from_request__` classmethod customizes construction. A missing required param is a 400, a failed cast a 404. These special names need no annotation:
 
     req, ws   the Request / WebSocket connection
     sess      session dict
@@ -55,7 +55,7 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'DEF_MAXPART', 'htmx_ex
            'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
-import json,uuid,inspect,types,asyncio,inspect,random,contextlib,itsdangerous,hashlib
+import json,uuid,inspect,types,asyncio,inspect,random,contextlib,itsdangerous,hashlib,signal,subprocess
 from uuid import uuid5, NAMESPACE_URL
 
 from fastcore.utils import *
@@ -80,6 +80,7 @@ from base64 import b64encode,b64decode
 from email.utils import format_datetime
 
 from .starlette import *
+from python_multipart.exceptions import MultipartParseError
 
 # %% ../nbs/api/00_core.ipynb #19d3f2a7
 def _params(f): return signature_ex(f, True).parameters
@@ -169,7 +170,7 @@ class HttpHeader:
 def _to_htmx_header(s): return 'HX-' + s.replace('_', '-').title()
 
 htmx_resps = dict(location=None, push_url=None, redirect=None, refresh=None, replace_url=None,
-                 reswap=None, retarget=None, reselect=None, trigger=None, trigger_after_settle=None, trigger_after_swap=None)
+    reswap=None, retarget=None, reselect=None, trigger=None, trigger_after_settle=None, trigger_after_swap=None)
 
 # %% ../nbs/api/00_core.ipynb #f6a2e62e
 @use_kwargs_dict(**htmx_resps)
@@ -189,7 +190,8 @@ def _is_body(anno): return issubclass(anno, (dict,ns)) or hasattr(anno,'__from_r
 
 # %% ../nbs/api/00_core.ipynb #ffdde66f
 def _formitem(form, k):
-    "Return single item `k` from `form` if len 1, otherwise return list"
+    "Return item `k`, accepting hyphens for underscores and unwrapping single-item form lists"
+    if k not in form: k = {o.replace('-', '_'):o for o in form}.get(k, k)
     if isinstance(form, dict): return form.get(k)
     o = form.getlist(k)
     return o[0] if len(o) == 1 else o if o else None
@@ -205,16 +207,21 @@ DEF_MAXPART = 100*1024*1024
 
 # %% ../nbs/api/00_core.ipynb #42c9cea0
 async def parse_form(req: Request) -> FormData:
-    "Starlette errors on empty multipart/json forms, so this checks for that situation"
+    "Starlette errors on empty multipart/json forms and 500s on malformed multipart, so this handles those situations"
     ctype = req.headers.get("Content-Type", "")
     maxpart = getattr(req, "max_part_size", DEF_MAXPART)
     if ctype.startswith("multipart/form-data"):
         try: boundary = ctype.split("boundary=")[1].strip()
         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)
+        try: return await req.form(max_part_size=maxpart)
+        except MultipartParseError as e: raise HTTPException(400, f"Invalid form-data: {e}")
     body = await req.body()  # Cache body for non-multipart request types
-    if ctype == 'application/json': return await req.json() if body else {}
+    if ctype == 'application/json':
+        try: res = await req.json() if body else {}
+        except ValueError: raise HTTPException(400, "Invalid JSON body")
+        if not isinstance(res, dict): raise HTTPException(400, "JSON body must be an object")
+        return res
     return await req.form(max_part_size=maxpart)
 
 # %% ../nbs/api/00_core.ipynb #0caedd04
@@ -229,6 +236,7 @@ async def _from_body(conn, p, data):
         kwargs = await _find_ps(conn, data, conn.headers, ps)
         return await maybe_await(ctor(**kwargs))
     d = _annotations(anno)
+    if d: data = {k.replace('-', '_'):v for k,v in data.items()} | data
     cargs = {k: _form_arg(k, v, d) for k, v in data.items() if not d or k in d}
     return anno(**cargs)
 
@@ -286,10 +294,9 @@ async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     res = conn.path_params.get(arg, None)
     if res in (empty,None): res = conn.cookies.get(arg, None)
     if res in (empty,None): res = hdrs.get(snake2hyphens(arg), None)
-    if res in (empty,None): res = conn.query_params.getlist(arg)
-    if res==[]: res = None
-    if res in (empty,None): res = data.get(arg, None)
-    if res in (empty,None) and isinstance(vals := data.get('values'), dict): res = vals.get(arg)  # htmx v4 nests form data under `values`
+    if res in (empty,None): res = _formitem(conn.query_params, arg)
+    if res in (empty,None): res = _formitem(data, arg)
+    if res in (empty,None) and isinstance(vals := data.get('values'), dict): res = _formitem(vals, arg)  # htmx v4 nests form data under `values`
     if res in (empty,None):
         if p.default is empty:
             if isinstance(conn, Request): raise HTTPException(400, f"Missing required field: {arg}")
@@ -544,6 +551,7 @@ async def _wrap_call(f, req, params):
     return await _handle(f, **wreq)
 
 # %% ../nbs/api/00_core.ipynb #b0d1cbbf
+# chkstyle: skip
 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",
@@ -555,16 +563,16 @@ htmx_exts = {
     "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",
-    "ws4": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-ws.js",
+    "ws4": "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0/dist/ext/hx-ws.min.js",
     "chunked-transfer": "https://cdn.jsdelivr.net/npm/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js",
-    "sse4": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-sse.js",
-    "live": "https://unpkg.com/htmx.org@4.0.0-beta6/dist/ext/hx-live.js",
-    "multipart": "https://cdn.jsdelivr.net/gh/bigskysoftware/htmx@four/src/ext/hx-multipart.min.js"
+    "sse4": "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0/dist/ext/hx-sse.min.js",
+    "live": "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0/dist/ext/hx-live.min.js",
+    "multipart": "https://cdn.jsdelivr.net/npm/htmx.org@4.0.0/dist/ext/hx-multipart.min.js"
 }
 
 # %% ../nbs/api/00_core.ipynb #60cb52ea
 htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.js")
-htmx4src  = Script(src="https://unpkg.com/htmx.org@4.0.0-beta6/dist/htmx.js")
+htmx4src  = Script(src="https://cdn.jsdelivr.net/npm/htmx.org@4.0.0/dist/htmx.min.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")
@@ -618,13 +626,11 @@ def def_hdrs(htmx=True, htmx4=False, surreal=True):
         meta_cfg = Meta(name="htmx-config", content=json.dumps({"metaCharacter": "-"}))
         hdrs = [meta_cfg, htmx4src,fhjsscr] + hdrs 
         # TODO: Check if fhjsscr works with htmx4
-    elif htmx:
-        hdrs = [htmxsrc,fhjsscr] + hdrs
+    elif htmx: hdrs = [htmxsrc,fhjsscr] + hdrs
     return [charset, viewport] + hdrs
 
 # %% ../nbs/api/00_core.ipynb #2c5285ae
-cors_allow = Middleware(CORSMiddleware, allow_credentials=True,
-                        allow_origins=["*"], allow_methods=["*"], allow_headers=["*"])
+cors_allow = Middleware(CORSMiddleware, allow_credentials=True, allow_origins=['*'], allow_methods=['*'], allow_headers=['*'])
 
 iframe_scr = Script(NotStr("""
     function sendmsg() {
@@ -674,23 +680,21 @@ class Lifespan:
         else: yield
         for f in self.shutdown: await _handle(f)
 
-    def on_event(self, event_type):
-        return lambda f: (getattr(self, event_type)).append(f)
+    def on_event(self, event_type): return lambda f: (getattr(self, event_type)).append(f)
 
 # %% ../nbs/api/00_core.ipynb #3327a1e9
 class FastHTML(Starlette):
     "An HTML-first Starlette app: handler params filled from the request, FT returns rendered as pages or HTMX fragments"
     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, htmx4=False, 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, max_part_size=DEF_MAXPART, **bodykw):
+        on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, ftrs=None, exts=None,
+        before=None, after=None, surreal=True, htmx=True, htmx4=False, 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, max_part_size=DEF_MAXPART, **bodykw):
         middleware,before,after = map(_list, (middleware,before,after))
         self.title,self.canonical,self.session_cookie,self.key_fname = title,canonical,session_cookie,key_fname
         hdrs,ftrs,exts = map(listify, (hdrs,ftrs,exts))
-        if htmx4 and exts:
-            exts = ['ws4' if e in ('ws', 'ws4') else e for e in exts]
+        if htmx4 and exts: exts = ['ws4' if e in ('ws', 'ws4') else e for e in exts]
         exts = {k:htmx_exts[k] for k in exts}
         htmlkw = htmlkw or {}
         if default_hdrs: hdrs = def_hdrs(htmx, htmx4, surreal=surreal) + hdrs
@@ -705,9 +709,8 @@ class FastHTML(Starlette):
         self.body_wrap,self.before,self.after,self.htmlkw,self.bodykw,self.max_part_size = body_wrap,before,after,htmlkw,bodykw,max_part_size
         self.secret_key = get_key(secret_key, key_fname)
         if sess_cls:
-            sess = Middleware(sess_cls, secret_key=self.secret_key,session_cookie=session_cookie,
-                                max_age=max_age, path=sess_path, same_site=same_site,
-                                https_only=sess_https_only, domain=sess_domain)
+            sess = Middleware(sess_cls, secret_key=self.secret_key, session_cookie=session_cookie, max_age=max_age, path=sess_path,
+                same_site=same_site, https_only=sess_https_only, domain=sess_domain)
             middleware.append(sess)
         exception_handlers = ifnone(exception_handlers, {})
         if 404 not in exception_handlers:
@@ -742,8 +745,8 @@ def add_route(self:FastHTML, route):
     "Add or replace a route in the FastHTML app"
     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))))]
+        (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)
     self.router.routes.sort(key=lambda r: not getattr(r, 'host', None))
 
@@ -767,8 +770,7 @@ def _endp(self:FastHTML, f, body_wrap, before:Optional[Callable|tuple]=None):
             if not resp:
                 if isinstance(b, Beforeware): bf,skip = b.f,b.skip
                 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))
+                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
@@ -879,12 +881,13 @@ def set_lifespan(self:FastHTML, value):
 
 # %% ../nbs/api/00_core.ipynb #3a348474
 def serve(
-        appname=None, # Name of the module
-        app='app', # App instance to be served
-        host='0.0.0.0', # If host is 0.0.0.0 will convert to localhost
-        port=None, # If port is None it will default to 5001 or the PORT environment variable
-        reload=True, # Default is to reload the app upon code changes
-        **kwargs
+    appname=None, # Name of the module
+    app='app', # App instance to be served
+    host='0.0.0.0', # If host is 0.0.0.0 will convert to localhost
+    port=None, # If port is None it will default to 5001 or the PORT environment variable
+    reload=True, # Default is to reload the app upon code changes
+    procs=None, # Processes to run on consecutive ports from `port`; default 1 or the PROCS environment variable
+    **kwargs
     ):
     "Run the app in an async server, with live reload set as the default."
     from uvicorn import run
@@ -895,10 +898,20 @@ def serve(
         elif back and back.f_globals.get('__name__')=='__main__': appname = inspect.getmodule(bk).__name__
     if appname:
         if not port: port=int(os.getenv("PORT", default=5001))
+        if not procs: procs=int(os.getenv("PROCS", default=1))
+        if procs>1 and 'FH_PROCNUM' not in os.environ: return _spawn(procs)
+        port += int(os.getenv('FH_PROCNUM', 0))
         link = f'http://{"localhost" if host=="0.0.0.0" else host}:{port}'
         print('Link: '+ S.light_red.bold(link))
         run(f'{appname}:{app}', host=host, port=port, reload=reload, **kwargs)
 
+# %% ../nbs/api/00_core.ipynb #91b08e9a
+def _spawn(n):
+    "Run this script `n` times over, numbering each copy in `FH_PROCNUM`, and wait for them all"
+    ps = [subprocess.Popen([sys.executable, *sys.argv], env={**os.environ, 'FH_PROCNUM':str(i)}) for i in range(n)]
+    signal.signal(signal.SIGTERM, lambda *a: [p.terminate() for p in ps])
+    for p in ps: p.wait()
+
 # %% ../nbs/api/00_core.ipynb #c5220a0e
 async def _wait_disconnect(req):
     while (await req.receive())["type"] != "http.disconnect": pass
@@ -1001,8 +1014,7 @@ def cookie(key: str, value="", max_age=None, expires=None, path="/", domain=None
     cookie = cookies.SimpleCookie()
     cookie[key] = value
     if max_age is not None: cookie[key]["max-age"] = max_age
-    if expires is not None:
-        cookie[key]["expires"] = format_datetime(expires, usegmt=True) if isinstance(expires, datetime) else expires
+    if expires is not None: cookie[key]["expires"] = format_datetime(expires, usegmt=True) if isinstance(expires, datetime) else expires
     if path is not None: cookie[key]["path"] = path
     if domain is not None: cookie[key]["domain"] = domain
     if secure: cookie[key]["secure"] = True
@@ -1159,8 +1171,7 @@ def devtools_json(self:FastHTML, path=None, uuid=None):
     if not path: path = Path().absolute()
     if not uuid: uuid = str(uuid5(NAMESPACE_URL, str(path)))
     @self.route(devtools_loc)
-    def devtools():
-        return dict(workspace=dict(root=str(path), uuid=uuid))
+    def devtools(): return dict(workspace=dict(root=str(path), uuid=uuid))
 
 # %% ../nbs/api/00_core.ipynb #e27908c0
 @patch
@@ -1192,8 +1203,7 @@ def get_testclient(self:FastHTML, **kw):
         "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)
+            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.14.12 → python_fasthtml-0.14.14}/fasthtml/oauth.py

@@ -249,7 +249,10 @@ class OAuth:
                 return RedirectResponse(self.error_path, status_code=303)
             scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'
             base_url = f"{scheme}://{get_host(req)}"
-            info = AttrDictDefault(await cli.retr_info_async(code, base_url+redir_path))
+            try: info = AttrDictDefault(await cli.retr_info_async(code, base_url+redir_path))
+            except httpx2.HTTPStatusError as e:
+                session['oauth_error'] = e.response.text
+                return RedirectResponse(self.error_path, status_code=303)
             ident = info.get(self.cli.id_key)
             if not ident: return self.redir_login(session)
             res = await _arun(self.get_auth(info, ident, session, state))

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=64"]
+requires = ["setuptools>=77"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "The fastest way to create an HTML app"
 readme = "README.md"
 requires-python = ">=3.10"
-license = {text = "Apache-2.0"}
+license = "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"]

{python_fasthtml-0.14.12 → python_fasthtml-0.14.14/python_fasthtml.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.12
+Version: 0.14.14
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Repository, https://github.com/AnswerDotAI/fasthtml
 Project-URL: Documentation, https://www.fastht.ml/docs/
 Keywords: nbdev,jupyter,notebook,python