python-fasthtml 0.6.10__tar.gz → 0.6.12__tar.gz

{python-fasthtml-0.6.10/python_fasthtml.egg-info → python-fasthtml-0.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.6.10
+Version: 0.6.12
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.7.10
+Requires-Dist: fastcore>=1.7.15
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

python-fasthtml-0.6.12/fasthtml/__init__.py

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

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/_modidx.py

@@ -46,6 +46,11 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.HttpHeader': ('api/core.html#httpheader', '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.Pusher': ('api/core.html#pusher', 'fasthtml/core.py'),
+                               'fasthtml.core.Pusher.__call__': ('api/core.html#pusher.__call__', 'fasthtml/core.py'),
+                               'fasthtml.core.Pusher.__init__': ('api/core.html#pusher.__init__', 'fasthtml/core.py'),
+                               'fasthtml.core.Pusher.queue': ('api/core.html#pusher.queue', 'fasthtml/core.py'),
+                               'fasthtml.core.Pusher.set_q': ('api/core.html#pusher.set_q', 'fasthtml/core.py'),
                                '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'),
@@ -60,6 +65,7 @@ d = { 'settings': { 'branch': 'main',
                                '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'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
@@ -102,8 +108,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.serve': ('api/core.html#serve', 'fasthtml/core.py'),
                                'fasthtml.core.signal_shutdown': ('api/core.html#signal_shutdown', 'fasthtml/core.py'),
                                'fasthtml.core.snake2hyphens': ('api/core.html#snake2hyphens', 'fasthtml/core.py'),
-                               'fasthtml.core.str2date': ('api/core.html#str2date', 'fasthtml/core.py'),
-                               'fasthtml.core.str2int': ('api/core.html#str2int', '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'),

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/components.py

@@ -65,16 +65,21 @@ def attrmap_x(o):
 # %% ../nbs/api/01_components.ipynb
 fh_cfg['attrmap']=attrmap_x
 fh_cfg['valmap' ]=valmap
+fh_cfg['ft_cls' ]=FT
+fh_cfg['auto_id' ]=False
 
 # %% ../nbs/api/01_components.ipynb
-def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=FT, **kwargs):
+def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, auto_id=None, **kwargs):
     ds,c = partition(c, risinstance(dict))
     for d in ds: kwargs = {**kwargs, **d}
+    if ft_cls is None: ft_cls = fh_cfg.ft_cls
     if attrmap is None: attrmap=fh_cfg.attrmap
     if valmap  is None: valmap =fh_cfg.valmap
+    if auto_id is None: auto_id = fh_cfg.auto_id
+    if auto_id and not id: id = unqid()
     kwargs['id'],kwargs['cls'],kwargs['title'],kwargs['style'] = id,cls,title,style
     tag,c,kw = ft(tag, *c, attrmap=attrmap, valmap=valmap, **kwargs).list
-    if tag in named and 'id' in kw and 'name' not in kw: kw['name'] = kw['id']
+    if tag in named and id and 'name' not in kw: kw['name'] = kw['id']
     return ft_cls(tag,c,kw, void_=tag in voids)
 
 # %% ../nbs/api/01_components.ipynb

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/core.py

@@ -3,12 +3,11 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmxsrc', 'htmxwssrc', 'fhjsscr', 'htmxctsrc', 'surrsrc', 'scopesrc',
-           'viewport', 'charset', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'str2date',
-           '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']
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'htmxwssrc', 'fhjsscr', 'htmxctsrc', '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', 'Pusher']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn,signal,asyncio,threading
@@ -31,6 +30,8 @@ from warnings import warn
 from dateutil import parser as dtparse
 from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
+from uuid import uuid4
+from base64 import b85encode,b64encode
 
 from .starlette import *
 
@@ -71,32 +72,19 @@ def _get_htmx(h):
     res = {k:h.get(v.lower(), None) for k,v in htmx_hdrs.items()}
     return HtmxHeaders(**res)
 
-# %% ../nbs/api/00_core.ipynb
-def str2int(s)->int:
-    "Convert `s` to an `int`"
-    s = s.lower()
-    if s=='on': return 1
-    if s=='none': return 0
-    return 0 if not s else int(s)
-
 # %% ../nbs/api/00_core.ipynb
 def _mk_list(t, v): return [t(o) for o in v]
 
 # %% ../nbs/api/00_core.ipynb
 fh_cfg = AttrDict(indent=True)
 
