refactor qp

Author: jph00

fasthtml/core.py

@@ -478,14 +478,12 @@ async def _f(req, exc):
 # %% ../nbs/api/00_core.ipynb
 def qp(p:str, **kw) -> str:
     "Add parameters kw to path p"
-    kw = {k.split(':')[0]:v for k,v in kw.items()}
-    for k,v in kw.copy().items():
-        for pat in [f"{{{k}}}", f"{{{k}:"]: 
-            if pat in p: 
-                # encode path params
-                p = p.replace(p[p.find(pat):p.find("}", p.find(pat))+1], str(v))
-                kw.pop(k) 
-                break
+    def _sub(m):
+        pre,post = m.groups()
+        if pre not in kw: return f'{{{pre}{post or ""}}}'
+        pre = kw.pop(pre)
+        return '' if pre in (False,None) else str(pre)
+    p = re.sub(r'\{([^:}]+)(:.+?)?}', _sub, p)
     # encode query params
     return p + ('?' + urlencode({k:'' if v in (False,None) else v for k,v in kw.items()},doseq=True) if kw else '')
 

nbs/api/00_core.ipynb

@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2025, 1, 30, 14, 0)"
+       "datetime.datetime(2025, 1, 31, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -1230,7 +1230,7 @@
     {
      "data": {
       "text/plain": [
-       "'7293b76e-03e7-4cba-9a48-346d25aa5f32'"
+       "'cc87253c-bfc1-4544-bbc0-58dd8d3291bc'"
       ]
      },
      "execution_count": null,
@@ -1273,141 +1273,70 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "271b920a",
+   "id": "bc323fd4",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| export\n",
     "def qp(p:str, **kw) -> str:\n",
     "    \"Add parameters kw to path p\"\n",
-    "    kw = {k.split(':')[0]:v for k,v in kw.items()}\n",
-    "    for k,v in kw.copy().items():\n",
-    "        for pat in [f\"{{{k}}}\", f\"{{{k}:\"]: \n",
-    "            if pat in p: \n",
-    "                # encode path params\n",
-    "                p = p.replace(p[p.find(pat):p.find(\"}\", p.find(pat))+1], str(v))\n",
-    "                kw.pop(k) \n",
-    "                break\n",
+    "    def _sub(m):\n",
+    "        pre,post = m.groups()\n",
+    "        if pre not in kw: return f'{{{pre}{post or \"\"}}}'\n",
+    "        pre = kw.pop(pre)\n",
+    "        return '' if pre in (False,None) else str(pre)\n",
+    "    p = re.sub(r'\\{([^:}]+)(:.+?)?}', _sub, p)\n",
     "    # encode query params\n",
     "    return p + ('?' + urlencode({k:'' if v in (False,None) else v for k,v in kw.items()},doseq=True) if kw else '')"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "40507fbf",
+   "cell_type": "markdown",
+   "id": "e51e2dc3",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "vals = {'a':5, 'b':False, 'c':[1,2], 'd':'bar', 'e':None, 'ab:cd':42}"
+    "`qp` adds query parameters to route path strings"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "6bd3945d",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/foo/5/bar/42?b=&c=1&c=2&e='"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "res = qp('/foo/{a}/{d}/{ab:int}', **vals)\n",
-    "assert res == '/foo/5/bar/42?b=&c=1&c=2&e='\n",
-    "res"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "e51e2dc3",
+   "id": "ff82dc78",
    "metadata": {},
+   "outputs": [],
    "source": [
-    "`qp` adds query parameters to route path strings"
+    "vals = {'a':5, 'b':False, 'c':[1,2], 'd':'bar', 'e':None, 'ab':42}"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "id": "c0836a8f",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/foo?a=5&b=&c=1&c=2&d=bar&e=&ab=42'"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "res = qp('/foo', **vals)\n",
-    "assert res == '/foo?a=5&b=&c=1&c=2&d=bar&e=&ab=42'\n",
-    "res"
+    "test_eq(res, '/foo?a=5&b=&c=1&c=2&d=bar&e=&ab=42')"
    ]
   },
   {
    "cell_type": "markdown",
    "id": "4740272f",
    "metadata": {},
    "source": [
-    "`qp` checks to see if it should be sent as a query parameter or as part of the route and encodes that properly."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "bd4d1630",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/foo/5/bar?b=&c=1&c=2&e=&ab=42'"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "res = qp('/foo/{a}/{d}', **vals)\n",
-    "assert res == '/foo/5/bar?b=&c=1&c=2&e=&ab=42'\n",
-    "res"
+    "`qp` checks to see if each param should be sent as a query parameter or as part of the route, and encodes that properly."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "85a243b5",
+   "id": "50ebb1ee",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/foo/5/bar/42?b=&c=1&c=2&e='"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "res = qp('/foo/{a}/{d}/{ab:int}', **vals)\n",
-    "assert res == '/foo/5/bar/42?b=&c=1&c=2&e='\n",
-    "res"
+    "path = '/foo/{a}/{d}/{ab:int}'\n",
+    "res = qp(path, **vals)\n",
+    "test_eq(res, '/foo/5/bar/42?b=&c=1&c=2&e=')"
    ]
   },
   {
@@ -2648,13 +2577,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2025-01-12 14:12:46.576323\n"
+      "Set to 2025-01-31 14:35:31.433371\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2025-01-12 14:12:46.576323'"
+       "'Session time: 2025-01-31 14:35:31.433371'"
       ]
      },
      "execution_count": null,
@@ -3175,7 +3104,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 14:12:47.159530'"
+       "'Cookie was set at time 14:35:32.085198'"
       ]
      },
      "execution_count": null,