Merge branch 'main' into fix-streamingresponse-issue

Author: jph00

fasthtml/_modidx.py

@@ -46,6 +46,7 @@
                                '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'),

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:

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 @@ def _f(*c, target_id=None, **kwargs): return ft_hx(tag, *c, target_id=target_id,
 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'):

fasthtml/core.py

@@ -12,7 +12,7 @@
            '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 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
@@ -566,7 +565,7 @@ def __init__(self, debug=False, routes=None, middleware=None, title: str = "Fast
                  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 @@ def __init__(self, debug=False, routes=None, middleware=None, title: str = "Fast
         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

nbs/api/00_core.ipynb

@@ -43,7 +43,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib\n",
+    "import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib,httpx,itsdangerous\n",
     "\n",
     "from fastcore.utils import *\n",
     "from fastcore.xml import *\n",
@@ -61,7 +61,6 @@
     "from copy import copy,deepcopy\n",
     "from warnings import warn\n",
     "from dateutil import parser as dtparse\n",
-    "from httpx import ASGITransport, AsyncClient\n",
     "from anyio import from_thread\n",
     "from uuid import uuid4, UUID\n",
     "from base64 import b85encode,b64encode\n",
@@ -1692,7 +1691,7 @@
     "                 same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey',\n",
     "                 body_wrap=noop_body, htmlkw=None, nb_hdrs=False, canonical=True, **bodykw):\n",
     "        middleware,before,after = map(_list, (middleware,before,after))\n",
-    "        self.title,self.canonical = title,canonical\n",
+    "        self.title,self.canonical,self.session_cookie,self.key_fname = title,canonical,session_cookie,key_fname\n",
     "        hdrs,ftrs,exts = map(listify, (hdrs,ftrs,exts))\n",
     "        exts = {k:htmx_exts[k] for k in exts}\n",
     "        htmlkw = htmlkw or {}\n",
@@ -1706,9 +1705,9 @@
     "        on_startup,on_shutdown = listify(on_startup) or None,listify(on_shutdown) or None\n",
     "        self.lifespan,self.hdrs,self.ftrs = lifespan,hdrs,ftrs\n",
     "        self.body_wrap,self.before,self.after,self.htmlkw,self.bodykw = body_wrap,before,after,htmlkw,bodykw\n",
-    "        secret_key = get_key(secret_key, key_fname)\n",
+    "        self.secret_key = get_key(secret_key, key_fname)\n",
     "        if sess_cls:\n",
-    "            sess = Middleware(sess_cls, secret_key=secret_key,session_cookie=session_cookie,\n",
+    "            sess = Middleware(sess_cls, secret_key=self.secret_key,session_cookie=session_cookie,\n",
     "                              max_age=max_age, path=sess_path, same_site=same_site,\n",
     "                              https_only=sess_https_only, domain=sess_domain)\n",
     "            middleware.append(sess)\n",
@@ -2032,7 +2031,7 @@
     "class Client:\n",
     "    \"A simple httpx ASGI client that doesn't require `async`\"\n",
     "    def __init__(self, app, url=\"http://testserver\"):\n",
-    "        self.cli = AsyncClient(transport=ASGITransport(app), base_url=url)\n",
+    "        self.cli = httpx.AsyncClient(transport=httpx.ASGITransport(app), base_url=url)\n",
     "\n",
     "    def _sync(self, method, url, **kwargs):\n",
     "        async def _request(): return await self.cli.request(method, url, **kwargs)\n",
@@ -3963,6 +3962,25 @@
     "        return dict(workspace=dict(root=path, uuid=uuid))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "e27908c0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "@patch\n",
+    "def get_client(self:FastHTML, asink=False, **kw):\n",
+    "    \"Get an httpx client with session cookes set from `**kw`\"\n",
+    "    signer = itsdangerous.TimestampSigner(self.secret_key)\n",
+    "    data = b64encode(dumps(kw).encode())\n",
+    "    data = signer.sign(data)\n",
+    "    client = httpx.AsyncClient() if asink else httpx.Client()\n",
+    "    client.cookies.update({self.session_cookie: data.decode()})\n",
+    "    return client"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "474e14b4",
@@ -3978,7 +3996,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#|hide\n",
+    "#| hide\n",
     "import nbdev; nbdev.nbdev_export()"
    ]
   },