feat: 优化图片资源删除管理，生图任务列表管理

2026-08-30 14:50:33 +08:00
parent 4ee667142b
commit 957289f717
46 changed files with 4180 additions and 524 deletions
@@ -0,0 +1,44 @@
+"""add asset image lifecycle fields
+
+Revision ID: a41e8c7f4b20
+Revises: 658b0503f71c
+Create Date: 2026-08-30 09:00:00
+
+"""
+from __future__ import annotations
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = "a41e8c7f4b20"
+down_revision = "658b0503f71c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("product_assets", sa.Column("original_url", sa.Text(), nullable=True))
+    op.add_column("product_assets", sa.Column("original_storage_key", sa.String(length=1024), nullable=True))
+    op.add_column("product_assets", sa.Column("current_storage_key", sa.String(length=1024), nullable=True))
+    op.add_column("product_assets", sa.Column("watermark_enabled", sa.Boolean(), nullable=False, server_default=sa.false()))
+    op.add_column("product_assets", sa.Column("watermark_config", sa.JSON(), nullable=True))
+
+    # 兼容旧数据：采集图优先以已转存文件为原图；生成图若此前已保存 source_url，则它是无水印原图。
+    op.execute(
+        """
+        UPDATE product_assets
+        SET original_url = CASE
+            WHEN group_key = 'generated' AND source_url IS NOT NULL AND source_url <> '' THEN source_url
+            ELSE COALESCE(stored_url, source_url)
+        END
+        """
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("product_assets", "watermark_config")
+    op.drop_column("product_assets", "watermark_enabled")
+    op.drop_column("product_assets", "current_storage_key")
+    op.drop_column("product_assets", "original_storage_key")
+    op.drop_column("product_assets", "original_url")
@@ -0,0 +1,92 @@
+"""add persistent background jobs
+
+Revision ID: b5d2c9a3e1f7
+Revises: a41e8c7f4b20
+Create Date: 2026-08-30 12:00:00
+"""
+from __future__ import annotations
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = "b5d2c9a3e1f7"
+down_revision = "a41e8c7f4b20"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 开发态 FastAPI 会在 startup 以 Base.metadata.create_all 兜底；若它先于 Alembic
+    # 启动，表已完整存在，此处只补迁移版本记录，避免 create_table 冲突。
+    if "background_jobs" in sa.inspect(op.get_bind()).get_table_names():
+        return
+    op.create_table(
+        "background_jobs",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("product_id", sa.Uuid(), nullable=True),
+        sa.Column("kind", sa.String(length=32), nullable=False),
+        sa.Column("status", sa.String(length=24), nullable=False, server_default="queued"),
+        sa.Column("priority", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("provider", sa.String(length=32), nullable=False, server_default=""),
+        sa.Column("model", sa.String(length=128), nullable=True),
+        sa.Column("platform", sa.String(length=16), nullable=False, server_default="ozon"),
+        sa.Column("lang", sa.String(length=16), nullable=False, server_default="ru"),
+        sa.Column("ratio", sa.String(length=16), nullable=False, server_default="3:4"),
+        sa.Column("style_set", sa.Integer(), nullable=False, server_default="1"),
+        sa.Column("request_payload", sa.JSON(), nullable=False),
+        sa.Column("total", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("completed", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("failed", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("cancel_requested", sa.Boolean(), nullable=False, server_default=sa.false()),
+        sa.Column("error", sa.Text(), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.ForeignKeyConstraint(["product_id"], ["products.id"], ondelete="SET NULL"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index("ix_background_jobs_product_id", "background_jobs", ["product_id"])
+    op.create_index("ix_background_jobs_kind", "background_jobs", ["kind"])
+    op.create_index("ix_background_jobs_status", "background_jobs", ["status"])
+    op.create_index("ix_background_jobs_priority", "background_jobs", ["priority"])
+    op.create_index("ix_background_jobs_cancel_requested", "background_jobs", ["cancel_requested"])
+    op.create_index("ix_background_jobs_created_at", "background_jobs", ["created_at"])
+    op.create_index("ix_background_jobs_updated_at", "background_jobs", ["updated_at"])
+    op.create_table(
+        "background_job_items",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("job_id", sa.Uuid(), nullable=False),
+        sa.Column("position", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("status", sa.String(length=24), nullable=False, server_default="queued"),
+        sa.Column("payload", sa.JSON(), nullable=False),
+        sa.Column("provider_task_id", sa.String(length=512), nullable=True),
+        sa.Column("provider_task_kind", sa.String(length=64), nullable=True),
+        sa.Column("attempts", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("max_attempts", sa.Integer(), nullable=False, server_default="3"),
+        sa.Column("result_url", sa.Text(), nullable=True),
+        sa.Column("source_url", sa.Text(), nullable=True),
+        sa.Column("watermark_config", sa.JSON(), nullable=True),
+        sa.Column("generated_asset_id", sa.Uuid(), nullable=True),
+        sa.Column("error", sa.Text(), nullable=True),
+        sa.Column("next_run_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("lease_owner", sa.String(length=128), nullable=True),
+        sa.Column("lease_expires_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.ForeignKeyConstraint(["job_id"], ["background_jobs.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index("ix_background_job_items_job_id", "background_job_items", ["job_id"])
+    op.create_index("ix_background_job_items_status", "background_job_items", ["status"])
+    op.create_index("ix_background_job_items_provider_task_id", "background_job_items", ["provider_task_id"])
+    op.create_index("ix_background_job_items_next_run_at", "background_job_items", ["next_run_at"])
+    op.create_index("ix_background_job_items_lease_expires_at", "background_job_items", ["lease_expires_at"])
+
+
+def downgrade() -> None:
+    op.drop_table("background_job_items")
+    op.drop_table("background_jobs")