Merge pull request #50 from volfpeter/fix/multiple-actions-with-same-path-diff-method

volfpeter · web-flow · commit 7c125dcc4ac2 · 2026-01-10T14:35:54.000+01:00
Fix: allow multiple actions with same path but different method
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -1,30 +1,28 @@
 name: Build documentation
-
 on:
   push:
     branches:
       - main
-
 permissions:
-  contents: write
-
+  contents: read
+  pages: write
+  id-token: write
 jobs:
   deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Setup Python
-        uses: actions/setup-python@v6
+      - uses: actions/checkout@v5
+      - uses: actions/configure-pages@v5
+      - uses: actions/setup-python@v5
         with:
-          python-version-file: pyproject.toml
-
-      - run: pip install mkdocs-material mkdocstrings[python]
-
-      - uses: actions/cache@v4
+          python-version: 3.x
+      - run: pip install zensical mkdocstrings[python]
+      - run: zensical build --clean
+      - uses: actions/upload-pages-artifact@v4
         with:
-          key: ${{ github.ref }}
-          path: .cache
-
-      - run: mkdocs gh-deploy --force
+          path: site
+      - uses: actions/deploy-pages@v4
+        id: deployment
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -17,9 +17,9 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
-            enable-cache: true
+          enable-cache: true
 
       - name: Setup Python
         uses: actions/setup-python@v6
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,9 +17,9 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
-            enable-cache: true
+          enable-cache: true
 
       - name: Setup Python
         uses: actions/setup-python@v6
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,9 +17,9 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
-            enable-cache: true
+          enable-cache: true
 
       - name: Setup Python
         uses: actions/setup-python@v6
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,10 @@ uv.lock
 
 dist/
 
+# Docs
+
+site/
+
+# Place for local dev stuff
+
 dev/
diff --git a/holm/__init__.py b/holm/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.8.0"
+__version__ = "0.8.1"
 
 from .app import App as App
 from .fastapi import FastAPIDependency as FastAPIDependency
