python-fasthtml 0.14.2__tar.gz → 0.14.3__tar.gz

{python_fasthtml-0.14.2/python_fasthtml.egg-info → python_fasthtml-0.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.2
+Version: 0.14.3
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -21,7 +21,7 @@ Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib
 Requires-Dist: itsdangerous
 Requires-Dist: uvicorn[standard]>=0.30
-Requires-Dist: httpx
+Requires-Dist: httpx2
 Requires-Dist: fastlite>=0.1.1
 Requires-Dist: python-multipart
 Requires-Dist: beautifulsoup4

python_fasthtml-0.14.3/fasthtml/__init__.py

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

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/fasthtml/_modidx.py

@@ -176,7 +176,6 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.JupyUvi._live_sse': ('api/jupyter.html#jupyuvi._live_sse', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi._setup_live': ('api/jupyter.html#jupyuvi._setup_live', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.start': ('api/jupyter.html#jupyuvi.start', 'fasthtml/jupyter.py'),
-                                  'fasthtml.jupyter.JupyUvi.start_async': ('api/jupyter.html#jupyuvi.start_async', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.stop': ('api/jupyter.html#jupyuvi.stop', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUviAsync': ('api/jupyter.html#jupyuviasync', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUviAsync.__init__': ( 'api/jupyter.html#jupyuviasync.__init__',
@@ -190,6 +189,7 @@ 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.wait_port_free': ('api/jupyter.html#wait_port_free', 'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.wait_port_free_async': ('api/jupyter.html#wait_port_free_async', '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'),

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/fasthtml/core.py

@@ -5,13 +5,13 @@ Docs: https://www.fastht.ml/docsapi/core.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
 # %% auto #0
-__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', 'ApiReturn', 'JSONResponse',
-           'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body',
-           'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'Lifespan', 'FastHTML', 'HostRoute',
-           'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache',
-           'add_sig_param', 'into', 'MiddlewareBase', 'FtResponse', 'unqid']
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'DEF_MAXPART', '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', 'ApiReturn',
+           'JSONResponse', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple',
+           'noop_body', 'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'Lifespan', 'FastHTML',
+           'HostRoute', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param',
+           'StaticNoCache', 'add_sig_param', 'into', 'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
 import json,uuid,inspect,types,asyncio,inspect,random,contextlib,itsdangerous
@@ -152,18 +152,21 @@ def form2dict(form: FormData) -> dict:
     if isinstance(form, dict): return form
     return {k: _formitem(form, k) for k in form}
 
+# %% ../nbs/api/00_core.ipynb #8899bc0a
+DEF_MAXPART = 100*1024*1024
+
 # %% ../nbs/api/00_core.ipynb #42c9cea0
 async def parse_form(req: Request) -> FormData:
     "Starlette errors on empty multipart forms, so this checks for that situation"
     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()
+        return await req.form(max_part_size=maxpart)
     await req.body()  # Cache body for non-multipart request types
-    return await req.json() if ctype == 'application/json' else await req.form()
-
+    return await req.json() if ctype == 'application/json' else await req.form(max_part_size=maxpart)
 
 # %% ../nbs/api/00_core.ipynb #0caedd04
 async def _from_body(conn, p, data):
@@ -602,7 +605,7 @@ class FastHTML(Starlette):
                  before=None, after=None, surreal=True, htmx=True, 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, **bodykw):
+                 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))
@@ -617,7 +620,7 @@ class FastHTML(Starlette):
             middleware.append(cors_allow)
         self.lifespan = Lifespan(on_startup, on_shutdown, lifespan)
         self.hdrs,self.ftrs = hdrs,ftrs
-        self.body_wrap,self.before,self.after,self.htmlkw,self.bodykw = body_wrap,before,after,htmlkw,bodykw
+        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,
@@ -675,6 +678,7 @@ def _endp(self:FastHTML, f, body_wrap, before:Optional[Callable|tuple]=None):
     async def _f(req):
         resp = None
         req.injects = []
+        req.max_part_size = self.max_part_size
         req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (self.hdrs,self.ftrs,self.htmlkw,self.bodykw))
         req.hdrs,req.ftrs = listify(req.hdrs),listify(req.ftrs)
         for b in self.before:
