fixes #771

Author: jph00

fasthtml/core.py

@@ -213,7 +213,7 @@ async def _find_p(req, arg:str, p:Parameter):
     except ValueError: raise HTTPException(404, req.url.path) from None
 
 async def _wrap_req(req, params):
-    return [await _find_p(req, arg, p) for arg,p in params.items()]
+    return {arg:await _find_p(req, arg, p) for arg,p in params.items()}
 
 # %% ../nbs/api/00_core.ipynb
 def flat_xt(lst):
@@ -230,7 +230,7 @@ class Beforeware:
     def __init__(self, f, skip=None): self.f,self.skip = f,skip or []
 
 # %% ../nbs/api/00_core.ipynb
-async def _handle(f, args, **kwargs):
+async def _handle(f, *args, **kwargs):
     return (await f(*args, **kwargs)) if is_async_callable(f) else await run_in_threadpool(f, *args, **kwargs)
 
 # %% ../nbs/api/00_core.ipynb
@@ -260,12 +260,11 @@ def _find_wsp(ws, data, hdrs, arg:str, p:Parameter):
 
 def _wrap_ws(ws, data, params):
     hdrs = {k.lower().replace('-','_'):v for k,v in data.pop('HEADERS', {}).items()}
-    return [_find_wsp(ws, data, hdrs, arg, p) for arg,p in params.items()]
+    return {arg:_find_wsp(ws, data, hdrs, arg, p) for arg,p in params.items()}
 
 # %% ../nbs/api/00_core.ipynb
 async def _send_ws(ws, resp):
     if not resp: return
-#     res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple,FT)) or hasattr(resp, '__ft__') else resp
     res = to_xml(resp, indent=fh_cfg.indent)
     await ws.send_text(res)
 
@@ -274,7 +273,7 @@ def _ws_endp(recv, conn=None, disconn=None):
 
     async def _generic_handler(handler, ws, data=None):
         wd = _wrap_ws(ws, loads(data) if data else {}, _params(handler))
-        resp = await _handle(handler, wd)
+        resp = await _handle(handler, **wd)
         if resp: await _send_ws(ws, resp)
 
     async def _connect(self, ws):
@@ -469,7 +468,7 @@ def __response__(self, req):
 async def _wrap_call(f, req, params):
     "Wrap function call with request parameter injection"
     wreq = await _wrap_req(req, params)
-    return await _handle(f, wreq)
+    return await _handle(f, **wreq)
 
 # %% ../nbs/api/00_core.ipynb
 htmx_exts = {
@@ -514,7 +513,7 @@ def _wrap_ex(f, status_code, hdrs, ftrs, htmlkw, bodykw, body_wrap):
     async def _f(req, exc):
         req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (hdrs, ftrs, htmlkw, bodykw))
         req.body_wrap = body_wrap
-        res = await _handle(f, (req, exc))
+        res = await _handle(f, req, exc)
         return _resp(req, res, status_code=status_code)
     return _f
 

nbs/api/00_core.ipynb

@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2025, 8, 4, 14, 0)"
+       "datetime.datetime(2025, 8, 22, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -774,7 +774,7 @@
     "    except ValueError: raise HTTPException(404, req.url.path) from None\n",
     "\n",
     "async def _wrap_req(req, params):\n",
-    "    return [await _find_p(req, arg, p) for arg,p in params.items()]"
+    "    return {arg:await _find_p(req, arg, p) for arg,p in params.items()}"
    ]
   },
   {
@@ -787,7 +787,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[<starlette.requests.Request object>, <starlette.applications.Starlette object>, '1', HttpHeader(k='value1', v='value3')]\n"
+      "{'req': <starlette.requests.Request object>, 'this': <starlette.applications.Starlette object>, 'a': '1', 'b': HttpHeader(k='value1', v='value3')}\n"
      ]
     }
    ],
