From d4a73152e43c9890e4dc6df07971fcd6c858be91 Mon Sep 17 00:00:00 2001 From: Evgeny Bushkov Date: Fri, 6 Nov 2026 16:53:13 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20PendingUp?= =?UTF-8?q?load=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20.env.example?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: aider (deepseek/deepseek-chat) --- .env.example | 6 ++++++ app/models.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.env.example b/.env.example index cc317a4..788b0bf 100644 --- a/.env.example +++ b/.env.example @@ -23,3 +23,9 @@ UPLOAD_CHUNK_SIZE=65536 # SeaweedFS S3-шлюз credentials (только для локального стенда; не коммитить .env). S3_ACCESS_KEY_ID=seaweedfs S3_SECRET_ACCESS_KEY=seaweedfs-local-only +# Закрепление образов по digest (опционально; по умолчанию — теги из compose.yaml). +# Пример: POSTGRES_IMAGE=postgres:16.4-alpine@sha256: +# POSTGRES_IMAGE= +# REDIS_IMAGE= +# SEAWEEDFS_IMAGE= +# NGINX_IMAGE= diff --git a/app/models.py b/app/models.py index 5d9c2ca..df5bc07 100644 --- a/app/models.py +++ b/app/models.py @@ -86,6 +86,25 @@ class MessageAttachment(Base): position: Mapped[int] = mapped_column(Integer, nullable=False, default=0) +class PendingUpload(Base): + """Журнал намерения загрузить объект в S3. + + Пишется до `put_object`, снимается в той же транзакции, что и вставка + `attachments`. Если процесс упал между S3 PUT и COMMIT, запись остаётся + и её подбирает reconciler (`scripts/reconcile_orphans.py`) после grace + period. PK — object_key, чтобы повторная запись того же ключа была + идемпотентной. + """ + __tablename__ = "pending_uploads" + object_key: Mapped[str] = mapped_column(String(255), primary_key=True) + chat_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("chats.id", ondelete="CASCADE"), nullable=False) + owner_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False) + size_bytes: Mapped[int] = mapped_column(Integer, nullable=False) + sha256: Mapped[str] = mapped_column(String(64), nullable=False) + created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False) + __table_args__ = (Index("ix_pending_uploads_created_at", "created_at"),) + + class IdempotencyKey(Base): __tablename__ = "idempotency_keys" user_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), primary_key=True)