diff --git a/holm/app.py b/holm/app.py
@@ -135,7 +135,7 @@ def _build_api(
 
         # -- Register actions from every action owner.
         for actions in (a for a in (get_actions(page_module), get_actions(actions_module)) if a):
-            for action_path, desc in actions.items():
+            for action_key, desc in actions.items():
                 if desc.use_layout or (desc.metadata is not None):
                     # Use _make_page_path_operation() if the action requires the layout or has
                     # metadata. If one is missing, the overhead is minimal, but the code is
@@ -150,7 +150,7 @@ def _build_api(
                     # No layout or metadata. Use the most efficient route registration.
                     route = htmy.page()(desc.action)
 
-                api.api_route(action_path, **desc.route_args)(route)
+                api.api_route(action_key[0], **desc.route_args)(route)
 
     for sub_url, child_node in node.subtree.items():
         api.include_router(
diff --git a/holm/module_options/_actions.py b/holm/module_options/_actions.py
@@ -1,5 +1,5 @@
 import sys
-from collections.abc import Callable, Collection, Sequence
+from collections.abc import Callable, Sequence
 from dataclasses import dataclass
 from enum import Enum
 from typing import Any, Literal, TypeAlias, TypeGuard
@@ -41,16 +41,17 @@ class ActionDescriptor:
     """
 
 
-ActionDescriptors: TypeAlias = dict[str, ActionDescriptor]
+HTTPMethod: TypeAlias = Literal["GET", "POST", "PUT", "PATCH", "DELETE"]
+
+
+ActionDescriptors: TypeAlias = dict[tuple[str, HTTPMethod], ActionDescriptor]
 """
 Typing for the value of `_actions_variable`.
 
-Dictionary that maps action paths to action descriptors. This allows
+Dictionary that maps action path-method pairs to action descriptors. This allows
 decorator stacking (registering the same action with multiple paths).
 """
 
-HTTPMethod: TypeAlias = Literal["GET", "POST", "PUT", "PATCH", "DELETE"]
-
 
 _actions_variable = "_holm_action_descriptors"
 """The name of the variable that stores action descriptors in modules."""
@@ -89,7 +90,7 @@ def __call__(
         *,
         use_layout: bool = False,
         metadata: MetadataMappingOrDependency | None = None,
-        methods: Collection[HTTPMethod] | None = None,
+        methods: Sequence[HTTPMethod] | None = None,
         dependencies: Sequence[DependsParam] | None = None,
         deprecated: bool | None = None,
         tags: list[str | Enum] | None = None,
@@ -329,6 +330,7 @@ def _register_action(
         action: ActionDependency,
         *,
         use_layout: bool,
+        methods: Sequence[HTTPMethod] | None,
         metadata: MetadataMappingOrDependency | None,
         path: str | None,
         tags: list[str | Enum] | None,
@@ -362,9 +364,10 @@ def _register_action(
         route_args["response_model"] = None  # Don't generate a response schema.
 
         # Register the action.
-        module_actions[path] = ActionDescriptor(
-            action=action,
-            route_args=route_args,
-            use_layout=use_layout,
-            metadata=metadata,
-        )
+        for method in ("GET",) if not methods else methods:
+            module_actions[(path, method)] = ActionDescriptor(
+                action=action,
+                route_args={**route_args, "methods": (method,)},
+                use_layout=use_layout,
+                metadata=metadata,
+            )
diff --git a/holm/modules/_layout.py b/holm/modules/_layout.py
@@ -1,5 +1,4 @@
 import inspect
-from asyncio import iscoroutinefunction
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any, Protocol, TypeAlias, TypeGuard
@@ -142,7 +141,7 @@ def layout_to_dependency(layout: Layout) -> FastAPIDependency[LayoutFactory]:
         raise ValueError("Layout factory must at least one argument.")
 
     result: FastAPIDependency[LayoutFactory]
-    if iscoroutinefunction(layout):
+    if inspect.iscoroutinefunction(layout):
 
         async def async_layout_factory_dep(**kwargs: Any) -> LayoutFactory:
             async def layout_factory(props: Any) -> Any:
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -3,20 +3,26 @@ repo_name: volfpeter/holm
 repo_url: https://github.com/volfpeter/holm
 
 theme:
-  name: material
+  name: modern
   palette:
+    # Palette toggle for automatic mode
+    - media: "(prefers-color-scheme)"
+      scheme: slate
+      toggle:
+        icon: lucide/sun-moon
+        name: Switch to light mode
     # Palette toggle for light mode
     - media: "(prefers-color-scheme: light)"
       scheme: default
       toggle:
-        icon: material/brightness-7
+        icon: lucide/sun
         name: Switch to dark mode
     # Palette toggle for dark mode
     - media: "(prefers-color-scheme: dark)"
       scheme: slate
       toggle:
-        icon: material/brightness-4
-        name: Switch to light mode
+        icon: lucide/moon
+        name: Switch to system preference
   features:
     - navigation.indexes
     - navigation.instant
@@ -49,11 +55,11 @@ nav:
   - utilities.md
   - security.md
   - Guides:
-    - guides/quick-start-guide.md
-    - guides/path-parameters.md
-    - guides/actions-with-htmx.md
-    - guides/forms.md
-    - guides/rendering-apis-with-htmx.md
-    - guides/custom-applications.md
-    - guides/error-handling.md
+      - guides/quick-start-guide.md
+      - guides/path-parameters.md
+      - guides/actions-with-htmx.md
+      - guides/forms.md
+      - guides/rendering-apis-with-htmx.md
+      - guides/custom-applications.md
+      - guides/error-handling.md
   - API Reference: api.md
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,15 +18,15 @@ build-backend = "pdm.backend"
 [dependency-groups]
 dev = [
     "httpx>=0.28.1",
-    "mkdocs-material>=9.6.20",
     "mkdocstrings[python]>=0.30.1",
-    "mypy>=1.15.0",
-    "poethepoet>=0.35.0",
-    "pytest>=8.3.5",
-    "pytest-random-order>=1.1.1",
-    "ruff>=0.12.0",
+    "mypy>=1.19.1",
+    "poethepoet>=0.40.0",
+    "pytest>=9.0.0",
+    "pytest-random-order>=1.2.0",
+    "ruff>=0.14.11",
     "uvicorn>=0.34.1",
     "watchfiles>=1.1.0",
+    "zensical>=0.0.15",
 ]
 
 [tool.mypy]
@@ -100,4 +100,4 @@ check.ignore_fail = "return_non_zero"
 test.cmd = "python -m pytest tests"
 test.env = { APP_ENV = "test" }
 
-serve-docs = "mkdocs serve"
+serve-docs = "zensical serve"
diff --git a/test_app/actions.py b/test_app/actions.py
@@ -1,5 +1,7 @@
 from holm import action
 
+# -- Actions with and without custom paths and metadata
+
 
 @action.get()
 @action.get("/get/wl", use_layout=True)
@@ -36,6 +38,34 @@ def delete() -> str:
     return "DELETE action"
 
 
+# -- Multiple actions with the same name/path, but different HTTP methods
+
+
+@action.get()
+def multi() -> str:
+    return "GET"
+
+
+@action.post()  # type: ignore[no-redef]
+def multi() -> str:  # noqa: F811
+    return "POST"
+
+
+@action.put()  # type: ignore[no-redef]
+def multi() -> str:  # noqa: F811
+    return "PUT"
+
+
+@action.patch()  # type: ignore[no-redef]
+def multi() -> str:  # noqa: F811
+    return "PATCH"
+
+
+@action.delete()  # type: ignore[no-redef]
+def multi() -> str:  # noqa: F811
+    return "DELETE"
+
+
 def _in_layout(rendered_action: str, title: str = "App") -> str:
     return "\n".join(
         [
diff --git a/tests/test_actions.py b/tests/test_actions.py
@@ -25,6 +25,12 @@
         ("/put/wlm", "PUT", RenderedAction.put.use_layout_and_metadata),
         ("/patch/wlm", "PATCH", RenderedAction.patch.use_layout_and_metadata),
         ("/delete/wlm", "DELETE", RenderedAction.delete.use_layout_and_metadata),
+        # Multiple actions with the same path but different methods
+        ("/multi", "GET", "GET"),
+        ("/multi", "POST", "POST"),
+        ("/multi", "PUT", "PUT"),
+        ("/multi", "PATCH", "PATCH"),
+        ("/multi", "DELETE", "DELETE"),
     ],
 )
 def test_action(client: TestClient, action_path: str, method: str, expected: str) -> None:

-Original file line number
+Diff line change
 dist/
 +# Docs
++
 +site/
++
 +# Place for local dev stuff
++
 dev/
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "0.8.0"`
	`1`	`+__version__ = "0.8.1"`
`2`	`2`
`3`	`3`	`from .app import App as App`
`4`	`4`	`from .fastapi import FastAPIDependency as FastAPIDependency`