python-fasthtml 0.9.2__tar.gz → 0.10.1__tar.gz

{python-fasthtml-0.9.2/python_fasthtml.egg-info → python-fasthtml-0.10.1}/PKG-INFO

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

python-fasthtml-0.10.1/fasthtml/__init__.py

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

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/fasthtml/_modidx.py

@@ -131,7 +131,13 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.wait_port_free': ('api/jupyter.html#wait_port_free', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.ws_client': ('api/jupyter.html#ws_client', 'fasthtml/jupyter.py')},
             'fasthtml.live_reload': {},
-            'fasthtml.oauth': { 'fasthtml.oauth.DiscordAppClient': ('api/oauth.html#discordappclient', 'fasthtml/oauth.py'),
+            'fasthtml.oauth': { 'fasthtml.oauth.Auth0AppClient': ('api/oauth.html#auth0appclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.Auth0AppClient.__init__': ('api/oauth.html#auth0appclient.__init__', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.Auth0AppClient._fetch_openid_config': ( 'api/oauth.html#auth0appclient._fetch_openid_config',
+                                                                                        'fasthtml/oauth.py'),
+                                'fasthtml.oauth.Auth0AppClient.login_link': ( 'api/oauth.html#auth0appclient.login_link',
+                                                                              'fasthtml/oauth.py'),
+                                'fasthtml.oauth.DiscordAppClient': ('api/oauth.html#discordappclient', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.DiscordAppClient.__init__': ( 'api/oauth.html#discordappclient.__init__',
                                                                               'fasthtml/oauth.py'),
                                 'fasthtml.oauth.DiscordAppClient.login_link': ( 'api/oauth.html#discordappclient.login_link',

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/fasthtml/components.py

@@ -121,7 +121,10 @@ def _fill_item(item, obj):
     if val is not None and not 'skip' in attr:
         if tag=='input':
             if attr.get('type', '') == 'checkbox':
-                if val: attr['checked'] = '1'
+                if isinstance(val, list):
+                    if attr['value'] in val: attr['checked'] = '1'
+                    else: attr.pop('checked', '')
+                elif val: attr['checked'] = '1'
                 else: attr.pop('checked', '')
             elif attr.get('type', '') == 'radio':
                 if val and val == attr['value']: attr['checked'] = '1'
@@ -129,8 +132,13 @@ def _fill_item(item, obj):
             else: attr['value'] = val
         if tag=='textarea': cs=(val,)
         if tag == 'select':
-            option = next((o for o in cs if o.tag=='option' and o.get('value')==val), None)
-            if option: option.selected = '1'
+            if isinstance(val, list):
+                for opt in cs:
+                    if opt.tag == 'option' and opt.get('value') in val:
+                        opt.selected = '1'
+            else:
+                option = next((o for o in cs if o.tag=='option' and o.get('value')==val), None)
+                if option: option.selected = '1'
     return FT(tag,cs,attr,void_=item.void_)
 
 # %% ../nbs/api/01_components.ipynb
@@ -181,17 +189,23 @@ def html2ft(html, attr1st=False):
         cts = elm.contents
         cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)
               for c in cts if str(c).strip()]
-        attrs = []
+        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)
-            key = rev_map.get(key, key)
-            attrs.append(f'{key.replace("-", "_")}={value!r}'
-                         if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
+            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
+        if exotic_attrs: attrs.append(f'**{exotic_attrs!r}')
         spc = " "*lvl*indent
         onlychild = not cts or (len(cts)==1 and isinstance(cts[0],str))
         j = ', ' if onlychild else f',\n{spc}'
         inner = j.join(filter(None, cs+attrs))
-        if onlychild: return f'{tag_name}({inner})'
+        if onlychild:
+            if not attr1st: return f'{tag_name}({inner})'
+            else:
+                # respect attr1st setting
+                attrs = ', '.join(filter(None, attrs))
+                return f'{tag_name}({attrs})({cs[0] if cs else ""})'
         if not attr1st or not attrs: return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})' 
         inner_cs = j.join(filter(None, cs))
         inner_attrs = ', '.join(filter(None, attrs))

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/fasthtml/live_reload.py

@@ -4,24 +4,25 @@ from fasthtml.basics import FastHTML, Script
 __all__ = ["FastHTMLWithLiveReload"]
 
 
-LIVE_RELOAD_SCRIPT = """
-    (function() {{
-        var socket = new WebSocket(`ws://${{window.location.host}}/live-reload`);
-        var maxReloadAttempts = {reload_attempts};
-        var reloadInterval = {reload_interval}; // time between reload attempts in ms
-        socket.onclose = function() {{
+def LiveReloadJs(reload_attempts:int=1, reload_interval:float=1000., **kwargs):
+    src = """
+    (function() {
+        var socket = new WebSocket(`ws://${window.location.host}/live-reload`);
+        var maxReloadAttempts = %s;
+        var reloadInterval = %s; // time between reload attempts in ms
+        socket.onclose = function() {
             let reloadAttempts = 0;
-            const intervalFn = setInterval(function(){{
+            const intervalFn = setInterval(function(){
                 window.location.reload();
                 reloadAttempts++;
                 if (reloadAttempts === maxReloadAttempts) clearInterval(intervalFn);
-            }}, reloadInterval);
-        }}
-    }})();
+            }, reloadInterval);
+        }
+    })();
 """
+    return Script(src % (reload_attempts, reload_interval))
 
-
-async def live_reload_websocket(websocket): await websocket.accept()
+async def live_reload_ws(websocket): await websocket.accept()
 
 class FastHTMLWithLiveReload(FastHTML):
     """
