fixes #387

AnswerDotAI · Aug 31, 2024 · c7e3258 · c7e3258
1 parent 976a018
commit c7e3258
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 11 deletions.
diff --git a/examples/basic_app.py b/examples/basic_app.py
@@ -28,7 +28,7 @@ def get(id:int):
     return fill_form(res, todos[id])
 
 @rt("/")
-def put(todo: Todo): return todos.upsert(todo), clear('current-todo')
+def put(todo: Todo): return todos.update(todo), clear('current-todo')
 
 @rt("/todos/{id}")
 def get(id:int):

diff --git a/fasthtml/_modidx.py b/fasthtml/_modidx.py
@@ -29,6 +29,8 @@
                                'fasthtml.core.FastHTML': ('api/core.html#fasthtml', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.__init__': ('api/core.html#fasthtml.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.route': ('api/core.html#fasthtml.route', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.static_route': ('api/core.html#fasthtml.static_route', 'fasthtml/core.py'),
+                               'fasthtml.core.FastHTML.static_route_exts': ('api/core.html#fasthtml.static_route_exts', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.ws': ('api/core.html#fasthtml.ws', 'fasthtml/core.py'),
                                'fasthtml.core.HTTPConnection.url_path_for': ( 'api/core.html#httpconnection.url_path_for',
                                                                               'fasthtml/core.py'),

diff --git a/fasthtml/core.py b/fasthtml/core.py
@@ -565,6 +565,19 @@ def reg_re_param(m, s):
 reg_re_param("path", ".*?")
 reg_re_param("static", "ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map")
 
+@patch
+def static_route_exts(self:FastHTML, prefix='/', static_path='.', exts='static'):
+    "Add a static route at URL path `prefix` with files from `static_path` and `exts` defined by `reg_re_param()`"
+    @app.route(f"{prefix}{{fname:path}}.{{ext:{exts}}}")
+    async def get(fname:str, ext:str): return FileResponse(f'{static_path}/{fname}.{ext}')
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def static_route(self:FastHTML, ext='', prefix='/', static_path='.'):
+    "Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')"
+    @app.route(f"{prefix}{{fname:path}}{ext}")
+    async def get(fname:str): return FileResponse(f'{static_path}/{fname}{ext}')
+
 # %% ../nbs/api/00_core.ipynb
 class MiddlewareBase:
     async def __call__(self, scope, receive, send) -> None:

diff --git a/nbs/api/00_core.ipynb b/nbs/api/00_core.ipynb
@@ -127,7 +127,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 8, 31, 14, 0)"
+       "datetime.datetime(2024, 9, 1, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -1297,7 +1297,28 @@
     "#| export\n",
     "# Starlette doesn't have the '?', so it chomps the whole remaining URL\n",
     "reg_re_param(\"path\", \".*?\")\n",
-    "reg_re_param(\"static\", \"ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map\")"
+    "reg_re_param(\"static\", \"ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map\")\n",
+    "\n",
+    "@patch\n",
+    "def static_route_exts(self:FastHTML, prefix='/', static_path='.', exts='static'):\n",
+    "    \"Add a static route at URL path `prefix` with files from `static_path` and `exts` defined by `reg_re_param()`\"\n",
+    "    @app.route(f\"{prefix}{{fname:path}}.{{ext:{exts}}}\")\n",
+    "    async def get(fname:str, ext:str): return FileResponse(f'{static_path}/{fname}.{ext}')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3dbef25a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "@patch\n",
+    "def static_route(self:FastHTML, ext='', prefix='/', static_path='.'):\n",
+    "    \"Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')\"\n",
+    "    @app.route(f\"{prefix}{{fname:path}}{ext}\")\n",
+    "    async def get(fname:str): return FileResponse(f'{static_path}/{fname}{ext}')"
    ]
   },
   {
@@ -1661,7 +1682,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "0bfd7af6",
+   "id": "dd017867",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1916,7 +1937,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 17:01:39.973522'"
+       "'Cookie was set at time 02:06:07.683225'"
       ]
      },
      "execution_count": null,
@@ -1946,13 +1967,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-08-30 17:01:40.008995\n"
+      "Set to 2024-09-01 02:06:07.701151\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-08-30 17:01:40.008995'"
+       "'Session time: 2024-09-01 02:06:07.701151'"
       ]
      },
      "execution_count": null,
@@ -2021,13 +2042,22 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9c1863bc",
+   "id": "46b2e24f",
    "metadata": {},
    "outputs": [],
    "source": [
-    "@rt(\"/{fname:path}.{ext:static}\")\n",
-    "async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')\n",
-    "\n",
+    "app.static_route('.md', static_path='../..')\n",
+    "assert 'THIS FILE WAS AUTOGENERATED' in cli.get('/README.md').text"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0ed44d28",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "app.static_route_exts()\n",
     "assert 'These are the source notebooks for FastHTML' in cli.get('/README.txt').text"
    ]
   },