@@ -813,7 +813,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[<starlette.requests.Request object>, <starlette.applications.Starlette object>, '1', HttpHeader(k='value1', v='value3')]\n"
+      "{'req': <starlette.requests.Request object>, 'this': <starlette.applications.Starlette object>, 'a': '1', 'b': HttpHeader(k='value1', v='value3')}\n"
      ]
     }
    ],
@@ -855,7 +855,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[<starlette.requests.Request object>, <starlette.applications.Starlette object>, '']\n"
+      "{'req': <starlette.requests.Request object>, 'this': <starlette.applications.Starlette object>, 'a': ''}\n"
      ]
     }
    ],
@@ -955,7 +955,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "async def _handle(f, args, **kwargs):\n",
+    "async def _handle(f, *args, **kwargs):\n",
     "    return (await f(*args, **kwargs)) if is_async_callable(f) else await run_in_threadpool(f, *args, **kwargs)"
    ]
   },
@@ -1001,7 +1001,7 @@
     "\n",
     "def _wrap_ws(ws, data, params):\n",
     "    hdrs = {k.lower().replace('-','_'):v for k,v in data.pop('HEADERS', {}).items()}\n",
-    "    return [_find_wsp(ws, data, hdrs, arg, p) for arg,p in params.items()]"
+    "    return {arg:_find_wsp(ws, data, hdrs, arg, p) for arg,p in params.items()}"
    ]
   },
   {
@@ -1014,7 +1014,6 @@
     "#| export\n",
     "async def _send_ws(ws, resp):\n",
     "    if not resp: return\n",
-    "#     res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple,FT)) or hasattr(resp, '__ft__') else resp\n",
     "    res = to_xml(resp, indent=fh_cfg.indent)\n",
     "    await ws.send_text(res)\n",
     "\n",
@@ -1023,7 +1022,7 @@
     "\n",
     "    async def _generic_handler(handler, ws, data=None):\n",
     "        wd = _wrap_ws(ws, loads(data) if data else {}, _params(handler))\n",
-    "        resp = await _handle(handler, wd)\n",
+    "        resp = await _handle(handler, **wd)\n",
     "        if resp: await _send_ws(ws, resp)\n",
     "\n",
     "    async def _connect(self, ws):\n",
@@ -1403,7 +1402,7 @@
     "async def _wrap_call(f, req, params):\n",
     "    \"Wrap function call with request parameter injection\"\n",
     "    wreq = await _wrap_req(req, params)\n",
-    "    return await _handle(f, wreq)"
+    "    return await _handle(f, **wreq)"
    ]
   },
   {
@@ -1514,7 +1513,7 @@
     "    async def _f(req, exc):\n",
     "        req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (hdrs, ftrs, htmlkw, bodykw))\n",
     "        req.body_wrap = body_wrap\n",
-    "        res = await _handle(f, (req, exc))\n",
+    "        res = await _handle(f, req, exc)\n",
     "        return _resp(req, res, status_code=status_code)\n",
     "    return _f"
    ]
@@ -2879,13 +2878,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2025-05-29 08:31:48.235262\n"
+      "Set to 2025-08-22 01:21:53.772537\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2025-05-29 08:31:48.235262'"
+       "'Session time: 2025-08-22 01:21:53.772537'"
       ]
      },
      "execution_count": null,
@@ -3407,7 +3406,7 @@
       "     <link rel=\"canonical\" href=\"http://testserver/setcookie\">\n",
       "     <meta charset=\"utf-8\">\n",
       "     <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n",
-      "<script src=\"https://cdn.jsdelivr.net/npm/[email protected].4/dist/htmx.min.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js\"></script><script>\n",
+      "<script src=\"https://cdn.jsdelivr.net/npm/[email protected].6/dist/htmx.min.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js\"></script><script>\n",
       "    function sendmsg() {\n",
       "        window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');\n",
       "    }\n",
@@ -3424,7 +3423,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 08:31:49.013668'"
+       "'Cookie was set at time 01:21:59.994611'"
       ]
      },
      "execution_count": null,