-# %% ../nbs/api/00_core.ipynb
-def str2date(s:str)->date:
-    "`date.fromisoformat` with empty string handling"
-    return date.fromisoformat(s) if s else None
-
 # %% ../nbs/api/00_core.ipynb
 def _fix_anno(t):
     "Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"
     origin = get_origin(t)
     if origin is Union or origin is UnionType or origin in (list,List):
         t = first(o for o in get_args(t) if o!=type(None))
-    d = {bool: str2bool, int: str2int, date: str2date}
+    d = {bool: str2bool, int: str2int, date: str2date, UploadFile: noop}
     res = d.get(t, t)
     if origin in (list,List): return partial(_mk_list, res)
     return lambda o: res(o[-1]) if isinstance(o,(list,tuple)) else res(o)
@@ -382,17 +370,20 @@ def _xt_cts(req, resp):
     resp = resp + tuple(getattr(req, 'injects', ()))
     http_hdrs,resp = partition(resp, risinstance(HttpHeader))
     http_hdrs = {o.k:str(o.v) for o in http_hdrs}
+    tasks,resp = partition(resp, risinstance(BackgroundTask))
+    ts = BackgroundTasks()
+    for t in tasks: ts.tasks.append(t)
     hdr_tags = 'title','meta','link','style','base'
     titles,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)
     if resp and 'hx-request' not in req.headers and not any(getattr(o, 'tag', '')=='html' for o in resp):
         if not titles: titles = [Title('FastHTML page')]
         resp = Html(Head(*titles, *flat_xt(req.hdrs)), Body(bdy, *flat_xt(req.ftrs), **req.bodykw), **req.htmlkw)
-    return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs
+    return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs, ts
 
 # %% ../nbs/api/00_core.ipynb
 def _xt_resp(req, resp):
-    cts,http_hdrs = _xt_cts(req, resp)
-    return HTMLResponse(cts, headers=http_hdrs)
+    cts,http_hdrs,tasks = _xt_cts(req, resp)
+    return HTMLResponse(cts, headers=http_hdrs, background=tasks)
 
 # %% ../nbs/api/00_core.ipynb
 def _is_ft_resp(resp): return isinstance(resp, (list,tuple,HttpHeader,FT)) or hasattr(resp, '__ft__')
@@ -472,6 +463,17 @@ class RouterX(Router):
         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", 
+    "preload": "https://unpkg.com/htmx-ext-preload@2.0.1/preload.js", 
+    "class-tools": "https://unpkg.com/htmx-ext-class-tools@2.0.1/class-tools.js", 
+    "loading-states": "https://unpkg.com/htmx-ext-loading-states@2.0.0/loading-states.js", 
+    "multi-swap": "https://unpkg.com/htmx-ext-multi-swap@2.0.0/multi-swap.js", 
+    "path-deps": "https://unpkg.com/htmx-ext-path-deps@2.0.0/path-deps.js", 
+    "remove-me": "https://unpkg.com/htmx-ext-remove-me@2.0.0/remove-me.js"
+}
+
 # %% ../nbs/api/00_core.ipynb
 htmxsrc   = Script(src="https://unpkg.com/htmx.org@next/dist/htmx.min.js")
 htmxwssrc = Script(src="https://unpkg.com/htmx-ext-ws/ws.js")
@@ -666,11 +668,53 @@ class MiddlewareBase:
 # %% ../nbs/api/00_core.ipynb
 class FtResponse:
     "Wrap an FT response with any Starlette `Response`"
-    def __init__(self, content, status_code:int=200, headers=None, cls=HTMLResponse, media_type:str|None=None, background=None):
+    def __init__(self, content, status_code:int=200, headers=None, cls=HTMLResponse, media_type:str|None=None):
         self.content,self.status_code,self.headers = content,status_code,headers
-        self.cls,self.media_type,self.background = cls,media_type,background
+        self.cls,self.media_type = cls,media_type
     
     def __response__(self, req):
