fixes #334

Author: jph00

fasthtml/_modidx.py

@@ -74,6 +74,7 @@
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
                                'fasthtml.core.date': ('api/core.html#date', 'fasthtml/core.py'),
                                'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
+                               'fasthtml.core.flat_tuple': ('api/core.html#flat_tuple', 'fasthtml/core.py'),
                                '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.py

@@ -3,8 +3,8 @@
 # %% auto 0
 __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths',
            'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'form2dict', 'flat_xt', 'Beforeware',
-           'WS_RouteX', 'uri', 'decode_uri', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'cookie',
-           'reg_re_param', 'MiddlewareBase']
+           'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve',
+           'cookie', 'reg_re_param', 'MiddlewareBase']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn
@@ -152,6 +152,7 @@ async def _find_p(req, arg:str, p:Parameter):
         if arg.lower()=='auth': return req.scope.get('auth', None)
         if arg.lower()=='htmx': return _get_htmx(req.headers)
         if arg.lower()=='app': return req.scope['app']
+        if arg.lower()=='body': return (await req.body()).decode()
         if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())
         warn(f"`{arg} has no type annotation and is not a recognised special name, so is ignored.")
         return None
@@ -310,9 +311,20 @@ def _to_xml(req, resp, indent):
     _find_targets(req, resp)
     return to_xml(resp, indent)
 
+# %% ../nbs/api/00_core.ipynb
+def flat_tuple(o):
+    "Flatten lists"
+    result = []
+    if not isinstance(o,(tuple,list)): o=[o]
+    o = list(o)
+    for item in o:
+        if isinstance(item, (list,tuple)): result.extend(item)
+        else: result.append(item)
+    return tuple(result)
+
 # %% ../nbs/api/00_core.ipynb
 def _xt_resp(req, resp):
-    if not isinstance(resp, tuple): resp = (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}
@@ -418,7 +430,8 @@ async def _f(req, exc):
 def _mk_locfunc(f,p):
     class _lf:
         def __init__(self): update_wrapper(self, f)
-        def __call__(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')
+        def __call__(self, *args, **kw): return f(*args, **kw)
+        def rt(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')
         def __str__(self): return p
     return _lf()
 

nbs/api/00_core.ipynb

@@ -126,7 +126,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 8, 15, 14, 0)"
+       "datetime.datetime(2024, 8, 19, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -528,6 +528,7 @@
     "        if arg.lower()=='auth': return req.scope.get('auth', None)\n",
     "        if arg.lower()=='htmx': return _get_htmx(req.headers)\n",
     "        if arg.lower()=='app': return req.scope['app']\n",
+    "        if arg.lower()=='body': return (await req.body()).decode()\n",
     "        if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())\n",
     "        warn(f\"`{arg} has no type annotation and is not a recognised special name, so is ignored.\")\n",
     "        return None\n",
@@ -857,6 +858,25 @@
     "    return to_xml(resp, indent)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "a407dc0e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def flat_tuple(o):\n",
+    "    \"Flatten lists\"\n",
+    "    result = []\n",
+    "    if not isinstance(o,(tuple,list)): o=[o]\n",
+    "    o = list(o)\n",
+    "    for item in o:\n",
+    "        if isinstance(item, (list,tuple)): result.extend(item)\n",
+    "        else: result.append(item)\n",
+    "    return tuple(result)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -866,7 +886,7 @@
    "source": [
     "#| export\n",
     "def _xt_resp(req, resp):\n",
-    "    if not isinstance(resp, tuple): resp = (resp,)\n",
+    "    resp = flat_tuple(resp)\n",
     "    resp = resp + tuple(getattr(req, 'injects', ()))\n",
     "    http_hdrs,resp = partition(resp, risinstance(HttpHeader))\n",
     "    http_hdrs = {o.k:str(o.v) for o in http_hdrs}\n",
@@ -1015,7 +1035,7 @@
     {
      "data": {
       "text/plain": [
-       "'091b529e-f0be-4107-a22e-5644344a20d3'"
+       "'a604e4a2-08e8-462d-aff9-15468891fe09'"
       ]
      },
      "execution_count": null,
@@ -1065,7 +1085,8 @@
     "def _mk_locfunc(f,p):\n",
     "    class _lf:\n",
     "        def __init__(self): update_wrapper(self, f)\n",
-    "        def __call__(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')\n",
+    "        def __call__(self, *args, **kw): return f(*args, **kw)\n",
+    "        def rt(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')\n",
     "        def __str__(self): return p\n",
     "    return _lf()"
    ]
@@ -1384,7 +1405,7 @@
      "text": [
       "<!doctype html>\n",
       "\n",
-      "<html><div hx-post=\"/yoyo\">Text.</div>\n",
+      "<html><div hx-post=\"a yoyo\">Text.</div>\n",
       "</html>\n",
       "\n"
      ]
@@ -1417,7 +1438,7 @@
    ],
    "source": [
     "@app.get\n",
-    "def autopost2(): return Html(Body(Div('Text.', cls='px-2', hx_post=show_host(a='b'))))\n",
+    "def autopost2(): return Html(Body(Div('Text.', cls='px-2', hx_post=show_host.rt(a='b'))))\n",
     "print(cli.get('/autopost2').text)"
    ]
   },
@@ -1683,6 +1704,24 @@
     "test_eq(r.headers['mykey'], 'myval')"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "8a91b0af",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "@rt\n",
+    "def meta(): \n",
+    "    return ((Title('hi'),H1('hi')),\n",
+    "        (Meta(property='image'), Meta(property='site_name'))\n",
+    "   )\n",
+    "\n",
+    "t = cli.post('/meta').text\n",
+    "assert re.search('<body>\\s*<h1>hi</h1>\\s*</body>', t)\n",
+    "assert '<meta' in t"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1775,6 +1814,21 @@
     "assert \"<title>It worked!</title>\" in response and \"<p>15, Lorem</p>\" in response"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "51cd4643",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Testing POST with Content-Type: application/json\n",
+    "@app.post(\"/bodytext\")\n",
+    "def index(body): return body\n",
+    "\n",
+    "response = cli.post('/bodytext', headers={\"Content-Type\": \"application/json\"}, data=s).text\n",
+    "test_eq(response, '{\"b\": \"Lorem\", \"a\": 15}')"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1807,7 +1861,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 21:05:42.196533'"
+       "'Cookie was set at time 10:40:02.914012'"
       ]
      },
      "execution_count": null,
@@ -1837,13 +1891,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-08-15 21:05:42.225287\n"
+      "Set to 2024-08-19 10:40:03.311880\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-08-15 21:05:42.225287'"
+       "'Session time: 2024-08-19 10:40:03.311880'"
       ]
      },
      "execution_count": null,
@@ -2032,6 +2086,14 @@
     "#|hide\n",
     "import nbdev; nbdev.nbdev_export()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "2af5e721",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {