feat: bound upload memory with per-replica slots and a body deadline
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,7 +2,8 @@
|
||||
|
||||
Сервисы получают сессию БД, а чаты и сообщения — ещё и кэш процесса
|
||||
(`src/infra/cache/instance.py`). Вложения — фабрику короткой сессии на
|
||||
шаг, кэш и хранилище объектов (`src/infra/s3/instance.py`).
|
||||
шаг, кэш, хранилище объектов (`src/infra/s3/instance.py`) и места
|
||||
загрузок процесса (`src/infra/upload_slots.py`).
|
||||
"""
|
||||
|
||||
import base64
|
||||
@@ -33,6 +34,7 @@ from src.infra.db.scope import session_scope
|
||||
from src.infra.db.session import engine, session_factory
|
||||
from src.infra.logger import current_user_id
|
||||
from src.infra.s3.instance import object_storage
|
||||
from src.infra.upload_slots import upload_slots
|
||||
from src.schemas import dataclasses
|
||||
from src.utils.constants import (
|
||||
PAGE_LIMIT_DEFAULT,
|
||||
@@ -108,6 +110,7 @@ async def get_attachment_service() -> AttachmentService:
|
||||
db_scope=db_session_scope,
|
||||
cache=cache,
|
||||
storage=object_storage,
|
||||
slots=upload_slots,
|
||||
)
|
||||
|
||||
|
||||
|
||||
+17
-2
@@ -20,6 +20,7 @@ from src.utils.constants import (
|
||||
AUTH_REALM,
|
||||
INSTANCE_ID_HEADER,
|
||||
REQUEST_ID_HEADER,
|
||||
UPLOAD_RETRY_AFTER_SECONDS,
|
||||
)
|
||||
|
||||
DOMAIN_ERRORS: dict[type[exceptions.DomainError], tuple[int, ErrorCode]] = {
|
||||
@@ -33,7 +34,12 @@ DOMAIN_ERRORS: dict[type[exceptions.DomainError], tuple[int, ErrorCode]] = {
|
||||
exceptions.InvalidCursor: (400, ErrorCode.INVALID_REQUEST),
|
||||
exceptions.InvalidFilename: (400, ErrorCode.INVALID_REQUEST),
|
||||
exceptions.UploadInterrupted: (400, ErrorCode.INVALID_REQUEST),
|
||||
# тело не пришло за срок: как обрыв, клиент не доставил тело
|
||||
exceptions.UploadTimedOut: (400, ErrorCode.INVALID_REQUEST),
|
||||
exceptions.PayloadTooLarge: (413, ErrorCode.PAYLOAD_TOO_LARGE),
|
||||
# места загрузки процесса заняты (design change upload-memory,
|
||||
# решение 2); заголовок Retry-After — RETRY_AFTER ниже
|
||||
exceptions.UploadsBusy: (429, ErrorCode.RATE_LIMITED),
|
||||
exceptions.UnsupportedMediaType: (
|
||||
415,
|
||||
ErrorCode.UNSUPPORTED_MEDIA_TYPE,
|
||||
@@ -53,6 +59,11 @@ CHALLENGES: dict[type[exceptions.DomainError], str] = {
|
||||
exceptions.Unauthenticated: f'Bearer realm="{AUTH_REALM}"',
|
||||
}
|
||||
|
||||
# Retry-After у 429: через сколько секунд повторить запрос
|
||||
RETRY_AFTER: dict[type[exceptions.DomainError], int] = {
|
||||
exceptions.UploadsBusy: UPLOAD_RETRY_AFTER_SECONDS,
|
||||
}
|
||||
|
||||
HTTP_ERRORS: dict[int, tuple[ErrorCode, str]] = {
|
||||
404: (ErrorCode.NOT_FOUND, "Not found"),
|
||||
405: (ErrorCode.INVALID_REQUEST, "Method not allowed"),
|
||||
@@ -89,13 +100,17 @@ async def handle_domain_error(
|
||||
status_code, code = next(
|
||||
DOMAIN_ERRORS[cls] for cls in type(exc).__mro__ if cls in DOMAIN_ERRORS
|
||||
)
|
||||
challenge = CHALLENGES.get(type(exc))
|
||||
headers: dict[str, str] = {}
|
||||
if challenge := CHALLENGES.get(type(exc)):
|
||||
headers["WWW-Authenticate"] = challenge
|
||||
if (retry_after := RETRY_AFTER.get(type(exc))) is not None:
|
||||
headers["Retry-After"] = str(retry_after)
|
||||
return error_response(
|
||||
request_id=_request_id(request),
|
||||
status_code=status_code,
|
||||
code=code,
|
||||
message=str(exc),
|
||||
headers={"WWW-Authenticate": challenge} if challenge else None,
|
||||
headers=headers or None,
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user