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

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

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

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

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

@@ -46,6 +46,7 @@ d = { 'settings': { 'branch': 'main',
                                '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.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.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'),

{python_fasthtml-0.12.32 → python_fasthtml-0.12.34}/fasthtml/cli.py

@@ -36,7 +36,7 @@ def railway_deploy(
 ):
     """Deploy a FastHTML app to Railway"""
     nm,ver = check_output("railway --version".split()).decode().split()
-    assert nm=='railway', f'Unexpected railway version string: {nm}'
+    assert nm.startswith('railway'), f'Unexpected railway version string: {nm}'
     if ver2tuple(ver)<(3,8): return print("Please update your railway CLI version to 3.8 or higher")
     cp = run("railway status --json".split(), capture_output=True)
     if not cp.returncode:

{python_fasthtml-0.12.32 → python_fasthtml-0.12.34}/fasthtml/components.py

@@ -127,6 +127,7 @@ def File(fname):
 # %% ../nbs/api/01_components.ipynb
 def show(ft, *rest, iframe=False, height='auto', style=None):
     "Renders FT Components into HTML within a Jupyter notebook."
+    if isinstance(ft, str): ft = Safe(ft)
     if rest: ft = (ft,)+rest
     res = to_xml(ft)
     if iframe:
@@ -206,14 +207,14 @@ _re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')
 def html2ft(html, attr1st=False):
     """Convert HTML to an `ft` expression"""
     rev_map = {'class': 'cls', 'for': 'fr'}
-    
+
     def _parse(elm, lvl=0, indent=4):
-        if isinstance(elm, str): return repr(elm.strip()) if elm.strip() else ''
+        if isinstance(elm, str): return repr(elm.strip("\n")) if elm.strip() else ''
         if isinstance(elm, list): return '\n'.join(_parse(o, lvl) for o in elm)
         tag_name = elm.name.capitalize().replace("-", "_")
         if tag_name=='[document]': return _parse(list(elm.children), lvl)
         cts = elm.contents
-        cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)
+        cs = [repr(c.strip("\n")) if isinstance(c, str) else _parse(c, lvl+1)
               for c in cts if str(c).strip()]
         attrs, exotic_attrs  = [], {}
         for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):

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

@@ -12,7 +12,7 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'unqid']
 
 # %% ../nbs/api/00_core.ipynb
-import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib
+import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib,httpx,itsdangerous
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -30,7 +30,6 @@ from urllib.parse import urlencode, parse_qs, quote, unquote
 from copy import copy,deepcopy
 from warnings import warn
 from dateutil import parser as dtparse
-from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
 from uuid import uuid4, UUID
 from base64 import b85encode,b64encode
@@ -449,8 +448,8 @@ def _resp(req, resp, cls=empty, status_code=200):
     if cls in (Any,FT): cls=empty
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
     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 cls is not empty: return cls(resp, status_code=status_code, **kw)
     if _is_ft_resp(resp):
         cts = _xt_cts(req, resp)
         return HTMLResponse(cts, status_code=status_code, **kw)
@@ -566,7 +565,7 @@ class FastHTML(Starlette):
                  same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey',
                  body_wrap=noop_body, htmlkw=None, nb_hdrs=False, canonical=True, **bodykw):
         middleware,before,after = map(_list, (middleware,before,after))
-        self.title,self.canonical = title,canonical
+        self.title,self.canonical,self.session_cookie,self.key_fname = title,canonical,session_cookie,key_fname
         hdrs,ftrs,exts = map(listify, (hdrs,ftrs,exts))
         exts = {k:htmx_exts[k] for k in exts}
         htmlkw = htmlkw or {}
@@ -580,9 +579,9 @@ class FastHTML(Starlette):
         on_startup,on_shutdown = listify(on_startup) or None,listify(on_shutdown) or None
         self.lifespan,self.hdrs,self.ftrs = lifespan,hdrs,ftrs
         self.body_wrap,self.before,self.after,self.htmlkw,self.bodykw = body_wrap,before,after,htmlkw,bodykw
-        secret_key = get_key(secret_key, key_fname)
+        self.secret_key = get_key(secret_key, key_fname)
         if sess_cls:
-            sess = Middleware(sess_cls, secret_key=secret_key,session_cookie=session_cookie,
+            sess = Middleware(sess_cls, secret_key=self.secret_key,session_cookie=session_cookie,
                               max_age=max_age, path=sess_path, same_site=same_site,
                               https_only=sess_https_only, domain=sess_domain)
             middleware.append(sess)
@@ -727,7 +726,7 @@ def serve(
 class Client:
     "A simple httpx ASGI client that doesn't require `async`"
     def __init__(self, app, url="http://testserver"):
-        self.cli = AsyncClient(transport=ASGITransport(app), base_url=url)
+        self.cli = httpx.AsyncClient(transport=httpx.ASGITransport(app), base_url=url)
 
     def _sync(self, method, url, **kwargs):
         async def _request(): return await self.cli.request(method, url, **kwargs)
@@ -894,3 +893,14 @@ def devtools_json(self:FastHTML, path=None, uuid=None):
     @self.route(devtools_loc)
     def devtools():
         return dict(workspace=dict(root=path, uuid=uuid))
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def get_client(self:FastHTML, asink=False, **kw):
+    "Get an httpx client with session cookes set from `**kw`"
+    signer = itsdangerous.TimestampSigner(self.secret_key)
+    data = b64encode(dumps(kw).encode())
+    data = signer.sign(data)
+    client = httpx.AsyncClient() if asink else httpx.Client()
+    client.cookies.update({self.session_cookie: data.decode()})
+    return client

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

@@ -62,9 +62,12 @@ def show(*s, **kwargs):
     return _show(*s, **kwargs)
 
 # %% ../nbs/api/06_jupyter.ipynb
-def render_ft():
+def render_ft(**kw):
+    "Call once in a notebook or solveit dialog to auto-render components"
     @patch
-    def _repr_markdown_(self:FT): return to_xml(Div(self, Script('if (window.htmx) htmx.process(document.body)')))
+    def _repr_markdown_(self:FT):
+        scr_proc = Script('if (window.htmx) htmx.process(document.body)')
+        return to_xml(Div(self, scr_proc, **kw))
 
 # %% ../nbs/api/06_jupyter.ipynb
 def htmx_config_port(port=8000):

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

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

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

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