feat: finish postgres-storage change
- keep engine and session factory in src/infra/db/session.py - sync delta specs into openspec/specs, add db-migrations spec - update rules, AGENTS.md and run skill for lab 2 storage - fill REPORT.md for the storage part Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+5
-18
@@ -5,18 +5,15 @@ from collections.abc import AsyncIterator
|
||||
from dataclasses import dataclass
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import Depends, Query, Request, Security
|
||||
from fastapi import Depends, Query, Security
|
||||
from fastapi.security import APIKeyHeader
|
||||
from sqlalchemy.ext.asyncio import (
|
||||
AsyncEngine,
|
||||
AsyncSession,
|
||||
async_sessionmaker,
|
||||
)
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from src.config import settings
|
||||
from src.core import exceptions
|
||||
from src.core.services import ChatService, MessageService, UserService
|
||||
from src.infra.db import is_db_unavailable, ping
|
||||
from src.infra.db.session import engine, session_factory
|
||||
from src.infra.logger import AbstractLogger, current_user_id, get_logger
|
||||
from src.schemas import dataclasses
|
||||
from src.utils.constants import (
|
||||
@@ -30,7 +27,7 @@ from src.utils.constants import (
|
||||
logger: AbstractLogger = get_logger().bind(module="api_dependencies")
|
||||
|
||||
|
||||
async def get_db_session(request: Request) -> AsyncIterator[AsyncSession]:
|
||||
async def get_db_session() -> AsyncIterator[AsyncSession]:
|
||||
"""Одна сессия БД на запрос; commit делает сервис.
|
||||
|
||||
Незакоммиченное при выходе откатывается. Вся работа запроса с БД
|
||||
@@ -39,13 +36,6 @@ async def get_db_session(request: Request) -> AsyncIterator[AsyncSession]:
|
||||
503 `unavailable`, а соединение не возвращается в пул: его состояние
|
||||
неизвестно, а откат на зависшем сервере повис бы.
|
||||
"""
|
||||
session_factory: async_sessionmaker[AsyncSession] | None = getattr(
|
||||
request.app.state,
|
||||
"session_factory",
|
||||
None,
|
||||
)
|
||||
if session_factory is None:
|
||||
raise exceptions.ServiceUnavailable
|
||||
async with session_factory() as db_session:
|
||||
try:
|
||||
async with asyncio.timeout(
|
||||
@@ -67,15 +57,12 @@ async def get_db_session(request: Request) -> AsyncIterator[AsyncSession]:
|
||||
DbSessionDep = Annotated[AsyncSession, Depends(get_db_session)]
|
||||
|
||||
|
||||
async def require_database(request: Request) -> None:
|
||||
async def require_database() -> None:
|
||||
"""Readiness: Postgres отвечает на `SELECT 1` за отведённое время.
|
||||
|
||||
Любая ошибка — 503: готовность не должна отвечать 500. Не логирует:
|
||||
healthcheck спрашивает каждые несколько секунд.
|
||||
"""
|
||||
engine: AsyncEngine | None = getattr(request.app.state, "engine", None)
|
||||
if engine is None:
|
||||
raise exceptions.ServiceUnavailable
|
||||
try:
|
||||
await ping(engine, timeout=READINESS_DB_TIMEOUT_SECONDS)
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user