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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.20
+Version: 0.12.22
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -187,7 +187,7 @@ repo’s notebooks and the official FastHTML examples repo:
 Then explore the small but growing third-party ecosystem of FastHTML
 tutorials, notebooks, libraries, and components:
 
-- [FastHTML Gallery](https://fastht.ml/gallery): Learn from minimal
+- [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal
   examples of components (ie chat bubbles, click-to-edit, infinite
   scroll, etc)
 - [Creating Custom FastHTML Tags for Markdown

{python_fasthtml-0.12.20 → python_fasthtml-0.12.22}/README.md

@@ -138,7 +138,7 @@ repo’s notebooks and the official FastHTML examples repo:
 Then explore the small but growing third-party ecosystem of FastHTML
 tutorials, notebooks, libraries, and components:
 
-- [FastHTML Gallery](https://fastht.ml/gallery): Learn from minimal
+- [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal
   examples of components (ie chat bubbles, click-to-edit, infinite
   scroll, etc)
 - [Creating Custom FastHTML Tags for Markdown

python_fasthtml-0.12.22/fasthtml/__init__.py

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

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

@@ -197,6 +197,7 @@ d = { 'settings': { 'branch': 'main',
                                                                               'fasthtml/oauth.py'),
                                 'fasthtml.oauth._AppClient.retr_id': ('api/oauth.html#_appclient.retr_id', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth._AppClient.retr_info': ('api/oauth.html#_appclient.retr_info', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.get_host': ('api/oauth.html#get_host', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.load_creds': ('api/oauth.html#load_creds', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.redir_url': ('api/oauth.html#redir_url', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.url_match': ('api/oauth.html#url_match', 'fasthtml/oauth.py')},

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

@@ -240,6 +240,7 @@ def _find_wsp(ws, data, hdrs, arg:str, p:Parameter):
         if issubclass(anno, HtmxHeaders): return _get_htmx(hdrs)
         if issubclass(anno, Starlette): return ws.scope['app']
         if issubclass(anno, WebSocket): return ws
+        if issubclass(anno, dict): return data
     if anno is empty:
         if arg.lower()=='ws': return ws
         if arg.lower()=='scope': return dict2obj(ws.scope)
@@ -263,7 +264,8 @@ def _wrap_ws(ws, data, params):
 # %% ../nbs/api/00_core.ipynb
 async def _send_ws(ws, resp):
     if not resp: return
-    res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple,FT)) or hasattr(resp, '__ft__') else resp
+#     res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple,FT)) or hasattr(resp, '__ft__') else resp
+    res = to_xml(resp, indent=fh_cfg.indent)
     await ws.send_text(res)
 
 def _ws_endp(recv, conn=None, disconn=None):

{python_fasthtml-0.12.20 → python_fasthtml-0.12.22}/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, random
+__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
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs_dict
@@ -213,7 +213,7 @@ class Redirect:
 
 async def _wrap_call(f, req, params):
     ...
-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.2/ws.js', 'chunked-transfer': 'https://cdn.jsdelivr.net/npm/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.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.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')
 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')
@@ -265,6 +265,9 @@ class FastHTML(Starlette):
         """Add a route at `path`"""
         ...
 
+    def set_lifespan(self, value):
+        ...
+
     def static_route_exts(self, 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()`"""
         ...
@@ -273,6 +276,9 @@ class FastHTML(Starlette):
         """Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')"""
         ...
 
+    def setup_ws(app, f=noop):
+        ...
+
     def devtools_json(self, path=None, uuid=None):
         ...
 all_meths = 'get post put delete patch head trace options'.split()
@@ -370,7 +376,4 @@ def unqid(seeded=False):
 
 def _add_ids(s):
     ...
-
-def setup_ws(app, f=noop):
-    ...
 devtools_loc = '/.well-known/appspecific/com.chrome.devtools.json'

{python_fasthtml-0.12.20 → python_fasthtml-0.12.22}/fasthtml/jupyter.py

@@ -111,7 +111,7 @@ class JupyUviAsync(JupyUvi):
         wait_port_free(self.port)
 
 # %% ../nbs/api/06_jupyter.ipynb
-def HTMX(path="", app=None, host='localhost', port=8000, height="auto", link=False, iframe=True):
+def HTMX(path="/", host='localhost', app=None, port=8000, height="auto", link=False, iframe=True):
     "An iframe which displays the HTMX application in a notebook."
     if isinstance(path, (FT,tuple,Safe)):
         assert app, 'Need an app to render a component'
@@ -127,9 +127,11 @@ def HTMX(path="", app=None, host='localhost', port=8000, height="auto", link=Fal
             if (e.data.height) frame.style.height = (e.data.height+1) + 'px';
         }, false);
     }""" if height == "auto" else ""
-    if link: display(HTML(f'<a href="http://{host}:{port}{path}" target="_blank">Open in new tab</a>'))
+    proto = 'http' if host=='localhost' else 'https'
+    fullpath = f"{proto}://{host}:{port}{path}" if host else path
+    if link: display(HTML(f'<a href="{fullpath}" target="_blank">Open in new tab</a>'))
     if iframe:
-        return HTML(f'<iframe src="http://{host}:{port}{path}" style="width: 100%; height: {height}; border: none;" onload="{scr}" ' + """allow="accelerometer; autoplay; camera; clipboard-read; clipboard-write; display-capture; encrypted-media; fullscreen; gamepad; geolocation; gyroscope; hid; identity-credentials-get; idle-detection; magnetometer; microphone; midi; payment; picture-in-picture; publickey-credentials-get; screen-wake-lock; serial; usb; web-share; xr-spatial-tracking"></iframe> """)
+        return HTML(f'<iframe src="{fullpath}" style="width: 100%; height: {height}; border: none;" onload="{scr}" ' + """allow="accelerometer; autoplay; camera; clipboard-read; clipboard-write; display-capture; encrypted-media; fullscreen; gamepad; geolocation; gyroscope; hid; identity-credentials-get; idle-detection; magnetometer; microphone; midi; payment; picture-in-picture; publickey-credentials-get; screen-wake-lock; serial; usb; web-share; xr-spatial-tracking"></iframe> """)
 
 # %% ../nbs/api/06_jupyter.ipynb
 def ws_client(app, nm='', host='localhost', port=8000, ws_connect='/ws', frame=True, link=True, **kwargs):

{python_fasthtml-0.12.20 → python_fasthtml-0.12.22}/fasthtml/oauth.py

@@ -4,7 +4,7 @@
 
 # %% auto 0
 __all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'Auth0AppClient',
-           'redir_url', 'url_match', 'OAuth', 'load_creds']
+           'get_host', 'redir_url', 'url_match', 'OAuth', 'load_creds']
 
 # %% ../nbs/api/08_oauth.ipynb
 from .common import *
@@ -121,10 +121,17 @@ def login_link(self:WebApplicationClient, redirect_uri, scope=None, state=None,
     return self.prepare_request_uri(self.base_url, redirect_uri, scope, state=state, **kwargs)
 
 # %% ../nbs/api/08_oauth.ipynb
-def redir_url(request, redir_path, scheme=None):
+def get_host(request):
+    """Get the host, preferring X-Forwarded-Host if available"""
+    forwarded_host = request.headers.get('x-forwarded-host')
+    return forwarded_host if forwarded_host else request.url.netloc
+
+# %% ../nbs/api/08_oauth.ipynb
+def redir_url(req, redir_path, scheme=None):
     "Get the redir url for the host in `request`"
-    scheme = 'http' if request.url.hostname in ("localhost", "127.0.0.1") else 'https'
-    return f"{scheme}://{request.url.netloc}{redir_path}"
+    host = get_host(req)
+    scheme = 'http' if host.split(':')[0] in ("localhost", "127.0.0.1") else 'https'
+    return f"{scheme}://{host}{redir_path}"
 
 # %% ../nbs/api/08_oauth.ipynb
 @patch
@@ -132,7 +139,7 @@ def parse_response(self:_AppClient, code, redirect_uri):
     "Get the token from the oauth2 server response"
     payload = dict(code=code, redirect_uri=redirect_uri, client_id=self.client_id,
                    client_secret=self.client_secret, grant_type='authorization_code')
-    r = httpx.post(self.token_url, json=payload)
+    r = httpx.post(self.token_url, data=payload)
     r.raise_for_status()
     self.parse_request_body_response(r.text)
 
@@ -159,8 +166,8 @@ def retr_id(self:_AppClient, code, redirect_uri):
 
 # %% ../nbs/api/08_oauth.ipynb
 http_patterns = (r'^(localhost|127\.0\.0\.1)(:\d+)?$',)
-def url_match(url, patterns=http_patterns):
-    return any(re.match(pattern, url.netloc.split(':')[0]) for pattern in patterns)
+def url_match(request, patterns=http_patterns):
+    return any(re.match(pattern, get_host(request).split(':')[0]) for pattern in patterns)
 
 # %% ../nbs/api/08_oauth.ipynb
 class OAuth:
@@ -178,8 +185,8 @@ class OAuth:
         @app.get(redir_path)
         def redirect(req, session, code:str=None, error:str=None, state:str=None):
             if not code: session['oauth_error']=error; return RedirectResponse(self.error_path, status_code=303)
-            scheme = 'http' if url_match(req.url,self.http_patterns) or not self.https else 'https'
-            base_url = f"{scheme}://{req.url.netloc}"
+            scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'
+            base_url = f"{scheme}://{get_host(req)}"
             info = AttrDictDefault(cli.retr_info(code, base_url+redir_path))
             ident = info.get(self.cli.id_key)
             if not ident: return self.redir_login(session)
@@ -195,7 +202,7 @@ class OAuth:
 
     def redir_login(self, session): return RedirectResponse(self.login_path, status_code=303)
     def redir_url(self, req):
-        scheme = 'http' if url_match(req.url,self.http_patterns) or not self.https else 'https'
+        scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'
         return redir_url(req, self.redir_path, scheme)
 
     def login_link(self, req, scope=None, state=None): return self.cli.login_link(self.redir_url(req), scope=scope, state=state)

{python_fasthtml-0.12.20 → python_fasthtml-0.12.22}/fasthtml/toaster.py

@@ -33,9 +33,17 @@ toast_css = """
 .fh-toast-error { background-color: #F44336; }
 """
 
+js = '''htmx.onLoad(() => {
+if (!htmx.find('#fh-toast-container')) {
+    const ctn = document.createElement('div');
+    ctn.id = 'fh-toast-container';
+    document.body.appendChild(ctn);
+    }
+});'''
+
 def Toast(message: str, typ: str = "info", dismiss: bool = False, duration:int=5000):
     x_btn = Button('x', cls="fh-toast-dismiss", onclick="htmx.remove(this?.parentElement);") if dismiss else None
-    return Div(Span(message), x_btn, cls=f"fh-toast fh-toast-{typ}", hx_on_transitionend="setTimeout(() => this?.remove(), %d);" % duration)
+    return Div(Span(message), x_btn, cls=f"fh-toast fh-toast-{typ}", hx_on_transitionend=f"setTimeout(() => this?.remove(), {duration});")
 
 def add_toast(sess, message: str, typ: str = "info", dismiss: bool = False):
     assert typ in ("info", "success", "warning", "error"), '`typ` not in ("info", "success", "warning", "error")'
@@ -43,7 +51,7 @@ def add_toast(sess, message: str, typ: str = "info", dismiss: bool = False):
 
 def render_toasts(sess):
     toasts = [Toast(msg, typ, dismiss, sess['toast_duration']) for msg, typ, dismiss in sess.pop(sk, [])]
-    return Div(*toasts, id=tcid, hx_swap_oob='afterbegin')
+    return Div(*toasts, hx_swap_oob=f'beforeend:#{tcid}')
 
 def toast_after(resp, req, sess):
     if sk in sess and (not resp or isinstance(resp, (tuple,FT,FtResponse))):
@@ -52,5 +60,5 @@ def toast_after(resp, req, sess):
 
 def setup_toasts(app, duration=5000):
     app.state.toast_duration = duration
-    app.hdrs += [Style(toast_css)]
+    app.hdrs += [Style(toast_css), Script(js)]
     app.after.append(toast_after)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.20
+Version: 0.12.22
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -187,7 +187,7 @@ repo’s notebooks and the official FastHTML examples repo:
 Then explore the small but growing third-party ecosystem of FastHTML
 tutorials, notebooks, libraries, and components:
 
-- [FastHTML Gallery](https://fastht.ml/gallery): Learn from minimal
+- [FastHTML Gallery](https://gallery.fastht.ml): Learn from minimal
   examples of components (ie chat bubbles, click-to-edit, infinite
   scroll, etc)
 - [Creating Custom FastHTML Tags for Markdown

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

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.20
+version = 0.12.22
 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.20/fasthtml/__init__.py

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