python-fasthtml 0.12.16__tar.gz → 0.12.17__tar.gz

{python_fasthtml-0.12.16/python_fasthtml.egg-info → python_fasthtml-0.12.17}/PKG-INFO

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

python_fasthtml-0.12.17/fasthtml/__init__.py

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

{python_fasthtml-0.12.16 → python_fasthtml-0.12.17}/fasthtml/_modidx.py

@@ -90,6 +90,7 @@ d = { 'settings': { 'branch': 'main',
                                '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._part_resp': ('api/core.html#_part_resp', '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._to_htmx_header': ('api/core.html#_to_htmx_header', 'fasthtml/core.py'),
@@ -101,7 +102,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._wrap_ws': ('api/core.html#_wrap_ws', 'fasthtml/core.py'),
                                'fasthtml.core._ws_endp': ('api/core.html#_ws_endp', 'fasthtml/core.py'),
                                'fasthtml.core._xt_cts': ('api/core.html#_xt_cts', 'fasthtml/core.py'),
-                               'fasthtml.core._xt_resp': ('api/core.html#_xt_resp', 'fasthtml/core.py'),
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
                                'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
                                'fasthtml.core.def_hdrs': ('api/core.html#def_hdrs', 'fasthtml/core.py'),
@@ -109,6 +109,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.flat_xt': ('api/core.html#flat_xt', 'fasthtml/core.py'),
                                'fasthtml.core.form2dict': ('api/core.html#form2dict', 'fasthtml/core.py'),
                                'fasthtml.core.get_key': ('api/core.html#get_key', 'fasthtml/core.py'),
+                               'fasthtml.core.is_full_page': ('api/core.html#is_full_page', 'fasthtml/core.py'),
                                'fasthtml.core.nested_name': ('api/core.html#nested_name', 'fasthtml/core.py'),
                                'fasthtml.core.noop_body': ('api/core.html#noop_body', 'fasthtml/core.py'),
                                'fasthtml.core.parse_form': ('api/core.html#parse_form', 'fasthtml/core.py'),

{python_fasthtml-0.12.16 → python_fasthtml-0.12.17}/fasthtml/core.py

@@ -7,8 +7,8 @@ __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', 'JSONResponse', 'flat_xt',
            'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond',
-           'Redirect', 'get_key', 'qp', 'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client', 'RouteFuncs',
-           'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
+           'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client',
+           'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,signal,asyncio,threading,inspect
@@ -389,25 +389,35 @@ def respond(req, heads, bdy):
     return Html(Head(*heads, *flat_xt(req.hdrs)), body, **req.htmlkw)
 
 # %% ../nbs/api/00_core.ipynb
-def _xt_cts(req, resp):
+def is_full_page(req, resp):
+    is_frag = 'hx-request' in req.headers and 'hx-history-restore-request' not in req.headers
+    return (resp and not is_frag and not any(getattr(o, 'tag', '')=='html' for o in resp))
+
+# %% ../nbs/api/00_core.ipynb
+def _part_resp(req, resp):
     resp = flat_tuple(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)
+    kw = {"headers": {"vary": "HX-Request, HX-History-Restore-Request"}}
+    if http_hdrs: kw['headers'] |= {o.k:str(o.v) for o in http_hdrs}
+    if tasks:
+        ts = BackgroundTasks()
+        for t in tasks: ts.tasks.append(t)
+        kw['background'] = ts
+    resp = tuple(resp)
+    if len(resp)==1: resp = resp[0]
+    return resp,kw
+
+# %% ../nbs/api/00_core.ipynb
+def _xt_cts(req, resp):
     hdr_tags = 'title','meta','link','style','base'
+    resp = tuplify(resp)
     heads,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 is_full_page(req, resp):
         title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]
         resp = respond(req, [*heads, *title], bdy)
-    return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs, ts
-
-# %% ../nbs/api/00_core.ipynb
-def _xt_resp(req, resp, status_code):
-    cts,http_hdrs,tasks = _xt_cts(req, resp)
-    return HTMLResponse(cts, status_code=status_code, headers=http_hdrs, background=tasks)
+    return _to_xml(req, resp, indent=fh_cfg.indent)
 
 # %% ../nbs/api/00_core.ipynb
 def _is_ft_resp(resp): return isinstance(resp, _iter_typs+(HttpHeader,FT)) or hasattr(resp, '__ft__')
@@ -418,15 +428,18 @@ def _resp(req, resp, cls=empty, status_code=200):
     if hasattr(resp, '__response__'): resp = resp.__response__(req)
     if cls in (Any,FT): cls=empty
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
-    if cls is not empty: return cls(resp, status_code=status_code)
-    if isinstance(resp, Response): return resp # respect manually set status_code
-    if _is_ft_resp(resp): return _xt_resp(req, resp, status_code)
+    resp,kw = _part_resp(req, resp)
+    if cls is not empty: return cls(resp, status_code=status_code, **kw)
+    if isinstance(resp, Response): return resp
+    if _is_ft_resp(resp):
+        cts = _xt_cts(req, resp)
+        return HTMLResponse(cts, status_code=status_code, **kw)
     if isinstance(resp, str): cls = HTMLResponse
     elif isinstance(resp, Mapping): cls = JSONResponse
     else:
         resp = str(resp)
         cls = HTMLResponse
-    return cls(resp, status_code=status_code)
+    return cls(resp, status_code=status_code, **kw)
 
 # %% ../nbs/api/00_core.ipynb
 class Redirect:
@@ -788,8 +801,10 @@ class FtResponse:
         self.cls,self.media_type,self.background = cls,media_type,background
 
     def __response__(self, req):
-        cts,httphdrs,tasks = _xt_cts(req, self.content)
-        if not tasks.tasks: tasks = self.background
+        resp,kw = _part_resp(req, self.content)
+        cts = _xt_cts(req, resp)
+        tasks,httphdrs = kw.get('background'),kw.get('headers')
+        if not tasks: tasks = self.background
         headers = {**(self.headers or {}), **httphdrs}
         return self.cls(cts, status_code=self.status_code, headers=headers, media_type=self.media_type, background=tasks)
 

{python_fasthtml-0.12.16 → python_fasthtml-0.12.17/python_fasthtml.egg-info}/PKG-INFO

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

{python_fasthtml-0.12.16 → python_fasthtml-0.12.17}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.16
+version = 0.12.17
 min_python = 3.10
 license = apache2
 requirements = fastcore>=1.8.1 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.1.1 python-multipart beautifulsoup4

python_fasthtml-0.12.16/fasthtml/__init__.py

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