@@ -47,19 +48,8 @@ class FastHTMLWithLiveReload(FastHTML):
         Run:
             serve()
     """
-    LIVE_RELOAD_ROUTE = WebSocketRoute("/live-reload", endpoint=live_reload_websocket)
-
     def __init__(self, *args, **kwargs):
-        # Create the live reload script to be injected into the webpage
-        self.LIVE_RELOAD_HEADER = Script(
-            LIVE_RELOAD_SCRIPT.format(
-                reload_attempts=kwargs.get("reload_attempts", 1),
-                reload_interval=kwargs.get("reload_interval", 1000),
-            )
-        )
-
         # "hdrs" and "routes" can be missing, None, a list or a tuple.
-        kwargs["hdrs"] = [*(kwargs.get("hdrs") or []), self.LIVE_RELOAD_HEADER]
-        kwargs["routes"] = [*(kwargs.get("routes") or []), self.LIVE_RELOAD_ROUTE]
+        kwargs["hdrs"] = [*(kwargs.get("hdrs") or []), LiveReloadJs(**kwargs)]
+        kwargs["routes"] = [*(kwargs.get("routes") or []), WebSocketRoute("/live-reload", endpoint=live_reload_ws)]
         super().__init__(*args, **kwargs)
-

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/fasthtml/oauth.py

@@ -3,8 +3,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/08_oauth.ipynb.
 
 # %% auto 0
-__all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'redir_url',
-           'url_match', 'OAuth']
+__all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'Auth0AppClient',
+           'redir_url', 'url_match', 'OAuth']
 
 # %% ../nbs/api/08_oauth.ipynb
 from .common import *
@@ -14,6 +14,7 @@ import secrets, httpx
 
 # %% ../nbs/api/08_oauth.ipynb
 class _AppClient(WebApplicationClient):
+    id_key = 'sub'
     def __init__(self, client_id, client_secret, code=None, scope=None, **kwargs):
         super().__init__(client_id, code=code, scope=scope, **kwargs)
         self.client_secret = client_secret
@@ -22,9 +23,8 @@ class _AppClient(WebApplicationClient):
 class GoogleAppClient(_AppClient):
     "A `WebApplicationClient` for Google oauth2"
     base_url = "https://accounts.google.com/o/oauth2/v2/auth"
-    token_url = "https://www.googleapis.com/oauth2/v4/token"
-    info_url = "https://www.googleapis.com/oauth2/v3/userinfo"
-    id_key = 'sub'
+    token_url = "https://oauth2.googleapis.com/token"
+    info_url = "https://openidconnect.googleapis.com/v1/userinfo"
     
     def __init__(self, client_id, client_secret, code=None, scope=None, **kwargs):
         scope_pre = "https://www.googleapis.com/auth/userinfo"
@@ -39,8 +39,9 @@ class GoogleAppClient(_AppClient):
 # %% ../nbs/api/08_oauth.ipynb
 class GitHubAppClient(_AppClient):
     "A `WebApplicationClient` for GitHub oauth2"
-    base_url = "https://github.com/login/oauth/authorize"
-    token_url = "https://github.com/login/oauth/access_token"
+    prefix = "https://github.com/login/oauth/"
+    base_url = f"{prefix}authorize"
+    token_url = f"{prefix}access_token"
     info_url = "https://api.github.com/user"
     id_key = 'id'
 
@@ -50,11 +51,10 @@ class GitHubAppClient(_AppClient):
 # %% ../nbs/api/08_oauth.ipynb
 class HuggingFaceClient(_AppClient):
     "A `WebApplicationClient` for HuggingFace oauth2"
-
-    base_url = "https://huggingface.co/oauth/authorize"
-    token_url = "https://huggingface.co/oauth/token"
-    info_url = "https://huggingface.co/oauth/userinfo"
-    id_key = 'sub'
+    prefix = "https://huggingface.co/oauth/"
+    base_url = f"{prefix}authorize"
+    token_url = f"{prefix}token"
+    info_url = f"{prefix}userinfo"
     
     def __init__(self, client_id, client_secret, code=None, scope=None, state=None, **kwargs):
         if not scope: scope=["openid","profile"]
@@ -87,6 +87,24 @@ class DiscordAppClient(_AppClient):
         r.raise_for_status()
         self.parse_request_body_response(r.text)
 
+# %% ../nbs/api/08_oauth.ipynb
+class Auth0AppClient(_AppClient):
+    "A `WebApplicationClient` for Auth0 OAuth2"
+    def __init__(self, domain, client_id, client_secret, code=None, scope=None, redirect_uri="", **kwargs):
+        self.redirect_uri,self.domain = redirect_uri,domain
+        config = self._fetch_openid_config()
+        self.base_url,self.token_url,self.info_url = config["authorization_endpoint"],config["token_endpoint"],config["userinfo_endpoint"]
+        super().__init__(client_id, client_secret, code=code, scope=scope, redirect_uri=redirect_uri, **kwargs)
+
+    def _fetch_openid_config(self):
+        r = httpx.get(f"https://{self.domain}/.well-known/openid-configuration")
+        r.raise_for_status()
+        return r.json()
+
+    def login_link(self, req):
+        d = dict(response_type="code", client_id=self.client_id, scope=self.scope, redirect_uri=redir_url(req, self.redirect_uri))
+        return f"{self.base_url}?{urlencode(d)}"
+
 # %% ../nbs/api/08_oauth.ipynb
 @patch
 def login_link(self:WebApplicationClient, redirect_uri, scope=None, state=None):
@@ -96,8 +114,9 @@ def login_link(self:WebApplicationClient, redirect_uri, scope=None, state=None):
     return self.prepare_request_uri(self.base_url, redirect_uri, scope, state=state)
 
 # %% ../nbs/api/08_oauth.ipynb
-def redir_url(request, redir_path, scheme='https'):
+def redir_url(request, 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}"
 
 # %% ../nbs/api/08_oauth.ipynb

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/fasthtml/toaster.py

@@ -13,9 +13,17 @@ toast_css = """
 }
 .fh-toast {
     background-color: #333; color: white;
-    padding: 12px 20px; border-radius: 4px; margin-bottom: 10px;
+    padding: 12px 28px 12px 20px; border-radius: 4px; margin-bottom: 10px;
     max-width: 80%; width: auto; text-align: center;
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    position: relative;
+}
+.fh-toast-dismiss {
+    position:absolute; top:0.2em; right:0.4em;
+    line-height:1em; padding: 0 0.2em 0.2em 0.2em; border-radius:inherit; 
+    transform:scaleY(0.8); transform:scaleX(1.); 
+    pointer-events:auto; cursor:pointer; 
+    background-color:inherit; color:inherit; filter:brightness(0.85);
 }
 .fh-toast-info { background-color: #2196F3; }
 .fh-toast-success { background-color: #4CAF50; }
@@ -23,7 +31,9 @@ toast_css = """
 .fh-toast-error { background-color: #F44336; }
 """
 
-toast_js = """
+def ToastJs(duration:float):
+    duration = int(1000*duration)
+    src = """
 export function proc_htmx(sel, func) {
   htmx.onLoad(elt => {
     const elements = any(sel, elt, false);
@@ -34,26 +44,30 @@ export function proc_htmx(sel, func) {
 proc_htmx('.fh-toast-container', async function(toast) {
     await sleep(100);
     toast.style.opacity = '0.8';
-    await sleep(3000);
+    await sleep(%s);
     toast.style.opacity = '0';
     await sleep(300);
     toast.remove();
 });
+
+proc_htmx('.fh-toast-dismiss', function(elem) { 
+    elem.addEventListener('click', (e) => { e.target.parentElement.remove() }); 
+});
 """
+    return Script(src % (duration,), type="module")
+
 
 def add_toast(sess, message, typ="info"):
     assert typ in ("info", "success", "warning", "error"), '`typ` not in ("info", "success", "warning", "error")'
     sess.setdefault(sk, []).append((message, typ))
 
 def render_toasts(sess):
-    toasts = [Div(msg, cls=f"fh-toast fh-toast-{typ}") for msg,typ in sess.pop(sk, [])]
-    return Div(Div(*toasts, cls="fh-toast-container"),
-               hx_swap_oob="afterbegin:body")
+    toasts = [Div(msg, Span('x', cls='fh-toast-dismiss'), cls=f"fh-toast fh-toast-{typ}") for msg,typ in sess.pop(sk, [])]
+    return Div(Div(*toasts, cls="fh-toast-container"), hx_swap_oob="afterbegin:body")
 
 def toast_after(resp, req, sess):
     if sk in sess and (not resp or isinstance(resp, (tuple,FT,FtResponse))): req.injects.append(render_toasts(sess))
 
-def setup_toasts(app):
-    app.hdrs += (Style(toast_css), Script(toast_js, type="module"))
+def setup_toasts(app, duration:float=10.):
+    app.hdrs += (Style(toast_css), ToastJs(duration))
     app.after.append(toast_after)
-

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1/python_fasthtml.egg-info}/PKG-INFO

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

{python-fasthtml-0.9.2 → python-fasthtml-0.10.1}/settings.ini

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

python-fasthtml-0.9.2/fasthtml/__init__.py

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