mirror
/
tiangolo.fastapi
mirror of https://github.com/tiangolo/fastapi
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use unions instead

pull/14193/head
ProfiAnton 9 months ago
parent
0253ac7273
commit
bef402a41e
2 changed files with 33 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      fastapi/applications.py
  2. 36
      fastapi/routing.py

28
fastapi/applications.py
View File

@ -333,7 +333,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of global dependencies, they will be applied to each
@ -1141,7 +1141,7 @@ class FastAPI(Starlette):
response_model: Any = Default(None),
status_code: Optional[int] = None,
tags: Optional[List[Union[str, Enum]]] = None,
dependencies: Optional[Sequence[Depends | routing.AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[Depends, routing.AnnotatedType]]] = None,
summary: Optional[str] = None,
description: Optional[str] = None,
response_description: str = "Successful Response",
@ -1199,7 +1199,7 @@ class FastAPI(Starlette):
response_model: Any = Default(None),
status_code: Optional[int] = None,
tags: Optional[List[Union[str, Enum]]] = None,
dependencies: Optional[Sequence[Depends | routing.AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[Depends, routing.AnnotatedType]]] = None,
summary: Optional[str] = None,
description: Optional[str] = None,
response_description: str = "Successful Response",
@ -1258,7 +1258,7 @@ class FastAPI(Starlette):
endpoint: Callable[..., Any],
name: Optional[str] = None,
*,
dependencies: Optional[Sequence[Depends | routing.AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[Depends, routing.AnnotatedType]]] = None,
) -> None:
self.router.add_api_websocket_route(
path,
@ -1287,7 +1287,7 @@ class FastAPI(Starlette):
] = None,
*,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be used for this
@ -1352,7 +1352,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to all the
@ -1611,7 +1611,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -1984,7 +1984,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -2362,7 +2362,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -2740,7 +2740,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3113,7 +3113,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3486,7 +3486,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3859,7 +3859,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -4237,7 +4237,7 @@ class FastAPI(Starlette):
),
] = None,
dependencies: Annotated[
Optional[Sequence[Depends | routing.AnnotatedType]],
Optional[Sequence[Union[Depends, routing.AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the

36
fastapi/routing.py
View File

@ -476,7 +476,7 @@ class APIWebSocketRoute(routing.WebSocketRoute):
endpoint: Callable[..., Any],
*,
name: Optional[str] = None,
dependencies: Optional[Sequence[params.Depends | AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[params.Depends, AnnotatedType]]] = None,
dependency_overrides_provider: Optional[Any] = None,
) -> None:
self.path = path
@ -520,7 +520,7 @@ class APIRoute(routing.Route):
response_model: Any = Default(None),
status_code: Optional[int] = None,
tags: Optional[List[Union[str, Enum]]] = None,
dependencies: Optional[Sequence[params.Depends | AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[params.Depends, AnnotatedType]]] = None,
summary: Optional[str] = None,
description: Optional[str] = None,
response_description: str = "Successful Response",
@ -680,7 +680,9 @@ class APIRoute(routing.Route):
return match, child_scope
def get_depends_from_annotated(dep: params.Depends | AnnotatedType) -> params.Depends:
def get_depends_from_annotated(
dep: Union[params.Depends, AnnotatedType],
) -> params.Depends:
if isinstance(dep, params.Depends):
return dep
d = analyze_param(
@ -742,7 +744,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies to be applied to all the *path operations* in
@ -996,7 +998,7 @@ class APIRouter(routing.Router):
response_model: Any = Default(None),
status_code: Optional[int] = None,
tags: Optional[List[Union[str, Enum]]] = None,
dependencies: Optional[Sequence[params.Depends | AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[params.Depends, AnnotatedType]]] = None,
summary: Optional[str] = None,
description: Optional[str] = None,
response_description: str = "Successful Response",
@ -1079,7 +1081,7 @@ class APIRouter(routing.Router):
response_model: Any = Default(None),
status_code: Optional[int] = None,
tags: Optional[List[Union[str, Enum]]] = None,
dependencies: Optional[Sequence[params.Depends | AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[params.Depends, AnnotatedType]]] = None,
summary: Optional[str] = None,
description: Optional[str] = None,
response_description: str = "Successful Response",
@ -1140,7 +1142,7 @@ class APIRouter(routing.Router):
endpoint: Callable[..., Any],
name: Optional[str] = None,
*,
dependencies: Optional[Sequence[params.Depends | AnnotatedType]] = None,
dependencies: Optional[Sequence[Union[params.Depends, AnnotatedType]]] = None,
) -> None:
current_dependencies = self.dependencies.copy()
if dependencies:
@ -1177,7 +1179,7 @@ class APIRouter(routing.Router):
] = None,
*,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be used for this
@ -1253,7 +1255,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to all the
@ -1555,7 +1557,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -1932,7 +1934,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -2314,7 +2316,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -2696,7 +2698,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3073,7 +3075,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3450,7 +3452,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -3832,7 +3834,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the
@ -4214,7 +4216,7 @@ class APIRouter(routing.Router):
),
] = None,
dependencies: Annotated[
Optional[Sequence[params.Depends | AnnotatedType]],
Optional[Sequence[Union[params.Depends, AnnotatedType]]],
Doc(
"""
A list of dependencies (using `Depends()`) to be applied to the

Write Preview
Loading…
Cancel
Save