ЛР3: балансировка, отказоустойчивость и идемпотентность

This commit is contained in:
2026-10-23 18:54:18 +03:00
parent 3f7c306f4f
commit 57b4e8b5ec
20 changed files with 659 additions and 39 deletions
+6 -1
View File
@@ -1,4 +1,6 @@
import logging
import os
import socket
from uuid import uuid4
from starlette.datastructures import MutableHeaders
@@ -11,6 +13,7 @@ logger = logging.getLogger('app')
class RequestContext:
def __init__(self, app) -> None:
self.app = app
self.instance_id = os.getenv('INSTANCE_ID') or socket.gethostname()
async def __call__(self, scope, receive, send) -> None:
if scope['type'] != 'http':
@@ -25,7 +28,9 @@ class RequestContext:
nonlocal started
if message['type'] == 'http.response.start':
started = True
MutableHeaders(scope=message)['X-Request-Id'] = request_id
headers = MutableHeaders(scope=message)
headers['X-Request-Id'] = request_id
headers['X-Instance-Id'] = self.instance_id
await send(message)
try:
+12 -3
View File
@@ -1,7 +1,7 @@
from typing import Optional
from typing import Annotated, Optional
from uuid import UUID
from fastapi import APIRouter, Depends, Query
from fastapi import APIRouter, Depends, Header, Query
from ...domain.models import User
from ...services.messages import MessageService
@@ -23,10 +23,19 @@ router = APIRouter(prefix='/api/v1/chats/{chat_id}/messages', tags=['messages'])
async def send(
chat_id: UUID,
body: CreateMessage,
idempotency_key: Annotated[
str,
Header(
alias='Idempotency-Key',
min_length=1,
max_length=128,
pattern=r'^[A-Za-z0-9._:-]+$',
),
],
actor: User = Depends(current_user),
messages: MessageService = Depends(message_service),
) -> MessageOut:
return MessageOut.from_domain(await messages.send(actor, chat_id, body.text))
return MessageOut.from_domain(await messages.send(actor, chat_id, body.text, idempotency_key))
@router.get('', response_model=MessagePageOut)
+2 -2
View File
@@ -70,8 +70,8 @@ def create_app() -> FastAPI:
logger.info('shutdown complete')
api = FastAPI(
title='MTUSI Messenger. LR 2',
version='1.2.0',
title='MTUSI Messenger. LR 3',
version='1.3.0',
description=DESCRIPTION,
lifespan=lifespan,
)
+11 -2
View File
@@ -3,7 +3,7 @@ from __future__ import annotations
from datetime import datetime
from uuid import UUID
from sqlalchemy import DateTime, ForeignKey, Index, String
from sqlalchemy import DateTime, ForeignKey, Index, String, UniqueConstraint
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.types import Uuid
@@ -12,10 +12,19 @@ from ..db.postgres import Base
class MessageRow(Base):
__tablename__ = 'messages'
__table_args__ = (Index('messages_history_idx', 'chat_id', 'created_at', 'id'),)
__table_args__ = (
Index('messages_history_idx', 'chat_id', 'created_at', 'id'),
UniqueConstraint(
'sender_id',
'chat_id',
'idempotency_key',
name='messages_sender_chat_idempotency_key',
),
)
id: Mapped[UUID] = mapped_column(Uuid, primary_key=True)
chat_id: Mapped[UUID] = mapped_column(ForeignKey('chats.id', ondelete='CASCADE'), nullable=False)
sender_id: Mapped[UUID] = mapped_column(ForeignKey('users.id'), nullable=False)
text: Mapped[str] = mapped_column(String(4000), nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
idempotency_key: Mapped[str | None] = mapped_column(String(128), nullable=True)
+43 -9
View File
@@ -4,8 +4,10 @@ from datetime import datetime
from uuid import UUID
from sqlalchemy import select, tuple_
from sqlalchemy.dialects.postgresql import insert
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
from ..domain.errors import Conflict
from ..domain.models import Keyset, Message
from ..models.chat import ChatMemberRow, ChatRow
from ..models.message import MessageRow
@@ -34,22 +36,54 @@ class MessageRepository:
)
async def create_for_member(
self, message_id: UUID, chat_id: UUID, sender_id: UUID, text: str, created_at: datetime
self,
message_id: UUID,
chat_id: UUID,
sender_id: UUID,
text: str,
created_at: datetime,
idempotency_key: str,
) -> Message | None:
async with self._sessions() as session:
async with session.begin():
accessible_chat_id = await self._accessible_chat_id(session, chat_id, sender_id)
if accessible_chat_id is None:
return None
row = MessageRow(
id=message_id,
chat_id=accessible_chat_id,
sender_id=sender_id,
text=text,
created_at=created_at,
statement = (
insert(MessageRow)
.values(
id=message_id,
chat_id=accessible_chat_id,
sender_id=sender_id,
text=text,
created_at=created_at,
idempotency_key=idempotency_key,
)
.on_conflict_do_nothing(
index_elements=[
MessageRow.sender_id,
MessageRow.chat_id,
MessageRow.idempotency_key,
]
)
.returning(MessageRow.id)
)
session.add(row)
await session.flush()
created_id = await session.scalar(statement)
if created_id is not None:
row = await session.get(MessageRow, created_id)
else:
row = await session.scalar(
select(MessageRow).where(
MessageRow.sender_id == sender_id,
MessageRow.chat_id == accessible_chat_id,
MessageRow.idempotency_key == idempotency_key,
)
)
if row is None:
raise RuntimeError('результат идемпотентной операции не найден')
if row.text != text:
raise Conflict('Idempotency-Key уже использован с другим сообщением')
return self._to_domain(row)
async def page_for_member(
+2 -1
View File
@@ -13,13 +13,14 @@ class MessageService:
def __init__(self, repository: MessageRepository) -> None:
self._repository = repository
async def send(self, actor: User, chat_id: UUID, text: str) -> Message:
async def send(self, actor: User, chat_id: UUID, text: str, idempotency_key: str) -> Message:
message = await self._repository.create_for_member(
message_id=uuid4(),
chat_id=chat_id,
sender_id=actor.id,
text=text,
created_at=datetime.now(timezone.utc),
idempotency_key=idempotency_key,
)
if message is None:
raise NotFound('чат не найден')