Preserve websocket's name as a positional argument

tiangolo · Oct 4, 2022 · e4ddcb8 · e4ddcb8
1 parent 3945a32
commit e4ddcb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/fastapi/applications.py b/fastapi/applications.py
@@ -392,30 +392,30 @@ def add_api_websocket_route(
         self,
         path: str,
         endpoint: Callable[..., Any],
+        name: Optional[str] = None,
         *,
         dependencies: Optional[Sequence[Depends]] = None,
-        name: Optional[str] = None,
     ) -> None:
         self.router.add_api_websocket_route(
             path,
             endpoint,
-            dependencies=dependencies,
             name=name,
+            dependencies=dependencies,
         )
 
     def websocket(
         self,
         path: str,
+        name: Optional[str] = None,
         *,
         dependencies: Optional[Sequence[Depends]] = None,
-        name: Optional[str] = None,
     ) -> Callable[[DecoratedCallable], DecoratedCallable]:
         def decorator(func: DecoratedCallable) -> DecoratedCallable:
             self.add_api_websocket_route(
                 path,
                 func,
-                dependencies=dependencies,
                 name=name,
+                dependencies=dependencies,
             )
             return func
 

diff --git a/fastapi/routing.py b/fastapi/routing.py
@@ -291,14 +291,14 @@ def __init__(
         path: str,
         endpoint: Callable[..., Any],
         *,
-        dependencies: Optional[Sequence[params.Depends]] = None,
         name: Optional[str] = None,
+        dependencies: Optional[Sequence[params.Depends]] = None,
         dependency_overrides_provider: Optional[Any] = None,
     ) -> None:
         self.path = path
         self.endpoint = endpoint
-        self.dependencies = dependencies or []
         self.name = get_name(endpoint) if name is None else name
+        self.dependencies = dependencies or []
         self.path_regex, self.path_format, self.param_convertors = compile_path(path)
         self.dependant = get_dependant(path=self.path_format, call=self.endpoint)
         for depends in self.dependencies[::-1]:
@@ -663,9 +663,9 @@ def add_api_websocket_route(
         self,
         path: str,
         endpoint: Callable[..., Any],
+        name: Optional[str] = None,
         *,
         dependencies: Optional[Sequence[params.Depends]] = None,
-        name: Optional[str] = None,
     ) -> None:
         current_dependencies = list(self.dependencies)
         if dependencies:
@@ -675,17 +675,17 @@ def add_api_websocket_route(
             self.prefix + path,
             endpoint=endpoint,
             name=name,
-            dependency_overrides_provider=self.dependency_overrides_provider,
             dependencies=current_dependencies,
+            dependency_overrides_provider=self.dependency_overrides_provider,
         )
         self.routes.append(route)
 
     def websocket(
         self,
         path: str,
+        name: Optional[str] = None,
         *,
         dependencies: Optional[Sequence[params.Depends]] = None,
-        name: Optional[str] = None,
     ) -> Callable[[DecoratedCallable], DecoratedCallable]:
         def decorator(func: DecoratedCallable) -> DecoratedCallable:
             self.add_api_websocket_route(