@@ -818,8 +822,8 @@ def serve(
 class Client:
     "A simple httpx ASGI client that doesn't require `async`"
     def __init__(self, app, url="http://testserver"):
-        import httpx
-        self.cli = httpx.AsyncClient(transport=httpx.ASGITransport(app), base_url=url)
+        import httpx2
+        self.cli = httpx2.AsyncClient(transport=httpx2.ASGITransport(app), base_url=url)
 
     def _sync(self, method, url, **kwargs):
         async def _request(): return await self.cli.request(method, url, **kwargs)
@@ -1028,11 +1032,11 @@ def devtools_json(self:FastHTML, path=None, uuid=None):
 @patch
 def get_client(self:FastHTML, asink=False, **kw):
     "Get an httpx client with session cookes set from `**kw`"
-    import httpx
+    import httpx2
     signer = itsdangerous.TimestampSigner(self.secret_key)
     data = b64encode(dumps(kw).encode())
     data = signer.sign(data)
-    client = httpx.AsyncClient() if asink else httpx.Client()
+    client = httpx2.AsyncClient() if asink else httpx2.Client()
     client.cookies.update({self.session_cookie: data.decode()})
     return client
 

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/fasthtml/jupyter.py

@@ -5,8 +5,8 @@ Docs: https://www.fastht.ml/docsapi/jupyter.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/06_jupyter.ipynb.
 
 # %% auto #0
-__all__ = ['nb_serve', 'nb_serve_async', 'is_port_free', 'wait_port_free', 'show', 'render_ft', 'htmx_config_port', 'JupyUvi',
-           'JupyUviAsync', 'HTMX', 'ws_client']
+__all__ = ['nb_serve', 'nb_serve_async', 'is_port_free', 'wait_port_free', 'wait_port_free_async', 'show', 'render_ft',
+           'htmx_config_port', 'JupyUvi', 'JupyUviAsync', 'HTMX', 'ws_client']
 
 # %% ../nbs/api/06_jupyter.ipynb #2c69d9d0
 import asyncio, socket, time, uvicorn
@@ -38,23 +38,31 @@ async def nb_serve_async(app, log_level="error", port=8000, host='0.0.0.0', **kw
 
 # %% ../nbs/api/06_jupyter.ipynb #508917bc
 def is_port_free(port, host='localhost'):
-    "Check if `port` is free on `host`"
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     try:
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
+        sock.listen(1)
         return True
     except OSError: return False
     finally: sock.close()
 
 # %% ../nbs/api/06_jupyter.ipynb #1779cb76
-def wait_port_free(port, host='localhost', max_wait=3):
+def wait_port_free(port, host='localhost', max_wait=20):
     "Wait for `port` to be free on `host`"
     start_time = time.time()
-    while not is_port_free(port):
-        if time.time() - start_time>max_wait: return print(f"Timeout")
+    while not is_port_free(port, host):
+        if time.time() - start_time > max_wait: raise TimeoutError(f"Port {host}:{port} not free after {max_wait}s")
         time.sleep(0.1)
 
+async def wait_port_free_async(port, host='localhost', max_wait=20):
+    "Async wait for `port` to be free on `host`"
+    start_time   = time.time()
+    while not is_port_free(port, host):
+        if time.time() - start_time > max_wait: raise TimeoutError(f"Port {host}:{port} not free after {max_wait}s")
+        await asyncio.sleep(0.1)
+
+
 # %% ../nbs/api/06_jupyter.ipynb #654b36bb
 @delegates(_show)
 def show(*s, **kwargs):
@@ -96,12 +104,9 @@ class JupyUvi:
     def start(self):
         self.server = nb_serve(self.app, log_level=self.log_level, host=self.host, port=self.port,daemon=self.daemon, **self.kwargs)
 
-    async def start_async(self):
-        self.server = await nb_serve_async(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
-
     def stop(self):
         self.server.should_exit = True
-        wait_port_free(self.port)
+        wait_port_free(self.port, self.host)
 
     def _setup_live(self, app):
         rt = self.live_rt or '/_lr'
@@ -119,7 +124,7 @@ class JupyUvi:
                 ver = self._live_ver
                 yield 'data: reload\n\n'
 
-# %% ../nbs/api/06_jupyter.ipynb #9134035e
+# %% ../nbs/api/06_jupyter.ipynb #f6316c73
 class JupyUviAsync(JupyUvi):
     "Start and stop an async Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
     def __init__(self, app, log_level="error", host='0.0.0.0', port=8000, **kwargs):
@@ -128,9 +133,10 @@ class JupyUviAsync(JupyUvi):
     async def start(self):
         self.server = await nb_serve_async(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
 
-    def stop(self):
+    async def stop(self):
         self.server.should_exit = True
-        wait_port_free(self.port)
+        await wait_port_free_async(self.port, self.host)
+
 
 # %% ../nbs/api/06_jupyter.ipynb #a448e420
 from starlette.testclient import TestClient

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/fasthtml/oauth.py

@@ -12,7 +12,7 @@ __all__ = ['log', 'http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'Huggin
 from .common import *
 from oauthlib.oauth2 import WebApplicationClient
 from urllib.parse import urlparse, urlencode, parse_qs, quote, unquote
-import secrets, httpx, time, asyncio, logging
+import secrets, httpx2, time, asyncio, logging
 
 # %% ../nbs/api/08_oauth.ipynb #44aa4a88
 log = logging.getLogger(__name__)
@@ -95,7 +95,7 @@ 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 = httpx2.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)
 
@@ -109,7 +109,7 @@ class Auth0AppClient(_AppClient):
         super().__init__(client_id, client_secret, code=code, scope=scope, redirect_uri=redirect_uri, **kwargs)
 
     def _fetch_openid_config(self):
-        return httpx.get(f"https://{self.domain}/.well-known/openid-configuration").raise_for_status().json()
+        return httpx2.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))
@@ -169,7 +169,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, data=payload).raise_for_status()
+    r = httpx2.post(self.token_url, data=payload).raise_for_status()
     self.parse_request_body_response(r.text)
 
 @patch
@@ -177,7 +177,7 @@ def get_info(self:_AppClient, token=None):
     "Get the info for authenticated user"
     if not token: token = self.token["access_token"]
     headers = {'Authorization': f'Bearer {token}'}
-    return httpx.get(self.info_url, headers=headers).json()
+    return httpx2.get(self.info_url, headers=headers).json()
 
 @patch
 def retr_info(self:_AppClient, code, redirect_uri):
@@ -192,7 +192,7 @@ async def parse_response_async(self:_AppClient, code, redirect_uri):
     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:
+    async with httpx2.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()
@@ -203,7 +203,7 @@ 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:
+    async with httpx2.AsyncClient() as c:
         return (await c.get(self.info_url, headers=headers)).raise_for_status().json()
 
 @patch

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/pyproject.toml

@@ -12,7 +12,7 @@ license = {text = "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"]
-dependencies = ['fastcore>=1.12.45', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
+dependencies = ['fastcore>=1.12.45', 'python-dateutil', 'starlette>=1.0.1', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx2', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fasthtml"

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.14.2
+Version: 0.14.3
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -21,7 +21,7 @@ Requires-Dist: starlette>=1.0.1
 Requires-Dist: oauthlib
 Requires-Dist: itsdangerous
 Requires-Dist: uvicorn[standard]>=0.30
-Requires-Dist: httpx
+Requires-Dist: httpx2
 Requires-Dist: fastlite>=0.1.1
 Requires-Dist: python-multipart
 Requires-Dist: beautifulsoup4

{python_fasthtml-0.14.2 → python_fasthtml-0.14.3}/python_fasthtml.egg-info/requires.txt

@@ -4,7 +4,7 @@ starlette>=1.0.1
 oauthlib
 itsdangerous
 uvicorn[standard]>=0.30
-httpx
+httpx2
 fastlite>=0.1.1
 python-multipart
 beautifulsoup4

python_fasthtml-0.14.2/fasthtml/__init__.py

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