python-fasthtml 0.12.30__tar.gz → 0.12.32__tar.gz

{python_fasthtml-0.12.30/python_fasthtml.egg-info → python_fasthtml-0.12.32}/PKG-INFO

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

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

{python_fasthtml-0.12.30 → python_fasthtml-0.12.32}/fasthtml/_modidx.py

@@ -80,6 +80,7 @@ d = { 'settings': { 'branch': 'main',
                                '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._canonical': ('api/core.html#_canonical', 'fasthtml/core.py'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
                                'fasthtml.core._find_targets': ('api/core.html#_find_targets', 'fasthtml/core.py'),
                                'fasthtml.core._find_wsp': ('api/core.html#_find_wsp', 'fasthtml/core.py'),

{python_fasthtml-0.12.30 → python_fasthtml-0.12.32}/fasthtml/core.py

@@ -421,6 +421,11 @@ def _part_resp(req, resp):
     return resp,kw
 
 # %% ../nbs/api/00_core.ipynb
+def _canonical(req):
+    if not req.app.canonical: return []
+    url = str(getattr(req, 'canonical', req.url)).replace('http://', 'https://', 1)
+    return [Link(rel="canonical", href=url)]
+
 def _xt_cts(req, resp):
     "Extract content and headers, render as full page or fragment"
     hdr_tags = 'title','meta','link','style','base'
@@ -428,8 +433,7 @@ def _xt_cts(req, resp):
     heads,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)
     if not is_full_page(req, resp):
         title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]
-        canonical = [Link(rel="canonical", href=getattr(req, 'canonical', req.url))] if req.app.canonical else []
-        resp = respond(req, [*heads, *title, *canonical], bdy)
+        resp = respond(req, [*heads, *title, *_canonical(req)], bdy)
     return _to_xml(req, resp, indent=fh_cfg.indent)
 
 # %% ../nbs/api/00_core.ipynb
@@ -481,12 +485,13 @@ htmx_exts = {
     "multi-swap": "https://cdn.jsdelivr.net/npm/htmx-ext-multi-swap@2.0.0/multi-swap.js",
     "path-deps": "https://cdn.jsdelivr.net/npm/htmx-ext-path-deps@2.0.0/path-deps.js",
     "remove-me": "https://cdn.jsdelivr.net/npm/htmx-ext-remove-me@2.0.0/remove-me.js",
+    "debug": "https://unpkg.com/htmx.org@1.9.12/dist/ext/debug.js",
     "ws": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.3/ws.js",
     "chunked-transfer": "https://cdn.jsdelivr.net/npm/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js"
 }
 
 # %% ../nbs/api/00_core.ipynb
-htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.6/dist/htmx.min.js")
+htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.js")
 fhjsscr   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@1.0.12/fasthtml.js")
 surrsrc   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js")
 scopesrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js")
@@ -645,13 +650,17 @@ def ws(self:FastHTML, path:str, conn=None, disconn=None, name=None, middleware=N
     return f
 
 # %% ../nbs/api/00_core.ipynb
-def _mk_locfunc(f,p):
+def _mk_locfunc(f, p, app=None):
     "Create a location function wrapper with route path and to() method"
     class _lf:
-        def __init__(self): update_wrapper(self, f)
+        def __init__(self):
+            update_wrapper(self, f)
+            self.app = app
+
         def __call__(self, *args, **kw): return f(*args, **kw)
         def to(self, **kw): return qp(p, **kw)
         def __str__(self): return p
+
     return _lf()
 
 # %% ../nbs/api/00_core.ipynb
@@ -671,7 +680,7 @@ def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body
     if not p: p = '/'+('' if fn=='index' else fn)
     route = Route(p, endpoint=self._endp(func, body_wrap or self.body_wrap), methods=m, name=n, include_in_schema=include_in_schema)
     self.add_route(route)
-    lf = _mk_locfunc(func, p)
+    lf = _mk_locfunc(func, p, app=self)
     lf.__routename__ = n
     return lf
 

{python_fasthtml-0.12.30 → python_fasthtml-0.12.32}/fasthtml/jupyter.py

@@ -85,7 +85,7 @@ class JupyUvi:
         store_attr(but='start')
         self.server = None
         if start: self.start()
-        htmx_config_port(port)
+        if not os.environ.get('IN_SOLVEIT'): htmx_config_port(port)
 
     def start(self):
         self.server = nb_serve(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
@@ -110,15 +110,13 @@ class JupyUviAsync(JupyUvi):
         self.server.should_exit = True
         wait_port_free(self.port)
 
+# %% ../nbs/api/06_jupyter.ipynb
+from starlette.testclient import TestClient
+from html import escape
+
 # %% ../nbs/api/06_jupyter.ipynb
 def HTMX(path="/", host='localhost', app=None, port=8000, height="auto", link=False, iframe=True):
     "An iframe which displays the HTMX application in a notebook."
-    if isinstance(path, (FT,tuple,Safe)):
-        assert app, 'Need an app to render a component'
-        route = f'/{unqid()}'
-        res = path
-        app.get(route)(lambda: res)
-        path = route
     if isinstance(height, int): height = f"{height}px"
     scr = """{
         let frame = this;
@@ -129,9 +127,17 @@ def HTMX(path="/", host='localhost', app=None, port=8000, height="auto", link=Fa
     }""" if height == "auto" else ""
     proto = 'http' if host=='localhost' else 'https'
     fullpath = f"{proto}://{host}:{port}{path}" if host else path
+    src = f'src="{fullpath}"'
     if link: display(HTML(f'<a href="{fullpath}" target="_blank">Open in new tab</a>'))
+    if isinstance(path, (FT,tuple,Safe)):
+        assert app, 'Need an app to render a component'
+        route = f'/{unqid()}'
+        res = path
+        app.get(route)(lambda: res)
+        page = TestClient(app).get(route).text
+        src = f'srcdoc="{escape(page)}"'
     if iframe:
-        return HTML(f'<iframe src="{fullpath}" style="width: 100%; height: {height}; border: none;" onload="{scr}" ' + """allow="accelerometer; autoplay; camera; clipboard-read; clipboard-write; display-capture; encrypted-media; fullscreen; gamepad; geolocation; gyroscope; hid; identity-credentials-get; idle-detection; magnetometer; microphone; midi; payment; picture-in-picture; publickey-credentials-get; screen-wake-lock; serial; usb; web-share; xr-spatial-tracking"></iframe> """)
+        return HTML(f'<iframe {src} style="width: 100%; height: {height}; border: none;" onload="{scr}" ' + """allow="accelerometer; autoplay; camera; clipboard-read; clipboard-write; display-capture; encrypted-media; fullscreen; gamepad; geolocation; gyroscope; hid; identity-credentials-get; idle-detection; magnetometer; microphone; midi; payment; picture-in-picture; publickey-credentials-get; screen-wake-lock; serial; usb; web-share; xr-spatial-tracking"></iframe> """)
 
 # %% ../nbs/api/06_jupyter.ipynb
 def ws_client(app, nm='', host='localhost', port=8000, ws_connect='/ws', frame=True, link=True, **kwargs):

{python_fasthtml-0.12.30 → python_fasthtml-0.12.32/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.30
+Version: 0.12.32
 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.30 → python_fasthtml-0.12.32}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.30
+version = 0.12.32
 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.30/fasthtml/__init__.py

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