python-fasthtml 0.12.40__tar.gz → 0.12.42__tar.gz

{python_fasthtml-0.12.40/python_fasthtml.egg-info → python_fasthtml-0.12.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.40
+Version: 0.12.42
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0

python_fasthtml-0.12.42/fasthtml/__init__.py

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

{python_fasthtml-0.12.40 → python_fasthtml-0.12.42}/fasthtml/_modidx.py

@@ -203,10 +203,17 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.oauth._AppClient': ('api/oauth.html#_appclient', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth._AppClient.__init__': ('api/oauth.html#_appclient.__init__', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth._AppClient.get_info': ('api/oauth.html#_appclient.get_info', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.get_info_async': ( 'api/oauth.html#_appclient.get_info_async',
+                                                                              'fasthtml/oauth.py'),
                                 'fasthtml.oauth._AppClient.parse_response': ( 'api/oauth.html#_appclient.parse_response',
                                                                               'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.parse_response_async': ( 'api/oauth.html#_appclient.parse_response_async',
+                                                                                    '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._AppClient.retr_info_async': ( 'api/oauth.html#_appclient.retr_info_async',
+                                                                               'fasthtml/oauth.py'),
+                                'fasthtml.oauth._arun': ('api/oauth.html#_arun', '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'),

{python_fasthtml-0.12.40 → python_fasthtml-0.12.42}/fasthtml/core.py

@@ -12,11 +12,12 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
-import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib,httpx,itsdangerous
+import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib,httpx,itsdangerous,uvicorn
 
 from fastcore.utils import *
 from fastcore.xml import *
-from fastcore.meta import use_kwargs_dict
+from fastcore.meta import use_kwargs_dict,delegates
+from fastcore.style import S
 
 from types import UnionType, SimpleNamespace as ns, GenericAlias
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
@@ -183,6 +184,7 @@ async def _find_p(req, arg:str, p:Parameter):
         if issubclass(anno, HtmxHeaders): return _get_htmx(req.headers)
         if issubclass(anno, Starlette): return req.scope['app']
         if _is_body(anno) and 'session'.startswith(arg.lower()): return req.scope.get('session', {})
+        if issubclass(anno, State): return req.scope['app'].state
         if _is_body(anno): return await _from_body(req, p)
     # If there's no annotation, check for special names
     if anno is empty:
@@ -193,6 +195,7 @@ async def _find_p(req, arg:str, p:Parameter):
         if arg.lower()=='htmx': return _get_htmx(req.headers)
         if arg.lower()=='app': return req.scope['app']
         if arg.lower()=='body': return (await req.body()).decode()
+        if arg.lower()=='state': return req.scope['app'].state
         if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())
         if arg!='resp': warn(f"`{arg} has no type annotation and is not a recognised special name, so is ignored.")
         return None
@@ -700,15 +703,15 @@ def set_lifespan(self:FastHTML, value):
     self.router.lifespan_context = value
 
 # %% ../nbs/api/00_core.ipynb #3a348474
+@delegates(uvicorn.run)
 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
-        reload_includes:list[str]|str|None=None, # Additional files to watch for changes
-        reload_excludes:list[str]|str|None=None # Files to ignore for changes
-        ):
+        **kwargs
+    ):
     "Run the app in an async server, with live reload set as the default."
     bk = inspect.currentframe().f_back
     glb = bk.f_globals
@@ -716,11 +719,11 @@ def serve(
     if not appname:
         if glb.get('__name__')=='__main__': appname = Path(glb.get('__file__', '')).stem
         elif code.co_name=='main' and bk.f_back.f_globals.get('__name__')=='__main__': appname = inspect.getmodule(bk).__name__
-    import uvicorn
     if appname:
         if not port: port=int(os.getenv("PORT", default=5001))
-        print(f'Link: http://{"localhost" if host=="0.0.0.0" else host}:{port}')
-        uvicorn.run(f'{appname}:{app}', host=host, port=port, reload=reload, reload_includes=reload_includes, reload_excludes=reload_excludes)
+        link = f'http://{"localhost" if host=="0.0.0.0" else host}:{port}'
+        print('Link: '+ S.light_red.bold(link))
+        uvicorn.run(f'{appname}:{app}', host=host, port=port, reload=reload, **kwargs)
 
 # %% ../nbs/api/00_core.ipynb #8121968a
 class Client:

{python_fasthtml-0.12.40 → python_fasthtml-0.12.42}/fasthtml/oauth.py

@@ -3,14 +3,17 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/08_oauth.ipynb.
 
 # %% auto #0
-__all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'Auth0AppClient',
-           'AppleAppClient', 'get_host', 'redir_url', 'url_match', 'OAuth', 'load_creds']
+__all__ = ['log', 'http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient',
+           'Auth0AppClient', 'AppleAppClient', 'get_host', 'redir_url', 'url_match', 'OAuth', 'load_creds']
 
 # %% ../nbs/api/08_oauth.ipynb #793722f2
 from .common import *
 from oauthlib.oauth2 import WebApplicationClient
 from urllib.parse import urlparse, urlencode, parse_qs, quote, unquote
-import secrets, httpx, time
+import secrets, httpx, time, asyncio, logging
+
+# %% ../nbs/api/08_oauth.ipynb #44aa4a88
+log = logging.getLogger(__name__)
 
 # %% ../nbs/api/08_oauth.ipynb #0a078133
 class _AppClient(WebApplicationClient):
@@ -90,8 +93,8 @@ class DiscordAppClient(_AppClient):
         headers = {'Content-Type': 'application/x-www-form-urlencoded'}
         data = dict(grant_type='authorization_code', code=code)
         if redirect_uri: data['redirect_uri'] = redirect_uri
