fixes #198

Author: jph00

fasthtml/_modidx.py

@@ -53,6 +53,7 @@
                                'fasthtml.core._mk_list': ('api/core.html#_mk_list', 'fasthtml/core.py'),
                                'fasthtml.core._resp': ('api/core.html#_resp', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('api/core.html#_send_ws', 'fasthtml/core.py'),
+                               'fasthtml.core._sig': ('api/core.html#_sig', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_call': ('api/core.html#_wrap_call', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_ex': ('api/core.html#_wrap_ex', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_req': ('api/core.html#_wrap_req', 'fasthtml/core.py'),

fasthtml/core.py

@@ -18,7 +18,7 @@
 from datetime import datetime
 from dataclasses import dataclass,fields,is_dataclass,MISSING,asdict
 from collections import namedtuple
-from inspect import isfunction,ismethod,signature,Parameter,get_annotations
+from inspect import isfunction,ismethod,Parameter,get_annotations
 from functools import wraps, partialmethod
 from http import cookies
 from copy import copy,deepcopy
@@ -27,6 +27,9 @@
 
 empty = Parameter.empty
 
+# %% ../nbs/api/00_core.ipynb
+def _sig(f): return signature_ex(f, True)
+
 # %% ../nbs/api/00_core.ipynb
 def is_typeddict(cls:type)->bool:
     "Check if `cls` is a `TypedDict`"
@@ -226,7 +229,7 @@ def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None):
     cls = type('WS_Endp', (WebSocketEndpoint,), {"encoding":"text"})
 
     async def _generic_handler(handler, ws, data=None):
-        wd = _wrap_ws(ws, loads(data) if data else {}, signature(handler).parameters)
+        wd = _wrap_ws(ws, loads(data) if data else {}, _sig(handler).parameters)
         resp = handler(*wd)
         if resp:
             if is_async_callable(handler): resp = await resp
@@ -287,7 +290,7 @@ async def _wrap_call(f, req, params):
 class RouteX(Route):
     def __init__(self, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None,
                 hdrs=None, ftrs=None, before=None, after=None, htmlkw=None, **bodykw):
-        self.sig = signature(endpoint)
+        self.sig = _sig(endpoint)
         self.f,self.hdrs,self.ftrs,self.before,self.after,self.htmlkw,self.bodykw = endpoint,hdrs,ftrs,before,after,htmlkw,bodykw
         super().__init__(path, self._endp, methods=methods, name=name, include_in_schema=include_in_schema, middleware=middleware)
 
@@ -301,10 +304,10 @@ async def _endp(self, req):
                 if isinstance(b, Beforeware): bf,skip = b.f,b.skip
                 else: bf,skip = b,[]
                 if not any(re.match(r, req.url.path) for r in skip):
-                    resp = await _wrap_call(bf, req, signature(bf).parameters)
+                    resp = await _wrap_call(bf, req, _sig(bf).parameters)
         if not resp: resp = await _wrap_call(self.f, req, self.sig.parameters)
         for a in self.after:
-            _,*wreq = await _wrap_req(req, signature(a).parameters)
+            _,*wreq = await _wrap_req(req, _sig(a).parameters)
             nr = a(resp, *wreq)
             if nr: resp = nr
         return _resp(req, resp, self.sig.return_annotation)

fasthtml/fastapp.py

@@ -60,12 +60,12 @@ def fast_app(
         **kwargs)->Any:
     h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
-    
+
     app = app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key,
                   session_cookie=session_cookie, max_age=max_age, sess_path=sess_path, same_site=same_site, sess_https_only=sess_https_only,
                   sess_domain=sess_domain, key_fname=key_fname, ws_hdr=ws_hdr, htmlkw=htmlkw, reload_attempts=reload_attempts, reload_interval=reload_interval, **(bodykw or {}))
-    
+
     @app.route("/{fname:path}.{ext:static}")
     async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
     if not db_file: return app,app.route

nbs/api/00_core.ipynb

@@ -53,7 +53,7 @@
     "from datetime import datetime\n",
     "from dataclasses import dataclass,fields,is_dataclass,MISSING,asdict\n",
     "from collections import namedtuple\n",
-    "from inspect import isfunction,ismethod,signature,Parameter,get_annotations\n",
+    "from inspect import isfunction,ismethod,Parameter,get_annotations\n",
     "from functools import wraps, partialmethod\n",
     "from http import cookies\n",
     "from copy import copy,deepcopy\n",
@@ -96,6 +96,17 @@
    "id": "19d3f2a7",
    "metadata": {},
    "outputs": [],