-        cts,httphdrs = _xt_cts(req, self.content)
+        cts,httphdrs,tasks = _xt_cts(req, self.content)
         headers = {**(self.headers or {}), **httphdrs}
-        return self.cls(cts, status_code=self.status_code, headers=headers, media_type=self.media_type, background=self.background)
+        return self.cls(cts, status_code=self.status_code, headers=headers, media_type=self.media_type, background=tasks)
+
+# %% ../nbs/api/00_core.ipynb
+def unqid():
+    res = b64encode(uuid4().bytes)
+    return '_' + res.decode().rstrip('=').translate(str.maketrans('+/', '_-'))
+
+# %% ../nbs/api/00_core.ipynb
+def _add_ids(s):
+    if not isinstance(s, FT): return
+    if not getattr(s, 'id', None): s.id = unqid()
+    for c in s.children: _add_ids(c)
+
+# %% ../nbs/api/00_core.ipynb
+class Pusher:
+    def __init__(self, app, dest_id='_dest', auto_id=True):
+        store_attr()
+        self._queue = None
+        self('')
+        @app.route
+        def index():
+            return Div(id=self.dest_id, hx_trigger='load', hx_ext="ws",
+                       ws_send=True, ws_connect="/ws")
+    
+    @property
+    def queue(self):
+        self.set_q()
+        return self._queue
+
+    def set_q(self):
+        if self._queue: return
+        self._queue = asyncio.Queue()
+        @self.app.ws("/ws")
+        async def ws(ws, send):
+            try:
+                while True:  await send(await self.queue.get())
+            except WebSocketDisconnect: self._queue=None
+
+    def __call__(self, *s):
+        id = getattr(s[0], 'id', None)
+        if not id: s = Div(*s, hx_swap_oob='innerHTML', id=self.dest_id)
+        if self.auto_id: _add_ids(s)
+        self.queue.put_nowait(s)

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/jupyter.py

@@ -88,9 +88,9 @@ def FastJupy(hdrs=None, middleware=None, **kwargs):
     return FastHTML(hdrs=hdrs, middleware=middleware, **kwargs)
 
 # %% ../nbs/api/06_jupyter.ipynb
-def HTMX(host='localhost', port=8000, iframe_height="auto"):
+def HTMX(path="", host='localhost', port=8000, iframe_height="auto"):
     "An iframe which displays the HTMX application in a notebook."
-    return HTML(f'<iframe src="http://{host}:{port}" style="width: 100%; height: {iframe_height}; border: none;" ' + """onload="{
+    return HTML(f'<iframe src="http://{host}:{port}{str(path)}" style="width: 100%; height: {iframe_height}; border: none;" ' + """onload="{
         let frame = this;
         window.addEventListener('message', function(e) {
             if (e.data.height) frame.style.height = (e.data.height+1) + 'px';

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/live_reload.py

@@ -47,7 +47,7 @@ class FastHTMLWithLiveReload(FastHTML):
         >>> app = FastHTMLWithLiveReload()
 
         Run:
-            run_uv()
+            serve()
     """
     LIVE_RELOAD_ROUTE = WebSocketRoute("/live-reload", endpoint=live_reload_websocket)
 

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/fasthtml/starlette.py

@@ -18,3 +18,6 @@ from starlette.config import Config
 from starlette.datastructures import CommaSeparatedStrings, Secret, UploadFile, URLPath
 from starlette.types import ASGIApp, Receive, Scope, Send
 from starlette.concurrency import run_in_threadpool
+from starlette.background import BackgroundTask, BackgroundTasks
+from starlette.websockets import WebSocketDisconnect
+

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.6.10
+Version: 0.6.12
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.7.10
+Requires-Dist: fastcore>=1.7.15
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.7.10
+fastcore>=1.7.15
 python-dateutil
 starlette>0.33
 oauthlib

{python-fasthtml-0.6.10 → python-fasthtml-0.6.12}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.6.10
+version = 0.6.12
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.7.10 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
+requirements = fastcore>=1.7.15 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
 dev_requirements = ipython lxml pysymbol_llm
 black_formatting = False
 conda_user = fastai

python-fasthtml-0.6.10/fasthtml/__init__.py

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