formatted project by python-black

This commit is contained in:
2026-11-10 09:52:42 +03:00
parent 7cd02da51d
commit 9899ee4676
66 changed files with 2517 additions and 944 deletions
@@ -20,21 +20,26 @@ def upgrade() -> None:
sa.Column("request_hash", sa.String(64), nullable=False),
sa.Column("message_id", sa.UUID(), nullable=False),
sa.Column(
"created_at", sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"), nullable=False,
"created_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.ForeignKeyConstraint(
["user_id"], ["users.id"], name=op.f("fk_idempotency_keys_user_id_users")
),
sa.ForeignKeyConstraint(
["message_id"], ["messages.id"],
["message_id"],
["messages.id"],
name=op.f("fk_idempotency_keys_message_id_messages"),
),
sa.PrimaryKeyConstraint(
"user_id", "method", "path", "key", name=op.f("pk_idempotency_keys")
),
)
op.create_index("ix_idempotency_keys_created_at", "idempotency_keys", ["created_at"])
op.create_index(
"ix_idempotency_keys_created_at", "idempotency_keys", ["created_at"]
)
def downgrade() -> None:
@@ -21,14 +21,35 @@ def upgrade() -> None:
sa.Column("size_bytes", sa.Integer(), nullable=False),
sa.Column("sha256", sa.String(64), nullable=False),
sa.Column("status", sa.String(16), server_default="ready", nullable=False),
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("clock_timestamp()"), nullable=False),
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("clock_timestamp()"), nullable=False),
sa.CheckConstraint("size_bytes BETWEEN 1 AND 10485760", name=op.f("ck_attachments_size_bytes")),
sa.CheckConstraint("content_type IN ('image/png', 'image/jpeg')", name=op.f("ck_attachments_content_type")),
sa.CheckConstraint("sha256 ~ '^[a-f0-9]{64}$'", name=op.f("ck_attachments_sha256")),
sa.Column(
"created_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.Column(
"updated_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.CheckConstraint(
"size_bytes BETWEEN 1 AND 10485760", name=op.f("ck_attachments_size_bytes")
),
sa.CheckConstraint(
"content_type IN ('image/png', 'image/jpeg')",
name=op.f("ck_attachments_content_type"),
),
sa.CheckConstraint(
"sha256 ~ '^[a-f0-9]{64}$'", name=op.f("ck_attachments_sha256")
),
sa.CheckConstraint("status = 'ready'", name=op.f("ck_attachments_status")),
sa.ForeignKeyConstraint(["chat_id"], ["chats.id"], name=op.f("fk_attachments_chat_id_chats")),
sa.ForeignKeyConstraint(["owner_id"], ["users.id"], name=op.f("fk_attachments_owner_id_users")),
sa.ForeignKeyConstraint(
["chat_id"], ["chats.id"], name=op.f("fk_attachments_chat_id_chats")
),
sa.ForeignKeyConstraint(
["owner_id"], ["users.id"], name=op.f("fk_attachments_owner_id_users")
),
sa.PrimaryKeyConstraint("id", name=op.f("pk_attachments")),
sa.UniqueConstraint("object_key", name=op.f("uq_attachments_object_key")),
)
@@ -38,15 +59,31 @@ def upgrade() -> None:
sa.Column("message_id", sa.UUID(), nullable=False),
sa.Column("attachment_id", sa.UUID(), nullable=False),
sa.Column("position", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(["message_id"], ["messages.id"], ondelete="CASCADE", name=op.f("fk_message_attachments_message_id_messages")),
sa.ForeignKeyConstraint(["attachment_id"], ["attachments.id"], name=op.f("fk_message_attachments_attachment_id_attachments")),
sa.PrimaryKeyConstraint("message_id", "attachment_id", name=op.f("pk_message_attachments")),
sa.ForeignKeyConstraint(
["message_id"],
["messages.id"],
ondelete="CASCADE",
name=op.f("fk_message_attachments_message_id_messages"),
),
sa.ForeignKeyConstraint(
["attachment_id"],
["attachments.id"],
name=op.f("fk_message_attachments_attachment_id_attachments"),
),
sa.PrimaryKeyConstraint(
"message_id", "attachment_id", name=op.f("pk_message_attachments")
),
)
op.create_table(
"upload_intents",
sa.Column("id", sa.UUID(), nullable=False),
sa.Column("object_key", sa.String(128), nullable=False),
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("clock_timestamp()"), nullable=False),
sa.Column(
"created_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.PrimaryKeyConstraint("id", name=op.f("pk_upload_intents")),
sa.UniqueConstraint("object_key", name=op.f("uq_upload_intents_object_key")),
)
@@ -5,29 +5,30 @@ Revises: db06fd3126ff
Create Date: 2026-10-26 22:01:01.910396
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = 'abd273076068'
down_revision: Union[str, None] = 'db06fd3126ff'
revision: str = "abd273076068"
down_revision: Union[str, None] = "db06fd3126ff"
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('counters',
sa.Column('name', sa.String(length=64), nullable=False),
sa.Column('value', sa.BigInteger(), nullable=False),
sa.PrimaryKeyConstraint('name', name=op.f('pk_counters'))
op.create_table(
"counters",
sa.Column("name", sa.String(length=64), nullable=False),
sa.Column("value", sa.BigInteger(), nullable=False),
sa.PrimaryKeyConstraint("name", name=op.f("pk_counters")),
)
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('counters')
op.drop_table("counters")
# ### end Alembic commands ###
@@ -12,12 +12,30 @@ depends_on = None
def upgrade() -> None:
op.drop_constraint(op.f("ck_attachments_status"), "attachments", type_="check")
op.create_check_constraint(op.f("ck_attachments_status"), "attachments", "status IN ('queued', 'processing', 'ready', 'failed')")
op.create_check_constraint(
op.f("ck_attachments_status"),
"attachments",
"status IN ('queued', 'processing', 'ready', 'failed')",
)
op.alter_column("attachments", "status", server_default="queued")
op.add_column("attachments", sa.Column("error_code", sa.String(64), nullable=True))
op.add_column("attachments", sa.Column("thumbnail_key", sa.String(128), nullable=True))
op.add_column("attachments", sa.Column("variants", postgresql.JSONB(), nullable=False, server_default=sa.text("'[]'::jsonb")))
op.create_check_constraint(op.f("ck_attachments_error_code"), "attachments", "(status = 'failed' AND error_code IS NOT NULL) OR (status <> 'failed' AND error_code IS NULL)")
op.add_column(
"attachments", sa.Column("thumbnail_key", sa.String(128), nullable=True)
)
op.add_column(
"attachments",
sa.Column(
"variants",
postgresql.JSONB(),
nullable=False,
server_default=sa.text("'[]'::jsonb"),
),
)
op.create_check_constraint(
op.f("ck_attachments_error_code"),
"attachments",
"(status = 'failed' AND error_code IS NOT NULL) OR (status <> 'failed' AND error_code IS NULL)",
)
op.create_table(
"attachment_jobs",
sa.Column("id", sa.UUID(), nullable=False),
@@ -25,31 +43,62 @@ def upgrade() -> None:
sa.Column("staging_key", sa.String(128), nullable=True),
sa.Column("pipeline_version", sa.Integer(), server_default="1", nullable=False),
sa.Column("attempt", sa.Integer(), server_default="0", nullable=False),
sa.Column("published_attempt", sa.Integer(), server_default="0", nullable=False),
sa.Column("next_attempt_at", sa.DateTime(timezone=True), server_default=sa.text("clock_timestamp()"), nullable=False),
sa.Column(
"published_attempt", sa.Integer(), server_default="0", nullable=False
),
sa.Column(
"next_attempt_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.Column("lease_token", sa.UUID(), nullable=True),
sa.Column("lease_until", sa.DateTime(timezone=True), nullable=True),
sa.Column("last_error_code", sa.String(64), nullable=True),
sa.Column("finished_at", sa.DateTime(timezone=True), nullable=True),
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("clock_timestamp()"), nullable=False),
sa.Column(
"created_at",
sa.DateTime(timezone=True),
server_default=sa.text("clock_timestamp()"),
nullable=False,
),
sa.PrimaryKeyConstraint("id", name=op.f("pk_attachment_jobs")),
sa.ForeignKeyConstraint(["attachment_id"], ["attachments.id"], name=op.f("fk_attachment_jobs_attachment_id_attachments")),
sa.UniqueConstraint("attachment_id", name=op.f("uq_attachment_jobs_attachment_id")),
sa.CheckConstraint("pipeline_version = 1", name=op.f("ck_attachment_jobs_pipeline_version")),
sa.CheckConstraint("attempt >= 0 AND published_attempt >= 0", name=op.f("ck_attachment_jobs_attempt")),
sa.ForeignKeyConstraint(
["attachment_id"],
["attachments.id"],
name=op.f("fk_attachment_jobs_attachment_id_attachments"),
),
sa.UniqueConstraint(
"attachment_id", name=op.f("uq_attachment_jobs_attachment_id")
),
sa.CheckConstraint(
"pipeline_version = 1", name=op.f("ck_attachment_jobs_pipeline_version")
),
sa.CheckConstraint(
"attempt >= 0 AND published_attempt >= 0",
name=op.f("ck_attachment_jobs_attempt"),
),
)
op.create_index("ix_attachment_jobs_due", "attachment_jobs", ["next_attempt_at"])
op.create_index("ix_attachment_jobs_lease", "attachment_jobs", ["lease_until"])
# Прежние оригиналы остаются источником; worker создаст отсутствующий thumbnail.
op.execute("INSERT INTO attachment_jobs (id, attachment_id, staging_key) SELECT id, id, object_key FROM attachments")
op.execute("UPDATE attachments SET status = 'queued', updated_at = clock_timestamp()")
op.execute(
"INSERT INTO attachment_jobs (id, attachment_id, staging_key) SELECT id, id, object_key FROM attachments"
)
op.execute(
"UPDATE attachments SET status = 'queued', updated_at = clock_timestamp()"
)
def downgrade() -> None:
connection = op.get_bind()
unfinished = connection.scalar(sa.text("SELECT count(*) FROM attachments WHERE status <> 'ready'"))
unfinished = connection.scalar(
sa.text("SELECT count(*) FROM attachments WHERE status <> 'ready'")
)
if unfinished:
raise RuntimeError("Перед downgrade нужно завершить или вручную разобрать все queued/processing/failed вложения")
raise RuntimeError(
"Перед downgrade нужно завершить или вручную разобрать все queued/processing/failed вложения"
)
op.drop_index("ix_attachment_jobs_lease", table_name="attachment_jobs")
op.drop_index("ix_attachment_jobs_due", table_name="attachment_jobs")
op.drop_table("attachment_jobs")
@@ -58,5 +107,7 @@ def downgrade() -> None:
op.drop_column("attachments", "thumbnail_key")
op.drop_column("attachments", "error_code")
op.drop_constraint(op.f("ck_attachments_status"), "attachments", type_="check")
op.create_check_constraint(op.f("ck_attachments_status"), "attachments", "status = 'ready'")
op.create_check_constraint(
op.f("ck_attachments_status"), "attachments", "status = 'ready'"
)
op.alter_column("attachments", "status", server_default="ready")
@@ -11,7 +11,9 @@ depends_on = None
def upgrade() -> None:
op.add_column("attachments", sa.Column("crop_key", sa.String(128), nullable=True))
op.add_column("attachments", sa.Column("optimized_key", sa.String(128), nullable=True))
op.add_column(
"attachments", sa.Column("optimized_key", sa.String(128), nullable=True)
)
# Старый staging сменяется надёжным ready-оригиналом, но не теряется из журнала cleanup.
op.execute("""
INSERT INTO upload_intents (id, object_key)
@@ -37,7 +39,11 @@ def upgrade() -> None:
def downgrade() -> None:
active = op.get_bind().scalar(sa.text("SELECT count(*) FROM attachments WHERE status IN ('queued', 'processing')"))
active = op.get_bind().scalar(
sa.text(
"SELECT count(*) FROM attachments WHERE status IN ('queued', 'processing')"
)
)
if active:
raise RuntimeError("Перед downgrade необходимо завершить активные задания")
op.execute("""
+22 -5
View File
@@ -10,19 +10,36 @@ depends_on = None
def upgrade() -> None:
op.add_column("attachment_jobs", sa.Column("cycle_start_attempt", sa.Integer(), nullable=False, server_default="0"))
op.add_column("attachment_jobs", sa.Column("attempt_limit", sa.Integer(), nullable=True))
op.add_column("attachment_jobs", sa.Column("last_error_permanent", sa.Boolean(), nullable=True))
op.add_column(
"attachment_jobs",
sa.Column(
"cycle_start_attempt", sa.Integer(), nullable=False, server_default="0"
),
)
op.add_column(
"attachment_jobs", sa.Column("attempt_limit", sa.Integer(), nullable=True)
)
op.add_column(
"attachment_jobs",
sa.Column("last_error_permanent", sa.Boolean(), nullable=True),
)
op.create_table(
"job_replays",
sa.Column("id", sa.Uuid(), primary_key=True),
sa.Column("job_id", sa.Uuid(), sa.ForeignKey("attachment_jobs.id"), nullable=False),
sa.Column(
"job_id", sa.Uuid(), sa.ForeignKey("attachment_jobs.id"), nullable=False
),
sa.Column("actor", sa.String(64), nullable=False),
sa.Column("reason", sa.String(32), nullable=False),
sa.Column("previous_attempt", sa.Integer(), nullable=False),
sa.Column("attempt_limit", sa.Integer(), nullable=False),
sa.Column("previous_error_code", sa.String(64), nullable=True),
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.clock_timestamp()),
sa.Column(
"created_at",
sa.DateTime(timezone=True),
nullable=False,
server_default=sa.func.clock_timestamp(),
),
)
op.create_index("ix_job_replays_job_id", "job_replays", ["job_id"])