xiaoxia/xiaoxia-saas

fix: 渲染产物临时目录不在render_plan中提前清理，改由调用方上传后清理 #1484

Merged

auto-approve-bot merged 3 commits from fix/temp-dir-cleanup-race into develop

2026-08-24 21:21:00 +08:00

Author	SHA1	Message	Date
CI Bot	c9fb83a88c	style: auto-format with black + isort + prettier [skip ci-format-check] 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 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 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 38s 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 / PR Build Worker Image (pull_request) Successful in 30s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 35s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m44s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m49s Details AI Code Review / AI Code Review (pull_request) Successful in 2m22s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 2m42s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 3m10s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m24s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 6m47s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 9m6s 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 / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 6m12s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 6s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 1m15s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m23s Details	2026-08-24 13:04:19 +00:00
xiaoxia	6b67bb948b	fix: 将try块上移到render_temp_dir赋值之后，确保异常时也清理临时目录 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 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 / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 24s 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 / PR Build API Image (pull_request) Successful in 39s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 44s Details AI Code Review / AI Code Review (pull_request) Successful in 1m56s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 2m1s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m5s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 3m35s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m36s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 4m0s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details	2026-08-24 20:59:13 +08:00
xiaoxia	4295f20fd6	fix: 渲染产物临时目录不在render_plan中提前清理，改由调用方上传后清理 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 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 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 35s 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 / PR Build Worker Image (pull_request) Successful in 37s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 39s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m39s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m51s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 2m47s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m51s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m40s Details AI Code Review / AI Code Review (pull_request) Successful in 4m15s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 4m22s Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details render_plan 的 finally 块在 _do_render 返回后立即清理临时目录，但 generation.py 的 _upload_and_record 还需要读取其中的 output_path 进行 OSS 上传，导致 FileNotFoundError。修复方案： - RenderAdapterResult 增加 temp_dir 字段 - render_plan 成功时将 temp_dir 转移给 result，并设 temp_dir=None 阻止 finally 清理；失败时 finally 仍正常清理 - _render_from_edit_plan 返回 temp_dir - generation.py 上传代码包裹在 try/finally 中，finally 清理临时目录 - 新增4个回归测试	2026-08-24 20:46:35 +08:00