xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 5 Pull Requests 4 Actions 34.2k Packages Projects Releases 7 Wiki Activity

fix: #1970 修复 migration 编号冲突 081→082（AI 标签 migration 链入 GPU migration） #1982

Closed
xiaoxia wants to merge 1 commits from fix/1970-migration-conflict into develop
pull from: fix/1970-migration-conflict
merge into: xiaoxia:develop
Conversation 3 Commits 1 Files Changed 1
+10 -7
xiaoxia commented 2026-09-18 21:30:17 +08:00
Owner
Copy Link
Copy Source

问题

PR #1979（GPU Worker）和 PR #1981（AI 标签）各自使用了 migration 081 编号，合并到 develop 后存在 alembic 分叉冲突：

  • 081_add_gpu_lipsync_tasks.py（来自 PR #1979）
  • 081_atom_clip_ai_tags.py（来自 PR #1981）

两者 down_revision 均指向 080_edit_plan_clips_atom_clip_id，导致 alembic 无法确定迁移链。

修复

  • 将 081_atom_clip_ai_tags.py 重命名为 082_atom_clip_ai_tags.py
  • down_revision 从 080_edit_plan_clips_atom_clip_id 改为 081_add_gpu_lipsync
  • 形成正确的迁移链：080 → 081(gpu_lipsync) → 082(ai_tags)

验证

  • migration 链唯一无分叉
  • 相关单测 42 passed
## 问题 PR #1979（GPU Worker）和 PR #1981（AI 标签）各自使用了 migration 081 编号，合并到 develop 后存在 alembic 分叉冲突： - `081_add_gpu_lipsync_tasks.py`（来自 PR #1979） - `081_atom_clip_ai_tags.py`（来自 PR #1981） 两者 `down_revision` 均指向 `080_edit_plan_clips_atom_clip_id`，导致 alembic 无法确定迁移链。 ## 修复 - 将 `081_atom_clip_ai_tags.py` 重命名为 `082_atom_clip_ai_tags.py` - `down_revision` 从 `080_edit_plan_clips_atom_clip_id` 改为 `081_add_gpu_lipsync` - 形成正确的迁移链：080 → 081(gpu_lipsync) → 082(ai_tags) ## 验证 - migration 链唯一无分叉 - 相关单测 42 passed
xiaoxia added 1 commit 2026-09-18 21:30:19 +08:00
fix(gpu): result接口上报不存在task返回404而非500
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m45s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 51s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m0s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m59s
Details
CI/CD Pipeline / Integration Tests (pull_request) Failing after 3m35s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Failing after 3m41s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m56s
Details
CI/CD Pipeline / Validate - Style (pull_request) Successful in 4m8s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 4m41s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m35s
Details
CI/CD Pipeline / Validate - Security (pull_request) Successful in 10m56s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / CI Gate (pull_request) Failing after 2s
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 10s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 32s
Details
8a310b8a78
gitea-actions bot commented 2026-09-19 00:42:08 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #1982
预览链接 https://pr-1982.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1982 | | 预览链接 | [https://pr-1982.preview.xiaoxiajianji.com](https://pr-1982.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
xiaoxia commented 2026-09-19 01:10:03 +08:00
Author
Owner
Copy Link
Copy Source

本 PR 被 #1985 取代，关闭。

说明：之前排查发现两个问题——

  1. 本分支头 8a310b8a 实际不含 migration 修复提交（Gitea 故障期间分支引用异常）；
  2. develop 上的修复提交 9af73dcd 只新增了 082 文件，漏删旧的 081_atom_clip_ai_tags.py，develop 仍是 alembic 双头。

#1985 已完整修复（删除旧 081、保留链入 081(gpu) 的 082，alembic 单 head），并顺带提交 hflip 按 ai_tags.has_text 放开的改动。

另外昨晚 CI 失败（Unit Tests/Security/Build 均在 13:28~13:35 UTC 中断）与 Gitea 服务故障时间重合，日志显示 runner 在步骤中途被切断，非代码问题。

本 PR 被 #1985 取代，关闭。 说明：之前排查发现两个问题—— 1. 本分支头 8a310b8a 实际不含 migration 修复提交（Gitea 故障期间分支引用异常）； 2. develop 上的修复提交 9af73dcd 只新增了 082 文件，漏删旧的 081_atom_clip_ai_tags.py，develop 仍是 alembic 双头。 #1985 已完整修复（删除旧 081、保留链入 081(gpu) 的 082，alembic 单 head），并顺带提交 hflip 按 ai_tags.has_text 放开的改动。 另外昨晚 CI 失败（Unit Tests/Security/Build 均在 13:28~13:35 UTC 中断）与 Gitea 服务故障时间重合，日志显示 runner 在步骤中途被切断，非代码问题。
xiaoxia closed this pull request 2026-09-19 01:10:04 +08:00
gitea-actions bot commented 2026-09-19 01:12:54 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #1982 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #1982 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Some checks are pending
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m45s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 51s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m0s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m59s
Details
CI/CD Pipeline / Integration Tests (pull_request) Failing after 3m35s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Failing after 3m41s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m56s
Details
CI/CD Pipeline / Validate - Style (pull_request) Successful in 4m8s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 4m41s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m35s
Details
CI/CD Pipeline / Validate - Security (pull_request) Successful in 10m56s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / CI Gate (pull_request) Failing after 2s
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 10s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 32s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot frontend-dev xiaoxia
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#1982
Delete Branch "fix/1970-migration-conflict"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?