python-fasthtml 0.7.0__tar.gz → 0.8.0__tar.gz

{python-fasthtml-0.7.0/python_fasthtml.egg-info → python-fasthtml-0.8.0}/PKG-INFO

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

python-fasthtml-0.8.0/fasthtml/__init__.py

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

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/fasthtml/_modidx.py

@@ -23,7 +23,12 @@ d = { 'settings': { 'branch': 'main',
                                      'fasthtml.components.html2ft': ('api/components.html#html2ft', 'fasthtml/components.py'),
                                      'fasthtml.components.show': ('api/components.html#show', 'fasthtml/components.py'),
                                      'fasthtml.components.sse_message': ('api/components.html#sse_message', 'fasthtml/components.py')},
-            'fasthtml.core': { 'fasthtml.core.Beforeware': ('api/core.html#beforeware', 'fasthtml/core.py'),
+            'fasthtml.core': { 'fasthtml.core.APIRouter': ('api/core.html#apirouter', 'fasthtml/core.py'),
+                               'fasthtml.core.APIRouter.__call__': ('api/core.html#apirouter.__call__', 'fasthtml/core.py'),
+                               'fasthtml.core.APIRouter.__init__': ('api/core.html#apirouter.__init__', 'fasthtml/core.py'),
+                               'fasthtml.core.APIRouter.to_app': ('api/core.html#apirouter.to_app', 'fasthtml/core.py'),
+                               'fasthtml.core.APIRouter.ws': ('api/core.html#apirouter.ws', 'fasthtml/core.py'),
+                               'fasthtml.core.Beforeware': ('api/core.html#beforeware', 'fasthtml/core.py'),
                                'fasthtml.core.Beforeware.__init__': ('api/core.html#beforeware.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.Client': ('api/core.html#client', 'fasthtml/core.py'),
                                'fasthtml.core.Client.__init__': ('api/core.html#client.__init__', 'fasthtml/core.py'),
@@ -31,6 +36,10 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.EventStream': ('api/core.html#eventstream', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML': ('api/core.html#fasthtml', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.__init__': ('api/core.html#fasthtml.__init__', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML._add_route': ('api/core.html#fasthtml._add_route', 'fasthtml/core.py'),
+                               '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.route': ('api/core.html#fasthtml.route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.static_route': ('api/core.html#fasthtml.static_route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.static_route_exts': ('api/core.html#fasthtml.static_route_exts', 'fasthtml/core.py'),
@@ -49,17 +58,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.Redirect': ('api/core.html#redirect', 'fasthtml/core.py'),
                                'fasthtml.core.Redirect.__init__': ('api/core.html#redirect.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.Redirect.__response__': ('api/core.html#redirect.__response__', 'fasthtml/core.py'),
-                               'fasthtml.core.RouteX': ('api/core.html#routex', 'fasthtml/core.py'),
-                               'fasthtml.core.RouteX.__init__': ('api/core.html#routex.__init__', 'fasthtml/core.py'),
-                               'fasthtml.core.RouteX._endp': ('api/core.html#routex._endp', 'fasthtml/core.py'),
-                               'fasthtml.core.RouterX': ('api/core.html#routerx', 'fasthtml/core.py'),
-                               'fasthtml.core.RouterX.__init__': ('api/core.html#routerx.__init__', 'fasthtml/core.py'),
-                               'fasthtml.core.RouterX._add_route': ('api/core.html#routerx._add_route', 'fasthtml/core.py'),
-                               'fasthtml.core.RouterX.add_route': ('api/core.html#routerx.add_route', 'fasthtml/core.py'),
-                               'fasthtml.core.RouterX.add_ws': ('api/core.html#routerx.add_ws', 'fasthtml/core.py'),
                                'fasthtml.core.StringConvertor.to_string': ('api/core.html#stringconvertor.to_string', 'fasthtml/core.py'),
-                               'fasthtml.core.WS_RouteX': ('api/core.html#ws_routex', 'fasthtml/core.py'),
-                               'fasthtml.core.WS_RouteX.__init__': ('api/core.html#ws_routex.__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'),
@@ -77,9 +76,9 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._list': ('api/core.html#_list', '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'),
                                'fasthtml.core._resp': ('api/core.html#_resp', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('api/core.html#_send_ws', 'fasthtml/core.py'),
-                               'fasthtml.core._sig': ('api/core.html#_sig', 'fasthtml/core.py'),
                                'fasthtml.core._to_htmx_header': ('api/core.html#_to_htmx_header', 'fasthtml/core.py'),
                                'fasthtml.core._to_xml': ('api/core.html#_to_xml', 'fasthtml/core.py'),
                                'fasthtml.core._url_for': ('api/core.html#_url_for', 'fasthtml/core.py'),
@@ -106,9 +105,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.snake2hyphens': ('api/core.html#snake2hyphens', 'fasthtml/core.py'),
                                'fasthtml.core.unqid': ('api/core.html#unqid', 'fasthtml/core.py'),
                                'fasthtml.core.uri': ('api/core.html#uri', 'fasthtml/core.py')},
-            'fasthtml.fastapp': { 'fasthtml.fastapp._app_factory': ('api/fastapp.html#_app_factory', 'fasthtml/fastapp.py'),
-                                  'fasthtml.fastapp._get_tbl': ('api/fastapp.html#_get_tbl', 'fasthtml/fastapp.py'),
-                                  'fasthtml.fastapp.fast_app': ('api/fastapp.html#fast_app', 'fasthtml/fastapp.py')},
+            'fasthtml.fastapp': {},
             'fasthtml.ft': {},
             'fasthtml.js': { 'fasthtml.js.HighlightJS': ('api/js.html#highlightjs', 'fasthtml/js.py'),
                              'fasthtml.js.KatexMarkdownJS': ('api/js.html#katexmarkdownjs', 'fasthtml/js.py'),
@@ -117,14 +114,12 @@ d = { 'settings': { 'branch': 'main',
                              'fasthtml.js.SortableJS': ('api/js.html#sortablejs', 'fasthtml/js.py'),
                              'fasthtml.js.dark_media': ('api/js.html#dark_media', 'fasthtml/js.py'),
                              'fasthtml.js.light_media': ('api/js.html#light_media', 'fasthtml/js.py')},
-            'fasthtml.jupyter': { 'fasthtml.jupyter.FastJupy': ('api/jupyter.html#fastjupy', 'fasthtml/jupyter.py'),
-                                  'fasthtml.jupyter.HTMX': ('api/jupyter.html#htmx', 'fasthtml/jupyter.py'),
+            'fasthtml.jupyter': { 'fasthtml.jupyter.HTMX': ('api/jupyter.html#htmx', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi': ('api/jupyter.html#jupyuvi', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.__init__': ('api/jupyter.html#jupyuvi.__init__', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.start': ('api/jupyter.html#jupyuvi.start', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.stop': ('api/jupyter.html#jupyuvi.stop', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.is_port_free': ('api/jupyter.html#is_port_free', 'fasthtml/jupyter.py'),
-                                  'fasthtml.jupyter.jupy_app': ('api/jupyter.html#jupy_app', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.nb_serve': ('api/jupyter.html#nb_serve', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.nb_serve_async': ('api/jupyter.html#nb_serve_async', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.wait_port_free': ('api/jupyter.html#wait_port_free', 'fasthtml/jupyter.py'),

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/fasthtml/core.py

@@ -4,10 +4,10 @@
 
 # %% auto 0
 __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport',
-           'charset', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders',
-           'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'WS_RouteX', 'uri',
-           'decode_uri', 'flat_tuple', 'Redirect', 'RouteX', 'RouterX', 'get_key', 'def_hdrs', 'FastHTML', 'serve',
-           'Client', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
+           'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders',
+           'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream',
+           'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'Redirect', 'get_key', 'def_hdrs', 'FastHTML', 'serve',
+           'Client', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn,signal,asyncio,threading
@@ -35,10 +35,10 @@ from base64 import b85encode,b64encode
 
 from .starlette import *
 
-empty = Parameter.empty
-
 # %% ../nbs/api/00_core.ipynb
-def _sig(f): return signature_ex(f, True)
+def _params(f): return signature_ex(f, True).parameters
+
+empty = Parameter.empty
 
 # %% ../nbs/api/00_core.ipynb
 def parsed_date(s:str):
@@ -257,7 +257,7 @@ def _ws_endp(recv, conn=None, disconn=None):
     cls = type('WS_Endp', (WebSocketEndpoint,), {"encoding":"text"})
     
     async def _generic_handler(handler, ws, data=None):
-        wd = _wrap_ws(ws, loads(data) if data else {}, _sig(handler).parameters)
+        wd = _wrap_ws(ws, loads(data) if data else {}, _params(handler))
         resp = await _handle(handler, wd)
         if resp: await _send_ws(ws, resp)
 
@@ -289,13 +289,6 @@ def signal_shutdown():
     for sig in (signal.SIGINT, signal.SIGTERM): signal.signal(sig, signal_handler)
     return event
 
-# %% ../nbs/api/00_core.ipynb
-class WS_RouteX(WebSocketRoute):
-    def __init__(self, app, path:str, recv, conn:callable=None, disconn:callable=None, *,
-                 name=None, middleware=None):
-        super().__init__(path, _ws_endp(recv, conn, disconn), name=name, middleware=middleware)
-        self.methods = ['WS']
-
 # %% ../nbs/api/00_core.ipynb
 def uri(_arg, **kwargs):
     return f"{quote(_arg)}/{urlencode(kwargs, doseq=True)}"
@@ -418,52 +411,6 @@ async def _wrap_call(f, req, params):
     wreq = await _wrap_req(req, params)
     return await _handle(f, wreq)
 
-# %% ../nbs/api/00_core.ipynb
-class RouteX(Route):
-    def __init__(self, app, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None):
-        self.f,self.sig,self._app = endpoint,_sig(endpoint),app
-        super().__init__(path, self._endp, methods=methods, name=name, include_in_schema=include_in_schema, middleware=middleware)
-
-    async def _endp(self, req):
-        resp = None
-        req.injects = []
-        req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (self._app.hdrs,self._app.ftrs,self._app.htmlkw,self._app.bodykw))
-        req.hdrs,req.ftrs = listify(req.hdrs),listify(req.ftrs)
-        for b in self._app.before:
-            if not resp:
-                if isinstance(b, Beforeware): bf,skip = b.f,b.skip
-                else: bf,skip = b,[]
-                if not any(re.fullmatch(r, req.url.path) for r in skip):
-                    resp = await _wrap_call(bf, req, _sig(bf).parameters)
-        if not resp: resp = await _wrap_call(self.f, req, self.sig.parameters)
-        for a in self._app.after:
-            _,*wreq = await _wrap_req(req, _sig(a).parameters)
-            nr = a(resp, *wreq)
-            if nr: resp = nr
-        return _resp(req, resp, self.sig.return_annotation)
-
-# %% ../nbs/api/00_core.ipynb
-class RouterX(Router):
-    def __init__(self, app, routes=None, redirect_slashes=True, default=None, *, middleware=None):
-        self._app = app
-        super().__init__(routes, redirect_slashes, default, app.on_startup, app.on_shutdown,
-                         lifespan=app.lifespan, middleware=middleware)
-    
-    def _add_route(self, route):
-        route.methods = [m.upper() for m in listify(route.methods)]
-        self.routes = [r for r in self.routes if not
-                       (r.path==route.path and r.name == route.name and
-                        ((route.methods is None) or (set(r.methods) == set(route.methods))))]
-        self.routes.append(route)
-
-    def add_route(self, path: str, endpoint: callable, methods=None, name=None, include_in_schema=True):
-        route = RouteX(self._app, path, endpoint=endpoint, methods=methods, name=name, include_in_schema=include_in_schema)
-        self._add_route(route)
-
-    def add_ws(self, path: str, recv: callable, conn:callable=None, disconn:callable=None, name=None):
-        route = WS_RouteX(self._app, path, recv=recv, conn=conn, disconn=disconn, name=name)
-        self._add_route(route)
-
 # %% ../nbs/api/00_core.ipynb
 htmx_exts = {
     "head-support": "https://unpkg.com/htmx-ext-head-support@2.0.1/head-support.js", 
@@ -522,6 +469,20 @@ def def_hdrs(htmx=True, surreal=True):
     if htmx: hdrs = [htmxsrc,fhjsscr] + hdrs
     return [charset, viewport] + hdrs
 
+# %% ../nbs/api/00_core.ipynb
+cors_allow = Middleware(CORSMiddleware, allow_credentials=True,
+                        allow_origins=["*"], allow_methods=["*"], allow_headers=["*"])
+
+iframe_scr = Script("""
+    function sendmsg() {
+        window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');
+    }
+    window.onload = function() {
+        sendmsg();
+        document.body.addEventListener('htmx:afterSettle',    sendmsg);
+        document.body.addEventListener('htmx:wsAfterMessage', sendmsg);
+    };""")
+
 # %% ../nbs/api/00_core.ipynb
 class FastHTML(Starlette):
     def __init__(self, debug=False, routes=None, middleware=None, exception_handlers=None,
@@ -536,6 +497,9 @@ class FastHTML(Starlette):
         htmlkw = htmlkw or {}
         if default_hdrs: hdrs = def_hdrs(htmx, surreal=surreal) + hdrs
         hdrs += [Script(src=ext) for ext in exts.values()]
+        if IN_NOTEBOOK:
+            hdrs.append(iframe_scr)
+            middleware.append(cors_allow)
         self.on_startup,self.on_shutdown,self.lifespan,self.hdrs,self.ftrs = on_startup,on_shutdown,lifespan,hdrs,ftrs
         self.before,self.after,self.htmlkw,self.bodykw = before,after,htmlkw,bodykw
         secret_key = get_key(secret_key, key_fname)
@@ -550,36 +514,78 @@ class FastHTML(Starlette):
             exception_handlers[404] = _not_found
         excs = {k:_wrap_ex(v, hdrs, ftrs, htmlkw, bodykw) for k,v in exception_handlers.items()}
         super().__init__(debug, routes, middleware=middleware, exception_handlers=excs, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan)
-        self.router = RouterX(self, routes)
-
-    def ws(self, path:str, conn=None, disconn=None, name=None):
-        "Add a websocket route at `path`"
-        def f(func=None):
-            self.router.add_ws(path, func or noop, conn=conn, disconn=disconn, name=name)
-            return func
-        return f
+    
+    def add_route(self, route):
+        route.methods = [m.upper() for m in listify(route.methods)]
+        self.router.routes = [r for r in self.router.routes if not
+                       (r.path==route.path and r.name == route.name and
+                        ((route.methods is None) or (set(r.methods) == set(route.methods))))]
+        self.router.routes.append(route)
 
 # %% ../nbs/api/00_core.ipynb
 all_meths = 'get post put delete patch head trace options'.split()
 
+# %% ../nbs/api/00_core.ipynb
+@patch
+def _endp(self:FastHTML, f):
+    sig = signature_ex(f, True)
+    async def _f(req):
+        resp = None
+        req.injects = []
+        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:
+            if not resp:
+                if isinstance(b, Beforeware): bf,skip = b.f,b.skip
+                else: bf,skip = b,[]
+                if not any(re.fullmatch(r, req.url.path) for r in skip):
+                    resp = await _wrap_call(bf, req, _params(bf))
+        if not resp: resp = await _wrap_call(f, req, sig.parameters)
+        for a in self.after:
+            _,*wreq = await _wrap_req(req, _params(a))
+            nr = a(resp, *wreq)
+            if nr: resp = nr
+        return _resp(req, resp, sig.return_annotation)
+    return _f
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def _add_ws(self:FastHTML, func, path, conn, disconn, name, middleware):
+    endp = _ws_endp(func, conn, disconn)
+    route = WebSocketRoute(path, endpoint=endp, name=name, middleware=middleware)
+    route.methods = ['ws']
+    self.add_route(route)
+    return func
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def ws(self:FastHTML, path:str, conn=None, disconn=None, name=None, middleware=None):
+    "Add a websocket route at `path`"
+    def f(func=noop): return self._add_ws(func, path, conn, disconn, name=name, middleware=middleware)
+    return f
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def _add_route(self:FastHTML, func, path, methods, name, include_in_schema):
+    n,fn,p = name,func.__name__,None if callable(path) else path
+    if methods: m = [methods] if isinstance(methods,str) else methods
+    elif fn in all_meths and p is not None: m = [fn]
+    else: m = ['get','post']
+    if not n: n = fn
+    if not p: p = '/'+('' if fn=='index' else fn)
+    route = Route(p, endpoint=self._endp(func), methods=m, name=n, include_in_schema=include_in_schema)
+    self.add_route(route)
+    lf = _mk_locfunc(func, p)
+    lf.__routename__ = n
+    return lf
+
+# %% ../nbs/api/00_core.ipynb
 @patch
 def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_schema=True):
     "Add a route at `path`"
-    pathstr = None if callable(path) else path
-    def f(func):
-        n,fn,p = name,func.__name__,pathstr
-        if methods: m = [methods] if isinstance(methods,str) else methods
-        elif fn in all_meths and p is not None: m = [fn]
-        else: m = ['get','post']
-        if not n: n = fn
-        if not p: p = '/'+('' if fn=='index' else fn)
-        self.router.add_route(p, func, methods=m, name=n, include_in_schema=include_in_schema)
-        lf = _mk_locfunc(func, p)
-        lf.__routename__ = n
-        return lf
+    def f(func): return self._add_route(func, path, methods, name=name, include_in_schema=include_in_schema)
     return f(path) if callable(path) else f
 
-# %% ../nbs/api/00_core.ipynb
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
 # %% ../nbs/api/00_core.ipynb
@@ -616,6 +622,26 @@ class Client:
 
 for o in ('get', 'post', 'delete', 'put', 'patch', 'options'): setattr(Client, o, partialmethod(Client._sync, o))
 
+# %% ../nbs/api/00_core.ipynb
+class APIRouter:
+    "Add routes to an app"
+    def __init__(self): self.routes,self.wss = [],[]
+
+    def __call__(self:FastHTML, path:str=None, methods=None, name=None, include_in_schema=True):
+        "Add a route at `path`"
+        def f(func): return self.routes.append((func, path,methods,name,include_in_schema))
+        return f(path) if callable(path) else f
+
+    def to_app(self, app):
+        "Add routes to `app`"
+        for args in self.routes: app._add_route(*args)
+        for args in self.wss   : app._add_ws   (*args)
+
+    def ws(self:FastHTML, path:str, conn=None, disconn=None, name=None, middleware=None):
+        "Add a websocket route at `path`"
+        def f(func=noop): return self.wss.append((func, path, conn, disconn, name, middleware))
+        return f
+
 # %% ../nbs/api/00_core.ipynb
 def cookie(key: str, value="", max_age=None, expires=None, path="/", domain=None, secure=False, httponly=False, samesite="lax",):
     "Create a 'set-cookie' `HttpHeader`"

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/fasthtml/fastapp.py

@@ -1,10 +1,5 @@
 """The `fast_app` convenience wrapper"""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/10_fastapp.ipynb.
-
-# %% ../nbs/api/10_fastapp.ipynb 3
-from __future__ import annotations
-
 import inspect,uvicorn
 from fastcore.utils import *
 from fastlite import *
@@ -13,10 +8,8 @@ from .pico import *
 from .starlette import *
 from .live_reload import FastHTMLWithLiveReload
 
-# %% auto 0
 __all__ = ['fast_app']
 
-# %% ../nbs/api/10_fastapp.ipynb
 def _get_tbl(dt, nm, schema):
     render = schema.pop('render', None)
     tbl = dt[nm]
@@ -26,7 +19,6 @@ def _get_tbl(dt, nm, schema):
     if render: dc.__ft__ = render
     return tbl,dc
 
-# %% ../nbs/api/10_fastapp.ipynb
 def _app_factory(*args, **kwargs) -> FastHTML | FastHTMLWithLiveReload:
     "Creates a FastHTML or FastHTMLWithLiveReload app instance"
     if kwargs.pop('live', False): return FastHTMLWithLiveReload(*args, **kwargs)
@@ -34,7 +26,6 @@ def _app_factory(*args, **kwargs) -> FastHTML | FastHTMLWithLiveReload:
     kwargs.pop('reload_interval', None)
     return FastHTML(*args, **kwargs)
 
-# %% ../nbs/api/10_fastapp.ipynb
 def fast_app(
         db_file:Optional[str]=None, # Database file name, if needed
         render:Optional[callable]=None, # Function used to render default database class
@@ -91,3 +82,4 @@ def fast_app(
     dbtbls = [_get_tbl(db.t, k, v) for k,v in tbls.items()]
     if len(dbtbls)==1: dbtbls=dbtbls[0]
     return app,app.route,*dbtbls
+

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/fasthtml/jupyter.py

@@ -1,8 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/06_jupyter.ipynb.
 
 # %% auto 0
-__all__ = ['cors_allow', 'nb_serve', 'nb_serve_async', 'is_port_free', 'wait_port_free', 'JupyUvi', 'FastJupy', 'HTMX',
-           'ws_client', 'jupy_app']
+__all__ = ['nb_serve', 'nb_serve_async', 'is_port_free', 'wait_port_free', 'JupyUvi', 'HTMX', 'ws_client']
 
 # %% ../nbs/api/06_jupyter.ipynb
 import asyncio, socket, time, uvicorn
@@ -51,10 +50,6 @@ def wait_port_free(port, host='localhost', max_wait=3):
         if time.time() - start_time>max_wait: return print(f"Timeout")
         time.sleep(0.1)
 
-# %% ../nbs/api/06_jupyter.ipynb
-cors_allow = Middleware(CORSMiddleware, allow_credentials=True,
-                        allow_origins=["*"], allow_methods=["*"], allow_headers=["*"])
-
 # %% ../nbs/api/06_jupyter.ipynb
 class JupyUvi:
     "Start and stop a Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
@@ -71,25 +66,6 @@ class JupyUvi:
         self.server.should_exit = True
         wait_port_free(self.port)
 
-# %% ../nbs/api/06_jupyter.ipynb
-# The script lets an iframe parent know of changes so that it can resize automatically.  
-_iframe_scr = Script("""
-    function sendmsg() {
-        window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');
-    }
-    window.onload = function() {
-        sendmsg();
-        document.body.addEventListener('htmx:afterSettle',    sendmsg);
-        document.body.addEventListener('htmx:wsAfterMessage', sendmsg);
-    };""")
-
-# %% ../nbs/api/06_jupyter.ipynb
-def FastJupy(hdrs=None, middleware=None, **kwargs):
-    "Same as FastHTML, but with Jupyter compatible middleware and headers added"
-    hdrs = listify(hdrs)+[_iframe_scr]
-    middleware = listify(middleware)+[cors_allow]
-    return FastHTML(hdrs=hdrs, middleware=middleware, **kwargs)
-
 # %% ../nbs/api/06_jupyter.ipynb
 def HTMX(path="", host='localhost', port=8000, iframe_height="auto"):
     "An iframe which displays the HTMX application in a notebook."
@@ -114,10 +90,3 @@ def ws_client(app, nm='', host='localhost', port=8000, ws_connect='/ws', frame=T
     def send(o): asyncio.create_task(app._send(o))
     c.on(send)
     return c
-
-# %% ../nbs/api/06_jupyter.ipynb
-def jupy_app(pico=False, hdrs=None, middleware=None, **kwargs):
-    "Same as `fast_app` but for Jupyter notebooks"
-    hdrs = listify(hdrs)+[_iframe_scr]
-    middleware = listify(middleware)+[cors_allow]
-    return fast_app(pico=pico, hdrs=hdrs, middleware=middleware, **kwargs)

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/fasthtml/starlette.py

@@ -1,6 +1,7 @@
 from starlette.applications import Starlette
 from starlette.middleware import Middleware
 from starlette.middleware.sessions import SessionMiddleware
+from starlette.middleware.cors import CORSMiddleware
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.authentication import AuthCredentials, AuthenticationBackend, AuthenticationError, SimpleUser, requires
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0/python_fasthtml.egg-info}/PKG-INFO

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

{python-fasthtml-0.7.0 → python-fasthtml-0.8.0}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.7.0
+version = 0.8.0
 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.7.0/fasthtml/__init__.py

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