python-fasthtml 0.13.0__tar.gz → 0.13.1__tar.gz

{python_fasthtml-0.13.0/python_fasthtml.egg-info → python_fasthtml-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.0
+Version: 0.13.1
 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.13.1/fasthtml/__init__.py

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

{python_fasthtml-0.13.0 → python_fasthtml-0.13.1}/fasthtml/_modidx.py

@@ -50,8 +50,11 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.FastHTML._add_ws': ('api/core.html#fasthtml._add_ws', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML._endp': ('api/core.html#fasthtml._endp', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.add_route': ('api/core.html#fasthtml.add_route', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.add_websocket_route': ( 'api/core.html#fasthtml.add_websocket_route',
+                                                                               'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.devtools_json': ('api/core.html#fasthtml.devtools_json', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.get_client': ('api/core.html#fasthtml.get_client', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.on_event': ('api/core.html#fasthtml.on_event', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.route': ('api/core.html#fasthtml.route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.set_lifespan': ('api/core.html#fasthtml.set_lifespan', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.setup_ws': ('api/core.html#fasthtml.setup_ws', 'fasthtml/core.py'),
@@ -73,6 +76,11 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.HttpHeader': ('api/core.html#httpheader', 'fasthtml/core.py'),
                                'fasthtml.core.JSONResponse': ('api/core.html#jsonresponse', 'fasthtml/core.py'),
                                'fasthtml.core.JSONResponse.render': ('api/core.html#jsonresponse.render', 'fasthtml/core.py'),
+                               'fasthtml.core.Lifespan': ('api/core.html#lifespan', 'fasthtml/core.py'),
+                               'fasthtml.core.Lifespan.__call__': ('api/core.html#lifespan.__call__', 'fasthtml/core.py'),
+                               'fasthtml.core.Lifespan.__init__': ('api/core.html#lifespan.__init__', 'fasthtml/core.py'),
+                               'fasthtml.core.Lifespan._run': ('api/core.html#lifespan._run', 'fasthtml/core.py'),
+                               'fasthtml.core.Lifespan.on_event': ('api/core.html#lifespan.on_event', 'fasthtml/core.py'),
                                'fasthtml.core.MiddlewareBase': ('api/core.html#middlewarebase', 'fasthtml/core.py'),
                                'fasthtml.core.MiddlewareBase.__call__': ('api/core.html#middlewarebase.__call__', 'fasthtml/core.py'),
                                'fasthtml.core.Redirect': ('api/core.html#redirect', 'fasthtml/core.py'),
@@ -87,6 +95,12 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.StaticNoCache.file_response': ( 'api/core.html#staticnocache.file_response',
                                                                               'fasthtml/core.py'),
                                'fasthtml.core.StringConvertor.to_string': ('api/core.html#stringconvertor.to_string', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx': ('api/core.html#_lifespanctx', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx.__aenter__': ('api/core.html#_lifespanctx.__aenter__', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx.__aexit__': ('api/core.html#_lifespanctx.__aexit__', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx.__aiter__': ('api/core.html#_lifespanctx.__aiter__', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx.__anext__': ('api/core.html#_lifespanctx.__anext__', 'fasthtml/core.py'),
+                               'fasthtml.core._LifespanCtx.__init__': ('api/core.html#_lifespanctx.__init__', 'fasthtml/core.py'),
                                'fasthtml.core._add_ids': ('api/core.html#_add_ids', 'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
                                'fasthtml.core._apply_ft': ('api/core.html#_apply_ft', 'fasthtml/core.py'),
@@ -104,7 +118,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._is_body': ('api/core.html#_is_body', 'fasthtml/core.py'),
                                'fasthtml.core._is_ft_resp': ('api/core.html#_is_ft_resp', 'fasthtml/core.py'),
                                'fasthtml.core._list': ('api/core.html#_list', 'fasthtml/core.py'),
-                               'fasthtml.core._mk_lifespan': ('api/core.html#_mk_lifespan', 'fasthtml/core.py'),
                                'fasthtml.core._mk_list': ('api/core.html#_mk_list', 'fasthtml/core.py'),
                                'fasthtml.core._mk_locfunc': ('api/core.html#_mk_locfunc', 'fasthtml/core.py'),
                                'fasthtml.core._params': ('api/core.html#_params', 'fasthtml/core.py'),

{python_fasthtml-0.13.0 → python_fasthtml-0.13.1}/fasthtml/core.py

@@ -7,9 +7,9 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            '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', 'FastHTML', 'HostRoute', 'nested_name',
-           'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache', 'MiddlewareBase',
-           'FtResponse', 'unqid']
+           'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'Lifespan', 'FastHTML', 'HostRoute',
+           'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache',
+           'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
 import json,uuid,inspect,types,asyncio,inspect,random,contextlib,httpx,itsdangerous,uvicorn
@@ -566,17 +566,32 @@ iframe_scr = Script(NotStr("""
         document.body.addEventListener('htmx:wsAfterMessage', sendmsg);
     };"""))
 
-# %% ../nbs/api/00_core.ipynb #d370ef59
-def _mk_lifespan(ls, on_startup, on_shutdown):
-    if not on_startup and not on_shutdown: return ls
-    @contextlib.asynccontextmanager
-    async def _ls(app):
-        for f in listify(on_startup): await _handle(f)
-        if ls:
-            async with ls(app): yield
+# %% ../nbs/api/00_core.ipynb #17ced9a3
+class _LifespanCtx:
+    def __init__(self, gen): self.gen = gen
+    async def __aenter__(self): return await anext(self.gen)
+    async def __aexit__(self, *_):
+        try: await anext(self.gen)
+        except StopAsyncIteration: pass
+    def __aiter__(self): return self.gen
+    async def __anext__(self): return await self.gen.__anext__()
+
+class Lifespan:
+    def __init__(self, startup=None, shutdown=None, ls=None):
+        startup,shutdown = listify(startup),listify(shutdown)
+        store_attr()
+
+    def __call__(self, app): return _LifespanCtx(self._run(app))
+
+    async def _run(self, app):
+        for f in self.startup: await _handle(f)
+        if self.ls:
+            async for state in self.ls(app): yield state
         else: yield
-        for f in listify(on_shutdown): await _handle(f)
-    return _ls
+        for f in self.shutdown: await _handle(f)
+
+    def on_event(self, event_type):
+        return lambda f: (getattr(self, event_type)).append(f)
 
 # %% ../nbs/api/00_core.ipynb #3327a1e9
 class FastHTML(Starlette):
@@ -598,8 +613,8 @@ class FastHTML(Starlette):
             from IPython.display import display,HTML
             if nb_hdrs: display(HTML(to_xml(tuple(hdrs))))
             middleware.append(cors_allow)
-        lifespan = _mk_lifespan(lifespan, on_startup, on_shutdown)
-        self.lifespan,self.hdrs,self.ftrs = lifespan,hdrs,ftrs
+        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.secret_key = get_key(secret_key, key_fname)
         if sess_cls:
@@ -609,10 +624,12 @@ class FastHTML(Starlette):
             middleware.append(sess)
         exception_handlers = ifnone(exception_handlers, {})
         if 404 not in exception_handlers:
-            def _not_found(req, exc): return  Response('404 Not Found', status_code=404)
+            def _not_found(req, exc): return Response('404 Not Found', status_code=404)
             exception_handlers[404] = _not_found
         excs = {k:_wrap_ex(v, k, hdrs, ftrs, htmlkw, bodykw, body_wrap=body_wrap) for k,v in exception_handlers.items()}
-        super().__init__(debug, routes, middleware=middleware, exception_handlers=excs, lifespan=lifespan)
+        super().__init__(debug, routes, middleware=middleware, exception_handlers=excs, lifespan=self.lifespan)
+
+    def on_event(self, event_type): return self.lifespan.on_event(event_type)
 
 # %% ../nbs/api/00_core.ipynb #dce68049
 class HostRoute(Route):
@@ -691,6 +708,12 @@ def ws(self:FastHTML, path:str, conn=None, disconn=None, name=None, middleware=N
     def f(func=noop): return self._add_ws(func, path, conn, disconn, name=name, middleware=middleware)
     return f
 
+# %% ../nbs/api/00_core.ipynb #j6ete5u68fo
+@patch
+def add_websocket_route(self:FastHTML, path, func, conn=None, disconn=None, name=None, middleware=None):
+    "Add a websocket route at `path` (Starlette-compatible API)"
+    return self._add_ws(func, path, conn, disconn, name=name, middleware=middleware)
+
 # %% ../nbs/api/00_core.ipynb #919618c3
 def _mk_locfunc(f, p, app=None):
     "Create a location function wrapper with route path and to() method"

{python_fasthtml-0.13.0 → python_fasthtml-0.13.1/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.0
+Version: 0.13.1
 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.13.0/fasthtml/__init__.py

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