+   "source": [
+    "#| export\n",
+    "def _sig(f): return signature_ex(f, True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3d01cb33",
+   "metadata": {},
+   "outputs": [],
    "source": [
     "#| export\n",
     "def is_typeddict(cls:type)->bool:\n",
@@ -635,7 +646,7 @@
    "source": [
     "async def f(req):\n",
     "    def _f(p:HttpHeader): ...\n",
-    "    p = first(signature(_f).parameters.values())\n",
+    "    p = first(_sig(_f).parameters.values())\n",
     "    result = await _from_body(req, p)\n",
     "    return JSONResponse(result.__dict__)\n",
     "\n",
@@ -715,7 +726,7 @@
     "def g(req, this:Starlette, a:str, b:HttpHeader): ...\n",
     "\n",
     "async def f(req):\n",
-    "    a = await _wrap_req(req, signature(g).parameters)\n",
+    "    a = await _wrap_req(req, _sig(g).parameters)\n",
     "    return Response(str(a))\n",
     "\n",
     "app = Starlette(routes=[Route('/', f, methods=['POST'])])\n",
@@ -826,7 +837,7 @@
     "    cls = type('WS_Endp', (WebSocketEndpoint,), {\"encoding\":\"text\"})\n",
     "    \n",
     "    async def _generic_handler(handler, ws, data=None):\n",
-    "        wd = _wrap_ws(ws, loads(data) if data else {}, signature(handler).parameters)\n",
+    "        wd = _wrap_ws(ws, loads(data) if data else {}, _sig(handler).parameters)\n",
     "        resp = handler(*wd)\n",
     "        if resp:\n",
     "            if is_async_callable(handler): resp = await resp\n",
@@ -953,7 +964,7 @@
     "class RouteX(Route):\n",
     "    def __init__(self, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None,\n",
     "                hdrs=None, ftrs=None, before=None, after=None, htmlkw=None, **bodykw):\n",
-    "        self.sig = signature(endpoint)\n",
+    "        self.sig = _sig(endpoint)\n",
     "        self.f,self.hdrs,self.ftrs,self.before,self.after,self.htmlkw,self.bodykw = endpoint,hdrs,ftrs,before,after,htmlkw,bodykw\n",
     "        super().__init__(path, self._endp, methods=methods, name=name, include_in_schema=include_in_schema, middleware=middleware)\n",
     "\n",
@@ -967,10 +978,10 @@
     "                if isinstance(b, Beforeware): bf,skip = b.f,b.skip\n",
     "                else: bf,skip = b,[]\n",
     "                if not any(re.match(r, req.url.path) for r in skip):\n",
-    "                    resp = await _wrap_call(bf, req, signature(bf).parameters)\n",
+    "                    resp = await _wrap_call(bf, req, _sig(bf).parameters)\n",
     "        if not resp: resp = await _wrap_call(self.f, req, self.sig.parameters)\n",
     "        for a in self.after:\n",
-    "            _,*wreq = await _wrap_req(req, signature(a).parameters)\n",
+    "            _,*wreq = await _wrap_req(req, _sig(a).parameters)\n",
     "            nr = a(resp, *wreq)\n",
     "            if nr: resp = nr\n",
     "        return _resp(req, resp, self.sig.return_annotation)"
@@ -1598,7 +1609,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 13:26:44.481873'"
+       "'Cookie was set at time 23:01:53.591425'"
       ]
      },
      "execution_count": null,
@@ -1639,13 +1650,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-08-05 13:26:44.529004\n"
+      "Set to 2024-08-05 23:01:53.638504\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 13:26:44.529004'"
+       "'Session time: 23:01:53.638504'"
       ]
      },
      "execution_count": null,
@@ -1673,12 +1684,43 @@
       "\n",
       "<!-- do not remove -->\n",
       "\n",
-      "## 0.2.1\n",
+      "## 0.2.3\n",
+      "\n",
+      "### New Features\n",
+      "\n",
+      "- Add `attr\n"
+     ]
+    }
+   ],
+   "source": [
+    "@rt(\"/upload\")\n",
+    "async def post(uploadfile:UploadFile): return (await uploadfile.read()).decode()\n",
+    "\n",
+    "fn = '../../CHANGELOG.md'\n",
+    "data = {'message': 'Hello, world!'}\n",
+    "with open(fn, 'rb') as f:\n",
+    "    print(cli.post('/upload', files={'uploadfile': f}, data=data).text[:80])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4d17ab9c",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "# Release notes\n",
+      "\n",
+      "<!-- do not remove -->\n",
       "\n",
+      "## 0.2.3\n",
       "\n",
-      "### Bugs Squashed\n",
+      "### New Features\n",
       "\n",
-      "- railway\n"
+      "- Add `attr\n"
      ]
     }
    ],
@@ -1692,6 +1734,27 @@
     "    print(cli.post('/upload', files={'uploadfile': f}, data=data).text[:80])"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9c1863bc",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "@rt(\"/{fname:path}.{ext:static}\")\n",
+    "async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9281360c",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert 'These are the source notebooks for FastHTML' in cli.get('/README.txt').text"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

nbs/api/README.txt

@@ -0,0 +1,2 @@
+These are the source notebooks for FastHTML.
+