fixes #741

jph00 · jph00 · commit 601297dfaf73 · 2025-05-29T13:33:02.000+10:00
diff --git a/fasthtml/core.py b/fasthtml/core.py
@@ -11,7 +11,7 @@
            'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
 
 # %% ../nbs/api/00_core.ipynb
-import json,uuid,inspect,types,signal,asyncio,threading,inspect
+import json,uuid,inspect,types,signal,asyncio,threading,inspect,random
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -31,7 +31,7 @@
 from dateutil import parser as dtparse
 from httpx import ASGITransport, AsyncClient
 from anyio import from_thread
-from uuid import uuid4
+from uuid import uuid4, UUID
 from base64 import b85encode,b64encode
 
 from .starlette import *
@@ -810,8 +810,9 @@ def __response__(self, req):
         return self.cls(cts, status_code=self.status_code, headers=headers, media_type=self.media_type, background=tasks)
 
 # %% ../nbs/api/00_core.ipynb
-def unqid():
-    res = b64encode(uuid4().bytes)
+def unqid(seeded=False):
+    id4 = UUID(int=random.getrandbits(128), version=4) if seeded else uuid4()
+    res = b64encode(id4.bytes)
     return '_' + res.decode().rstrip('=').translate(str.maketrans('+/', '_-'))
 
 # %% ../nbs/api/00_core.ipynb
diff --git a/nbs/api/00_core.ipynb b/nbs/api/00_core.ipynb
@@ -43,7 +43,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "import json,uuid,inspect,types,signal,asyncio,threading,inspect\n",
+    "import json,uuid,inspect,types,signal,asyncio,threading,inspect,random\n",
     "\n",
     "from fastcore.utils import *\n",
     "from fastcore.xml import *\n",
@@ -63,7 +63,7 @@
     "from dateutil import parser as dtparse\n",
     "from httpx import ASGITransport, AsyncClient\n",
     "from anyio import from_thread\n",
-    "from uuid import uuid4\n",
+    "from uuid import uuid4, UUID\n",
     "from base64 import b85encode,b64encode\n",
     "\n",
     "from fasthtml.starlette import *"
@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2025, 5, 19, 14, 0)"
+       "datetime.datetime(2025, 5, 29, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -754,7 +754,6 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "b'{}'\n",
       "[<starlette.requests.Request object>, <starlette.applications.Starlette object>, '']\n"
      ]
     }
@@ -789,7 +788,6 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "b'{}'\n",
       "Missing required field: a\n"
      ]
     }
@@ -2615,15 +2613,7 @@
    "execution_count": null,
    "id": "73363a37",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "b'{\"b\": \"Lorem\", \"a\": 15}'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Testing POST with Content-Type: application/json\n",
     "@app.post(\"/\")\n",
@@ -2716,13 +2706,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2025-05-19 11:46:01.972924\n"
+      "Set to 2025-05-29 08:31:48.235262\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2025-05-19 11:46:01.972924'"
+       "'Session time: 2025-05-29 08:31:48.235262'"
       ]
      },
      "execution_count": null,
@@ -3241,6 +3231,7 @@
       " <html>\n",
       "   <head>\n",
       "     <title>FastHTML page</title>\n",
+      "     <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/htmx.org@2.0.4/dist/htmx.min.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@1.0.12/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",
@@ -3260,7 +3251,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 11:46:35.877920'"
+       "'Cookie was set at time 08:31:49.013668'"
       ]
      },
      "execution_count": null,
@@ -3592,8 +3583,9 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def unqid():\n",
-    "    res = b64encode(uuid4().bytes)\n",
+    "def unqid(seeded=False):\n",
+    "    id4 = UUID(int=random.getrandbits(128), version=4) if seeded else uuid4()\n",
+    "    res = b64encode(id4.bytes)\n",
     "    return '_' + res.decode().rstrip('=').translate(str.maketrans('+/', '_-'))"
    ]
   },
