fixes #827

Author: jph00

fasthtml/core.py

@@ -183,6 +183,7 @@ async def _find_p(req, arg:str, p:Parameter):
         if issubclass(anno, HtmxHeaders): return _get_htmx(req.headers)
         if issubclass(anno, Starlette): return req.scope['app']
         if _is_body(anno) and 'session'.startswith(arg.lower()): return req.scope.get('session', {})
+        if issubclass(anno, State): return req.scope['app'].state
         if _is_body(anno): return await _from_body(req, p)
     # If there's no annotation, check for special names
     if anno is empty:
@@ -193,6 +194,7 @@ async def _find_p(req, arg:str, p:Parameter):
         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()=='state': return req.scope['app'].state
         if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())
         if arg!='resp': warn(f"`{arg} has no type annotation and is not a recognised special name, so is ignored.")
         return None

fasthtml/starlette.py

@@ -16,7 +16,7 @@
 from starlette.exceptions import HTTPException,WebSocketException
 from starlette.endpoints import HTTPEndpoint,WebSocketEndpoint
 from starlette.config import Config
-from starlette.datastructures import CommaSeparatedStrings, Secret, UploadFile, URLPath
+from starlette.datastructures import CommaSeparatedStrings, Secret, UploadFile, URLPath, State
 from starlette.types import ASGIApp, Receive, Scope, Send
 from starlette.concurrency import run_in_threadpool
 from starlette.background import BackgroundTask, BackgroundTasks

nbs/api/00_core.ipynb

@@ -130,7 +130,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2025, 11, 19, 14, 0)"
+       "datetime.datetime(2026, 2, 6, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -743,6 +743,7 @@
     "        if issubclass(anno, HtmxHeaders): return _get_htmx(req.headers)\n",
     "        if issubclass(anno, Starlette): return req.scope['app']\n",
     "        if _is_body(anno) and 'session'.startswith(arg.lower()): return req.scope.get('session', {})\n",
+    "        if issubclass(anno, State): return req.scope['app'].state\n",
     "        if _is_body(anno): return await _from_body(req, p)\n",
     "    # If there's no annotation, check for special names\n",
     "    if anno is empty:\n",
@@ -753,6 +754,7 @@
     "        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()=='state': return req.scope['app'].state\n",
     "        if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())\n",
     "        if arg!='resp': warn(f\"`{arg} has no type annotation and is not a recognised special name, so is ignored.\")\n",
     "        return None\n",
@@ -786,12 +788,12 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "{'req': <starlette.requests.Request object>, 'this': <starlette.applications.Starlette object>, 'a': '1', 'b': HttpHeader(k='value1', v='value3')}\n"
+      "{'req': <starlette.requests.Request object>, 'this': <starlette.applications.Starlette object>, 'a': '1', 'b': HttpHeader(k='value1', v='value3'), 'state': <starlette.datastructures.State object>}\n"
      ]
     }
    ],
    "source": [
-    "def g(req, this:Starlette, a:str, b:HttpHeader): ...\n",
+    "def g(req, this:Starlette, a:str, b:HttpHeader, state): ...\n",
     "\n",
     "async def f(req):\n",
     "    a = await _wrap_req(req, _params(g))\n",
@@ -3953,14 +3955,6 @@
     "#| hide\n",
     "import nbdev; nbdev.nbdev_export()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "bf47445c",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {},

nbs/api/08_oauth.ipynb

@@ -340,30 +340,10 @@
    "execution_count": null,
    "id": "b4dd67a9",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "\n",
-       "<script>\n",
-       "document.body.addEventListener('htmx:configRequest', (event) => {\n",
-       "    if(event.detail.path.includes('://')) return;\n",
-       "    htmx.config.selfRequestsOnly=false;\n",
-       "    event.detail.path = `${location.protocol}//${location.hostname}:8000${event.detail.path}`;\n",
-       "});\n",
-       "</script>"
-      ],
-      "text/plain": [
-       "<IPython.core.display.HTML object>"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "app,rt = fast_app()\n",
-    "server = JupyUvi(app, port=port)"
+    "# app,rt = fast_app()\n",
+    "# server = JupyUvi(app, port=port)"
    ]
   },
   {
@@ -915,23 +895,9 @@
     "#| hide\n",
     "import nbdev; nbdev.nbdev_export()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e0f7a90b",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "python3",
-   "language": "python",
-   "name": "python3"
-  }
- },
+ "metadata": {},
  "nbformat": 4,
  "nbformat_minor": 5
 }