added "body_wrap" bits to APIRouter

Author: ohmeow

fasthtml/core.py

@@ -666,10 +666,11 @@ def __dir__(self): return list(self._funcs.keys())
 # %% ../nbs/api/00_core.ipynb
 class APIRouter:
     "Add routes to an app"
-    def __init__(self, prefix:str|None=None): 
+    def __init__(self, prefix:str|None=None, body_wrap=noop_body): 
         self.routes,self.wss = [],[]
         self.rt_funcs = RouteFuncs()  # Store wrapped route function for discoverability
         self.prefix = prefix if prefix else ""
+        self.body_wrap = body_wrap
 
     def _wrap_func(self, func, path=None):
         name = func.__name__
@@ -679,12 +680,12 @@ def _wrap_func(self, func, path=None):
         if name not in all_meths: setattr(self.rt_funcs, name, wrapped)
         return wrapped
 
-    def __call__(self, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):
+    def __call__(self, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         "Add a route at `path`"
         def f(func):
             p = self.prefix + ("/" + ('' if path.__name__=='index' else func.__name__) if callable(path) else path)
             wrapped = self._wrap_func(func, p)
-            self.routes.append((func, p, methods, name, include_in_schema, body_wrap))
+            self.routes.append((func, p, methods, name, include_in_schema, body_wrap or self.body_wrap))
             return wrapped
         return f(path) if callable(path) else f
 
@@ -694,7 +695,9 @@ def __getattr__(self, name):
 
     def to_app(self, app):
         "Add routes to `app`"
-        for args in self.routes: app._add_route(*args)
+        for args in self.routes: 
+            print(args)
+            app._add_route(*args)
         for args in self.wss: app._add_ws(*args)
 
     def ws(self, path:str, conn=None, disconn=None, name=None, middleware=None):

nbs/api/00_core.ipynb

@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 12, 10, 14, 0)"
+       "datetime.datetime(2024, 12, 20, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -2423,13 +2423,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-12-10 09:54:42.331681\n"
+      "Set to 2024-12-20 19:13:21.676722\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-12-10 09:54:42.331681'"
+       "'Session time: 2024-12-20 19:13:21.676722'"
       ]
      },
      "execution_count": null,
@@ -2636,10 +2636,11 @@
     "#| export\n",
     "class APIRouter:\n",
     "    \"Add routes to an app\"\n",
-    "    def __init__(self, prefix:str|None=None): \n",
+    "    def __init__(self, prefix:str|None=None, body_wrap=noop_body): \n",
     "        self.routes,self.wss = [],[]\n",
     "        self.rt_funcs = RouteFuncs()  # Store wrapped route function for discoverability\n",
     "        self.prefix = prefix if prefix else \"\"\n",
+    "        self.body_wrap = body_wrap\n",
     "\n",
     "    def _wrap_func(self, func, path=None):\n",
     "        name = func.__name__\n",
@@ -2649,12 +2650,12 @@
     "        if name not in all_meths: setattr(self.rt_funcs, name, wrapped)\n",
     "        return wrapped\n",
     "\n",
-    "    def __call__(self, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):\n",
+    "    def __call__(self, path:str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):\n",
     "        \"Add a route at `path`\"\n",
     "        def f(func):\n",
     "            p = self.prefix + (\"/\" + ('' if path.__name__=='index' else func.__name__) if callable(path) else path)\n",
     "            wrapped = self._wrap_func(func, p)\n",
-    "            self.routes.append((func, p, methods, name, include_in_schema, body_wrap))\n",
+    "            self.routes.append((func, p, methods, name, include_in_schema, body_wrap or self.body_wrap))\n",
     "            return wrapped\n",
     "        return f(path) if callable(path) else f\n",
     "    \n",
@@ -2664,7 +2665,9 @@
     "\n",
     "    def to_app(self, app):\n",
     "        \"Add routes to `app`\"\n",
-    "        for args in self.routes: app._add_route(*args)\n",
+    "        for args in self.routes: \n",
+    "            print(args)\n",
+    "            app._add_route(*args)\n",
     "        for args in self.wss: app._add_ws(*args)\n",
     "        \n",
     "    def ws(self, path:str, conn=None, disconn=None, name=None, middleware=None):\n",
@@ -2712,7 +2715,20 @@
    "execution_count": null,
    "id": "cd413b0d",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "(<function get>, '/hi', None, None, True, <function noop_body>)\n",
+      "(<function post>, '/hi', None, None, True, <function noop_body>)\n",
+      "(<function ho>, '/ho', None, None, True, <function noop_body>)\n",
+      "(<function show_host>, '/hostie', None, None, True, <function noop_body>)\n",
+      "(<function yoyo>, '/yoyo', None, None, True, <function noop_body>)\n",
+      "(<function index>, '/', None, None, True, <function noop_body>)\n"
+     ]
+    }
+   ],
    "source": [
     "app,cli,_ = get_cli(FastHTML())\n",
     "ar.to_app(app)"
@@ -2804,7 +2820,20 @@
    "execution_count": null,
    "id": "77ce8548",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "(<function get>, '/products/hi', None, None, True, <function noop_body>)\n",
+      "(<function post>, '/products/hi', None, None, True, <function noop_body>)\n",
+      "(<function ho>, '/products/ho', None, None, True, <function noop_body>)\n",
+      "(<function show_host>, '/products/hostie', None, None, True, <function noop_body>)\n",
+      "(<function yoyo>, '/products/yoyo', None, None, True, <function noop_body>)\n",
+      "(<function index>, '/products/', None, None, True, <function noop_body>)\n"
+     ]
+    }
+   ],
    "source": [
     "app,cli,_ = get_cli(FastHTML())\n",
     "ar2.to_app(app)"
@@ -2949,7 +2978,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 09:54:43.255286'"
+       "'Cookie was set at time 19:13:22.543473'"
       ]
      },
      "execution_count": null,