fix(ci): 补PR - 修复CI Bot直接push的两个修复（isort + F811+单测魔数） #335

2026-07-15T00:42:38+08:00

xiaoxia commented

2026-07-15 00:42:38 +08:00

背景

PR #332 合并后 CI 失败，CI Bot 直接 push 了两个修复 commit 到 develop，绕过了 PR 流程。本 PR 将这两个修复以正规 PR 流程重新提交。

修复内容

1. fix(lint): 修复generation.py isort import排序问题 (`6232300f`)

文件：packages/domain/render/generation.py
修复 isort 导入排序

2. fix(ci): 修复PR #332合并后CI失败 - F811重复import + url_security单测魔数校验 (`c6aac862`)

文件1：packages/adapters/sqlalchemy_impl/__init__.py - 修复 F811 重复 import
文件2：tests/unit/test_url_security.py - 修复 url_security 单测魔数校验失败

说明

这两个 commit 已经在 develop 上了（6232300fb1 和 c6aac862b1），本 PR 是补流程，确保 develop 上的变更都经过 PR review。

合并后 develop 上会有重复的 commit（因为 cherry-pick 生成新 hash），但内容一致，不会有冲突。

## 背景 PR #332 合并后 CI 失败，CI Bot 直接 push 了两个修复 commit 到 develop，绕过了 PR 流程。本 PR 将这两个修复以正规 PR 流程重新提交。 ## 修复内容 ### 1. fix(lint): 修复generation.py isort import排序问题 (6232300f) - 文件：`packages/domain/render/generation.py` - 修复 isort 导入排序 ### 2. fix(ci): 修复PR #332合并后CI失败 - F811重复import + url_security单测魔数校验 (c6aac862) - 文件1：`packages/adapters/sqlalchemy_impl/__init__.py` - 修复 F811 重复 import - 文件2：`tests/unit/test_url_security.py` - 修复 url_security 单测魔数校验失败 ## 说明这两个 commit 已经在 develop 上了（6232300fb1 和 c6aac862b1），本 PR 是补流程，确保 develop 上的变更都经过 PR review。合并后 develop 上会有重复的 commit（因为 cherry-pick 生成新 hash），但内容一致，不会有冲突。

xiaoxia added 2 commits 2026-07-15 00:42:38 +08:00

fix(lint): 修复generation.py isort import排序问题 b797e88b26

fix(ci): 修复PR #332合并后CI失败 - F811重复import + url_security单测魔数校验

CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m33s

Details

CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m6s

Details

CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m23s

Details

CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped

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 / Build Production API Image (pull_request) Has been skipped

Details

CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped

Details

CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped

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 / Staging API Integration Tests (pull_request) Has been skipped

Details

CI/CD Pipeline / Staging E2E Tests (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 1m20s

Details

ede42dd3c4

- generation.py: 删除重复的shared.url_security import（保留video_processing向后兼容层）
- test_url_security.py: mock数据添加ID3魔数头，适配新增的文件魔数校验

xiaoxia reviewed 2026-07-15 01:16:24 +08:00

xiaoxia left a comment

Review 通过 ✅

F811 重复 import 修复：

删除 generation.py 中重复的 shared.url_security import，保留 video_processing.url_security
修复正确，Worker 侧应该使用 video_processing 下的 url_security 模块

url_security 单测魔数修复：

mock 数据加 ID3 前缀，匹配 MP3 魔数校验逻辑
size 期望值从 10 调整为 13（+3 字节 ID3 头），计算正确

isort 修复： 删除重复 import 后空行自动正确

两个 bug 修复均正确，CI 全绿，可以合并。

Review 通过 ✅ **F811 重复 import 修复：** - 删除 `generation.py` 中重复的 `shared.url_security` import，保留 `video_processing.url_security` - 修复正确，Worker 侧应该使用 video_processing 下的 url_security 模块 **url_security 单测魔数修复：** - mock 数据加 `ID3` 前缀，匹配 MP3 魔数校验逻辑 - size 期望值从 10 调整为 13（+3 字节 ID3 头），计算正确 **isort 修复：** 删除重复 import 后空行自动正确两个 bug 修复均正确，CI 全绿，可以合并。

xiaoxia reviewed 2026-07-15 01:18:10 +08:00

xiaoxia left a comment

后端开发确认通过，CI全绿，同意合并

xiaoxia merged commit c24f24258a into develop

2026-07-15 01:21:34 +08:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#335