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

{python_fasthtml-0.12.41/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.41
+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.41 → 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
@@ -702,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
@@ -718,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.41 → 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, asyncio
+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):
@@ -186,8 +189,11 @@ 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)).raise_for_status()
+        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

{python_fasthtml-0.12.41 → 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.41
+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.41/fasthtml/__init__.py

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