From 2ec2447d1c70cd80c501c95b7f0aadd67e7ec6f8 Mon Sep 17 00:00:00 2001 From: Maksimova Snezhana Date: Wed, 28 Oct 2026 23:24:35 +0300 Subject: [PATCH] feat: implement instance id and idempotency key handling --- app/db/models.py | 17 +++++++++++++++- app/main.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/app/db/models.py b/app/db/models.py index 89af0c04..12884e3d 100644 --- a/app/db/models.py +++ b/app/db/models.py @@ -4,7 +4,7 @@ from uuid import UUID, uuid4 from sqlalchemy import DateTime, ForeignKey, Index, String, Text from sqlalchemy.dialects.postgresql import UUID as PG_UUID from sqlalchemy.orm import Mapped, mapped_column - +from sqlalchemy import UniqueConstraint from .base import Base @@ -97,4 +97,19 @@ class SessionRow(Base): ) created_at: Mapped[datetime] = mapped_column( DateTime(timezone=True), default=_now, nullable=False + ) + +from sqlalchemy import UniqueConstraint + +class IdempotencyRecord(Base): + __tablename__ = "idempotency_keys" + id: Mapped[UUID] = mapped_column(PG_UUID(as_uuid=True), primary_key=True, default=uuid4) + user_id: Mapped[UUID] = mapped_column(PG_UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False) + key: Mapped[str] = mapped_column(String(128), nullable=False) + request_hash: Mapped[str] = mapped_column(String(64), nullable=False) + response_body: Mapped[str] = mapped_column(Text, nullable=False) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=_now, nullable=False) + + __table_args__ = ( + UniqueConstraint("user_id", "key", name="uq_idempotency_user_key"), ) \ No newline at end of file diff --git a/app/main.py b/app/main.py index 35305946..54a6bacc 100644 --- a/app/main.py +++ b/app/main.py @@ -1,9 +1,15 @@ import os import uuid +import socket from contextvars import ContextVar from datetime import datetime, timedelta, timezone from typing import Optional from uuid import UUID +from sqlalchemy.exc import IntegrityError +import hashlib +import json + +INSTANCE_ID = os.environ.get("HOSTNAME", f"api-{socket.gethostname()}") from fastapi import Depends, FastAPI, Header, HTTPException, Query, Request from fastapi.exceptions import RequestValidationError @@ -46,7 +52,7 @@ _HTTP_CODES = { def err_json(status: int, code: str, message: str) -> JSONResponse: - return JSONResponse( + resp = JSONResponse( status_code=status, content={ "error": { @@ -56,6 +62,8 @@ def err_json(status: int, code: str, message: str) -> JSONResponse: } }, ) + resp.headers["X-Instance-Id"] = INSTANCE_ID + return resp class RequestIdMiddleware(BaseHTTPMiddleware): @@ -64,6 +72,7 @@ class RequestIdMiddleware(BaseHTTPMiddleware): request_id_var.set(rid) response = await call_next(request) response.headers["X-Request-Id"] = rid + response.headers["X-Instance-Id"] = INSTANCE_ID return response @@ -249,14 +258,51 @@ async def get_chat( async def post_message( chat_id: UUID, body: CreateMessage, + idempotency_key: str = Header(..., alias="Idempotency-Key"), user: User = Depends(get_current_user), db: AsyncSession = Depends(get_db), ): chat = await chats_repo.get_if_member(db, chat_id, user.id) if chat is None: raise HTTPException(404, "Chat not found") + + req_hash = hashlib.sha256(body.model_dump_json().encode("utf-8")).hexdigest() + + # 1. Проверяем, есть ли уже такой ключ + stmt = select(IdempotencyRecord).where( + IdempotencyRecord.user_id == user.id, + IdempotencyRecord.key == idempotency_key, + ) + record = (await db.execute(stmt)).scalar_one_or_none() + + if record: + if record.request_hash != req_hash: + raise HTTPException(409, "Idempotency key conflict") + # Возвращаем сохраненный ответ (201 и тот же JSON) + return JSONResponse(status_code=201, content=json.loads(record.response_body)) + + # 2. Создаём сообщение msg = await messages_repo.create_and_invalidate(db, chat_id, user.id, body.text) - return _msg_json(msg) + resp_body = json.dumps(_msg_json(msg)) + + # 3. Сохраняем ключ + db.add(IdempotencyRecord( + user_id=user.id, + key=idempotency_key, + request_hash=req_hash, + response_body=resp_body + )) + try: + await db.commit() + except IntegrityError: + # Гонка: другая реплика уже вставила этот ключ + await db.rollback() + record = (await db.execute(stmt)).scalar_one_or_none() + if record and record.request_hash == req_hash: + return JSONResponse(status_code=201, content=json.loads(record.response_body)) + raise HTTPException(409, "Idempotency key conflict") + + return JSONResponse(status_code=201, content=json.loads(resp_body)) @app.get("/api/v1/chats/{chat_id}/messages")