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

fix(viral-video): 修复「重新生成文案」返回 409 的问题 #2223

Merged
xiaoxia merged 1 commits from fix/regenerate-copy-409 into develop 2026-10-06 16:30:16 +08:00
Conversation 2 Commits 1 Files Changed 4
+146 -6
xiaoxia commented 2026-10-06 16:29:36 +08:00
Owner
Copy Link
Copy Source

问题

「重新生成文案」接口返回 409 Conflict。

修复

  • apps/api/app/api/routes/viral_video.py：generate-copy 接口状态白名单扩展，允许 COPY_GENERATED/COMPLETED 重入
  • packages/domain/viral_video.py：resume_from_image_analyzed 在重入场景（_is_regen）下清空旧 copy_result/intent_result/storyboard 等产物
  • 不改路径/不加接口/不改prompt
  • 单测已加：8 passed

改动

4 文件，+146/-6

## 问题 「重新生成文案」接口返回 409 Conflict。 ## 修复 - `apps/api/app/api/routes/viral_video.py`：generate-copy 接口状态白名单扩展，允许 COPY_GENERATED/COMPLETED 重入 - `packages/domain/viral_video.py`：`resume_from_image_analyzed` 在重入场景（`_is_regen`）下清空旧 `copy_result`/`intent_result`/`storyboard` 等产物 - 不改路径/不加接口/不改prompt - 单测已加：8 passed ## 改动 4 文件，+146/-6
xiaoxia added 1 commit 2026-10-06 16:29:38 +08:00
fix(viral-video): 修复「重新生成文案」409 冲突问题 (#2222)
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Style (pull_request) Has been skipped
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Security (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Has been skipped
Details
CI/CD Pipeline / Integration Tests (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 / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 33s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m7s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m4s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m32s
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 / Retag skipped Staging API Image (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m7s
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 / CI Gate (pull_request) Successful in 2s
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
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 / 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
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m14s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m46s
Details
AI Code Review / AI Code Review (pull_request) Successful in 9m54s
Details
84e0e53709 
- generate-copy 接口允许 COPY_GENERATED/COMPLETED 状态重新触发文案生成
- resume_from_image_analyzed 支持重入：重新生成时清空旧 copy_result/intent_result/storyboard/generated_copy_text/result_video_url，重置 completed_at/error_msg/phase_message
- 重新生成 retry_count 自增，与 FAILED 重试一致
- 首次进入（IMAGE_ANALYZED/PENDING）不清空已有字段
- 仍拒绝 WAIT_USER_CONFIRM 等中间状态
- 新增单测覆盖重入场景
xiaoxia merged commit a8a20d6f87 into develop 2026-10-06 16:30:16 +08:00
gitea-actions bot commented 2026-10-06 16:31:44 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

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

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

🗑️ **预览环境已清理** PR #2223 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
gitea-actions bot commented 2026-10-06 16:32:38 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

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

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

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

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

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #2223 | | 预览链接 | [https://pr-2223.preview.xiaoxiajianji.com](https://pr-2223.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
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#2223
Delete Branch "fix/regenerate-copy-409"

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?