refactor: привести FastAPI зависимости к стилю Annotated

- Убраны дубли response_model при наличии return type

- Переведены Depends-параметры на Annotated

- Сохранены текущие контракты и логика роутов

Author: RomanVetrov

app/get_or_404.py

@@ -16,8 +16,8 @@
 
 async def get_task_or_404(
     task_id: UUID,
-    session: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
+    session: Annotated[AsyncSession, Depends(get_db)],
+    current_user: Annotated[User, Depends(get_current_user)],
 ) -> Task:
     """Возвращает задачу по id. 404 если не найдена, 403 если чужая."""
     task = await task_repo.get_task_by_id(session, task_id)
@@ -32,7 +32,7 @@ async def get_task_or_404(
 
 async def get_tag_or_404(
     tag_id: UUID,
-    session: AsyncSession = Depends(get_db),
+    session: Annotated[AsyncSession, Depends(get_db)],
 ) -> Tag:
     """Возвращает тег по id или 404 если не найден."""
     tag = await tag_repo.get_tag_by_id(session, tag_id)

app/limits/dependencies.py

@@ -1,4 +1,5 @@
 from collections.abc import Callable
+from typing import Annotated
 
 from fastapi import Depends, Request
 from redis.asyncio import Redis
@@ -12,7 +13,7 @@ def rate_limit_by_ip(limit: int, window_seconds: int, scope: str) -> Callable:
 
     async def dependency(
         request: Request,
-        redis: Redis = Depends(get_redis),
+        redis: Annotated[Redis, Depends(get_redis)],
     ) -> None:
         client_ip = request.client.host if request.client else "unknown"
         key = f"rl:{scope}:ip:{client_ip}"

app/routes/auth.py

@@ -1,3 +1,4 @@
+from typing import Annotated
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Response, status
@@ -31,6 +32,11 @@
 router = APIRouter(prefix="/auth", tags=["auth"])
 tracer = trace.get_tracer(__name__)
 
+DbSession = Annotated[AsyncSession, Depends(get_db)]
+RedisClient = Annotated[Redis, Depends(get_redis)]
+LoginForm = Annotated[OAuth2PasswordRequestForm, Depends()]
+CurrentUserDep = Annotated[User, Depends(get_current_user)]
+
 
 def _refresh_ttl_seconds() -> int:
     """TTL refresh-токена в секундах из настроек (неделя)"""
@@ -86,7 +92,6 @@ async def _issue_token_pair(user_id: UUID, redis: Redis) -> TokenPair:
 
 @router.post(
     "/register",
-    response_model=UserRead,
     status_code=status.HTTP_201_CREATED,
     summary="Регистрация пользователя",
     dependencies=[
@@ -95,7 +100,7 @@ async def _issue_token_pair(user_id: UUID, redis: Redis) -> TokenPair:
 )
 async def create_user(
     payload: RegisterCreate,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> UserRead:
     try:
         new_user = await register_user(session, payload.email, payload.password)
@@ -109,16 +114,15 @@ async def create_user(
 
 @router.post(
     "/login",
-    response_model=TokenPair,
     summary="Вход в систему",
     dependencies=[
         Depends(rate_limit_by_ip(limit=10, window_seconds=60, scope="auth_login"))
     ],
 )
 async def login_user(
-    form_data: OAuth2PasswordRequestForm = Depends(),
-    session: AsyncSession = Depends(get_db),
-    redis: Redis = Depends(get_redis),
+    form_data: LoginForm,
+    session: DbSession,
+    redis: RedisClient,
 ) -> TokenPair:
     try:
         user = await authenticate_active_user(
@@ -144,16 +148,15 @@ async def login_user(
 
 @router.post(
     "/refresh",
-    response_model=TokenPair,
     summary="Обновить access/refresh токены",
     dependencies=[
         Depends(rate_limit_by_ip(limit=10, window_seconds=60, scope="auth_refresh"))
     ],
 )
 async def refresh_token_pair(
     payload: RefreshTokenRequest,
-    session: AsyncSession = Depends(get_db),
-    redis: Redis = Depends(get_redis),
+    session: DbSession,
+    redis: RedisClient,
 ) -> TokenPair:
     user_id, jti = _parse_refresh_token_or_401(payload.refresh_token)
 
@@ -176,8 +179,8 @@ async def refresh_token_pair(
 )
 async def logout_user(
     payload: RefreshTokenRequest,
-    session: AsyncSession = Depends(get_db),
-    redis: Redis = Depends(get_redis),
+    session: DbSession,
+    redis: RedisClient,
 ) -> Response:
     user_id, jti = _parse_refresh_token_or_401(payload.refresh_token)
 
@@ -187,6 +190,6 @@ async def logout_user(
     return Response(status_code=status.HTTP_204_NO_CONTENT)
 
 
-@router.get("/me", response_model=UserRead, summary="Получить текущего пользователя")
-async def current_user(current_user: User = Depends(get_current_user)) -> UserRead:
+@router.get("/me", summary="Получить текущего пользователя")
+async def current_user(current_user: CurrentUserDep) -> UserRead:
     return UserRead.model_validate(current_user)

app/routes/tags.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Annotated
+
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -10,6 +12,7 @@
 from app.services.tag import TagAlreadyExists
 
 router = APIRouter(prefix="/tags", tags=["tags"])
+DbSession = Annotated[AsyncSession, Depends(get_db)]
 
 _TAG_EXISTS_ERROR = HTTPException(
     status_code=status.HTTP_409_CONFLICT,
@@ -19,14 +22,13 @@
 
 @router.post(
     "",
-    response_model=TagRead,
     status_code=status.HTTP_201_CREATED,
     summary="Создать тег",
 )
 async def create_tag(
     payload: TagCreate,
     _: CurrentUser,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TagRead:
     try:
         created = await tag_service.create_tag(session, payload)
@@ -37,20 +39,18 @@ async def create_tag(
 
 @router.get(
     "",
-    response_model=list[TagRead],
     summary="Список тегов",
 )
 async def list_tags(
     _: CurrentUser,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> list[TagRead]:
     tags = await tag_service.list_tags(session)
     return [TagRead.model_validate(tag) for tag in tags]
 
 
 @router.get(
     "/{tag_id}",
-    response_model=TagRead,
     summary="Получить тег по id",
 )
 async def get_tag(
@@ -62,14 +62,13 @@ async def get_tag(
 
 @router.patch(
     "/{tag_id}",
-    response_model=TagRead,
     summary="Обновить тег",
 )
 async def update_tag(
     payload: TagUpdate,
     _: CurrentUser,
     tag: TagDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TagRead:
     try:
         updated = await tag_service.update_tag(session, tag, payload)
@@ -80,13 +79,12 @@ async def update_tag(
 
 @router.delete(
     "/{tag_id}",
-    response_model=TagDeleted,
     summary="Удалить тег",
 )
 async def delete_tag(
     _: CurrentUser,
     tag: TagDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TagDeleted:
     tag_id = await tag_service.delete_tag(session, tag)
     return TagDeleted(id=tag_id)

app/routes/tasks.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Annotated
+
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -12,6 +14,7 @@
 from app.services.task import InvalidDueDate
 
 router = APIRouter(prefix="/tasks", tags=["tasks"])
+DbSession = Annotated[AsyncSession, Depends(get_db)]
 
 _DUE_DATE_ERROR = HTTPException(
     status_code=status.HTTP_400_BAD_REQUEST,
@@ -21,14 +24,13 @@
 
 @router.post(
     "",
-    response_model=TaskRead,
     status_code=status.HTTP_201_CREATED,
     summary="Создать задачу",
 )
 async def create_task(
     payload: TaskCreate,
     current_user: CurrentUser,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TaskRead:
     try:
         task = await task_service.create_task(session, current_user, payload)
@@ -39,20 +41,18 @@ async def create_task(
 
 @router.get(
     "",
-    response_model=list[TaskRead],
     summary="Список задач текущего пользователя",
 )
 async def list_tasks(
     current_user: CurrentUser,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> list[TaskRead]:
     tasks = await task_service.get_user_tasks(session, current_user)
     return [TaskRead.model_validate(t) for t in tasks]
 
 
 @router.get(
     "/{task_id}",
-    response_model=TaskRead,
     summary="Получить задачу по id",
 )
 async def get_task(task: TaskDep) -> TaskRead:
@@ -61,13 +61,12 @@ async def get_task(task: TaskDep) -> TaskRead:
 
 @router.patch(
     "/{task_id}",
-    response_model=TaskRead,
     summary="Обновить задачу",
 )
 async def update_task(
     payload: TaskUpdate,
     task: TaskDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TaskRead:
     try:
         updated = await task_service.update_task(session, task, payload)
@@ -78,41 +77,38 @@ async def update_task(
 
 @router.delete(
     "/{task_id}",
-    response_model=TaskDeleted,
     summary="Удалить задачу",
 )
 async def delete_task(
     task: TaskDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TaskDeleted:
     task_id = await task_service.delete_task(session, task)
     return TaskDeleted(id=task_id)
 
 
 @router.post(
     "/{task_id}/tags/{tag_id}",
-    response_model=TaskTagLink,
     status_code=status.HTTP_201_CREATED,
     summary="Привязать тег к задаче",
 )
 async def attach_tag_to_task(
     task: TaskDep,
     tag: TagDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TaskTagLink:
     await tag_service.attach_tag_to_task(session, task, tag)
     return TaskTagLink(task_id=task.id, tag_id=tag.id)
 
 
 @router.delete(
     "/{task_id}/tags/{tag_id}",
-    response_model=TaskTagLink,
     summary="Отвязать тег от задачи",
 )
 async def detach_tag_from_task(
     task: TaskDep,
     tag: TagDep,
-    session: AsyncSession = Depends(get_db),
+    session: DbSession,
 ) -> TaskTagLink:
     await tag_service.detach_tag_from_task(session, task, tag)
     return TaskTagLink(task_id=task.id, tag_id=tag.id)

app/security/dependences.py

@@ -1,6 +1,7 @@
 """FastAPI зависимости для аутентификации и авторизации."""
 
 import uuid
+from typing import Annotated
 
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
@@ -15,8 +16,8 @@
 
 
 async def get_current_user(
-    token: str = Depends(oauth2_scheme),
-    session: AsyncSession = Depends(get_db),
+    token: Annotated[str, Depends(oauth2_scheme)],
+    session: Annotated[AsyncSession, Depends(get_db)],
 ) -> User:
     """Декодирует access-токен и возвращает активного пользователя. 401/403 при ошибке."""
     # 1. Проверка токена