-        r = httpx.post(self.token_url, data=data, headers=headers, auth=(self.client_id, self.client_secret))
-        r.raise_for_status()
+        r = httpx.post(self.token_url, data=data, headers=headers, auth=(self.client_id, self.client_secret)
+            ).raise_for_status()
         self.parse_request_body_response(r.text)
 
 # %% ../nbs/api/08_oauth.ipynb #276520b0
@@ -104,9 +107,7 @@ class Auth0AppClient(_AppClient):
         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()
+        return httpx.get(f"https://{self.domain}/.well-known/openid-configuration").raise_for_status().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))
@@ -166,11 +167,9 @@ 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, data=payload)
-    r.raise_for_status()
+    r = httpx.post(self.token_url, data=payload).raise_for_status()
     self.parse_request_body_response(r.text)
 
-# %% ../nbs/api/08_oauth.ipynb #6967dbb0
 @patch
 def get_info(self:_AppClient, token=None):
     "Get the info for authenticated user"
@@ -178,13 +177,39 @@ def get_info(self:_AppClient, token=None):
     headers = {'Authorization': f'Bearer {token}'}
     return httpx.get(self.info_url, headers=headers).json()
 
-# %% ../nbs/api/08_oauth.ipynb #03702349
 @patch
 def retr_info(self:_AppClient, code, redirect_uri):
     "Combines `parse_response` and `get_info`"
     self.parse_response(code, redirect_uri)
     return self.get_info()
 
+# %% ../nbs/api/08_oauth.ipynb #0ff353ae
+@patch
+async def parse_response_async(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')
+    log.debug(f"OAuth token request: redirect_uri={redirect_uri}, code={code[:20]}...")
+    async with httpx.AsyncClient() as c:
+        r = (await c.post(self.token_url, data=payload))
+        log.debug(f"OAuth response: {r.status_code} - {r.text}")
+        r.raise_for_status()
+    self.parse_request_body_response(r.text)
+
+@patch
+async def get_info_async(self:_AppClient, token=None):
+    "Get the info for authenticated user"
+    if not token: token = self.token["access_token"]
+    headers = {'Authorization': f'Bearer {token}'}
+    async with httpx.AsyncClient() as c:
+        return (await c.get(self.info_url, headers=headers)).raise_for_status().json()
+
+@patch
+async def retr_info_async(self:_AppClient, code, redirect_uri):
+    "Combines `parse_response` and `get_info`"
+    await self.parse_response_async(code, redirect_uri)
+    return await self.get_info_async()
+
 # %% ../nbs/api/08_oauth.ipynb #29f52061
 @patch
 def retr_id(self:_AppClient, code, redirect_uri):
@@ -197,38 +222,43 @@ 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 #dda68390
+async def _arun(res): return await res if asyncio.iscoroutine(res) else res
+
+# %% ../nbs/api/08_oauth.ipynb #c09a79ff
 class OAuth:
-    def __init__(self, app, cli, skip=None, redir_path='/redirect', error_path='/error', logout_path='/logout', login_path='/login', https=True, http_patterns=http_patterns, redir_method='get'):
+    def __init__(self, app, cli, skip=None,
+            redir_path='/redirect', error_path='/error', logout_path='/logout', login_path='/login',
+            https=True, http_patterns=http_patterns, redir_method='get'):
         if not skip: skip = [redir_path,error_path,login_path]
         redir_handler = app.post if redir_method == 'post' else app.get
         store_attr()
-        def before(req, session):
+        async def before(req, session):
             if 'auth' not in req.scope: req.scope['auth'] = session.get('auth')
             auth = req.scope['auth']
             if not auth: return self.redir_login(session)
-            res = self.check_invalid(req, session, auth)
+            res = await _arun(self.check_invalid(req, session, auth))
             if res: return res
         app.before.append(Beforeware(before, skip=skip))
 
         @redir_handler(redir_path)
-        def redirect(req, session, code:str=None, error:str=None, state:str=None):
+        async 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,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))
+            info = AttrDictDefault(await cli.retr_info_async(code, base_url+redir_path))
             ident = info.get(self.cli.id_key)
             if not ident: return self.redir_login(session)
-            res = self.get_auth(info, ident, session, state)
-            if not res:   return self.redir_login(session)
+            res = await _arun(self.get_auth(info, ident, session, state))
+            if not res: return self.redir_login(session)
             req.scope['auth'] = session['auth'] = ident
             return res
 
         @app.get(logout_path)
-        def logout(session):
+        async def logout(session):
             session.pop('auth', None)
-            return self.logout(session)
+            return await _arun(self.logout(session))
 
     def redir_login(self, session): return RedirectResponse(self.login_path, status_code=303)
     def redir_url(self, req):

{python_fasthtml-0.12.40 → python_fasthtml-0.12.42}/fasthtml/starlette.py

@@ -16,7 +16,7 @@ from starlette.routing import Route, Router, Mount, WebSocketRoute
 from starlette.exceptions import HTTPException,WebSocketException
 from starlette.endpoints import HTTPEndpoint,WebSocketEndpoint
 from starlette.config import Config
-from starlette.datastructures import CommaSeparatedStrings, Secret, UploadFile, URLPath
+from starlette.datastructures import CommaSeparatedStrings, Secret, UploadFile, URLPath, State
 from starlette.types import ASGIApp, Receive, Scope, Send
 from starlette.concurrency import run_in_threadpool
 from starlette.background import BackgroundTask, BackgroundTasks

{python_fasthtml-0.12.40 → python_fasthtml-0.12.42/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.40
+Version: 0.12.42
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0

python_fasthtml-0.12.40/fasthtml/__init__.py

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