fixes #439

Author: jph00

fasthtml/core.py

@@ -167,6 +167,7 @@ async def _from_body(req, p):
     d = _annotations(anno)
     if req.headers.get('content-type', None)=='application/json': data = await req.json()
     else: data = form2dict(await parse_form(req))
+    if req.query_params: data = {**data, **dict(req.query_params)}
     cargs = {k: _form_arg(k, v, d) for k, v in data.items() if not d or k in d}
     return anno(**cargs)
 

nbs/api/00_core.ipynb

@@ -129,7 +129,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 9, 17, 14, 0)"
+       "datetime.datetime(2024, 9, 19, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -588,7 +588,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "0b6ac588",
+   "id": "33d3bc16",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -599,6 +599,7 @@
     "    d = _annotations(anno)\n",
     "    if req.headers.get('content-type', None)=='application/json': data = await req.json()\n",
     "    else: data = form2dict(await parse_form(req))\n",
+    "    if req.query_params: data = {**data, **dict(req.query_params)}\n",
     "    cargs = {k: _form_arg(k, v, d) for k, v in data.items() if not d or k in d}\n",
     "    return anno(**cargs)"
    ]
@@ -734,6 +735,34 @@
     "print(response.text)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "a3ded5ec",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[<starlette.requests.Request object>, <starlette.applications.Starlette object>, '1', HttpHeader(k='value1', v='value3')]\n"
+     ]
+    }
+   ],
+   "source": [
+    "def g(req, this:Starlette, a:str, b:HttpHeader): ...\n",
+    "\n",
+    "async def f(req):\n",
+    "    a = await _wrap_req(req, _sig(g).parameters)\n",
+    "    return Response(str(a))\n",
+    "\n",
+    "app = Starlette(routes=[Route('/', f, methods=['POST'])])\n",
+    "client = TestClient(app)\n",
+    "\n",
+    "response = client.post('/?a=1', data=d)\n",
+    "print(response.text)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -2084,7 +2113,7 @@
     "    a:int|None; b:str\n",
     "    def __init__(self, a, b='foo'): store_attr()\n",
     "\n",
-    "@app.post(\"/bodie2/\")\n",
+    "@rt(\"/bodie2/\", methods=['get','post'])\n",
     "def bodie(d:Bodie2): return f\"a: {d.a}; b: {d.b}\""
    ]
   },
@@ -2101,7 +2130,24 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "6c1fbc4b",
+   "id": "48f0a45e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = dict(a=1, b='foo')\n",
+    "\n",
+    "test_r(cli, '/bodie/me', '{\"a\":1,\"b\":\"foo\",\"nm\":\"me\"}', 'post', data=dict(a=1, b='foo', nm='me'))\n",
+    "test_r(cli, '/bodied/', '{\"a\":\"1\",\"b\":\"foo\"}', 'post', data=d)\n",
+    "test_r(cli, '/bodie2/', 'a: 1; b: foo', 'post', data={'a':1})\n",
+    "test_r(cli, '/bodie2/?a=1&b=foo&nm=me', 'a: 1; b: foo')\n",
+    "test_r(cli, '/bodient/', '{\"a\":\"1\",\"b\":\"foo\"}', 'post', data=d)\n",
+    "test_r(cli, '/bodietd/', '{\"a\":1,\"b\":\"foo\"}', 'post', data=d)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "73363a37",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2117,7 +2163,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "51cd4643",
+   "id": "0aeaac36",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2129,22 +2175,6 @@
     "test_eq(response, '{\"b\": \"Lorem\", \"a\": 15}')"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "48f0a45e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "d = dict(a=1, b='foo')\n",
-    "\n",
-    "test_r(cli, '/bodie/me', '{\"a\":1,\"b\":\"foo\",\"nm\":\"me\"}', 'post', data=dict(a=1, b='foo', nm='me'))\n",
-    "test_r(cli, '/bodied/', '{\"a\":\"1\",\"b\":\"foo\"}', 'post', data=d)\n",
-    "test_r(cli, '/bodie2/', 'a: 1; b: foo', 'post', data={'a':1})\n",
-    "test_r(cli, '/bodient/', '{\"a\":\"1\",\"b\":\"foo\"}', 'post', data=d)\n",
-    "test_r(cli, '/bodietd/', '{\"a\":1,\"b\":\"foo\"}', 'post', data=d)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -2155,13 +2185,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-09-15 07:09:53.847227\n"
+      "Set to 2024-09-19 11:49:19.536169\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-09-15 07:09:53.847227'"
+       "'Session time: 2024-09-19 11:49:19.536169'"
       ]
      },
      "execution_count": null,
@@ -2392,7 +2422,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 07:09:55.075607'"
+       "'Cookie was set at time 11:49:19.827380'"
       ]
      },
      "execution_count": null,