fix(main): add ci-canary.yml + disable pr-auto-scan schedule on main

- Copy ci-canary.yml from develop (PR #1636) to enable 30-min health checks on main
- Disable pr-auto-scan.yml schedule on main (was still running */15, causing failure spam)
- Relates: PR #1635 (develop already had schedule disabled)

.ci-retigger-marker

@@ -1 +0,0 @@
-CI re-trigger after runner add-host/DNS fix. This file is harmless and not referenced.

.gitea/workflows/ci-pipeline.yml

@@ -283,7 +283,6 @@ jobs:
           sleep 5
         done
     - name: Run security checks
-      continue-on-error: true  # Security scan is advisory; runner failure must not block deploy
       shell: bash
       env:
         GITHUB_TOKEN: ${{ github.token }}
@@ -334,7 +333,7 @@ jobs:
       PIP_NO_CACHE_DIR: ''
       DATABASE_URL: postgresql+psycopg://postgres:postgres@host.docker.internal:5432/xiaoxia_saas
       USE_IN_MEMORY_DB: 'false'
-      CI_USE_SHARED_PG: 'false'
+      CI_USE_SHARED_PG: 'true'
     permissions:
       contents: read
     steps:
@@ -518,7 +517,7 @@ jobs:
     env:
       DATABASE_URL: postgresql+psycopg://postgres:postgres@host.docker.internal:5432/xiaoxia_saas
       USE_IN_MEMORY_DB: 'false'
-      CI_USE_SHARED_PG: 'false'
+      CI_USE_SHARED_PG: 'true'
       OSS_ACCESS_KEY_ID: placeholder
       OSS_ACCESS_KEY_SECRET: placeholder
       OSS_BUCKET_NAME: xiaoxia-autocut
@@ -1170,31 +1169,6 @@ jobs:
       run: |
         set +e
         NOTIFY_MODE=start JOB_NAME="Deploy Staging" python3 scripts/ci_notify.py
-    - name: Render .env from template
-      shell: sh
-      env:
-        STAGING_DATABASE_URL: ${{ secrets.STAGING_DATABASE_URL }}
-        STAGING_REDIS_URL: ${{ secrets.STAGING_REDIS_URL }}
-        STAGING_CELERY_BROKER_URL: ${{ secrets.STAGING_CELERY_BROKER_URL }}
-        STAGING_CELERY_RESULT_BACKEND: ${{ secrets.STAGING_CELERY_RESULT_BACKEND }}
-        STAGING_JWT_SECRET_KEY: ${{ secrets.STAGING_JWT_SECRET_KEY }}
-        STAGING_MINIO_ENDPOINT: ${{ secrets.STAGING_MINIO_ENDPOINT }}
-        STAGING_MINIO_ACCESS_KEY: ${{ secrets.STAGING_MINIO_ACCESS_KEY }}
-        STAGING_MINIO_SECRET_KEY: ${{ secrets.STAGING_MINIO_SECRET_KEY }}
-        STAGING_MINIO_BUCKET: ${{ secrets.STAGING_MINIO_BUCKET }}
-        OSS_ACCESS_KEY_ID: ${{ secrets.OSS_ACCESS_KEY_ID }}
-        OSS_ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
-        COSYVOICE_API_KEY: ${{ secrets.COSYVOICE_API_KEY }}
-        DASHSCOPE_API_KEY: ${{ secrets.DASHSCOPE_API_KEY }}
-        MEDIAKIT_API_KEY: ${{ secrets.MEDIAKIT_API_KEY }}
-      run: |
-        set -eu
-        echo "Rendering .env from template + secrets..."
-        bash scripts/render_env.sh staging
-        echo "✅ .env rendered (file contains secrets, not printed to log)"
-        # 验证文件存在且非空
-        test -s .env.rendered
-        echo "✅ .env.rendered validated ($(wc -l < .env.rendered) lines)"
     - name: Docker login to Registry
       shell: sh
       env:
@@ -1267,31 +1241,9 @@ jobs:
         ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" "echo SSH_CONNECTION_OK && hostname"
         echo "SSH connection verified"
 
-        # 配置 Diff 检查：下载服务器当前 .env，对比渲染结果，检测漂移
-        echo "Running config diff check..."
-        scp -P "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no \
-          "${staging_user}@${staging_host}:/var/lib/xiaoxia-saas-staging/.env" .env.current 2>/dev/null \
-          || touch .env.current  # 首次部署时文件不存在，创建空文件
-        bash scripts/config_diff_check.sh .env.rendered .env.current
-        rm -f .env.current
-        echo "Config diff check done"
-
-        # 上传渲染后的 .env 到服务器（替代服务器上旧的 .env）
-        echo "Uploading rendered .env to staging server..."
-        # 备份旧 .env
-        ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" \
-          "cp -f /var/lib/xiaoxia-saas-staging/.env /var/lib/xiaoxia-saas-staging/.env.bak.\$(date +%Y%m%d%H%M%S) 2>/dev/null || true"
-        # 上传新 .env
-        scp -P "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no .env.rendered \
-          "${staging_user}@${staging_host}:/var/lib/xiaoxia-saas-staging/.env"
-        echo "✅ .env uploaded to staging server"
-
         # 通过环境变量传递凭证，避免命令行引号转义问题
         cat scripts/ci_staging_deploy.sh | ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" "IMAGE_TAG=${GITHUB_SHA} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
 
-        # 清理 CI runner 上的渲染文件
-        rm -f .env.rendered
-
     - name: Staging health check + auto rollback
       if: success()
       shell: sh
@@ -1460,9 +1412,9 @@ jobs:
       - validate-security
       - validate-python
       - unit-tests
-      - frontend-lint
       - frontend-unit-test
-    if: github.event_name == 'push' && github.ref_name == 'main' && !failure() && !cancelled()
+    if: |
+      (startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'push' && github.ref_name == 'main')) && !failure() && !cancelled()
     strategy:
       fail-fast: false
       matrix:
@@ -1546,7 +1498,11 @@ jobs:
         set -eu
         REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
         # 根据ref类型设置镜像标签：tag用版本号，分支用分支名+sha
-        TAG_NAME="${GITHUB_SHA}"
+        if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+          TAG_NAME="${GITHUB_REF_NAME}"
+        else
+          TAG_NAME="${GITHUB_REF_NAME}-${GITHUB_SHA::8}"
+        fi
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"
 
@@ -1608,7 +1564,7 @@ jobs:
     concurrency:
       group: deploy-production-${{ gitea.ref }}
       cancel-in-progress: false
-    if: github.event_name == 'push' && github.ref_name == 'main'
+    if: startsWith(github.ref, 'refs/tags/v')
     needs:
     - build-production
     steps:
@@ -1681,7 +1637,7 @@ jobs:
         echo "SSH connection verified"
 
         # 通过环境变量传递凭证，避免命令行引号转义问题
-        cat scripts/ci_production_deploy.sh | ssh -p "$production_port" -i "$key_path" -o StrictHostKeyChecking=no "${production_user}@${production_host}" "IMAGE_TAG=${GITHUB_SHA} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
+        cat scripts/ci_production_deploy.sh | ssh -p "$production_port" -i "$key_path" -o StrictHostKeyChecking=no "${production_user}@${production_host}" "IMAGE_TAG=${GITHUB_REF_NAME} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
 
     - name: Production health check + auto rollback
       if: success()
@@ -1740,7 +1696,7 @@ jobs:
     name: Production Browser E2E
     runs-on: runtime-builder
     timeout-minutes: 15
-    # if: removed - runs after deploy-production succeeds
+    if: startsWith(github.ref, 'refs/tags/v')
     needs: deploy-production
     steps:
     - name: Checkout code
@@ -2060,11 +2016,6 @@ jobs:
               echo "  ⏳ $name: pending（审查中，暂不阻塞）"
               continue
             fi
-            # Security scan cancelled/failed时不阻塞部署（runner故障不应卡住流水线）
-            if [ "$name" = "validate-security" ] && { [ "$result" = "cancelled" ] || [ "$result" = "failure" ]; }; then
-              echo "  ⚠️  $name: $result（安全扫描为非阻塞项，不卡住部署）"
-              continue
-            fi
             check_job "$name" "$result"
           done
 
@@ -2117,3 +2068,4 @@ jobs:
           START_TIME=""
           [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
           curl -sfH "Authorization: token ${GITHUB_TOKEN:-$GITEA_TOKEN}" -o /tmp/_ci_trace.py "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/ci_trace_report.py?ref=${GITHUB_SHA}" 2>/dev/null && python3 /tmp/_ci_trace.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+# CI retry trigger

.gitea/workflows/playwright-base-image.yml

@@ -1,59 +0,0 @@
-name: Playwright Base Image Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: "触发原因"
-        required: false
-        default: "构建 playwright 基础镜像"
-
-jobs:
-  build-playwright:
-    name: Build Playwright Base Image
-    runs-on: runtime-builder
-    timeout-minutes: 30
-    steps:
-    - name: Docker login to Gitea Registry
-      shell: sh
-      env:
-        GITEA_REGISTRY_USER: xiaoxia
-        GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-      run: |
-        set -eu
-        for i in 1 2 3; do
-          echo "=== Docker login attempt $i/3 ==="
-          if printf '%s' "${GITEA_REGISTRY_TOKEN}" | docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" --password-stdin; then
-            echo "Docker login successful"
-            break
-          fi
-          echo "Docker login failed (attempt $i/3), retrying in 5s..."
-          sleep 5
-          [ $i -eq 3 ] && exit 1
-        done
-
-    - name: Pull, retag and push Playwright image
-      shell: sh
-      run: |
-        set -eu
-        OFFICIAL_IMAGE="mcr.microsoft.com/playwright:v1.45.0-jammy"
-        GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy"
-
-        echo "=== Pulling official Playwright image ==="
-        docker pull "${OFFICIAL_IMAGE}"
-
-        echo "=== Tagging ==="
-        docker tag "${OFFICIAL_IMAGE}" "${GITEA_IMAGE}"
-
-        echo "=== Pushing to Gitea Registry ==="
-        docker push "${GITEA_IMAGE}"
-
-        echo "Done: ${GITEA_IMAGE}"
-
-    - name: Cleanup
-      if: always()
-      shell: sh
-      run: |
-        docker rmi "mcr.microsoft.com/playwright:v1.45.0-jammy" 2>/dev/null || true
-        docker rmi "git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy" 2>/dev/null || true
-        echo "Cleanup done"

.gitea/workflows/pr-auto-scan.yml

@@ -3,7 +3,7 @@ name: PR Auto Scan
 # 作为短作业模式的兜底，防止事件驱动遗漏
 on:
   schedule:
-    # - cron: "*/15 * * * *"  # DISABLED: temporarily to stop failure spam (2026-09-02)  # 每10分钟扫描一次（脚本自带240s墙钟上限，降频减负）
+    # - cron: "*/15 * * * *"  # DISABLED: was causing failure spam on main (2026-09-03)  # 每10分钟扫描一次（脚本自带240s墙钟上限，降频减负）
   workflow_dispatch:
 
 permissions:

.gitea/workflows/pr-automation.yml

@@ -18,7 +18,7 @@ jobs:
     name: Auto Approve on CI Green
     runs-on: ci-check
     if: github.event_name == 'pull_request' && !github.event.pull_request.draft
-    timeout-minutes: 10  # 等待CI全绿+审批，需要充足时间
+    timeout-minutes: 3  # 长等待模式：等CI全绿后自动合并，不遗漏任何PR
     steps:
       - name: Checkout code
         shell: sh
@@ -61,8 +61,7 @@ jobs:
     name: Auto Merge on CI Green + Approved
     runs-on: ci-check
     if: github.event_name == 'pull_request' && !github.event.pull_request.draft && github.event.pull_request.base.ref == 'develop'
-    needs: [auto-approve]  # 修复竞态：必须等审批完成后再尝试合并
-    timeout-minutes: 15  # 等待审批+CI就绪+合并，需要充足时间
+    timeout-minutes: 3  # 短作业模式：检查一次，不满足就退出，由pr-auto-scan每5分钟定时兜底
     steps:
       - name: Checkout code
         shell: sh

.gitignore

@@ -24,11 +24,6 @@ ruff_cache/
 .env.production
 .env.staging
 !.env.example
-# 配置模板不受忽略规则限制
-!deploy/configs/.env.staging
-!deploy/configs/.env.production
-# 渲染后的 env 文件包含真实密钥，绝不能提交
-.env.rendered
 
 # OS / editor
 .DS_Store
@@ -59,4 +54,3 @@ frontend-v21-ui-prototype-final.html
 !.vscode/settings.json
 .vscode/extensions.json
 .coverage
-.env.current

EMPTY_COMMIT.txt

@@ -0,0 +1 @@
+retrigger3

README.md

@@ -263,3 +263,4 @@ pytest --cov=packages --cov-report=html
 ---
 
 **License**: MIT
+<!-- CI trigger: 1788229339 -->

alembic/versions/061_add_sort_order_to_template_categories.py

@@ -1,26 +0,0 @@
-"""add sort_order to template_categories
-
-Revision ID: 061_sort_order
-Revises: 060_migrate_segments
-Create Date: 2026-09-02
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "061_sort_order"
-down_revision = "060_migrate_segments"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "template_categories",
-        sa.Column("sort_order", sa.Integer, nullable=False, server_default="0"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("template_categories", "sort_order")

alembic/versions/062_readd_edit_plan_id_to_generation_tasks.py

@@ -1,28 +0,0 @@
-"""re-add edit_plan_id to generation_tasks (align staging with production)
-
-Revision ID: 062_edit_plan_id
-Revises: 061_sort_order
-Create Date: 2026-09-02
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "062_edit_plan_id"
-down_revision = "061_sort_order"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "generation_tasks",
-        sa.Column("edit_plan_id", sa.String(36), nullable=True),
-    )
-    op.create_index("ix_generation_tasks_edit_plan_id_2", "generation_tasks", ["edit_plan_id"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_generation_tasks_edit_plan_id_2", table_name="generation_tasks")
-    op.drop_column("generation_tasks", "edit_plan_id")

alembic/versions/063_add_video_fingerprint_chunks.py

@@ -1,46 +0,0 @@
-"""add video_fingerprint_chunks table for per-chunk fingerprint storage
-
-Revision ID: 063_fingerprint_chunks
-Revises: 062_edit_plan_id
-Create Date: 2026-09-03
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "063_fingerprint_chunks"
-down_revision = "062_edit_plan_id"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "video_fingerprint_chunks",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("video_id", sa.String(36), nullable=False),
-        sa.Column("project_id", sa.String(36), nullable=False),
-        sa.Column("user_id", sa.String(36), nullable=False, server_default=""),
-        sa.Column("start_time_ms", sa.Integer, nullable=False),
-        sa.Column("end_time_ms", sa.Integer, nullable=False),
-        sa.Column("phash_binary", sa.String(16), nullable=False),
-        sa.Column("color_histogram", sa.JSON, nullable=False),
-        sa.Column("frame_count", sa.Integer, nullable=False, server_default="1"),
-        sa.Column(
-            "created_at",
-            sa.DateTime,
-            nullable=False,
-            server_default=sa.func.now(),
-        ),
-    )
-    op.create_index("ix_vfc_video_id", "video_fingerprint_chunks", ["video_id"])
-    op.create_index("ix_vfc_project_id", "video_fingerprint_chunks", ["project_id"])
-    op.create_index("ix_vfc_user_id", "video_fingerprint_chunks", ["user_id"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_vfc_user_id", table_name="video_fingerprint_chunks")
-    op.drop_index("ix_vfc_project_id", table_name="video_fingerprint_chunks")
-    op.drop_index("ix_vfc_video_id", table_name="video_fingerprint_chunks")
-    op.drop_table("video_fingerprint_chunks")

alembic/versions/064_add_match_count_visual_similarity.py

@@ -1,25 +0,0 @@
-"""add match_count and visual_similarity to generated_videos
-
-Revision ID: 064_match_count_visual_sim
-Revises: 063_fingerprint_chunks
-Create Date: 2026-09-03
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "064_match_count_visual_sim"
-down_revision = "063_fingerprint_chunks"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column("generated_videos", sa.Column("match_count", sa.Integer(), nullable=True, server_default="0"))
-    op.add_column("generated_videos", sa.Column("visual_similarity", sa.Float(), nullable=True, server_default="0.0"))
-
-
-def downgrade() -> None:
-    op.drop_column("generated_videos", "visual_similarity")
-    op.drop_column("generated_videos", "match_count")

alembic/versions/065_add_visual_similarity_match_count_duplication.py

@@ -1,25 +0,0 @@
-"""add visual_similarity and match_count to duplication_records
-
-Revision ID: 065_dup_record_sim_match
-Revises: 064_match_count_visual_sim
-Create Date: 2026-09-04
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "065_dup_record_sim_match"
-down_revision = "064_match_count_visual_sim"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column("duplication_records", sa.Column("visual_similarity", sa.Float(), nullable=True))
-    op.add_column("duplication_records", sa.Column("match_count", sa.Integer(), nullable=True))
-
-
-def downgrade() -> None:
-    op.drop_column("duplication_records", "match_count")
-    op.drop_column("duplication_records", "visual_similarity")

apps/api/app/api/routes/assets.py

@@ -290,7 +290,7 @@ def list_assets(
         else:
             total = asset_repository.count_by_project_ids(project_ids, status=status_list)
             # 跨项目分页：逐项目累积直到凑够一页
-            paged_items = []
+            paged_items: list = []
             offset = skip
             remaining = limit
             for pid in project_ids:

apps/api/app/api/routes/auth.py

@@ -456,7 +456,7 @@ async def wechat_callback(
     user = user_repository.find_by_id(response.user_id)
     binding_complete = False
     if user:
-        binding_complete = bool(
+        binding_complete = (
             user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
         )
 

apps/api/app/api/routes/duplication.py

@@ -7,7 +7,6 @@ from typing import Any
 from uuid import uuid4
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
 from app.dependencies import get_duplication_repository
 from app.schemas.duplication import (
@@ -77,8 +76,6 @@ def _to_record_response(record: DuplicationRecord) -> DuplicationRecordResponse:
         status=record.status,
         duplicate_rate=record.duplicate_rate,
         duplicate_count=record.duplicate_count,
-        visual_similarity=getattr(record, "visual_similarity", None),
-        match_count=getattr(record, "match_count", None),
         created_at=record.created_at.isoformat(),
         updated_at=record.updated_at.isoformat(),
     )
@@ -93,8 +90,6 @@ def _to_detail_response(record: DuplicationRecord) -> DuplicationDetailResponse:
         status=record.status,
         duplicate_rate=record.duplicate_rate,
         duplicate_count=record.duplicate_count,
-        visual_similarity=getattr(record, "visual_similarity", None),
-        match_count=getattr(record, "match_count", None),
         created_at=record.created_at.isoformat(),
         updated_at=record.updated_at.isoformat(),
         segments=[
@@ -197,8 +192,6 @@ async def upload_for_duplication(
         authenticated_user.user.id,
     )
 
-    celery_app.send_task("worker.process_duplication_check", args=[record.id])
-
     return DuplicationUploadResponse(
         id=record.id,
         status=record.status,
@@ -303,8 +296,6 @@ def retry_duplication(
             detail=f"查重记录 {record_id} 不存在",
         )
 
-    celery_app.send_task("worker.process_duplication_check", args=[updated.id])
-
     return DuplicationUploadResponse(
         id=updated.id,
         status=updated.status,

apps/api/app/api/routes/generation_cover.py

@@ -513,7 +513,7 @@ def generate_cover(
         if generation_task_id:
             try:
                 task = gen_task_repo.get(generation_task_id)
-                if task and getattr(task, "cover_url", ""):  # type: ignore[arg-type]
+                if task and getattr(task, "cover_url", ""):
                     cover_url_from_task = task.cover_url
                     logger.info(
                         "[封面生成] 统一管道封面(步骤A-direct): plan_id=%s task_id=%s url=%s",
@@ -538,7 +538,7 @@ def generate_cover(
                     gv_task_id = getattr(gv, "generation_task_id", "") or ""
                     if gv_task_id:
                         task_a2 = gen_task_repo.get(gv_task_id)
-                        if task_a2 and getattr(task_a2, "cover_url", ""):  # type: ignore[arg-type]
+                        if task_a2 and getattr(task_a2, "cover_url", ""):
                             cover_url_from_task = task_a2.cover_url
                             logger.info(
                                 "[封面生成] 封面(步骤A2-video-task): plan_id=%s video_id=%s url=%s",
@@ -747,7 +747,7 @@ def generate_cover(
 
         if cover_url_from_task:
             # 标题已在预览视频渲染时烧录（ASS字幕），封面帧自然包含标题
-            cover_data: dict[str, object] = {  # type: ignore[no-redef]
+            cover_data = {
                 "type": "ai_frame",
                 "image_url": cover_url_from_task,
                 "frame_time": 0.0,

apps/api/app/api/routes/generation_preview.py

@@ -98,7 +98,7 @@ def _resolve_strategy_id_from_template(template_id: str, db: Session, user_id: s
     try:
         new_repo = SQLAlchemyEditTemplateRepository(db)
         new_template = new_repo.get(template_id)
-        if new_template and getattr(new_template, "editing_mode", ""):  # type: ignore[arg-type]
+        if new_template and getattr(new_template, "editing_mode", ""):
             mode = new_template.editing_mode.strip()
             if mode:
                 logger.info(

apps/api/app/api/routes/generation_tasks.py

@@ -92,9 +92,6 @@ def _to_generated_video_response(item, download_url: str | None = None) -> Gener
         height=item.height,
         fps=item.fps,
         download_url=download_url,
-        duplicate_rate=getattr(item, "duplicate_rate", None),
-        visual_similarity=getattr(item, "visual_similarity", None),
-        match_count=getattr(item, "match_count", None),
     )
 
 
@@ -140,6 +137,7 @@ def _select_assets_from_library(
     return [a.id for a in ready_video_assets]
 
 
+
 def _writeback_edit_plan_config(
     plan_id: str,
     task_id: str,
@@ -164,7 +162,7 @@ def _writeback_edit_plan_config(
         current_config = plan_model.config if isinstance(plan_model.config, dict) else {}
         merged = dict(current_config)
         merged["generation_task_id"] = task_id
-
+        
         # 检查标题是否发生变化，如果变化则清除 cover 字段强制重新生成封面
         if title_config:
             old_title_config = merged.get("title_config", {}) or {}
@@ -176,12 +174,10 @@ def _writeback_edit_plan_config(
                     del merged["cover"]
                     logger.info(
                         "[生成任务] 标题变化，清除旧封面: plan_id=%s old_title=%s new_title=%s",
-                        plan_id,
-                        old_title_text,
-                        new_title_text,
+                        plan_id, old_title_text, new_title_text,
                     )
             merged["title_config"] = title_config
-
+        
         plan_model.config = merged
         db.commit()
         logger.info(
@@ -389,7 +385,7 @@ def create_generation_task(
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     count = request.count
-    created_tasks: list = []
+    created_tasks = []
     failed_tasks = []
     user_id = authenticated_user.user.id
     # 同批次任务共享 batch_id，用于视频查重时批次内比对

apps/api/app/api/routes/templates_editor/clips.py

@@ -1056,8 +1056,8 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
                     try:
                         existing_meta = dict(getattr(asset, "metadata", None) or {})
                         existing_meta["scene_change_points"] = scene_changes
-                        asset.metadata = existing_meta  # type: ignore[attr-defined]
-                        asset_repo.update(asset)  # type: ignore[arg-type]
+                        asset.metadata = existing_meta
+                        asset_repo.update(asset)
                         logger.info(
                             "后台任务: 场景点已写入素材缓存: asset_id=%s points=%d",
                             asset_id,

apps/api/app/api/routes/templates_editor/effects.py

@@ -41,17 +41,17 @@ def list_editor_transition_presets(
     _: AuthenticatedUser = Depends(get_current_user),
 ) -> TransitionPresetListResponse:
     """获取转场预设列表"""
-    from packages.domain.transition_presets import TRANSITION_PRESET_LIBRARY
+    from packages.domain.transition_presets import TRANSITION_PRESETS
 
     items = [
         {
-            "id": p.id,
-            "name": p.name,
-            "category": p.category,
-            "duration": p.default_duration,
-            "description": p.description,
+            "id": p["id"],
+            "name": p["name"],
+            "category": p.get("category", "通用"),
+            "duration": p.get("default_duration", 0.5),
+            "description": p.get("description", ""),
         }
-        for p in TRANSITION_PRESET_LIBRARY
+        for p in TRANSITION_PRESETS
     ]
     return TransitionPresetListResponse(items=items, total=len(items))
 
@@ -123,17 +123,17 @@ def list_editor_filter_presets(
     _: AuthenticatedUser = Depends(get_current_user),
 ) -> FilterPresetListResponse:
     """获取滤镜预设列表"""
-    from packages.domain.filter_presets import FILTER_PRESET_LIBRARY
+    from packages.domain.filter_presets import FILTER_PRESETS
 
     items = [
         {
-            "id": p.id,
-            "name": p.name,
-            "category": p.category,
-            "thumbnail": p.lut_url,
-            "description": p.description,
+            "id": p["id"],
+            "name": p["name"],
+            "category": p.get("category", "通用"),
+            "thumbnail": p.get("thumbnail", ""),
+            "description": p.get("description", ""),
         }
-        for p in FILTER_PRESET_LIBRARY
+        for p in FILTER_PRESETS
     ]
     return FilterPresetListResponse(items=items, total=len(items))
 

apps/api/app/api/routes/tts.py

@@ -2,9 +2,7 @@
 
 from __future__ import annotations
 
-import json
 import logging
-import subprocess
 import tempfile
 from pathlib import Path
 from typing import Any, Optional
@@ -432,8 +430,6 @@ def save_tts_job_to_library(
     storage_key = f"uploads/voice/tts/{job.id}.{audio_format}"
 
     tmp_path: Path | None = None
-    audio_duration: float | None = None
-    file_size = 0
     try:
         with tempfile.NamedTemporaryFile(suffix=f".{audio_format}", delete=False) as tmp:
             tmp_path = Path(tmp.name)
@@ -449,23 +445,6 @@ def save_tts_job_to_library(
             )
         file_size = tmp_path.stat().st_size
         storage_service.upload_file(tmp_path, storage_key, content_type=content_type)
-
-        # 从音频文件提取时长（ffprobe），作为 job.duration 的兜底
-        try:
-            proc = subprocess.run(
-                [
-                    "ffprobe", "-v", "quiet", "-print_format", "json",
-                    "-show_format", str(tmp_path),
-                ],
-                capture_output=True, text=True, timeout=10,
-            )
-            if proc.returncode == 0:
-                fmt = json.loads(proc.stdout).get("format", {})
-                dur = float(fmt.get("duration", 0))
-                if dur > 0:
-                    audio_duration = dur
-        except Exception:
-            logger.warning("ffprobe 提取时长失败: job_id=%s", job.id, exc_info=True)
     except HTTPException:
         raise
     except Exception as e:
@@ -503,7 +482,7 @@ def save_tts_job_to_library(
         mime_type=content_type,
         metadata=metadata_,
         file_size=file_size,
-        duration=job.duration or audio_duration or None,
+        duration=job.duration or None,
         status=AssetStatus.READY,
         classification_status=ClassificationStatus.PENDING,  # 音频不参与内容分类，保持 pending 与 ingest 链路一致
         uploaded_by_user_id=user_id,

apps/api/app/api/routes/upload.py

@@ -23,7 +23,6 @@ from app.schemas.upload import (
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
 
 from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
-from packages.domain import Asset, AssetStatus
 
 logger = logging.getLogger(__name__)
 
@@ -81,40 +80,6 @@ def _validate_mime_type(content_type: str | None) -> str:
     return base_type
 
 
-def _infer_mime_type_from_storage_key(storage_key: str) -> str:
-    """从 storage_key 推断 MIME 类型（与 worker 端保持一致）。"""
-    lower_filename = storage_key.rsplit("/", 1)[-1].lower()
-    _MIME_MAP = {
-        ".mov": "video/quicktime", ".mp4": "video/mp4", ".avi": "video/x-msvideo",
-        ".mkv": "video/x-matroska", ".webm": "video/webm",
-        ".png": "image/png", ".gif": "image/gif", ".bmp": "image/bmp",
-        ".svg": "image/svg+xml", ".jpg": "image/jpeg", ".jpeg": "image/jpeg",
-        ".mp3": "audio/mpeg", ".wav": "audio/wav", ".ogg": "audio/ogg",
-        ".flac": "audio/flac", ".m4a": "audio/x-m4a",
-    }
-    for ext, mime in _MIME_MAP.items():
-        if lower_filename.endswith(ext):
-            return mime
-    return "video/mp4"  # default
-
-
-def _create_pending_asset(
-    asset_repository, project_id, library_id, storage_key, filename, mime_type, user_id, file_hash=""
-):
-    """立即创建一条 PROCESSING 状态的 Asset 记录，使前端能马上看到新素材。"""
-    asset = Asset.create(
-        project_id=project_id,
-        library_id=library_id,
-        name=filename,
-        storage_key=storage_key,
-        mime_type=mime_type,
-        status=AssetStatus.PROCESSING,
-        uploaded_by_user_id=user_id,
-        file_hash=file_hash,
-    )
-    return asset_repository.create(asset)
-
-
 def _submit_ingest_job(
     project_id: str,
     library_id: str,
@@ -244,20 +209,6 @@ async def complete_direct_upload(
                 url=storage_service.get_url(normalized_key),
             )
 
-    # 立即创建 Asset 记录（PROCESSING 状态），使前端刷新后即可看到新素材
-    filename = normalized_key.rsplit("/", 1)[-1]
-    mime_type = _infer_mime_type_from_storage_key(normalized_key)
-    pending_asset = _create_pending_asset(
-        asset_repository=asset_repository,
-        project_id=request.project_id,
-        library_id=request.library_id,
-        storage_key=normalized_key,
-        filename=filename,
-        mime_type=mime_type,
-        user_id=authenticated_user.user.id,
-        file_hash=request.file_hash,
-    )
-
     job = _submit_ingest_job(
         project_id=request.project_id,
         library_id=request.library_id,
@@ -265,12 +216,7 @@ async def complete_direct_upload(
         ingest_job_repository=ingest_job_repository,
         file_hash=request.file_hash,
     )
-    return DirectUploadCompleteResponse(
-        storage_key=normalized_key,
-        ingest_job_id=job.id,
-        asset_id=pending_asset.id,
-        url=storage_service.get_url(normalized_key),
-    )
+    return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id, url=storage_service.get_url(normalized_key))
 
 
 @router.post(
@@ -338,18 +284,6 @@ async def upload_asset(
             detail=f"Failed to upload file: {type(error).__name__}",
         ) from error
 
-    # 立即创建 Asset 记录（PROCESSING 状态），使前端刷新后即可看到新素材
-    pending_asset = _create_pending_asset(
-        asset_repository=asset_repository,
-        project_id=project_id,
-        library_id=library_id,
-        storage_key=storage_key,
-        filename=safe_filename,
-        mime_type=validated_content_type,
-        user_id=authenticated_user.user.id,
-        file_hash=file_hash,
-    )
-
     job = _submit_ingest_job(
         project_id=project_id,
         library_id=library_id,
@@ -361,6 +295,5 @@ async def upload_asset(
     return UploadAssetResponse(
         storage_key=storage_key,
         ingest_job_id=job.id,
-        asset_id=pending_asset.id,
         url=file_url,
     )

apps/api/app/api/routes/videos.py

@@ -53,8 +53,6 @@ def _to_video_response(item, storage: OSSStorageService | None = None) -> VideoI
         download_url=download_url,
         generated_at=format_utc_datetime(item.generated_at) if hasattr(item, "generated_at") else "",
         duplicate_rate=getattr(item, "duplicate_rate", None),
-        visual_similarity=getattr(item, "visual_similarity", None),
-        match_count=getattr(item, "match_count", None),
     )
 
 

apps/api/app/api/routes/voices.py

@@ -6,26 +6,12 @@
 from __future__ import annotations
 
 import logging
-import shutil
-import subprocess
-import tempfile
 import time
-from pathlib import Path
 from typing import Literal, Optional
-from uuid import uuid4
 
 from app.api.routes._helpers import get_user_plan
 from app.auth import AuthenticatedUser, get_current_user
-from app.core.storage import get_storage_service
-from app.dependencies import (
-    get_asset_library_repository,
-    get_asset_repository,
-    get_audio_url_signer,
-    get_cosyvoice_service,
-    get_db_session,
-    get_project_repository,
-    get_user_repository,
-)
+from app.dependencies import get_audio_url_signer, get_cosyvoice_service, get_db_session, get_user_repository
 from app.schemas.voice import (
     PresetVoiceItemResponse,
     PresetVoiceListResponse,
@@ -38,7 +24,7 @@ from app.schemas.voice_library import (
     UpdateVoiceLibraryRequest,
     VoiceLibraryItemResponse,
 )
-from fastapi import APIRouter, Depends, File, Form, HTTPException, Query, Response, UploadFile, status
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import SQLAlchemyVoiceCloneProfileRepository
@@ -54,12 +40,8 @@ from packages.application.voice_library.use_cases import (
     QuotaExceededError,
     UpdateVoiceLibraryUseCase,
 )
-from packages.domain import Asset, AssetStatus
-from packages.domain.classification import AssetLibraryKind, ClassificationStatus
-from packages.domain.entities import AssetLibrary
 from packages.domain.preset_voices import PRESET_VOICES, get_preset_voice_by_id
 from packages.ports.user_repository import UserRepository
-from packages.shared.storage import SharedStorageService
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -525,243 +507,3 @@ def delete_voice(
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
     return
-
-
-# ── 提取视频配音 ─────────────────────────────────────────────────────
-
-# 支持的视频格式
-EXTRACT_VIDEO_MIMES = frozenset({"video/mp4", "video/quicktime", "video/webm", "video/x-msvideo"})
-MAX_EXTRACT_SIZE = 500 * 1024 * 1024  # 500MB
-
-
-@router.post(
-    "/extract-voice",
-    status_code=status.HTTP_201_CREATED,
-)
-def extract_voice_from_video(
-    file: UploadFile = File(...),
-    project_id: str = Form(...),
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    project_repository=Depends(get_project_repository),
-    asset_library_repository=Depends(get_asset_library_repository),
-    asset_repository=Depends(get_asset_repository),
-    storage_service: SharedStorageService = Depends(get_storage_service),
-    sign_url=Depends(get_audio_url_signer),
-):
-    """从上传的视频中提取人声配音。
-
-    流程：
-    1. 接收视频文件（mp4/mov/webm）
-    2. ffmpeg 提取音频 + 降噪 + 编码为 mp3
-    3. 上传到 OSS，创建 Asset 记录到配音素材库
-    4. 返回素材信息（时长、文件大小、URL）
-    """
-    user_id = authenticated_user.user.id
-
-    # 校验文件类型
-    content_type = file.content_type or ""
-    if content_type and content_type not in EXTRACT_VIDEO_MIMES:
-        # 兜底：按扩展名判断
-        ext = (file.filename or "").rsplit(".", 1)[-1].lower()
-        ext_to_mime = {"mp4": "video/mp4", "mov": "video/quicktime", "webm": "video/webm", "avi": "video/x-msvideo"}
-        if ext not in ext_to_mime:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="仅支持 mp4/mov/webm/avi 格式的视频文件",
-            )
-        content_type = ext_to_mime[ext]
-
-    # 找到（或自动创建）用户 voice 素材库（复用 TTS 的逻辑）
-    library = _find_or_create_voice_library_for_extract(
-        user_id=user_id,
-        project_repository=project_repository,
-        asset_library_repository=asset_library_repository,
-    )
-
-    tmp_dir = None
-    try:
-        tmp_dir = Path(tempfile.mkdtemp(prefix="voice_extract_"))
-        video_path = tmp_dir / f"input_{uuid4().hex[:8]}_{file.filename or 'video.mp4'}"
-        audio_path = tmp_dir / f"output_{uuid4().hex[:8]}.mp3"
-
-        # 保存上传的视频到临时文件
-        with open(video_path, "wb") as f:
-            total = 0
-            while chunk := file.file.read(1024 * 1024):  # 1MB chunks
-                total += len(chunk)
-                if total > MAX_EXTRACT_SIZE:
-                    raise HTTPException(
-                        status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
-                        detail="视频文件过大，最大支持 500MB",
-                    )
-                f.write(chunk)
-
-        if video_path.stat().st_size == 0:
-            raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="视频文件为空")
-
-        # ffmpeg: 提取音频 + 降噪 + 编码 mp3
-        # 滤镜链：highpass(去低频噪声) → afftdn(FFT降噪) → lowpass(去高频噪声)
-        ffmpeg_cmd = [
-            "ffmpeg",
-            "-y",
-            "-i",
-            str(video_path),
-            "-vn",  # 不要视频
-            "-af",
-            "highpass=f=80,afftdn=nf=-25:tn=1,lowpass=f=8000",
-            "-acodec",
-            "libmp3lame",
-            "-ab",
-            "192k",
-            "-ar",
-            "44100",
-            "-ac",
-            "1",  # 单声道（人声足够）
-            str(audio_path),
-        ]
-
-        result = subprocess.run(
-            ffmpeg_cmd,
-            capture_output=True,
-            timeout=300,  # 5 分钟超时
-        )
-
-        if result.returncode != 0:
-            stderr_text = result.stderr.decode("utf-8", errors="replace")[-500:]
-            logger.error("ffmpeg 提取配音失败: %s", stderr_text)
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                detail="视频音频提取失败，可能该视频没有音轨或格式不支持",
-            )
-
-        if not audio_path.exists() or audio_path.stat().st_size == 0:
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                detail="音频提取结果为空",
-            )
-
-        # 获取音频时长
-        duration = _get_audio_duration(audio_path)
-        file_size = audio_path.stat().st_size
-
-        # 上传到 OSS
-        audio_ext = "mp3"
-        storage_key = f"uploads/voice/extracted/{uuid4().hex}.{audio_ext}"
-        storage_service.upload_file(audio_path, storage_key, content_type="audio/mpeg")
-
-        # 创建 Asset 记录
-        original_name = (file.filename or "video").rsplit(".", 1)[0]
-        asset_name = f"{original_name}-配音"
-
-        asset = Asset.create(
-            project_id=library.project_id,
-            library_id=library.id,
-            name=asset_name,
-            storage_key=storage_key,
-            mime_type="audio/mpeg",
-            metadata={
-                "source": "video_extract",
-                "original_video": file.filename or "unknown",
-            },
-            file_size=file_size,
-            duration=duration,
-            status=AssetStatus.READY,
-            classification_status=ClassificationStatus.PENDING,
-            uploaded_by_user_id=user_id,
-        )
-        asset = asset_repository.create(asset)
-
-        return {
-            "id": asset.id,
-            "name": asset.name,
-            "audio_url": sign_url(storage_key),
-            "duration": duration,
-            "file_size": file_size,
-            "status": "completed",
-            "source": "video_extract",
-        }
-
-    except HTTPException:
-        raise
-    except subprocess.TimeoutExpired:
-        raise HTTPException(
-            status_code=status.HTTP_504_GATEWAY_TIMEOUT,
-            detail="视频处理超时，请尝试较短的视频",
-        ) from None
-    except Exception as e:
-        logger.exception("提取视频配音失败: %s", e)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="提取配音失败，请稍后重试",
-        ) from e
-    finally:
-        # 清理临时文件
-        if tmp_dir and Path(tmp_dir).exists():
-            shutil.rmtree(tmp_dir, ignore_errors=True)
-
-
-def _find_or_create_voice_library_for_extract(*, user_id, project_repository, asset_library_repository):
-    """为用户找到或创建 voice 素材库（与 TTS 保存逻辑一致）。"""
-    projects = project_repository.find_accessible_projects(user_id)
-    if not projects:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="没有可用的项目，请先创建项目",
-        )
-
-    for project in projects:
-        for lib in asset_library_repository.find_by_project(project.id):
-            kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if kind == AssetLibraryKind.VOICE.value:
-                return lib
-
-    # 自动创建
-    from sqlalchemy.exc import IntegrityError
-
-    project = projects[0]
-    library = AssetLibrary.create(
-        project_id=project.id,
-        name="配音素材库",
-        kind=AssetLibraryKind.VOICE,
-    )
-    try:
-        return asset_library_repository.create(library)
-    except IntegrityError:
-        session = getattr(asset_library_repository, "session", None)
-        if session is not None:
-            try:
-                session.rollback()
-            except Exception:
-                pass
-        for lib in asset_library_repository.find_by_project(project.id):
-            kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if kind == AssetLibraryKind.VOICE.value:
-                return lib
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="配音素材库创建失败",
-        ) from None
-
-
-def _get_audio_duration(audio_path: Path) -> float:
-    """用 ffprobe 获取音频时长（秒）。"""
-    try:
-        result = subprocess.run(
-            [
-                "ffprobe",
-                "-v",
-                "quiet",
-                "-show_entries",
-                "format=duration",
-                "-of",
-                "csv=p=0",
-                str(audio_path),
-            ],
-            capture_output=True,
-            timeout=10,
-        )
-        if result.returncode == 0 and result.stdout.strip():
-            return float(result.stdout.strip())
-    except (ValueError, subprocess.TimeoutExpired):
-        pass
-    return 0.0

apps/api/app/schemas/duplication.py

@@ -28,9 +28,6 @@ class DuplicationRecordResponse(BaseModel):
     status: str = "pending"
     duplicate_rate: float | None = None
     duplicate_count: int = 0
-    # #1661 视觉相似度（归一化 0~1）/ 匹配视频数
-    visual_similarity: float | None = None
-    match_count: int | None = None
     created_at: str
     updated_at: str
 

apps/api/app/schemas/generated_video.py

@@ -25,10 +25,6 @@ class GeneratedVideoResponse(BaseModel):
     review_status: str = "pending_review"
     generation_params: dict = Field(default_factory=dict)
     download_url: str | None = None
-    # #1660 查重率（百分比 0~100）/ 视觉相似度（0~1）/ 匹配帧数
-    duplicate_rate: float | None = None
-    visual_similarity: float | None = None
-    match_count: int | None = None
 
 
 class GeneratedVideoDownloadUrlResponse(BaseModel):

apps/api/app/schemas/video_center.py

@@ -22,10 +22,7 @@ class VideoItemResponse(BaseModel):
     generation_params: dict = Field(default_factory=dict)
     download_url: str | None = None
     generated_at: str = ""
-    # #1660 查重率（百分比 0~100）/ 视觉相似度（0~1）/ 匹配帧数
     duplicate_rate: float | None = None
-    visual_similarity: float | None = None
-    match_count: int | None = None
 
 
 class ListVideosResponse(BaseModel):

apps/api/app/services/plan_generator_service.py

@@ -131,7 +131,6 @@ class PlanGeneratorService:
                 editing_mode,
                 random_selection=random_preview,
                 asset_durations=asset_durations,
-                user_id=created_by_user_id,
             )
 
         # 5. 持久化所有 clips 并计算总时长
@@ -219,7 +218,6 @@ class PlanGeneratorService:
         *,
         random_selection: bool = False,
         asset_durations: dict[str, float] | None = None,
-        user_id: str = "",
     ) -> None:
         """按 editing_mode 将素材分配到 clips（就地修改，未持久化）.
 
@@ -236,19 +234,6 @@ class PlanGeneratorService:
                 # 有缓存的素材片段起点从随机镜头段选取，无缓存走随机起点兜底
                 asset_scene_points = self._fetch_asset_scene_points(asset_ids)
 
-                # 正式生成也随机重排片段顺序（降重，默认开启无开关）
-                # smart_match 决定选哪些素材，shuffle 只改变分配到 clips 的顺序
-                asset_ids = list(asset_ids)  # 复制避免修改调用方原列表
-                random.shuffle(asset_ids)
-
-        # 查询已有视频的已用区间（跨视频避让）
-        external_used_segments = None
-        if user_id and self._clip_repo:
-            try:
-                external_used_segments = self._clip_repo.list_used_segments_by_user(user_id, limit_recent=50)
-            except Exception:
-                logger.warning("跨视频避让查询失败，回退到纯随机", exc_info=True)
-
         distribute_assets(
             clips,
             asset_ids,
@@ -256,7 +241,6 @@ class PlanGeneratorService:
             random_selection=random_selection,
             asset_durations=asset_durations,
             asset_scene_points=asset_scene_points,
-            external_used_segments=external_used_segments,
         )
 
     def _fetch_asset_scene_points(self, asset_ids: List[str]) -> dict[str, list[float]]:

apps/api/scripts/rebuild_fingerprint_chunks.py

@@ -1,174 +0,0 @@
-#!/usr/bin/env python3
-"""存量指纹重建脚本 — 为已有视频生成 video_fingerprint_chunks 分片数据。
-
-功能：
-- 查询 generated_videos 中 video_fingerprint IS NOT NULL 但尚无分片数据的视频
-- 从 OSS 下载视频 → 用新的分片算法重新计算指纹 → 写入分片表
-- 支持 --dry-run（只打印不写入）和 --batch-size（默认 50）
-- 幂等：已存在分片数据的视频跳过
-
-用法：
-    # 预览（不写入）
-    python rebuild_fingerprint_chunks.py --dry-run
-
-    # 执行重建
-    python rebuild_fingerprint_chunks.py --batch-size 50
-"""
-
-from __future__ import annotations
-
-import argparse
-import logging
-import os
-import sys
-import tempfile
-
-# 确保可以 import worker_app 和 packages
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "worker"))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", ".."))
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
-)
-logger = logging.getLogger("rebuild_fingerprint_chunks")
-
-
-def find_videos_needing_rebuild(session, batch_size: int) -> list[dict]:
-    """查询需要重建分片指纹的视频。"""
-    from sqlalchemy import and_
-
-    from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel, VideoFingerprintChunkModel
-
-    # 有 video_fingerprint 的视频
-    has_fingerprint = GeneratedVideoModel.video_fingerprint.isnot(None)
-    has_fingerprint = and_(has_fingerprint, GeneratedVideoModel.video_fingerprint != "")
-
-    # 排除已有分片数据的视频
-    subq = session.query(VideoFingerprintChunkModel.video_id).distinct().subquery()
-    no_chunks = ~GeneratedVideoModel.id.in_(subq)
-
-    videos = (
-        session.query(GeneratedVideoModel)
-        .filter(and_(has_fingerprint, no_chunks))
-        .order_by(GeneratedVideoModel.generated_at.desc())
-        .limit(batch_size)
-        .all()
-    )
-
-    return [
-        {
-            "id": v.id,
-            "project_id": v.project_id,
-            "user_id": v.user_id or "",
-            "duration": v.duration,
-        }
-        for v in videos
-    ]
-
-
-def rebuild_one(video_info: dict, dry_run: bool = False) -> int:
-    """重建单个视频的分片数据。返回写入的 chunk 数量。"""
-    from video_processing.dedup import VideoDeduplicator, _save_fingerprint_chunks
-    from worker_app.db import SessionLocal
-
-    from packages.adapters.sqlalchemy_impl.models import VideoFingerprintChunkModel
-    from packages.shared.storage import get_storage_service
-
-    video_id = video_info["id"]
-    project_id = video_info["project_id"]
-    user_id = video_info["user_id"]
-
-    if dry_run:
-        logger.info("[DRY-RUN] Would rebuild video %s (project=%s)", video_id, project_id)
-        return 0
-
-    session = SessionLocal()
-    temp_dir = tempfile.mkdtemp()
-
-    try:
-        # 再次检查幂等性
-        existing_count = (
-            session.query(VideoFingerprintChunkModel).filter(VideoFingerprintChunkModel.video_id == video_id).count()
-        )
-        if existing_count > 0:
-            logger.info("Video %s already has %d chunks, skipping", video_id, existing_count)
-            return 0
-
-        # 下载视频
-        storage_service = get_storage_service()
-        local_path = os.path.join(temp_dir, f"{video_id}.mp4")
-        storage_key = f"projects/{project_id}/generated/{video_id}/{video_id}.mp4"
-        storage_service.download_file(storage_key, local_path)
-
-        # 重新计算指纹
-        deduplicator = VideoDeduplicator()
-        fingerprint = deduplicator.compute_fingerprint(local_path)
-
-        # 写入分片表
-        _save_fingerprint_chunks(fingerprint, video_id, project_id, user_id, session)
-        session.commit()
-
-        chunk_count = len(fingerprint.chunks)
-        logger.info("Rebuilt %d chunks for video %s", chunk_count, video_id)
-        return chunk_count
-
-    except Exception as e:
-        logger.error("Failed to rebuild video %s: %s", video_id, e)
-        session.rollback()
-        return -1
-    finally:
-        session.close()
-        import shutil
-
-        shutil.rmtree(temp_dir, ignore_errors=True)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="存量指纹重建脚本")
-    parser.add_argument("--dry-run", action="store_true", help="只打印不写入")
-    parser.add_argument("--batch-size", type=int, default=50, help="每批处理数量（默认 50）")
-    parser.add_argument("--total-limit", type=int, default=0, help="总处理数量限制（0=不限制）")
-    args = parser.parse_args()
-
-    from worker_app.db import SessionLocal
-
-    session = SessionLocal()
-
-    try:
-        videos = find_videos_needing_rebuild(session, args.batch_size)
-        logger.info("Found %d videos needing rebuild", len(videos))
-
-        if args.dry_run:
-            for v in videos:
-                logger.info("[DRY-RUN] Video %s | project=%s | duration=%.1fs", v["id"], v["project_id"], v["duration"])
-            return
-
-        total_chunks = 0
-        processed = 0
-        failed = 0
-
-        for v in videos:
-            if args.total_limit > 0 and processed >= args.total_limit:
-                break
-
-            result = rebuild_one(v, dry_run=False)
-            if result < 0:
-                failed += 1
-            else:
-                total_chunks += result
-                processed += 1
-
-        logger.info(
-            "Rebuild complete: processed=%d, chunks=%d, failed=%d",
-            processed,
-            total_chunks,
-            failed,
-        )
-
-    finally:
-        session.close()
-
-
-if __name__ == "__main__":
-    main()

apps/web/src/api/duplication/types.ts

@@ -20,10 +20,6 @@ export interface DuplicationRecord {
   duplicate_rate?: number
   /** 重复片段数 */
   duplicate_count?: number
-  /** 视觉相似度（0-100），#1660 新增 */
-  visual_similarity?: number
-  /** 匹配帧数，#1660 新增 */
-  match_count?: number
   /** 创建时间 */
   created_at: string
   /** 更新时间 */

apps/web/src/api/products/types.ts

@@ -23,10 +23,6 @@ export interface ProductItem {
   project_name?: string
   /** 查重率（百分比） */
   duplicate_rate?: number
-  /** 视觉相似度（0-100），#1660 新增 */
-  visual_similarity?: number
-  /** 匹配帧数，#1660 新增 */
-  match_count?: number
   created_at?: string
   updated_at?: string
 }
@@ -76,8 +72,4 @@ export interface VideoItem {
   download_url: string
   generated_at: string
   duplicate_rate?: number
-  /** 视觉相似度（0-100），#1660 新增 */
-  visual_similarity?: number
-  /** 匹配帧数，#1660 新增 */
-  match_count?: number
 }

apps/web/src/api/products/utils.ts

@@ -30,7 +30,5 @@ export function mapVideoToProductItem(video: VideoItem): ProductItem {
     created_at: video.generated_at,
     updated_at: video.generated_at,
     duplicate_rate: video.duplicate_rate,
-    visual_similarity: video.visual_similarity,
-    match_count: video.match_count,
   }
 }

apps/web/src/api/tts/index.ts

@@ -28,5 +28,4 @@ export {
   deleteTTSJob,
   getTtsVoices,
   previewTts,
-  extractVideoVoice,
 } from "./jobs"

apps/web/src/api/tts/jobs.ts

@@ -70,56 +70,3 @@ export const previewTts = async (data: TTSPreviewRequest): Promise<TTSPreviewRes
   const response = await apiClient.post<TTSPreviewResponse>("/tts/preview", data)
   return response.data
 }
-
-/**
- * 从视频中提取配音（上传视频 → 后端提取人声 → 保存到配音素材库）
- * 支持 mp4/mov/webm 格式
- */
-export const extractVideoVoice = async (
-  file: File,
-  onProgress?: (percent: number) => void,
-): Promise<{ asset_id: string; duration: number }> => {
-  const formData = new FormData()
-  formData.append("file", file)
-
-  return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest()
-    xhr.open("POST", "/api/v1/voices/extract-voice")
-
-    // 携带认证 token（从 localStorage 获取，与 apiClient 拦截器一致）
-    const token = localStorage.getItem("access_token")
-    if (token) {
-      xhr.setRequestHeader("Authorization", `Bearer ${token}`)
-    }
-
-    xhr.timeout = 10 * 60 * 1000 // 10 分钟超时
-
-    xhr.upload.onprogress = (e) => {
-      if (e.lengthComputable && onProgress) {
-        onProgress(Math.round((e.loaded / e.total) * 100))
-      }
-    }
-
-    xhr.onload = () => {
-      if (xhr.status >= 200 && xhr.status < 300) {
-        try {
-          resolve(JSON.parse(xhr.responseText))
-        } catch {
-          reject(new Error("服务器返回数据解析失败"))
-        }
-      } else {
-        try {
-          const err = JSON.parse(xhr.responseText)
-          reject(new Error(err.detail || err.message || `提取失败: HTTP ${xhr.status}`))
-        } catch {
-          reject(new Error(`提取失败: HTTP ${xhr.status}`))
-        }
-      }
-    }
-
-    xhr.onerror = () => reject(new Error("网络错误，请检查网络连接"))
-    xhr.ontimeout = () => reject(new Error("上传超时（10分钟），请检查网络或尝试更小的文件"))
-
-    xhr.send(formData)
-  })
-}

apps/web/src/components/voice/CloneModal/index.tsx

@@ -297,7 +297,7 @@ const CloneModal: React.FC<CloneModalProps> = ({ open, onClose, onSuccess }) =>
                     buttonSize="sm"
                     onClick={() => {
                       handleClose()
-                      navigate("/app/voices?tab=material&upload=1")
+                      navigate("/app/voice-materials")
                     }}
                   >
                     去配音库上传

apps/web/src/pages/assets/hooks/useAssetsData.ts

@@ -3,11 +3,9 @@ import { useQuery } from "@tanstack/react-query"
 import {
   getAssetLibraries,
   getAssets,
-  ensureDefaultLibrary,
   type AssetLibraryItem,
   type AssetItem as ApiAssetItem,
 } from "@/api/assets"
-import { getOrCreateDefaultProject } from "@/api/projects"
 import { mapLibrary, mapAsset, type AssetItem, type LibraryItem } from "../types"
 
 /**
@@ -18,18 +16,7 @@ export function useAssetsData() {
   /* ── 视频库列表查询 ── */
   const { data: apiLibraries = [], isLoading: libLoading } = useQuery<AssetLibraryItem[], Error>({
     queryKey: ["asset-libraries"],
-    queryFn: async () => {
-      const libs = await getAssetLibraries()
-      // 如果没有 video 类型的库，自动创建默认视频素材库（与 useVoiceMaterials 保持一致）
-      const hasVideoLib = libs.some((lib) => lib.kind === "video")
-      if (!hasVideoLib) {
-        const project = await getOrCreateDefaultProject()
-        await ensureDefaultLibrary({ project_id: project.id, kind: "video" })
-        // 创建后重新拉取最新列表
-        return getAssetLibraries()
-      }
-      return libs
-    },
+    queryFn: getAssetLibraries,
     staleTime: 60_000,
   })
 

apps/web/src/pages/duplication/DuplicationDetail.tsx

@@ -98,7 +98,7 @@ const DuplicationDetail: React.FC = () => {
       <div className="dup-detail-grid">
         <RiskCard riskLevel={riskLevel} similarityPercent={similarityPercent} />
         <InfoCard detail={detail} />
-        <SegmentsSection segments={detail.segments} totalDuration={detail.duration_seconds} />
+        <SegmentsSection segments={detail.segments} />
       </div>
     </div>
   )

apps/web/src/pages/duplication/components/ResultCard.tsx

@@ -1,7 +1,7 @@
 import React from "react"
 import { Button, Tag, Tooltip } from "@/components/ui"
 import type { DuplicationRecord } from "@/api/duplication"
-import { STATUS_CONFIG, RISK_TAG_VARIANT, RISK_LABELS } from "../constants"
+import { STATUS_CONFIG } from "../constants"
 import { getRiskLevel, formatSize, formatDuration } from "../utils"
 
 interface ResultCardProps {
@@ -54,9 +54,6 @@ const ResultCard: React.FC<ResultCardProps> = ({ record, onView, onDelete, onRet
               />
             </div>
             <span className={`dup-score-value ${riskLevel}`}>{rateValue.toFixed(1)}%</span>
-            <Tag variant={RISK_TAG_VARIANT[riskLevel]} className="dup-score-risk-tag">
-              {RISK_LABELS[riskLevel]}
-            </Tag>
           </>
         ) : record.status === "failed" ? (
           <Tooltip title="重新查重">

apps/web/src/pages/duplication/components/SegmentsSection.tsx

@@ -2,81 +2,34 @@ import React from "react"
 import { Tag } from "@/components/ui"
 import type { DuplicateSegment } from "@/api/duplication"
 import { SegmentCard } from "./SegmentCard"
-import { formatTime } from "../utils"
 
 interface SegmentsSectionProps {
   segments?: DuplicateSegment[]
-  /** 视频总时长（秒），用于渲染时间轴 */
-  totalDuration?: number
-}
-
-/** 片段相似度 → 风险等级（时间轴配色用） */
-const getSegmentRisk = (similarity: number): "low" | "medium" | "high" => {
-  if (similarity >= 90) return "high"
-  if (similarity >= 70) return "medium"
-  return "low"
 }
 
 /**
- * 重复片段列表区域（含时间轴可视化）
+ * 重复片段列表区域
  */
-export const SegmentsSection: React.FC<SegmentsSectionProps> = ({
-  segments = [],
-  totalDuration,
-}) => {
-  const showTimeline = segments.length > 0 && totalDuration !== undefined && totalDuration > 0
+export const SegmentsSection: React.FC<SegmentsSectionProps> = ({ segments = [] }) => (
+  <div className="dup-checks-section">
+    <h3>
+      🔍 重复片段详情
+      <Tag variant="primary" style={{ marginLeft: 8 }}>
+        {segments.length} 个片段
+      </Tag>
+    </h3>
 
-  return (
-    <div className="dup-checks-section">
-      <h3>
-        🔍 重复片段详情
-        <Tag variant="primary" style={{ marginLeft: 8 }}>
-          {segments.length} 个片段
-        </Tag>
-      </h3>
-
-      {showTimeline && (
-        <div className="dup-timeline">
-          <div className="dup-timeline-bar">
-            {segments.map((seg, i) => {
-              const left = (seg.source_start / totalDuration) * 100
-              const width = Math.max(
-                ((seg.source_end - seg.source_start) / totalDuration) * 100,
-                0.5,
-              )
-              const segRisk = getSegmentRisk(seg.similarity)
-              return (
-                <div
-                  key={seg.id ?? i}
-                  className={`dup-timeline-segment ${segRisk}`}
-                  style={{
-                    left: `${Math.min(left, 100)}%`,
-                    width: `${Math.min(width, 100 - Math.min(left, 100))}%`,
-                  }}
-                  title={`${formatTime(seg.source_start)} - ${formatTime(seg.source_end)} · 相似度 ${seg.similarity.toFixed(0)}% · ${seg.matched_video_name}`}
-                />
-              )
-            })}
-          </div>
-          <div className="dup-timeline-labels">
-            <span>0s</span>
-            <span>{formatTime(totalDuration ?? 0)}</span>
-          </div>
-        </div>
-      )}
-
-      {segments.length > 0 ? (
-        <div className="dup-checks-list">
-          {segments.map((segment, index) => (
-            <SegmentCard key={segment.id} segment={segment} index={index} />
-          ))}
-        </div>
-      ) : (
-        <div className="dup-results-empty" style={{ padding: "32px 0" }}>
-          <div className="dup-results-empty-icon">🎉</div>
-          <p>未发现重复片段，内容原创度很高</p>
-        </div>
-      )}
-    </div>
-  )
-}
+    {segments.length > 0 ? (
+      <div className="dup-checks-list">
+        {segments.map((segment, index) => (
+          <SegmentCard key={segment.id} segment={segment} index={index} />
+        ))}
+      </div>
+    ) : (
+      <div className="dup-results-empty" style={{ padding: "32px 0" }}>
+        <div className="dup-results-empty-icon">🎉</div>
+        <p>未发现重复片段，内容原创度很高</p>
+      </div>
+    )}
+  </div>
+)

apps/web/src/pages/duplication/duplication.css

@@ -831,61 +831,3 @@
     font-size: 16px;
   }
 }
-
-/* ============================================================
-   查重率风险标签（列表卡片）
-   ============================================================ */
-.dup-score-risk-tag {
-  flex-shrink: 0;
-  margin-left: 2px;
-}
-
-/* ============================================================
-   重复片段时间轴可视化（#1662）
-   ============================================================ */
-.dup-timeline {
-  margin: 16px 0;
-  padding: 0 8px;
-}
-
-.dup-timeline-bar {
-  position: relative;
-  height: 24px;
-  background: var(--bg-secondary, #f1f5f9);
-  border-radius: 4px;
-  overflow: hidden;
-}
-
-.dup-timeline-segment {
-  position: absolute;
-  top: 2px;
-  height: 20px;
-  border-radius: 3px;
-  opacity: 0.8;
-  cursor: pointer;
-  transition: opacity 0.2s;
-}
-
-.dup-timeline-segment:hover {
-  opacity: 1;
-}
-
-.dup-timeline-segment.low {
-  background: #22c55e;
-}
-
-.dup-timeline-segment.medium {
-  background: #f59e0b;
-}
-
-.dup-timeline-segment.high {
-  background: #ef4444;
-}
-
-.dup-timeline-labels {
-  display: flex;
-  justify-content: space-between;
-  font-size: 12px;
-  color: var(--text-secondary);
-  margin-top: 4px;
-}

apps/web/src/pages/duplication/utils.ts

@@ -1,9 +1,9 @@
 /** 根据查重率获取风险等级 */
 export const getRiskLevel = (rate?: number): "low" | "medium" | "high" => {
   if (rate === undefined) return "low"
-  if (rate < 15) return "low" // <15% 绿色（安全）
-  if (rate <= 30) return "medium" // 15-30% 黄色（注意）
-  return "high" // >30% 红色（危险）
+  if (rate <= 10) return "low"
+  if (rate <= 30) return "medium"
+  return "high"
 }
 
 /** 格式化时间（秒 → mm:ss） */

apps/web/src/pages/generate/components/Step5VoiceSelect.tsx

@@ -134,7 +134,7 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
 
   /** 跳转到配音库上传 */
   const handleGoToUpload = useCallback(() => {
-    navigate("/app/voices?tab=material&upload=1")
+    navigate("/app/voices")
   }, [navigate])
 
   // 加载中状态

apps/web/src/pages/products/components/ProductInfoPanel.tsx

@@ -2,7 +2,6 @@ import React from "react"
 import type { ProductItem } from "../../../api/products"
 import { STATUS_MAP } from "../constants"
 import { formatDuration, formatFileSize, formatDate } from "../detailUtils"
-import { getRiskLevel } from "../../duplication/utils"
 
 interface ProductInfoPanelProps {
   product: ProductItem
@@ -45,26 +44,12 @@ export const ProductInfoPanel: React.FC<ProductInfoPanelProps> = ({ product }) =
         </div>
         <div className="xx-detail-meta-item">
           <span className="xx-detail-meta-label">查重率</span>
-          <span
-            className={`xx-detail-meta-value dup-risk-text dup-risk-${getRiskLevel(product.duplicate_rate)}`}
-          >
+          <span className="xx-detail-meta-value">
             {(product.duplicate_rate ?? 0) > 0
               ? `${(product.duplicate_rate ?? 0).toFixed(1)}%`
               : "-"}
           </span>
         </div>
-        {product.visual_similarity != null && (
-          <div className="xx-detail-meta-item">
-            <span className="xx-detail-meta-label">视觉相似度</span>
-            <span className="xx-detail-meta-value">{product.visual_similarity.toFixed(1)}%</span>
-          </div>
-        )}
-        {product.match_count != null && (
-          <div className="xx-detail-meta-item">
-            <span className="xx-detail-meta-label">匹配帧数</span>
-            <span className="xx-detail-meta-value">{product.match_count}</span>
-          </div>
-        )}
         <div className="xx-detail-meta-item">
           <span className="xx-detail-meta-label">创建时间</span>
           <span className="xx-detail-meta-value">{formatDate(product.created_at ?? "")}</span>

apps/web/src/pages/products/products.css

@@ -1076,19 +1076,3 @@
     gap: var(--space-sm);
   }
 }
-
-/* 查重率风险颜色（#1662） */
-.xx-detail-meta-value.dup-risk-low {
-  color: var(--success-color, #22c55e);
-  font-weight: 600;
-}
-
-.xx-detail-meta-value.dup-risk-medium {
-  color: var(--warning-color, #f59e0b);
-  font-weight: 600;
-}
-
-.xx-detail-meta-value.dup-risk-high {
-  color: var(--error-color, #ef4444);
-  font-weight: 600;
-}

apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/useVoiceMaterialData.ts

@@ -1,11 +1,6 @@
 import { useMemo, useEffect } from "react"
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"
-import {
-  getAssetsByKind,
-  getAssetLibraries,
-  createAssetLibrary,
-  type AssetItem,
-} from "@/api/assets"
+import { getAssetsByKind, getAssetLibraries, createAssetLibrary } from "@/api/assets"
 import { type VoiceMaterial, mapAssetToMaterial } from "../../types"
 
 interface UseVoiceMaterialDataOptions {
@@ -49,15 +44,6 @@ export function useVoiceMaterialData({ keyword, gender, tagIds }: UseVoiceMateri
     queryKey: ["assets", "voice", { keyword, gender, tag_ids: tagIds }],
     queryFn: () => getAssetsByKind("voice", { keyword, gender, tag_ids: tagIds }),
     staleTime: 30_000,
-    // 列表中存在上传中/处理中素材时每 3s 轮询；全部就绪后自动停止
-    refetchInterval: (query) => {
-      const items = (query.state.data as AssetItem[] | undefined) ?? []
-      const processing = items.some((a) => {
-        const st = a.status ?? ""
-        return st === "uploading" || st === "ingesting" || st === "processing" || st === "pending"
-      })
-      return processing ? 3000 : false
-    },
   })
 
   const materials: VoiceMaterial[] = useMemo(() => assets.map(mapAssetToMaterial), [assets])

apps/web/src/pages/voice-materials/types.ts

@@ -41,7 +41,7 @@ export const mapAssetToMaterial = (asset: AssetItem): VoiceMaterial => {
     tagIds: Array.isArray(asset.tag_ids) ? asset.tag_ids : [],
     fileName: asset.storage_key?.split("/").pop() || asset.name,
     fileSize: asset.file_size || 0,
-    duration: asset.duration || (meta.duration as number) || 0,
+    duration: (meta.duration as number) || 0,
     mimeType: asset.mime_type || "audio/mpeg",
     createdAt: asset.created_at || new Date().toISOString(),
     fileUrl: asset.file_url,

apps/web/src/pages/voices/VoiceLibrary.tsx

@@ -14,14 +14,8 @@
  * 弹窗集合 → components/VoiceModals
  * Toast 提示 → components/VoiceToasts
  */
-import React, { useCallback, useEffect, useState } from "react"
-import { useSearchParams } from "react-router-dom"
-import {
-  UploadOutlined,
-  AudioOutlined,
-  RobotOutlined,
-  VideoCameraOutlined,
-} from "@ant-design/icons"
+import React, { useCallback, useState } from "react"
+import { UploadOutlined, AudioOutlined, RobotOutlined } from "@ant-design/icons"
 import { Button } from "@/components/ui"
 import PageHead from "@/components/layout/PageHead"
 import { type AssetItem } from "@/api/assets"
@@ -40,8 +34,6 @@ import { useTtsSynthesize } from "./hooks/useTtsSynthesize"
 import { useVoiceUpload } from "./hooks/useVoiceUpload"
 import { useMaterialDelete } from "./hooks/useMaterialDelete"
 import { useMaterialBatchDelete } from "./hooks/useMaterialBatchDelete"
-import { useVideoExtract } from "./hooks/useVideoExtract"
-import VideoExtractModal from "./components/VideoExtractModal"
 import "./voices.css"
 
 let toastIdSeq = 0
@@ -166,32 +158,6 @@ const VoiceLibrary: React.FC = () => {
     handleUploadClose,
   } = useVoiceUpload({ showToast })
 
-  // ── 提取视频配音 ──────────────────────────────────────
-  const {
-    extractOpen,
-    extractFile,
-    extractProgress,
-    isExtracting,
-    setExtractOpen,
-    handleFileSelect: handleExtractFileSelect,
-    handleExtract,
-    handleExtractClose,
-  } = useVideoExtract({ showToast })
-
-  // ── URL 参数自动打开上传弹窗 ────────────────────────────
-  const [searchParams, setSearchParams] = useSearchParams()
-
-  useEffect(() => {
-    if (searchParams.get("upload") === "1") {
-      setActiveTab("material")
-      setUploadOpen(true)
-      // 一次性触发器：清理 upload 参数，避免切换 Tab 时重复触发
-      const next = new URLSearchParams(searchParams)
-      next.delete("upload")
-      setSearchParams(next, { replace: true })
-    }
-  }, [searchParams, setActiveTab, setUploadOpen, setSearchParams])
-
   // ── 切换 Tab 时停止播放 ───────────────────────────────
   const handleTabChange = useCallback(
     (tab: VoiceTabKey) => {
@@ -219,14 +185,6 @@ const VoiceLibrary: React.FC = () => {
       >
         上传音频
       </Button>
-      <Button
-        buttonType="primary"
-        buttonSize="sm"
-        icon={<VideoCameraOutlined />}
-        onClick={() => setExtractOpen(true)}
-      >
-        提取视频配音
-      </Button>
       <Button
         buttonType="ghost"
         buttonSize="sm"
@@ -327,18 +285,7 @@ const VoiceLibrary: React.FC = () => {
         />
       )}
 
-      {/* ── 视频提取配音弹窗 ─────────────────────────────── */}
-      <VideoExtractModal
-        open={extractOpen}
-        file={extractFile}
-        progress={extractProgress}
-        isExtracting={isExtracting}
-        onClose={handleExtractClose}
-        onFileSelect={handleExtractFileSelect}
-        onExtract={handleExtract}
-      />
-
-      {/* ── 弹窗集合 ─────────────────────────────────── */}
+      {/* ── 弹窗集合 ──────────────────────────────────── */}
       <VoiceModals
         cloneModalOpen={cloneModalOpen}
         onCloneClose={() => setCloneModalOpen(false)}

apps/web/src/pages/voices/components/MaterialVoiceTab.tsx

@@ -136,9 +136,6 @@ export const MaterialVoiceTab: React.FC<MaterialVoiceTabProps> = ({
             const material = mapAssetToMaterial(asset)
             // duration 优先取顶层（后端从 metadata 提取），兜底 metadata
             const cardDuration = asset.duration || material.duration || 0
-            // AI 生成素材标识：兼容旧素材（无 source 字段但有 tts_job_id）
-            const meta = asset.metadata as Record<string, unknown>
-            const isAiMaterial = meta?.source === "tts_job" || !!meta?.tts_job_id
             const isPlaying = playingId === asset.id
             const isSelected = selectedIds.has(asset.id)
             // 播放中以 audio 真实时长为准，未播放显示卡片时长
@@ -185,11 +182,8 @@ export const MaterialVoiceTab: React.FC<MaterialVoiceTabProps> = ({
                 </div>
 
                 <div className="xx-voice-info vmat-info">
-                  <div className="xx-voice-name-row">
-                    <div className="xx-voice-name" title={asset.name}>
-                      {asset.name}
-                    </div>
-                    {isAiMaterial && <span className="vmat-ai-badge">AI</span>}
+                  <div className="xx-voice-name" title={asset.name}>
+                    {asset.name}
                   </div>
                   <div className="xx-voice-subtitle">
                     {asset.file_size ? `${formatFileSize(asset.file_size)}` : "--"}

apps/web/src/pages/voices/components/VideoExtractModal.tsx

@@ -1,207 +0,0 @@
-import React, { useRef } from "react"
-import { Modal } from "antd"
-import { InboxOutlined, CloseOutlined } from "@ant-design/icons"
-
-interface VideoExtractModalProps {
-  open: boolean
-  file: File | null
-  progress: number | null
-  isExtracting: boolean
-  onClose: () => void
-  onFileSelect: (file: File | null) => void
-  onExtract: () => void
-}
-
-const ACCEPT_TYPES = ".mp4,.mov,.webm"
-
-const VideoExtractModal: React.FC<VideoExtractModalProps> = ({
-  open,
-  file,
-  progress,
-  isExtracting,
-  onClose,
-  onFileSelect,
-  onExtract,
-}) => {
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  return (
-    <Modal
-      title={<span style={{ fontSize: 16, fontWeight: 600 }}>提取视频配音</span>}
-      open={open}
-      onCancel={() => {
-        if (isExtracting) return
-        onClose()
-      }}
-      footer={null}
-      width={480}
-      maskClosable={!isExtracting}
-    >
-      {!file ? (
-        <div
-          className="vmat-upload-dropzone"
-          onClick={() => inputRef.current?.click()}
-          style={{
-            border: "2px dashed #d9d9d9",
-            borderRadius: 8,
-            padding: "40px 20px",
-            textAlign: "center",
-            cursor: "pointer",
-            transition: "border-color 0.3s",
-          }}
-          onMouseEnter={(e) => (e.currentTarget.style.borderColor = "#7c3aed")}
-          onMouseLeave={(e) => (e.currentTarget.style.borderColor = "#d9d9d9")}
-        >
-          <InboxOutlined style={{ fontSize: 32, color: "#7c3aed", marginBottom: 12 }} />
-          <p style={{ margin: "0 0 8px", fontSize: 14, color: "#333" }}>点击选择视频文件</p>
-          <span style={{ fontSize: 12, color: "#999" }}>支持 MP4、MOV、WebM 格式</span>
-          <input
-            ref={inputRef}
-            type="file"
-            accept={ACCEPT_TYPES}
-            style={{ display: "none" }}
-            onChange={(e) => {
-              const f = e.target.files?.[0]
-              if (f) onFileSelect(f)
-            }}
-          />
-        </div>
-      ) : (
-        <div>
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-              padding: "12px 16px",
-              background: "#fafafa",
-              borderRadius: 8,
-              marginBottom: 16,
-            }}
-          >
-            <span
-              style={{
-                flex: 1,
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-                whiteSpace: "nowrap",
-                fontSize: 14,
-                fontWeight: 500,
-              }}
-              title={file.name}
-            >
-              {file.name}
-            </span>
-            <span style={{ fontSize: 12, color: "#999", marginLeft: 8, flexShrink: 0 }}>
-              {(file.size / (1024 * 1024)).toFixed(1)} MB
-            </span>
-            {!isExtracting && (
-              <button
-                type="button"
-                onClick={() => {
-                  if (inputRef.current) inputRef.current.value = ""
-                  onFileSelect(null)
-                }}
-                style={{
-                  border: "none",
-                  background: "none",
-                  cursor: "pointer",
-                  color: "#999",
-                  marginLeft: 8,
-                  fontSize: 14,
-                }}
-                aria-label="移除文件"
-              >
-                <CloseOutlined />
-              </button>
-            )}
-          </div>
-
-          {progress !== null && (
-            <div style={{ marginBottom: 12 }}>
-              <div
-                style={{
-                  height: 6,
-                  background: "#f0f0f0",
-                  borderRadius: 3,
-                  overflow: "hidden",
-                }}
-              >
-                <div
-                  style={{
-                    height: "100%",
-                    width: `${progress}%`,
-                    background: "linear-gradient(90deg, #7c3aed, #a78bfa)",
-                    borderRadius: 3,
-                    transition: "width 0.3s",
-                  }}
-                />
-              </div>
-              <div
-                style={{
-                  textAlign: "right",
-                  fontSize: 12,
-                  color: "#999",
-                  marginTop: 4,
-                }}
-              >
-                {progress}%
-              </div>
-            </div>
-          )}
-
-          {isExtracting && (
-            <p style={{ textAlign: "center", fontSize: 13, color: "#7c3aed", margin: "12px 0 0" }}>
-              {progress === 100 ? "正在提取人声，请稍候..." : "正在上传视频..."}
-            </p>
-          )}
-        </div>
-      )}
-
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "flex-end",
-          gap: 8,
-          marginTop: 24,
-        }}
-      >
-        <button
-          type="button"
-          onClick={onClose}
-          disabled={isExtracting}
-          style={{
-            padding: "6px 16px",
-            borderRadius: 6,
-            border: "1px solid #d9d9d9",
-            background: "#fff",
-            cursor: isExtracting ? "not-allowed" : "pointer",
-            fontSize: 14,
-            opacity: isExtracting ? 0.5 : 1,
-          }}
-        >
-          取消
-        </button>
-        <button
-          type="button"
-          onClick={onExtract}
-          disabled={!file || isExtracting}
-          style={{
-            padding: "6px 16px",
-            borderRadius: 6,
-            border: "none",
-            background: !file || isExtracting ? "#d9d9d9" : "#7c3aed",
-            color: "#fff",
-            cursor: !file || isExtracting ? "not-allowed" : "pointer",
-            fontSize: 14,
-            fontWeight: 500,
-          }}
-        >
-          {isExtracting ? "提取中..." : "开始提取"}
-        </button>
-      </div>
-    </Modal>
-  )
-}
-
-export default VideoExtractModal

apps/web/src/pages/voices/hooks/useVideoExtract.ts

@@ -1,74 +0,0 @@
-import { useState, useCallback } from "react"
-import { useQueryClient } from "@tanstack/react-query"
-import { extractVideoVoice } from "@/api/tts"
-
-/**
- * 视频提取配音 Hook
- * 封装视频上传弹窗状态、提取进度、提取 mutation 逻辑
- */
-interface UseVideoExtractProps {
-  showToast: (message: string, type: "success" | "error") => void
-}
-
-export function useVideoExtract({ showToast }: UseVideoExtractProps) {
-  const queryClient = useQueryClient()
-
-  const [extractOpen, setExtractOpen] = useState(false)
-  const [extractFile, setExtractFile] = useState<File | null>(null)
-  const [extractProgress, setExtractProgress] = useState<number | null>(null)
-  const [isExtracting, setIsExtracting] = useState(false)
-
-  const handleExtractClose = useCallback(() => {
-    setExtractOpen(false)
-    setExtractFile(null)
-    setExtractProgress(null)
-    setIsExtracting(false)
-  }, [])
-
-  const handleExtract = useCallback(async () => {
-    if (!extractFile) return
-    setIsExtracting(true)
-    setExtractProgress(0)
-    try {
-      await extractVideoVoice(extractFile, (p) => setExtractProgress(p))
-      // 刷新素材列表
-      queryClient.invalidateQueries({ queryKey: ["assets", "voice"] })
-      queryClient.invalidateQueries({ queryKey: ["voice-materials"] })
-      showToast("视频配音提取成功", "success")
-      handleExtractClose()
-    } catch (err: unknown) {
-      const msg = err instanceof Error ? err.message : "提取失败，请重试"
-      showToast(msg, "error")
-    } finally {
-      setIsExtracting(false)
-      setExtractProgress(null)
-    }
-  }, [extractFile, queryClient, showToast, handleExtractClose])
-
-  const handleFileSelect = useCallback(
-    (file: File | null) => {
-      if (!file) {
-        setExtractFile(null)
-        return
-      }
-      const validTypes = ["video/mp4", "video/quicktime", "video/webm"]
-      if (!validTypes.includes(file.type)) {
-        showToast("仅支持 MP4、MOV、WebM 格式的视频文件", "error")
-        return
-      }
-      setExtractFile(file)
-    },
-    [showToast],
-  )
-
-  return {
-    extractOpen,
-    setExtractOpen,
-    extractFile,
-    extractProgress,
-    isExtracting,
-    handleFileSelect,
-    handleExtract,
-    handleExtractClose,
-  }
-}

apps/web/src/pages/voices/voices.css

@@ -193,24 +193,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
   flex: 1;
-  display: flex;
-  align-items: center;
-}
-
-/* AI 配音标识 */
-.vmat-ai-badge {
-  display: inline-block;
-  margin-left: 6px;
-  padding: 1px 6px;
-  font-size: 11px;
-  font-weight: 600;
-  color: #7c3aed;
-  background: #f3f0ff;
-  border: 1px solid #ddd6fe;
-  border-radius: 4px;
-  line-height: 16px;
-  vertical-align: middle;
-  flex-shrink: 0;
 }
 
 .xx-voice-star {

apps/web/src/test/pages/duplication/utils.test.ts

@@ -1,29 +0,0 @@
-import { describe, it, expect } from "vitest"
-import { getRiskLevel } from "@/pages/duplication/utils"
-
-describe("getRiskLevel (#1662 阈值 <15 / 15-30 / >30)", () => {
-  it("undefined 返回 low（兼容无数据）", () => {
-    expect(getRiskLevel(undefined)).toBe("low")
-  })
-
-  it("<15% 为低风险", () => {
-    expect(getRiskLevel(0)).toBe("low")
-    expect(getRiskLevel(10)).toBe("low")
-    expect(getRiskLevel(14.9)).toBe("low")
-  })
-
-  it("15% 边界为中风险", () => {
-    expect(getRiskLevel(15)).toBe("medium")
-  })
-
-  it("15-30% 为中风险", () => {
-    expect(getRiskLevel(20)).toBe("medium")
-    expect(getRiskLevel(30)).toBe("medium")
-  })
-
-  it(">30% 为高风险", () => {
-    expect(getRiskLevel(30.1)).toBe("high")
-    expect(getRiskLevel(80)).toBe("high")
-    expect(getRiskLevel(100)).toBe("high")
-  })
-})

apps/worker/video_processing/dedup_helpers.py

@@ -100,24 +100,8 @@ def create_video_record_and_dedup(
 
         generated_video.video_fingerprint = fingerprint.to_dict()
 
-        # 写入分片指纹表
-        from video_processing.dedup import _save_fingerprint_chunks
-
-        try:
-            _save_fingerprint_chunks(fingerprint, video_id, project_id, user_id, session)
-        except Exception as chunk_err:
-            logger.warning("Failed to save fingerprint chunks for %s: %s", video_id, chunk_err)
-
-        # (a) 历史成片查重（跨项目全局 + 时长预过滤）
-        duration_sec = fingerprint.duration / 1000 if fingerprint.duration else 0
-        duplicate_result = deduplicator.check_duplicate(
-            fingerprint,
-            project_id,
-            session,
-            scope="user",
-            user_id=user_id,
-            duration_sec=duration_sec,
-        )
+        # (a) 历史成片查重
+        duplicate_result = deduplicator.check_duplicate(fingerprint, project_id, session)
 
         # (b) 批次内查重（仅当有 batch_id 时）
         if not duplicate_result and batch_id:
@@ -137,26 +121,17 @@ def create_video_record_and_dedup(
             generated_video.is_duplicate = False
             generated_video.duplicate_of = None
 
-        # 计算重复率百分比（跨项目全局）
+        # 计算重复率百分比（与项目内所有已有视频对比取最高相似度）
         try:
-            rate_result = deduplicator.compute_duplicate_rate(
+            dup_rate = deduplicator.compute_duplicate_rate(
                 fingerprint,
                 project_id,
                 video_id,
                 session,
-                scope="user",
                 user_id=user_id,
             )
-            generated_video.duplicate_rate = rate_result["duplicate_rate"]
-            generated_video.match_count = rate_result["match_count"]
-            generated_video.visual_similarity = rate_result["visual_similarity"]
-            logger.info(
-                "Duplicate rate for %s: %.2f%% (visual_sim=%.3f, matches=%d)",
-                video_id,
-                rate_result["duplicate_rate"],
-                rate_result["visual_similarity"],
-                rate_result["match_count"],
-            )
+            generated_video.duplicate_rate = dup_rate
+            logger.info("Duplicate rate for %s: %.2f%%", video_id, dup_rate)
         except Exception as rate_err:
             logger.warning("Failed to compute duplicate_rate for %s: %s", video_id, rate_err)
             generated_video.duplicate_rate = None

apps/worker/worker_app/celery_app.py

@@ -15,7 +15,6 @@ celery_app.conf.imports = (
     "worker_app.tasks.voice_clone",
     "worker_app.tasks.tts_synthesis",
     "worker_app.tasks.batch_download",
-    "worker_app.tasks.duplication_check",
     "worker_app.tasks._startup",
     "apps.worker.video_processing.dedup",
     "worker_app.tasks.cleanup",

apps/worker/worker_app/tasks/duplication_check.py

@@ -1,196 +0,0 @@
-"""手动查重任务（Issue #1661）。
-
-流程：
-1. 从 OSS 下载用户上传的待查重视频
-2. 动态抽帧计算指纹（复用 VideoDeduplicator.compute_fingerprint）
-3. 跨项目与用户所有已有成片比对（compute_duplicate_rate + find_duplicate_segments）
-4. 更新 DuplicationRecord：status / duplicate_rate / duplicate_count / segments
-   同时写入 visual_similarity / match_count
-5. 失败重试 3 次、间隔 60 秒，最终失败标记 failed；临时文件始终清理
-"""
-
-import logging
-import os
-import shutil
-import tempfile
-
-from celery import Task
-from celery.exceptions import Retry
-from video_processing.dedup import (
-    VideoDeduplicator,
-    find_duplicate_segments,
-)
-from worker_app.celery_app import celery_app
-from worker_app.db import SessionLocal
-
-from packages.adapters.sqlalchemy_impl.duplication_repository import (
-    SQLAlchemyDuplicationRecordRepository,
-)
-from packages.adapters.sqlalchemy_impl.generated_video_repository import (
-    SQLAlchemyGeneratedVideoRepository,
-)
-from packages.domain.duplication import DuplicateSegment
-from packages.shared.storage import get_storage_service
-
-logger = logging.getLogger(__name__)
-
-
-def _build_domain_segments(
-    fingerprint,
-    session,
-    deduplicator: VideoDeduplicator,
-    user_id: str,
-) -> tuple[list[DuplicateSegment], int]:
-    """对用户所有已有视频做分片级时序匹配，构建领域片段列表。
-
-    Returns:
-        (segments, duplicate_count) — segments 为 query 视频中的重复片段，
-        duplicate_count 为存在重复片段的匹配视频数。
-    """
-    video_repo = SQLAlchemyGeneratedVideoRepository(session)
-    existing_videos = video_repo.list_by_user(user_id)
-
-    segments_out: list[DuplicateSegment] = []
-    duplicate_count = 0
-
-    for existing in existing_videos:
-        if not existing.video_fingerprint:
-            continue
-
-        chunk_data = deduplicator._get_existing_chunks(existing.id, session)
-        if not chunk_data:
-            # 老视频无分片数据，时序定位不可靠，跳过片段级匹配
-            continue
-
-        raw_segments = find_duplicate_segments(fingerprint.chunks, chunk_data)
-        if not raw_segments:
-            continue
-
-        duplicate_count += 1
-        for raw in raw_segments:
-            avg_sim = 1.0 - raw.avg_distance / 64.0
-            segments_out.append(
-                DuplicateSegment.create(
-                    source_start=round(raw.query_start_ms / 1000.0, 2),
-                    source_end=round(raw.query_end_ms / 1000.0, 2),
-                    matched_video_id=existing.id,
-                    matched_video_name=existing.name,
-                    matched_start=round(raw.target_start_ms / 1000.0, 2),
-                    matched_end=round(raw.target_end_ms / 1000.0, 2),
-                    similarity=round(max(0.0, min(1.0, avg_sim)) * 100, 1),
-                )
-            )
-
-    # 按 query 起始时间排序，片段时间轴稳定
-    segments_out.sort(key=lambda s: (s.source_start, s.source_end))
-    return segments_out, duplicate_count
-
-
-@celery_app.task(bind=True, max_retries=3, name="worker.process_duplication_check")
-def process_duplication_check(self: Task, record_id: str) -> dict:
-    """处理一次手动查重请求。
-
-    Args:
-        record_id: DuplicationRecord ID
-
-    Returns:
-        dict: {"ok": True, "record_id": ..., "duplicate_rate": ..., ...}
-    """
-    session = None
-    temp_dir = None
-    try:
-        session = SessionLocal()
-        repo = SQLAlchemyDuplicationRecordRepository(session)
-        storage_service = get_storage_service()
-        deduplicator = VideoDeduplicator()
-
-        record = repo.get(record_id)
-        if record is None:
-            raise ValueError(f"Duplication record {record_id} not found")
-
-        if record.status not in ("pending", "processing"):
-            logger.info("Duplication record %s already %s, skip", record_id, record.status)
-            return {"ok": True, "record_id": record_id, "status": record.status, "skipped": True}
-
-        record.mark_processing()
-        repo.update(record)
-        session.commit()
-
-        temp_dir = tempfile.mkdtemp(prefix="dup_check_")
-        suffix = os.path.splitext(record.filename)[1] or ".mp4"
-        local_path = os.path.join(temp_dir, f"{record_id}{suffix}")
-
-        storage_service.download_file(record.storage_key, local_path)
-
-        fingerprint = deduplicator.compute_fingerprint(local_path)
-        record.duration_seconds = round(fingerprint.duration, 2) if fingerprint.duration else 0.0
-        record.video_fingerprint = fingerprint.to_dict()
-
-        # 跨项目与用户所有已有视频比对（current_video_id=None：上传视频不在成片表中）
-        rate_result = deduplicator.compute_duplicate_rate(
-            fingerprint,
-            project_id="",
-            current_video_id=None,
-            session=session,
-            scope="user",
-            user_id=record.user_id,
-        )
-
-        # 分片级时序匹配 → 重复片段
-        segments, segment_match_count = _build_domain_segments(fingerprint, session, deduplicator, record.user_id)
-
-        record.mark_completed(
-            duplicate_rate=rate_result["duplicate_rate"],
-            duplicate_count=segment_match_count,
-            segments=segments,
-            visual_similarity=rate_result["visual_similarity"],
-            match_count=rate_result["match_count"],
-        )
-        repo.update(record)
-        session.commit()
-
-        logger.info(
-            "Duplication check completed: record=%s rate=%.2f%% matches=%d segments=%d",
-            record_id,
-            record.duplicate_rate,
-            record.match_count,
-            len(segments),
-        )
-
-        return {
-            "ok": True,
-            "record_id": record_id,
-            "status": "completed",
-            "duplicate_rate": record.duplicate_rate,
-            "duplicate_count": record.duplicate_count,
-            "visual_similarity": record.visual_similarity,
-            "match_count": record.match_count,
-            "segments": len(segments),
-        }
-
-    except Retry:
-        raise
-
-    except Exception as e:
-        logger.error("Duplication check failed for record %s: %s", record_id, e, exc_info=True)
-        if session is not None:
-            session.rollback()
-            # 本次是最后一次执行机会（retries 从 0 计数，达到 max_retries 说明重试已耗尽），
-            # 标记 failed；否则保持 pending 由 Celery 60 秒后重试
-            try:
-                if "repo" in locals() and self.request.retries >= self.max_retries:
-                    failed_record = repo.get(record_id)
-                    if failed_record is not None and failed_record.status != "failed":
-                        failed_record.mark_failed(f"查重失败（已重试{self.max_retries}次）: {e}")
-                        repo.update(failed_record)
-                        session.commit()
-            except Exception as inner:
-                logger.error("Failed to mark duplication record %s as failed: %s", record_id, inner)
-                session.rollback()
-        raise self.retry(exc=e, countdown=60) from e
-
-    finally:
-        if session is not None:
-            session.close()
-        if temp_dir and os.path.isdir(temp_dir):
-            shutil.rmtree(temp_dir, ignore_errors=True)

apps/worker/worker_app/tasks/ingest.py

@@ -630,7 +630,7 @@ def ingest_asset(job_id: str) -> dict:
                 name=filename,
                 storage_key=job.storage_key,
                 mime_type=mime_type,
-                metadata={"source": "upload", "ingest_error": error_reason},
+                metadata={"ingest_error": error_reason},
                 file_size=int(metadata.get("size_bytes", 0)),
                 duration=float(metadata.get("duration", 0)),
                 width=int(metadata.get("width", 0)),
@@ -656,57 +656,24 @@ def ingest_asset(job_id: str) -> dict:
                 "error": error_reason,
             }
 
-        # 查找已存在的 Asset 记录（由 API 端在上传完成时立即创建为 PROCESSING 状态）
-        existing_asset = None
-        try:
-            existing_asset = asset_repo.find_by_storage_key(job.storage_key)
-        except Exception:
-            logger.warning("find_by_storage_key not available, trying fallback lookup")
-
-        if existing_asset is None:
-            # 兜底：如果 API 端没有预先创建 Asset（旧版本兼容），则创建新记录
-            logger.info("No pre-created asset found for storage_key=%s, creating new", job.storage_key)
-            metadata["source"] = "upload"
-            asset = Asset.create(
-                project_id=job.project_id,
-                library_id=job.library_id,
-                name=filename,
-                storage_key=job.storage_key,
-                mime_type=mime_type,
-                metadata=metadata,
-                file_size=int(metadata.get("size_bytes", 0)),
-                duration=float(metadata.get("duration", 0)),
-                width=int(metadata.get("width", 0)),
-                height=int(metadata.get("height", 0)),
-                codec=metadata.get("codec") or None,
-                status=AssetStatus.READY,
-                file_hash=job.file_hash,
-                thumbnail_url=thumbnail_url,
-            )
-            asset_repo.create(asset)
-        else:
-            # 更新已有的 Asset 记录，补充元数据并将状态改为 READY
-            asset = existing_asset
-            asset.mime_type = mime_type
-            metadata["source"] = "upload"
-            asset.metadata = metadata
-            asset.file_size = int(metadata.get("size_bytes", 0))
-            asset.duration = float(metadata.get("duration", 0))
-            asset.width = int(metadata.get("width", 0))
-            asset.height = int(metadata.get("height", 0))
-            codec_val = metadata.get("codec")
-            if codec_val:
-                asset.codec = str(codec_val)
-            fps_val = metadata.get("fps")
-            if fps_val:
-                try:
-                    asset.fps = float(fps_val)
-                except (ValueError, TypeError):
-                    pass
-            asset.status = AssetStatus.READY
-            asset.thumbnail_url = thumbnail_url
-            asset.updated_at = datetime.now(timezone.utc)
-            asset_repo.update(asset)
+        # Create Asset
+        asset = Asset.create(
+            project_id=job.project_id,
+            library_id=job.library_id,
+            name=filename,
+            storage_key=job.storage_key,
+            mime_type=mime_type,
+            metadata=metadata,
+            file_size=int(metadata.get("size_bytes", 0)),
+            duration=float(metadata.get("duration", 0)),
+            width=int(metadata.get("width", 0)),
+            height=int(metadata.get("height", 0)),
+            codec=metadata.get("codec") or None,
+            status=AssetStatus.READY,
+            file_hash=job.file_hash,
+            thumbnail_url=thumbnail_url,
+        )
+        asset_repo.create(asset)
 
         # Update job status to COMPLETED
         job.status = IngestJobStatus.COMPLETED
@@ -725,37 +692,15 @@ def ingest_asset(job_id: str) -> dict:
         db.rollback()
         logger.error(f"Failed to ingest asset {job_id}: {e}")
 
-        # Update job status to FAILED and mark pre-created Asset as ERROR
+        # Update job status to FAILED
         try:
             job_repo = SQLAlchemyIngestJobRepository(db)
-            asset_repo = SQLAlchemyAssetRepository(db)
             job = job_repo.get(job_id)
             if job:
                 job.status = IngestJobStatus.FAILED
                 job.error_message = str(e)
                 job.updated_at = datetime.now(timezone.utc)
                 job_repo.update(job)
-
-                # 将上传时创建的占位 Asset（PROCESSING/UPLOADING）标记为 ERROR，
-                # 避免素材永远卡在中间状态
-                try:
-                    existing = asset_repo.find_by_storage_key(job.storage_key)
-                    if existing and existing.status in (
-                        AssetStatus.PROCESSING,
-                        AssetStatus.UPLOADING,
-                    ):
-                        existing.status = AssetStatus.ERROR
-                        existing.metadata = {**(existing.metadata or {}), "ingest_error": str(e)}
-                        existing.updated_at = datetime.now(timezone.utc)
-                        asset_repo.update(existing)
-                        logger.info(
-                            "Marked asset as ERROR due to ingest failure: asset_id=%s job_id=%s",
-                            existing.id,
-                            job_id,
-                        )
-                except Exception as asset_err:
-                    logger.warning("Failed to mark asset as ERROR: %s", asset_err)
-
                 db.commit()
         except Exception:
             db.rollback()

deploy/configs/.env.production

@@ -1,216 +0,0 @@
-# ============================================================
-# 小虾 SaaS — Production 环境配置模板
-# ============================================================
-# 使用方式：复制为 /var/lib/xiaoxia-saas-production/.env 并填入实际密钥
-# 敏感值标记为 ${PLACEHOLDER}，部署前必须替换为真实值
-# ============================================================
-
-
-# ==================== 应用基本配置 ====================
-
-# 应用名称
-APP_NAME=xiaoxia-saas
-
-# 环境标识
-APP_ENV=production
-
-# 关闭 Debug 模式
-DEBUG=false
-
-# 应用基础 URL（前端页面地址）
-APP_BASE_URL=https://xiaoxiajianji.com
-
-# 对外公开的 API 基础 URL（用于生成回调链接等）
-PUBLIC_API_BASE_URL=https://api.xiaoxiajianji.com
-
-# API 服务监听地址
-API_HOST=0.0.0.0
-
-# API 服务监听端口
-API_PORT=8001
-
-# 生产环境关闭自动建表，使用 alembic migration
-AUTO_CREATE_SCHEMA=false
-
-
-# ==================== 数据库配置 ====================
-
-# 数据库连接串（格式：postgresql+psycopg://user:password@host:port/dbname）
-# ${DATABASE_URL} — 替换为实际的 Production PostgreSQL 连接串
-DATABASE_URL=${DATABASE_URL}
-
-# 连接池大小（常驻连接数）
-DATABASE_POOL_SIZE=20
-
-# 连接池最大溢出连接数（pool_size + max_overflow = 最大并发连接数）
-DATABASE_MAX_OVERFLOW=10
-
-# 获取连接超时时间（秒）
-DATABASE_POOL_TIMEOUT=30
-
-# 连接回收时间（秒），防止数据库端主动断开导致的死连接
-DATABASE_POOL_RECYCLE=3600
-
-# 不使用内存数据库
-USE_IN_MEMORY_DB=false
-
-
-# ==================== Redis 配置 ====================
-
-# Redis 连接 URL（格式：redis://[:password@]host:port/db）
-# ${REDIS_URL} — 替换为实际的 Production Redis 连接串
-REDIS_URL=${REDIS_URL}
-
-# 启用 Redis Session 存储（多实例部署必须开启）
-ENABLE_REDIS_SESSIONS=true
-
-
-# ==================== Celery 任务队列 ====================
-
-# Celery Broker（任务分发），使用 Redis db0
-CELERY_BROKER_URL=${CELERY_BROKER_URL}
-
-# Celery Result Backend（任务结果存储），使用 Redis db1
-CELERY_RESULT_BACKEND=${CELERY_RESULT_BACKEND}
-
-
-# ==================== Worker 配置 ====================
-
-# Worker 进程名称
-WORKER_NAME=xiaoxia-saas-worker
-
-# Worker 并发数（同时执行的任务数）
-WORKER_CONCURRENCY=4
-
-# 每个子进程最多处理多少任务后重启（防止内存泄漏）
-WORKER_MAX_TASKS_PER_CHILD=1000
-
-
-# ==================== JWT 认证配置 ====================
-
-# JWT 签名密钥 — 必须设置为强随机字符串（至少32字符）
-# ${JWT_SECRET_KEY} — 替换为实际的随机密钥
-JWT_SECRET_KEY=${JWT_SECRET_KEY}
-
-# JWT 签名算法
-JWT_ALGORITHM=HS256
-
-# Access Token 过期时间（分钟）
-JWT_ACCESS_TOKEN_EXPIRE_MINUTES=30
-
-# Refresh Token 过期时间（天）
-JWT_REFRESH_TOKEN_EXPIRE_DAYS=30
-
-
-# ==================== 邮件配置 ====================
-
-# 邮件功能尚未上线，暂时关闭
-ENABLE_EMAIL_DELIVERY=false
-
-# SMTP 服务器地址
-SMTP_HOST=
-
-# SMTP 端口
-SMTP_PORT=587
-
-# SMTP 用户名（邮件功能上线后配置）
-SMTP_USER=
-
-# SMTP 密码（邮件功能上线后配置）
-SMTP_PASSWORD=
-
-# 发件人邮箱（邮件功能上线后配置）
-SMTP_FROM_EMAIL=
-
-# 发件人显示名称
-SMTP_FROM_NAME=小虾 SaaS
-
-# 启用 TLS
-SMTP_USE_TLS=true
-
-
-# ==================== 阿里云 OSS 配置 ====================
-
-# OSS 区域 endpoint
-OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
-
-# OSS Access Key ID
-# ${OSS_ACCESS_KEY_ID} — 替换为实际的 OSS Access Key ID
-OSS_ACCESS_KEY_ID=${OSS_ACCESS_KEY_ID}
-
-# OSS Access Key Secret
-# ${OSS_ACCESS_KEY_SECRET} — 替换为实际的 OSS Access Key Secret
-OSS_ACCESS_KEY_SECRET=${OSS_ACCESS_KEY_SECRET}
-
-# OSS Bucket 名称
-OSS_BUCKET_NAME=xiaoxia-autocut
-
-# 直传最大文件大小（MB）
-OSS_DIRECT_UPLOAD_MAX_MB=2000
-
-# 直传签名有效期（秒）
-OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
-
-
-# ==================== CORS 配置 ====================
-
-# 允许跨域的前端域名列表，逗号分隔
-CORS_ORIGINS_RAW=https://xiaoxiajianji.com,https://api.xiaoxiajianji.com
-
-
-# ==================== 生成文件路径 ====================
-
-# 容器内生成文件目录（固定值，勿改）
-GENERATED_FILES_DIR=/app/generated
-
-# 生成文件 URL 前缀
-GENERATED_FILES_URL_PREFIX=/generated-files
-
-# 主机上生成文件目录（供 Docker volume bind mount 使用）
-GENERATED_FILES_HOST_DIR=/var/lib/xiaoxia-saas-production/generated
-
-
-# ==================== 渲染引擎配置 ====================
-
-# 渲染引擎选择：legacy（旧引擎，稳定）/ unified（新架构）
-RENDER_ENGINE=legacy
-
-
-# ==================== CosyVoice 语音合成 ====================
-
-# 阿里云百灵语音合成服务 API Key
-# ${COSYVOICE_API_KEY} — 替换为实际的 CosyVoice API Key
-COSYVOICE_API_KEY=${COSYVOICE_API_KEY}
-
-# API 基础 URL
-COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
-
-# 模型选择：cosyvoice-v3-flash（推荐）/ cosyvoice-v3-plus
-COSYVOICE_MODEL=cosyvoice-v3-flash
-
-# 音色：v3 系列系统音色带 _v3 后缀
-COSYVOICE_VOICE=longxiaoxia_v3
-
-# 采样率
-COSYVOICE_SAMPLE_RATE=22050
-
-# 输出格式
-COSYVOICE_FORMAT=wav
-
-# 音色克隆模型名（固定值）
-COSYVOICE_CLONE_MODEL=voice-enrollment
-
-# DashScope 通用 API Key（与 CosyVoice 共用）
-DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY}
-
-
-# ==================== MediaKit 视频理解（火山引擎）====================
-
-MEDIAKIT_API_KEY=${MEDIAKIT_API_KEY}
-MEDIAKIT_BASE_URL=https://mediakit.cn-beijing.volces.com/api/v1
-MEDIAKIT_TIMEOUT=60
-
-
-# ==================== 监控（可选）====================
-# Sentry DSN（取消注释并填入实际值以启用错误追踪）
-# SENTRY_DSN=${SENTRY_DSN}

deploy/configs/.env.staging

@@ -1,233 +0,0 @@
-# ============================================================
-# 小虾 SaaS — Staging 环境配置模板
-# ============================================================
-# 使用方式：复制为 /var/lib/xiaoxia-saas-staging/.env 并填入实际密钥
-# 敏感值标记为 ${PLACEHOLDER}，部署前必须替换为真实值
-# ============================================================
-
-
-# ==================== 应用基本配置 ====================
-
-# 应用名称
-APP_NAME=xiaoxia-saas
-
-# 环境标识
-APP_ENV=staging
-
-# Staging 开启 Debug 模式便于排查问题
-DEBUG=true
-
-# 应用基础 URL（前端页面地址）
-APP_BASE_URL=https://staging.xiaoxiajianji.com
-
-# 对外公开的 API 基础 URL（用于生成回调链接等）
-PUBLIC_API_BASE_URL=https://staging-api.xiaoxiajianji.com
-
-# API 服务监听地址
-API_HOST=0.0.0.0
-
-# API 服务监听端口
-API_PORT=8000
-
-# 生产/预发布环境关闭自动建表，使用 alembic migration
-AUTO_CREATE_SCHEMA=false
-
-
-# ==================== 数据库配置 ====================
-
-# 数据库连接串（格式：postgresql+psycopg://user:password@host:port/dbname）
-# ${DATABASE_URL} — 替换为实际的 Staging PostgreSQL 连接串
-DATABASE_URL=${DATABASE_URL}
-
-# 连接池大小（常驻连接数）
-DATABASE_POOL_SIZE=20
-
-# 连接池最大溢出连接数（pool_size + max_overflow = 最大并发连接数）
-DATABASE_MAX_OVERFLOW=10
-
-# 获取连接超时时间（秒）
-DATABASE_POOL_TIMEOUT=30
-
-# 连接回收时间（秒），防止数据库端主动断开导致的死连接
-DATABASE_POOL_RECYCLE=3600
-
-# 不使用内存数据库
-USE_IN_MEMORY_DB=false
-
-
-# ==================== Redis 配置 ====================
-
-# Redis 连接 URL（格式：redis://[:password@]host:port/db）
-# ${REDIS_URL} — 替换为实际的 Staging Redis 连接串
-REDIS_URL=${REDIS_URL}
-
-# 启用 Redis Session 存储（多实例部署必须开启）
-ENABLE_REDIS_SESSIONS=true
-
-
-# ==================== Celery 任务队列 ====================
-
-# Celery Broker（任务分发），使用 Redis db0
-CELERY_BROKER_URL=${CELERY_BROKER_URL}
-
-# Celery Result Backend（任务结果存储），使用 Redis db1
-CELERY_RESULT_BACKEND=${CELERY_RESULT_BACKEND}
-
-
-# ==================== Worker 配置 ====================
-
-# Worker 进程名称
-WORKER_NAME=xiaoxia-saas-worker
-
-# Worker 并发数（同时执行的任务数）
-WORKER_CONCURRENCY=1
-
-# 每个子进程最多处理多少任务后重启（防止内存泄漏）
-WORKER_MAX_TASKS_PER_CHILD=1000
-
-
-# ==================== JWT 认证配置 ====================
-
-# JWT 签名密钥 — 必须设置为强随机字符串（至少32字符）
-# ${JWT_SECRET_KEY} — 替换为实际的随机密钥
-JWT_SECRET_KEY=${JWT_SECRET_KEY}
-
-# JWT 签名算法
-JWT_ALGORITHM=HS256
-
-# Access Token 过期时间（分钟）
-JWT_ACCESS_TOKEN_EXPIRE_MINUTES=1440
-
-# Refresh Token 过期时间（天）
-JWT_REFRESH_TOKEN_EXPIRE_DAYS=30
-
-
-# ==================== 邮件配置 ====================
-
-# 邮件功能尚未上线，暂时关闭
-ENABLE_EMAIL_DELIVERY=false
-
-# SMTP 服务器地址
-SMTP_HOST=smtp.gmail.com
-
-# SMTP 端口
-SMTP_PORT=587
-
-# SMTP 用户名（邮件功能上线后配置）
-SMTP_USER=
-
-# SMTP 密码（邮件功能上线后配置）
-SMTP_PASSWORD=
-
-# 发件人邮箱（邮件功能上线后配置）
-SMTP_FROM_EMAIL=
-
-# 发件人显示名称
-SMTP_FROM_NAME=小虾 SaaS
-
-# 启用 TLS
-SMTP_USE_TLS=true
-
-
-# ==================== 阿里云 OSS 配置 ====================
-
-# OSS 区域 endpoint
-OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
-
-# OSS Access Key ID
-# ${OSS_ACCESS_KEY_ID} — 替换为实际的 OSS Access Key ID
-OSS_ACCESS_KEY_ID=${OSS_ACCESS_KEY_ID}
-
-# OSS Access Key Secret
-# ${OSS_ACCESS_KEY_SECRET} — 替换为实际的 OSS Access Key Secret
-OSS_ACCESS_KEY_SECRET=${OSS_ACCESS_KEY_SECRET}
-
-# OSS Bucket 名称
-OSS_BUCKET_NAME=xiaoxia-autocut
-
-# 直传最大文件大小（MB）
-OSS_DIRECT_UPLOAD_MAX_MB=2000
-
-# 直传签名有效期（秒）
-OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
-
-
-# ==================== MinIO 配置（Staging 独有）====================
-# Staging 环境使用 MinIO 替代 OSS 进行文件存储测试
-
-# MinIO 服务 Endpoint
-# ${MINIO_ENDPOINT} — 替换为实际的 MinIO 地址
-MINIO_ENDPOINT=${MINIO_ENDPOINT}
-
-# MinIO Access Key
-# ${MINIO_ACCESS_KEY} — 替换为实际的 MinIO Access Key
-MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}
-
-# MinIO Secret Key
-# ${MINIO_SECRET_KEY} — 替换为实际的 MinIO Secret Key
-MINIO_SECRET_KEY=${MINIO_SECRET_KEY}
-
-# MinIO Bucket 名称
-MINIO_BUCKET_NAME=${MINIO_BUCKET_NAME}
-
-# 是否使用 SSL 连接 MinIO
-MINIO_USE_SSL=false
-
-
-# ==================== CORS 配置 ====================
-
-# 允许跨域的前端域名列表，逗号分隔
-CORS_ORIGINS_RAW=https://staging.xiaoxiajianji.com,https://staging-api.xiaoxiajianji.com
-
-
-# ==================== 生成文件路径 ====================
-
-# 容器内生成文件目录（固定值，勿改）
-GENERATED_FILES_DIR=/app/generated
-
-# 生成文件 URL 前缀
-GENERATED_FILES_URL_PREFIX=/generated-files
-
-# 主机上生成文件目录（供 Docker volume bind mount 使用）
-GENERATED_FILES_HOST_DIR=/var/lib/xiaoxia-saas-staging/generated
-
-
-# ==================== 渲染引擎配置 ====================
-
-# 渲染引擎选择：legacy（旧引擎，稳定）/ unified（新架构）
-RENDER_ENGINE=legacy
-
-
-# ==================== CosyVoice 语音合成 ====================
-
-# 阿里云百灵语音合成服务 API Key
-# ${COSYVOICE_API_KEY} — 替换为实际的 CosyVoice API Key
-COSYVOICE_API_KEY=${COSYVOICE_API_KEY}
-
-# API 基础 URL
-COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
-
-# 模型选择：cosyvoice-v3-flash（推荐）/ cosyvoice-v3-plus
-COSYVOICE_MODEL=cosyvoice-v3-flash
-
-# 音色：v3 系列系统音色带 _v3 后缀
-COSYVOICE_VOICE=longxiaoxia_v3
-
-# 采样率
-COSYVOICE_SAMPLE_RATE=22050
-
-# 输出格式
-COSYVOICE_FORMAT=wav
-
-# 音色克隆模型名（固定值）
-COSYVOICE_CLONE_MODEL=voice-enrollment
-
-# DashScope 通用 API Key（与 CosyVoice 共用）
-DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY}
-
-
-# ==================== MediaKit 视频理解（火山引擎）====================
-
-MEDIAKIT_API_KEY=${MEDIAKIT_API_KEY}
-MEDIAKIT_BASE_URL=https://mediakit.cn-beijing.volces.com/api/v1
-MEDIAKIT_TIMEOUT=60

deploy/configs/nginx-production.conf

@@ -1,51 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/json application/xml+rss;
-
-    client_max_body_size 800m;
-
-    # SPA routing - index.html 禁止缓存，确保每次获取最新版本
-    location / {
-        try_files $uri /index.html;
-    }
-
-    # API proxy — Production 环境代理到 production API 容器
-    resolver 127.0.0.11 valid=10s;
-    resolver_timeout 5s;
-    location /api/ {
-        proxy_pass http://xiaoxia-api-production:8000/api/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_request_buffering off;
-    }
-
-    # Generated files — 通过 alias 映射容器内 /app/generated/ 目录
-    location /generated-files/ {
-        alias /app/generated/;
-    }
-
-    # Assets with legacy fallback — 部署期间兼容旧版缓存的 hash 文件名
-    # 先在当前镜像中找，找不到去 legacy-assets 目录找（从旧版本容器中备份的）
-    location ^~ /assets/ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-        try_files $uri /assets-legacy$uri =404;
-    }
-
-    # 静态资源长缓存
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-    }
-}

deploy/configs/nginx-staging.conf

@@ -1,50 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/json application/xml+rss;
-
-    client_max_body_size 800m;
-
-    # SPA routing - index.html 禁止缓存，确保每次获取最新版本
-    location = /index.html {
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
-        add_header Pragma "no-cache";
-        expires 0;
-    }
-
-    # SPA fallback
-    location / {
-        try_files $uri /index.html;
-    }
-
-    # API proxy — Staging 环境代理到 staging API 容器
-    resolver 127.0.0.11 valid=10s;
-    resolver_timeout 5s;
-    location /api/ {
-        proxy_pass http://xiaoxia-api-staging:8000/api/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_request_buffering off;
-    }
-
-    # Generated files — 通过 alias 映射容器内 /app/generated/ 目录
-    location /generated-files/ {
-        alias /app/generated/;
-    }
-
-    # 静态资源长缓存
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-    }
-}

infra/docker/compose.yml

@@ -175,14 +175,9 @@ services:
       - xiaoxia-net
     
     # =========================================
-    # Nginx 配置运行时覆盖
-    # 确保容器使用正确环境的 nginx 配置，即使镜像构建时使用了默认配置
-    # 注意: 只覆盖 /etc/nginx/conf.d/default.conf，不挂载 /usr/share/nginx/html
+    # 重要: 生产环境不要添加任何 volume 挂载到 /usr/share/nginx/html
+    # 这会导致静态文件被覆盖，返回 403 错误
     # =========================================
-    environment:
-      - NGINX_ENV=${ENV:-staging}
-    volumes:
-      - ./nginx-${ENV:-staging}.conf:/etc/nginx/conf.d/default.conf:ro
     
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "http://127.0.0.1:80"]
@@ -213,7 +208,7 @@ volumes:
       # 重要: 确保主机目录存在且有正确权限
       # Staging: /var/lib/xiaoxia-saas-staging/generated
       # Production: /var/lib/xiaoxia-saas-production/generated
-      device: ${GENERATED_FILES_HOST_DIR:?GENERATED_FILES_HOST_DIR must be set in .env}
+      device: ${GENERATED_FILES_HOST_DIR:-/var/lib/xiaoxia-saas-staging/generated}
 
 # ===========================================
 # 网络配置

packages/adapters/in_memory/asset_repository.py

@@ -127,13 +127,6 @@ class InMemoryAssetRepository:
         items = [a for a in self._assets.values() if tag_set.issubset(set(a.tag_ids))]
         return items[skip : skip + limit]
 
-    def find_by_storage_key(self, storage_key: str) -> Asset | None:
-        """按 storage_key 查找素材。"""
-        for asset in self._assets.values():
-            if asset.storage_key == storage_key:
-                return asset
-        return None
-
     def find_by_library_and_file_hash(
         self,
         library_id: str,

packages/adapters/redis/session_store.py

@@ -99,8 +99,8 @@ class SessionStore(SessionStorePort):
         session_id: str,
         user_id: str,
         refresh_token: str,
-        device_info: str = "",
-        ip_address: str = "",
+        device_info: str,
+        ip_address: str,
         expires_in_seconds: int = 30 * 24 * 60 * 60,  # 30 天
     ) -> bool:
         """

packages/adapters/smtp/email_service.py

@@ -96,7 +96,7 @@ class EmailService(EmailServicePort):
         except Exception as e:
             return False, str(e)
 
-    def send_verification_email(  # type: ignore[override]
+    def send_verification_email(
         self,
         to_email: str,
         username: str,
@@ -165,7 +165,7 @@ class EmailService(EmailServicePort):
 
         return self.send_email(to_email, subject, html_body, text_body)
 
-    def send_password_reset_email(  # type: ignore[override]
+    def send_password_reset_email(
         self,
         to_email: str,
         username: str,

packages/adapters/sqlalchemy_impl/asset_repository.py

@@ -426,13 +426,6 @@ class SQLAlchemyAssetRepository:
         models = self.session.query(AssetModel).filter(AssetModel.id.in_(ids)).offset(skip).limit(limit).all()
         return [self._to_domain(m) for m in models]
 
-    def find_by_storage_key(self, storage_key: str) -> Asset | None:
-        """按 storage_key（对应 DB 中的 file_url）查找素材。"""
-        model = self.session.query(AssetModel).filter(AssetModel.file_url == storage_key).first()
-        if model is None:
-            return None
-        return self._to_domain(model)
-
     def find_by_library_and_file_hash(
         self,
         library_id: str,

packages/adapters/sqlalchemy_impl/duplication_repository.py

@@ -25,8 +25,6 @@ class SQLAlchemyDuplicationRecordRepository:
             status=record.status,
             duplicate_rate=record.duplicate_rate,
             duplicate_count=record.duplicate_count,
-            visual_similarity=record.visual_similarity,
-            match_count=record.match_count,
             video_fingerprint=json.dumps(record.video_fingerprint) if record.video_fingerprint else None,
             error_message=record.error_message,
             created_at=record.created_at,
@@ -60,8 +58,6 @@ class SQLAlchemyDuplicationRecordRepository:
         model.status = record.status
         model.duplicate_rate = record.duplicate_rate
         model.duplicate_count = record.duplicate_count
-        model.visual_similarity = record.visual_similarity
-        model.match_count = record.match_count
         model.video_fingerprint = json.dumps(record.video_fingerprint) if record.video_fingerprint else None
         model.error_message = record.error_message
         model.updated_at = record.updated_at
@@ -125,8 +121,6 @@ class SQLAlchemyDuplicationRecordRepository:
             status=model.status,
             duplicate_rate=model.duplicate_rate,
             duplicate_count=int(model.duplicate_count or 0),
-            visual_similarity=getattr(model, "visual_similarity", None),
-            match_count=getattr(model, "match_count", None),
             video_fingerprint=json.loads(fp_raw) if fp_raw else None,
             error_message=getattr(model, "error_message", ""),
             segments=segments,

packages/adapters/sqlalchemy_impl/edit_plan_clip_repository.py

@@ -131,65 +131,3 @@ class SQLAlchemyEditPlanClipRepository:
             created_at=model.created_at,
             updated_at=model.updated_at,
         )
-
-    def list_used_segments_by_user(
-        self,
-        user_id: str,
-        *,
-        limit_recent: int = 50,
-    ) -> dict[str, list[tuple[float, float]]]:
-        """查询用户已有视频中已使用的素材区间（跨视频避让）.
-
-        JOIN edit_plans 表，按 created_by_user_id 过滤，只查 status='completed'
-        的 plan 下 status='rendered' 且 asset_id 非空的 clips。按 plan 的
-        created_at DESC 取最近 limit_recent 个 plan。
-
-        Returns:
-            {asset_id: [(start_time, start_time + duration), ...]}
-            空结果返回空 dict。
-        """
-        from packages.adapters.sqlalchemy_impl.models import EditPlanModel
-
-        if not user_id:
-            return {}
-
-        # 1. 查出最近 limit_recent 个已完成 plan 的 ID
-        recent_plan_ids = [
-            row[0]
-            for row in self.session.query(EditPlanModel.id)
-            .filter(
-                EditPlanModel.created_by_user_id == user_id,
-                EditPlanModel.status == "completed",
-            )
-            .order_by(EditPlanModel.created_at.desc())
-            .limit(limit_recent)
-            .all()
-        ]
-
-        if not recent_plan_ids:
-            return {}
-
-        # 2. 查这些 plan 下已渲染、有素材的 clips
-        clips = (
-            self.session.query(
-                EditPlanClipModel.asset_id,
-                EditPlanClipModel.start_time,
-                EditPlanClipModel.duration,
-            )
-            .filter(
-                EditPlanClipModel.plan_id.in_(recent_plan_ids),
-                EditPlanClipModel.status == "rendered",
-                EditPlanClipModel.asset_id != "",
-                EditPlanClipModel.asset_id.isnot(None),
-            )
-            .all()
-        )
-
-        # 3. 聚合为 {asset_id: [(start, start+duration), ...]}
-        result: dict[str, list[tuple[float, float]]] = {}
-        for asset_id, start_time, duration in clips:
-            if asset_id not in result:
-                result[asset_id] = []
-            result[asset_id].append((start_time or 0.0, (start_time or 0.0) + (duration or 0.0)))
-
-        return result

packages/adapters/sqlalchemy_impl/generated_video_repository.py

@@ -31,8 +31,6 @@ class SQLAlchemyGeneratedVideoRepository:
             is_duplicate=video.is_duplicate,
             duplicate_of=video.duplicate_of,
             duplicate_rate=video.duplicate_rate,
-            match_count=getattr(video, "match_count", None),
-            visual_similarity=getattr(video, "visual_similarity", None),
             generated_at=video.generated_at,
             created_at=video.created_at,
         )
@@ -64,8 +62,6 @@ class SQLAlchemyGeneratedVideoRepository:
             is_duplicate=getattr(model, "is_duplicate", False),
             duplicate_of=getattr(model, "duplicate_of", None),
             duplicate_rate=getattr(model, "duplicate_rate", None),
-            match_count=getattr(model, "match_count", None),
-            visual_similarity=getattr(model, "visual_similarity", None),
             generated_at=model.generated_at,
             created_at=model.created_at,
         )
@@ -81,8 +77,6 @@ class SQLAlchemyGeneratedVideoRepository:
         model.is_duplicate = video.is_duplicate
         model.duplicate_of = video.duplicate_of
         model.duplicate_rate = video.duplicate_rate
-        model.match_count = getattr(video, "match_count", None)
-        model.visual_similarity = getattr(video, "visual_similarity", None)
         self.session.add(model)
         self.session.commit()
         return video
@@ -91,24 +85,6 @@ class SQLAlchemyGeneratedVideoRepository:
         models = self.session.query(GeneratedVideoModel).filter(GeneratedVideoModel.project_id == project_id).all()
         return [self._to_domain(model) for model in models]
 
-    def list_by_user(self, user_id: str, *, duration_min: float = 0, duration_max: float = 0) -> list[GeneratedVideo]:
-        """按 user_id 查询用户所有项目的视频（跨项目查重）。
-
-        Args:
-            user_id: 用户 ID
-            duration_min: 时长下限（秒），0 表示不限
-            duration_max: 时长上限（秒），0 表示不限
-        """
-        query = self.session.query(GeneratedVideoModel).filter(
-            GeneratedVideoModel.user_id == user_id,
-        )
-        if duration_min > 0:
-            query = query.filter(GeneratedVideoModel.duration >= duration_min)
-        if duration_max > 0:
-            query = query.filter(GeneratedVideoModel.duration <= duration_max)
-        models = query.all()
-        return [self._to_domain(model) for model in models]
-
     def list_by_generation_task(self, generation_task_id: str) -> list[GeneratedVideo]:
         models = (
             self.session.query(GeneratedVideoModel)
@@ -232,8 +208,6 @@ class SQLAlchemyGeneratedVideoRepository:
             is_duplicate=getattr(model, "is_duplicate", False),
             duplicate_of=getattr(model, "duplicate_of", None),
             duplicate_rate=getattr(model, "duplicate_rate", None),
-            match_count=getattr(model, "match_count", None),
-            visual_similarity=getattr(model, "visual_similarity", None),
             generated_at=model.generated_at,
             created_at=model.created_at,
         )

packages/adapters/sqlalchemy_impl/models.py

@@ -289,7 +289,6 @@ class GenerationTaskModel(Base):
     completed_at = Column(DateTime, nullable=True)
     created_by_user_id = Column(String(36), nullable=False, default="", index=True)
     source_edit_plan_id = Column(String(36), nullable=True, index=True)
-    edit_plan_id = Column(String(36), nullable=True, index=True)
     asset_select_mode = Column(String(20), nullable=False, default="")
     batch_id = Column(String(36), nullable=False, default="", index=True)
     video_title = Column(String(255), nullable=False, default="")
@@ -340,8 +339,6 @@ class GeneratedVideoModel(Base):
     is_duplicate = Column(Boolean, nullable=False, default=False)
     duplicate_of = Column(String(36), nullable=True)
     duplicate_rate = Column(Float, nullable=True)
-    match_count = Column(Integer, nullable=True, default=0)
-    visual_similarity = Column(Float, nullable=True, default=0.0)
 
 
 class TitleLibraryModel(Base):
@@ -417,9 +414,6 @@ class DuplicationRecordModel(Base):
     status = Column(String(20), nullable=False, default="pending", index=True)
     duplicate_rate = Column(Float, nullable=True)
     duplicate_count = Column(Integer, nullable=False, default=0)
-    # #1661 手动查重：视觉相似度（0~1）/ 匹配视频数
-    visual_similarity = Column(Float, nullable=True)
-    match_count = Column(Integer, nullable=True)
     video_fingerprint = Column(Text, nullable=True)
     error_message = Column(Text, nullable=False, default="")
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
@@ -503,7 +497,6 @@ class TemplateCategoryModel(Base):
     id = Column(String(36), primary_key=True)
     user_id = Column(String(36), nullable=False, index=True)
     name = Column(String(100), nullable=False)
-    sort_order = Column(Integer, nullable=False, default=0)
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
 
 
@@ -625,20 +618,3 @@ class CoverTemplateModel(Base):
     config = Column(JSON, nullable=False, default=dict)
     created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
     updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
-
-
-class VideoFingerprintChunkModel(Base):
-    """分片视频指纹 — 每个视频按时间分片存储 pHash + color_histogram."""
-
-    __tablename__ = "video_fingerprint_chunks"
-
-    id = Column(String(36), primary_key=True)
-    video_id = Column(String(36), nullable=False, index=True)
-    project_id = Column(String(36), nullable=False, index=True)
-    user_id = Column(String(36), nullable=False, index=True, default="")
-    start_time_ms = Column(Integer, nullable=False)
-    end_time_ms = Column(Integer, nullable=False)
-    phash_binary = Column(String(16), nullable=False)
-    color_histogram = Column(JSON, nullable=False)
-    frame_count = Column(Integer, nullable=False, default=1)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))

packages/domain/ai_parsing.py

@@ -51,7 +51,7 @@ def parse_titles_from_response(content: str) -> list[str]:
         pass
 
     # 尝试按行解析
-    titles = []
+    titles: list[str] = []
     for line in content.strip().split("\n"):
         line = line.strip()
         if not line:

packages/domain/duplication.py

@@ -63,9 +63,6 @@ class DuplicationRecord:
     status: str = "pending"  # pending / processing / completed / failed
     duplicate_rate: float | None = None  # 0-100
     duplicate_count: int = 0
-    # #1661 手动查重：视觉相似度（归一化 0~1）/ 匹配视频数
-    visual_similarity: float | None = None
-    match_count: int | None = None
     video_fingerprint: dict[str, Any] | None = None
     error_message: str = ""
     segments: list[DuplicateSegment] = field(default_factory=list)
@@ -101,23 +98,13 @@ class DuplicationRecord:
         self.status = "processing"
         self.updated_at = datetime.now(timezone.utc)
 
-    def mark_completed(
-        self,
-        duplicate_rate: float,
-        duplicate_count: int,
-        segments: list[DuplicateSegment],
-        *,
-        visual_similarity: float | None = None,
-        match_count: int | None = None,
-    ) -> None:
+    def mark_completed(self, duplicate_rate: float, duplicate_count: int, segments: list[DuplicateSegment]) -> None:
         if not 0 <= duplicate_rate <= 100:
             raise ValueError("duplicate_rate must be between 0 and 100")
         self.status = "completed"
         self.duplicate_rate = duplicate_rate
         self.duplicate_count = duplicate_count
         self.segments = segments
-        self.visual_similarity = visual_similarity
-        self.match_count = match_count
         self.updated_at = datetime.now(timezone.utc)
 
     def mark_failed(self, error_message: str) -> None:
@@ -146,8 +133,6 @@ class DuplicationRecord:
         self.status = "pending"
         self.duplicate_rate = None
         self.duplicate_count = 0
-        self.visual_similarity = None
-        self.match_count = None
         self.error_message = ""
         self.segments = []
         self.video_fingerprint = None

packages/domain/generated_video.py

@@ -27,8 +27,6 @@ class GeneratedVideo:
     is_duplicate: bool = False
     duplicate_of: str | None = None
     duplicate_rate: float | None = None
-    match_count: int | None = None
-    visual_similarity: float | None = None
     generated_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
     created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 

packages/domain/plan_generator_utils.py

@@ -169,7 +169,6 @@ def distribute_assets(
     random_selection: bool = False,
     asset_durations: dict[str, float] | None = None,
     asset_scene_points: dict[str, list[float]] | None = None,
-    external_used_segments: dict[str, list[tuple[float, float]]] | None = None,
 ) -> None:
     """按 editing_mode 将素材分配到 clips（就地修改）.
 
@@ -189,7 +188,6 @@ def distribute_assets(
         random_selection: 是否随机选择素材（用于预览生成）
         asset_durations: 素材 ID -> 时长（秒）映射，用于设置 start_time
         asset_scene_points: 素材 ID -> 场景切换点列表（metadata 缓存）
-        external_used_segments: 跨视频已用区间（来自其他视频的 clips），注入到分配逻辑中避让
     """
     if not asset_ids or not clips:
         return
@@ -200,16 +198,16 @@ def distribute_assets(
         random.shuffle(asset_ids)
 
     if editing_mode == EditingMode.ONE_TAKE.value:
-        _distribute_one_take(clips, asset_ids, asset_durations, asset_scene_points, external_used_segments)
+        _distribute_one_take(clips, asset_ids, asset_durations, asset_scene_points)
     elif editing_mode == EditingMode.PIP.value:
-        _distribute_pip(clips, asset_ids, asset_durations, asset_scene_points, external_used_segments)
+        _distribute_pip(clips, asset_ids, asset_durations, asset_scene_points)
     elif editing_mode == EditingMode.VOICE_OVER.value:
-        _distribute_voice_over(clips, asset_ids, asset_durations, asset_scene_points, external_used_segments)
+        _distribute_voice_over(clips, asset_ids, asset_durations, asset_scene_points)
     elif editing_mode == EditingMode.VOICE_PIP.value:
-        _distribute_voice_pip(clips, asset_ids, asset_durations, asset_scene_points, external_used_segments)
+        _distribute_voice_pip(clips, asset_ids, asset_durations, asset_scene_points)
     else:
         # 未知模式，退化为 one_take
-        _distribute_one_take(clips, asset_ids, asset_durations, asset_scene_points, external_used_segments)
+        _distribute_one_take(clips, asset_ids, asset_durations, asset_scene_points)
 
 
 def _resolve_start_time(
@@ -250,12 +248,9 @@ def _distribute_one_take(
     asset_ids: List[str],
     asset_durations: dict[str, float] | None = None,
     asset_scene_points: dict[str, list[float]] | None = None,
-    external_used_segments: dict[str, list[tuple[float, float]]] | None = None,
 ) -> None:
     """ONE_TAKE: 素材按顺序依次分配给 main 类型 clips."""
-    used_segments: dict[str, list[tuple[float, float]]] = (
-        {k: list(v) for k, v in external_used_segments.items()} if external_used_segments else {}
-    )
+    used_segments: dict[str, list[tuple[float, float]]] = {}
     main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
     for i, clip in enumerate(main_clips):
         if i < len(asset_ids):
@@ -276,12 +271,9 @@ def _distribute_pip(
     asset_ids: List[str],
     asset_durations: dict[str, float] | None = None,
     asset_scene_points: dict[str, list[float]] | None = None,
-    external_used_segments: dict[str, list[tuple[float, float]]] | None = None,
 ) -> None:
     """PIP: 第1个素材→main(全屏背景)，其余→overlay clips."""
-    used_segments: dict[str, list[tuple[float, float]]] = (
-        {k: list(v) for k, v in external_used_segments.items()} if external_used_segments else {}
-    )
+    used_segments: dict[str, list[tuple[float, float]]] = {}
     # 第1个素材 → main clip
     main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
     if main_clips and asset_ids:
@@ -318,12 +310,9 @@ def _distribute_voice_over(
     asset_ids: List[str],
     asset_durations: dict[str, float] | None = None,
     asset_scene_points: dict[str, list[float]] | None = None,
-    external_used_segments: dict[str, list[tuple[float, float]]] | None = None,
 ) -> None:
     """VOICE_OVER: 素材→main clips (B-roll)."""
-    used_segments: dict[str, list[tuple[float, float]]] = (
-        {k: list(v) for k, v in external_used_segments.items()} if external_used_segments else {}
-    )
+    used_segments: dict[str, list[tuple[float, float]]] = {}
     main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
     for i, clip in enumerate(main_clips):
         if i < len(asset_ids):
@@ -344,12 +333,9 @@ def _distribute_voice_pip(
     asset_ids: List[str],
     asset_durations: dict[str, float] | None = None,
     asset_scene_points: dict[str, list[float]] | None = None,
-    external_used_segments: dict[str, list[tuple[float, float]]] | None = None,
 ) -> None:
     """VOICE_PIP: 第1个→background, 第2个→corner_voice, 其余→b_roll."""
-    used_segments: dict[str, list[tuple[float, float]]] = (
-        {k: list(v) for k, v in external_used_segments.items()} if external_used_segments else {}
-    )
+    used_segments: dict[str, list[tuple[float, float]]] = {}
     bg_clips = [c for c in clips if c.clip_type == "background"]
     voice_clips = [c for c in clips if c.clip_type == "corner_voice"]
     broll_clips = [c for c in clips if c.clip_type == "b_roll"]

packages/ports/asset_repository.py

@@ -112,11 +112,6 @@ class AssetRepository(ABC):
         """查找包含所有指定标签的素材。"""
         pass
 
-    @abstractmethod
-    def find_by_storage_key(self, storage_key: str) -> Asset | None:
-        """按 storage_key 查找素材（用于异步处理时更新已创建的记录）。"""
-        pass
-
     @abstractmethod
     def find_by_library_and_file_hash(
         self,

packages/shared/url_security.py

@@ -100,7 +100,7 @@ def _check_ssrf_domain(hostname: str) -> None:
             raise UrlSecurityError(f"域名解析失败: {hostname}")
 
         for info in infos:
-            ip_str = str(info[4][0])
+            ip_str = info[4][0]
             try:
                 _check_ssrf_ip_base(ip_str)
             except ValueError:

scripts/ci/auto_merge.sh

@@ -32,9 +32,9 @@ CONTEXTS=(
 echo "检查CI Gate统一门禁"
 echo
 
-# 等待30秒后开始轮询，最多10分钟
-echo "等待30秒让CI启动..."
-sleep 30
+# 等待60秒，给CI启动写status的时间
+echo "等待60秒让CI启动..."
+sleep 60
 
 # 405计数器（单次运行内重试）
 MERGE_405_COUNT=0
@@ -72,9 +72,9 @@ check_and_merge() {
   # CI未全绿（pending中）→ 退出，等下次触发
   if [ "$ALL_SUCCESS" != "true" ]; then
     echo
-    echo "⏳ CI尚未全绿（仍有pending），等待重试..."
-    echo "   （当前第${attempt}次轮询，最多${MAX_ATTEMPTS}次）"
-    return 1
+    echo "⏳ CI尚未全绿（仍有pending），退出等待下次触发"
+    echo "   （pr-auto-scan每5分钟扫描一次，CI通过后会自动合并）"
+    exit 0
   fi
 
   # CI全绿 → 合并
@@ -136,28 +136,13 @@ check_and_merge() {
   fi
 }
 
-# 轮询等待CI就绪+审批完成，最多10分钟（60次x10秒）
-MAX_ATTEMPTS=60
-for attempt in $(seq 1 $MAX_ATTEMPTS); do
+# 最多重试3次（用于405重试，非CI轮询）
+for i in 1 2 3; do
   if check_and_merge; then
     exit 0
   fi
-  
-  # 检查PR是否还open（可能已被手动合并或关闭）
-  PR_STATE=$(curl -s -H "Authorization: token ${MERGE_TOKEN}" \
-    "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}" \
-    | python3 -c "import sys,json; print(json.load(sys.stdin).get('state',''))" 2>/dev/null || echo "?")
-  
-  if [ "$PR_STATE" != "open" ]; then
-    echo "PR状态为 ${PR_STATE}，无需继续等待"
-    exit 0
-  fi
-  
-  if [ $attempt -lt $MAX_ATTEMPTS ]; then
-    sleep 10
-  fi
 done
 
 echo
-echo "⏰ 等待10分钟后仍未满足合并条件，退出。pr-auto-scan定时扫描会继续重试。"
+echo "本次检查未满足合并条件，退出。pr-auto-scan每5分钟会继续扫描。"
 exit 0

scripts/ci/run_integration_tests.sh

@@ -52,45 +52,70 @@ bash scripts/ci/step_install_ffmpeg.sh
 # 需要用宿主机IP访问映射端口
 # 检测策略：host.docker.internal -> docker0桥接IP -> 容器IP直连 -> 默认网关 -> 127.0.0.1
 detect_docker_host() {
-  # 目标：找到宿主机IP（DooD模式下CI容器访问宿主机上其他容器用）
-  # 不依赖特定端口TCP探测，直接用网络拓扑信息
+  local test_port="${1:-${CI_LOCAL_PG_PORT}}"
+
+  # 候选IP列表
+  local candidates=()
 
   # 1. host.docker.internal（runner配置了--add-host时可用）
   if python3 -c "import socket; socket.gethostbyname('host.docker.internal')" 2>/dev/null; then
-    echo "host.docker.internal"
-    return 0
+    candidates+=("host.docker.internal")
   fi
 
-  # 2. 默认网关（Docker bridge模式下网关即宿主机）
+  # 2. docker0 桥接网关 (172.17.0.1)
+  candidates+=("172.17.0.1")
+
+  # 3. 默认网关（容器网络的网关即宿主机）
   local gw=""
   gw=$(ip route 2>/dev/null | grep default | awk '{print $3}' | head -1)
   if [ -n "$gw" ] && [ "$gw" != "127.0.0.1" ]; then
-    echo "$gw"
-    return 0
+    candidates+=("$gw")
   fi
 
-  # 3. docker0 桥接网关
-  if [ -n "$(ip addr show docker0 2>/dev/null)" ]; then
-    echo "172.17.0.1"
-    return 0
+  # 4. 宿主机可能的IP：容器同网段的.1或.254
+  local my_ip=""
+  my_ip=$(hostname -I 2>/dev/null | awk '{print $1}')
+  if [ -n "$my_ip" ]; then
+    # 尝试同网段的常见宿主机IP
+    local subnet=$(echo "$my_ip" | cut -d. -f1-3)
+    candidates+=("${subnet}.1")
+    candidates+=("${subnet}.254")
   fi
 
-  # 4. 通过 git server hostname 反查（runner 配置了 ExtraHosts host-gateway）
-  local git_host_ip=""
-  git_host_ip=$(python3 -c "import socket; print(socket.gethostbyname('git.xiaoxiajianji.com'))" 2>/dev/null || true)
-  if [ -n "$git_host_ip" ] && [ "$git_host_ip" != "127.0.0.1" ]; then
-    echo "$git_host_ip"
-    return 0
-  fi
+  # 5. 127.0.0.1 最后尝试
+  candidates+=("127.0.0.1")
 
-  # 5. 最终 fallback
+  # 测试每个候选IP
+  for candidate in "${candidates[@]}"; do
+    if python3 -c "
+import socket
+s = socket.socket()
+s.settimeout(2)
+try:
+    s.connect(('$candidate', $test_port))
+    s.close()
+    print('ok')
+except:
+    pass
+" 2>/dev/null | grep -q ok; then
+      echo "$candidate"
+      return 0
+    fi
+  done
+
+  # 都失败则返回127.0.0.1
   echo "127.0.0.1"
-  return 0
+  return 1
 }
 
 # 获取宿主机IP（先尝试用共享PG端口5433测试，再回退到其他端口）
 if [ -S /var/run/docker.sock ]; then
-  DOCKER_HOST_IP=$(detect_docker_host)
+  # 先用共享PG端口5433探测
+  DOCKER_HOST_IP=$(detect_docker_host "${CI_SHARED_PG_PORT}")
+  if [ "$DOCKER_HOST_IP" = "127.0.0.1" ]; then
+    # 如果共享PG端口探测失败，说明不在DooD或共享PG不可用，再试其他端口
+    DOCKER_HOST_IP=$(detect_docker_host 22)
+  fi
   echo "检测到DooD模式（/var/run/docker.sock已挂载），宿主机地址: $DOCKER_HOST_IP"
 else
   DOCKER_HOST_IP="127.0.0.1"
@@ -202,7 +227,7 @@ else
     postgres:16
   PG_PORT=$(docker port "$PG_CONTAINER" ${CI_LOCAL_PG_PORT}/tcp | cut -d: -f2)
   echo "PostgreSQL port: $PG_PORT"
-  export DATABASE_URL="postgresql+psycopg://postgres:postgres@${PG_HOST}:${PG_PORT}/${CI_DEFAULT_DB}"
+  export DATABASE_URL="postgresql+psycopg://${CI_SHARED_PG_USER}:${CI_SHARED_PG_PASSWORD}@${PG_HOST}:${PG_PORT}/${CI_DEFAULT_DB}"
 
   # 等待容器健康
   for i in $(seq 1 30); do

scripts/ci/sync_base_images.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+# ============================================
+# 基础镜像同步脚本 - 从公共镜像源同步到私有ACR
+# 用法:
+#   ACR_USERNAME=xxx ACR_PASSWORD=yyy bash scripts/ci/sync_base_images.sh
+# ============================================
+
+set -euo pipefail
+
+ACR_REGISTRY="${ACR_REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+ACR_USERNAME="${ACR_USERNAME:-}"
+ACR_PASSWORD="${ACR_PASSWORD:-}"
+SOURCE_PREFIX="${SOURCE_PREFIX:-docker.m.daocloud.io/library}"
+
+# 需要同步的镜像列表 (源镜像名:tag => ACR目标名:tag)
+IMAGES=(
+    "python:3.12-slim-bookworm"
+    "python:3.12-slim"
+    "node:20"
+    "nginx:alpine"
+)
+
+echo "============================================"
+echo "  基础镜像同步到 ACR"
+echo "  ACR: $ACR_REGISTRY"
+echo "  源: $SOURCE_PREFIX"
+echo "============================================"
+echo ""
+
+# 登录 ACR
+if [ -n "$ACR_PASSWORD" ] && [ -n "$ACR_USERNAME" ]; then
+    echo "登录 ACR..."
+    ACR_HOST=$(echo "$ACR_REGISTRY" | cut -d/ -f1)
+    printf '%s' "$ACR_PASSWORD" | docker login "$ACR_HOST" -u "$ACR_USERNAME" --password-stdin
+    echo "ACR 登录成功"
+    echo ""
+fi
+
+success=0
+failed=0
+
+for image in "${IMAGES[@]}"; do
+    source_image="${SOURCE_PREFIX}/${image}"
+    target_image="${ACR_REGISTRY}/base/${image}"
+
+    echo "--- 同步: $image ---"
+    echo "  源: $source_image"
+    echo "  目标: $target_image"
+
+    # Pull 源镜像（带重试）
+    pulled=0
+    for attempt in 1 2 3; do
+        echo "  Pull 尝试 $attempt/3..."
+        if docker pull "$source_image"; then
+            pulled=1
+            break
+        fi
+        echo "  Pull 失败，5s 后重试..."
+        sleep 5
+    done
+
+    if [ "$pulled" -eq 0 ]; then
+        echo "  ❌ Pull 失败: $image"
+        failed=$((failed + 1))
+        continue
+    fi
+
+    # Tag
+    docker tag "$source_image" "$target_image"
+    echo "  Tag 完成"
+
+    # Push 到 ACR
+    pushed=0
+    for attempt in 1 2 3; do
+        echo "  Push 尝试 $attempt/3..."
+        if docker push "$target_image"; then
+            pushed=1
+            break
+        fi
+        echo "  Push 失败，5s 后重试..."
+        sleep 5
+    done
+
+    if [ "$pushed" -eq 1 ]; then
+        echo "  ✅ 同步成功: $image"
+        success=$((success + 1))
+    else
+        echo "  ❌ Push 失败: $image"
+        failed=$((failed + 1))
+    fi
+
+    echo ""
+done
+
+echo "============================================"
+echo "  同步完成"
+echo "  成功: $success"
+echo "  失败: $failed"
+echo "============================================"
+
+if [ "$failed" -gt 0 ]; then
+    exit 1
+fi

scripts/ci/validate_code_quality.sh

@@ -0,0 +1,157 @@
+#!/bin/bash
+# CI Validate: 代码质量与安全扫描（并行Job 1/3）
+# 包含：密钥扫描、格式检查、安全扫描、依赖漏洞、死代码检测、脚本语法校验
+set -eu
+
+echo "=== CI Validate: 代码质量与安全扫描 ==="
+
+# --- 密钥检测 ---
+echo ""
+echo "=== [1/6] Secret detection (detect-secrets) ==="
+python3 -m pip install -q detect-secrets
+detect-secrets --version
+
+detect-secrets scan \
+  --all-files \
+  --exclude-files '(^|/)(tests|test|e2e|__tests__|spec|docs|node_modules|site-packages|migrations|alembic|.gitea|.git|.pytest_cache|.next|dist|build)/' \
+  --exclude-files '\.(md|rst|txt|lock|example|sample|min\.js|min\.css|spec\.ts|test\.ts|test\.py)$' \
+  --exclude-files '(package-lock|yarn\.lock|poetry\.lock|Pipfile\.lock)$' \
+  --disable-plugin Base64HighEntropyString \
+  --disable-plugin HexHighEntropyString \
+  --disable-plugin BasicAuthDetector \
+  --disable-plugin KeywordDetector \
+  --disable-plugin IPPublicDetector \
+  > /tmp/secrets-scan.json 2>&1
+
+FOUND=$(python3 -c "
+import json
+try:
+    with open('/tmp/secrets-scan.json') as f:
+        data = json.load(f)
+    results = data.get('results', {})
+    total = sum(len(v) for v in results.values())
+    print(total)
+except Exception:
+    print('error')
+")
+
+echo "Secrets detected: $FOUND"
+if [ "$FOUND" != "0" ] && [ "$FOUND" != "error" ]; then
+  echo ""
+  echo "=== Secret details ==="
+  python3 -c "
+import json
+with open('/tmp/secrets-scan.json') as f:
+    data = json.load(f)
+for fpath, items in data.get('results', {}).items():
+    for item in items:
+        line = item.get('line_number', '?')
+        stype = item.get('type', '?')
+        hashed = item.get('hashed_secret', '')[:16]
+        print(f'  {fpath}:{line} [{stype}] {hashed}...')
+"
+  echo ""
+  echo "ERROR: Potential secrets detected in code!"
+  exit 1
+fi
+echo "✅ Secret scan passed"
+
+# --- 代码质量检查（全量，PR 和 push 统一标准）---
+# 历史：PR 侧用增量检查以加速，但会导致 push 侧全量检查失败时 PR 侧感知不到
+# 现在统一全量检查，确保 CI 真正保护主分支（black/isort/ruff 全量仅多几十秒）
+echo ""
+echo "=== [2/6] Code quality checks (full scan) ==="
+SCAN_MODE="full"
+echo "Full scan mode"
+python3 -m compileall -q alembic apps packages tests scripts
+python3 -m black --check --fast alembic apps packages tests scripts
+python3 -m isort --check-only alembic apps packages tests scripts
+python3 -m ruff check apps packages tests --statistics
+
+echo "✅ Code quality checks passed"
+
+# --- Bandit 安全扫描（仅告警） ---
+echo ""
+echo "=== [3/6] Security scan (bandit, advisory only) ==="
+set +e
+bandit -r apps packages -q -ll
+BANDIT_EXIT=$?
+set -e
+if [ "$BANDIT_EXIT" -ne 0 ]; then
+  echo "⚠️  Bandit found security issues (advisory mode - not blocking CI)"
+else
+  echo "✅ Bandit security scan passed"
+fi
+
+# --- Pip-audit 依赖漏洞扫描（仅告警） ---
+echo ""
+echo "=== [4/6] Python dependency vulnerability scan (pip-audit, advisory only) ==="
+python3 -m pip install -q pip-audit
+pip-audit --version
+EXIT_CODE=0
+for req_file in requirements.txt requirements-base.txt requirements-dev.txt; do
+  if [ -f "$req_file" ]; then
+    echo "--- Scanning $req_file ---"
+    pip-audit -r "$req_file" --desc on 2>&1 | head -40 || EXIT_CODE=$?
+    echo ""
+  fi
+done
+echo "pip-audit scan completed (advisory mode - warnings only, not blocking CI)"
+
+# --- Vulture 死代码检测（仅告警） ---
+echo ""
+echo "=== [5/6] Dead code detection (vulture, advisory only) ==="
+set +e
+python3 -m pip install -q vulture
+vulture --version
+echo "告警模式，不阻断CI。置信度>=90%建议尽快确认。"
+echo ""
+vulture apps packages scripts \
+  --exclude "tests,test,migrations,.gitea,docs,node_modules,site-packages,*/test_*.py,*/conftest.py" \
+  --min-confidence 70 \
+  2>&1 | sort -t'(' -k2 -rn | head -80
+echo ""
+echo "=== vulture scan summary ==="
+echo "发现潜在死代码（可能包含框架装饰器注册的函数，为误报）"
+echo "建议：定期人工审查高置信度（>=90%）条目"
+set -e
+
+# --- CI脚本语法校验 ---
+echo ""
+echo "=== [6/6] CI & shell scripts syntax validation ==="
+SYNTAX_ERROR=0
+# 检查所有 CI shell 脚本
+for script in scripts/ci/*.sh; do
+  if [ -f "$script" ]; then
+    if ! bash -n "$script" 2>&1; then
+      echo "❌ 语法错误: $script"
+      SYNTAX_ERROR=1
+    fi
+  fi
+done
+# 检查所有 CI Python 脚本语法
+for script in scripts/ci/*.py; do
+  if [ -f "$script" ]; then
+    if ! python3 -m py_compile "$script" 2>&1; then
+      echo "❌ Python语法错误: $script"
+      SYNTAX_ERROR=1
+    fi
+  fi
+done
+# 检查 .gitea/workflows 下的脚本（如果有）
+for script in .gitea/workflows/*.sh; do
+  if [ -f "$script" ]; then
+    if ! bash -n "$script" 2>&1; then
+      echo "❌ 语法错误: $script"
+      SYNTAX_ERROR=1
+    fi
+  fi
+done
+if [ "$SYNTAX_ERROR" -ne 0 ]; then
+  echo "❌ CI脚本语法校验失败，见上方错误"
+  exit 1
+fi
+echo "✅ All CI scripts syntax OK"
+
+echo ""
+echo "=== CI Validate: 代码质量与安全扫描 全部通过 ✅ ==="

scripts/ci/validate_migration.sh

@@ -59,40 +59,56 @@ echo ""
 # ============================================================
 
 detect_docker_host() {
-  # 目标：找到宿主机IP（DooD模式下CI容器访问宿主机上其他容器用）
-  # 不依赖特定端口TCP探测，直接用网络拓扑信息
+  local test_port="${1:-${CI_LOCAL_PG_PORT}}"
 
-  # 1. host.docker.internal（runner配置了--add-host时可用）
+  local candidates=()
+
+  # 1. host.docker.internal
   if python3 -c "import socket; socket.gethostbyname('host.docker.internal')" 2>/dev/null; then
-    echo "host.docker.internal"
-    return 0
+    candidates+=("host.docker.internal")
   fi
 
-  # 2. 默认网关（Docker bridge模式下网关即宿主机）
+  # 2. docker0 桥接网关
+  candidates+=("172.17.0.1")
+
+  # 3. 默认网关
   local gw=""
   gw=$(ip route 2>/dev/null | grep default | awk '{print $3}' | head -1)
   if [ -n "$gw" ] && [ "$gw" != "127.0.0.1" ]; then
-    echo "$gw"
-    return 0
+    candidates+=("$gw")
   fi
 
-  # 3. docker0 桥接网关
-  if [ -n "$(ip addr show docker0 2>/dev/null)" ]; then
-    echo "172.17.0.1"
-    return 0
+  # 4. 宿主机同网段的.1或.254
+  local my_ip=""
+  my_ip=$(hostname -I 2>/dev/null | awk '{print $1}')
+  if [ -n "$my_ip" ]; then
+    local subnet=$(echo "$my_ip" | cut -d. -f1-3)
+    candidates+=("${subnet}.1")
+    candidates+=("${subnet}.254")
   fi
 
-  # 4. 通过 git server hostname 反查（runner 配置了 ExtraHosts host-gateway）
-  local git_host_ip=""
-  git_host_ip=$(python3 -c "import socket; print(socket.gethostbyname('git.xiaoxiajianji.com'))" 2>/dev/null || true)
-  if [ -n "$git_host_ip" ] && [ "$git_host_ip" != "127.0.0.1" ]; then
-    echo "$git_host_ip"
-    return 0
-  fi
+  # 5. 127.0.0.1 最后尝试
+  candidates+=("127.0.0.1")
+
+  for candidate in "${candidates[@]}"; do
+    if python3 -c "
+import socket
+s = socket.socket()
+s.settimeout(2)
+try:
+    s.connect(('$candidate', $test_port))
+    s.close()
+    print('ok')
+except:
+    pass
+" 2>/dev/null | grep -q ok; then
+      echo "$candidate"
+      return 0
+    fi
+  done
 
-  # 5. 最终 fallback
   echo "127.0.0.1"
-  return 0
+  return 1
 }
 
 # 指数退避TCP连接检查
@@ -116,7 +132,10 @@ wait_tcp_ready() {
 
 # 获取宿主机IP
 if [ -S /var/run/docker.sock ]; then
-  DOCKER_HOST_IP=$(detect_docker_host)
+  DOCKER_HOST_IP=$(detect_docker_host "${CI_SHARED_PG_PORT}")
+  if [ "$DOCKER_HOST_IP" = "127.0.0.1" ]; then
+    DOCKER_HOST_IP=$(detect_docker_host 22)
+  fi
   echo "检测到DooD模式，宿主机地址: $DOCKER_HOST_IP"
 else
   DOCKER_HOST_IP="127.0.0.1"
@@ -194,7 +213,7 @@ else
     postgres:16-alpine
   PG_PORT=$(docker port "$PG_CONTAINER" ${CI_LOCAL_PG_PORT}/tcp | cut -d: -f2)
   echo "PostgreSQL port: $PG_PORT"
-  export DATABASE_URL="postgresql+psycopg://postgres:postgres@${PG_HOST}:${PG_PORT}/${CI_DEFAULT_DB}"
+  export DATABASE_URL="postgresql+psycopg://${CI_SHARED_PG_USER}:${CI_SHARED_PG_PASSWORD}@${PG_HOST}:${PG_PORT}/${CI_DEFAULT_DB}"
 
   # 等待容器健康
   for i in $(seq 1 30); do

scripts/ci_production_deploy.sh

@@ -59,7 +59,6 @@ REGISTRY_TOKEN="${ACR_PASSWORD:-${REGISTRY_TOKEN:-}}"
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"
 GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-production/generated}"
 LEGACY_ASSETS_DIR="${LEGACY_ASSETS_DIR:-/var/lib/xiaoxia-saas-production/legacy-assets}"
-NGINX_CONF_FILE="${NGINX_CONF_FILE:-/var/lib/xiaoxia-saas-production/nginx-production.conf}"
 
 SKIP_MIGRATION="${SKIP_MIGRATION:-false}"
 SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}"
@@ -73,52 +72,6 @@ test -f "$ENV_FILE"
 mkdir -p "$GENERATED_DIR"
 mkdir -p "$LEGACY_ASSETS_DIR"
 
-# ── 写入 Production Nginx 配置 ──
-echo "Writing production nginx config..."
-cat > "$NGINX_CONF_FILE" << 'NGINX_EOF'
-server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/json application/xml+rss;
-
-    client_max_body_size 800m;
-
-    location / {
-        try_files $uri /index.html;
-    }
-
-    resolver 127.0.0.11 valid=10s;
-    resolver_timeout 5s;
-
-    location /api/ {
-        proxy_pass http://xiaoxia-api-production:8000/api/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_request_buffering off;
-    }
-
-    location /generated-files/ {
-        alias /app/generated/;
-    }
-
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-    }
-}
-NGINX_EOF
-echo "✅ Nginx config written: $NGINX_CONF_FILE"
-
 echo "==========================================="
 echo "  Production 部署 - $IMAGE_TAG"
 echo "==========================================="
@@ -235,7 +188,6 @@ rollback() {
   --cpus 0.5 \
   --memory 512m \
       $LEGACY_VOLUME \
-      -v "$NGINX_CONF_FILE:/etc/nginx/conf.d/default.conf:ro" \
       --health-cmd "wget --spider -q http://127.0.0.1:80" \
       --health-interval 30s \
       --health-timeout 5s \
@@ -433,7 +385,6 @@ docker run -d \
   --restart unless-stopped \
   --cpus 0.5 \
   --memory 512m \
-  -v "$NGINX_CONF_FILE:/etc/nginx/conf.d/default.conf:ro" \
   $LEGACY_VOLUME \
   --health-cmd "wget --spider -q http://127.0.0.1:80" \
   --health-interval 30s \

scripts/ci_production_healthcheck.sh

@@ -12,7 +12,7 @@
 # 环境变量:
 #   PROD_API_URL          - Production API 公网地址 (默认 https://api.xiaoxiajianji.com)
 #   PROD_WEB_URL          - Production Web 公网地址 (默认 https://saas.xiaoxiajianji.com)
-#   HEALTH_CHECK_TIMEOUT  - 健康检查总超时秒数 (默认 300)
+#   HEALTH_CHECK_TIMEOUT  - 健康检查总超时秒数 (默认 180)
 #   SKIP_ROLLBACK         - 失败时不自动回滚 (true/false, 默认 false)
 #   SKIP_NOTIFY           - 跳过通知 (true/false, 默认 false)
 #   CI_NOTIFY_WEBHOOK     - 通知 Webhook URL
@@ -36,7 +36,7 @@ SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
 # 配置
 PROD_API_URL="${PROD_API_URL:-https://api.xiaoxiajianji.com}"
 PROD_WEB_URL="${PROD_WEB_URL:-https://saas.xiaoxiajianji.com}"
-HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-300}"
+HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-180}"
 SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}"
 SKIP_NOTIFY="${SKIP_NOTIFY:-false}"
 
@@ -44,7 +44,7 @@ PRODUCTION_SSH_HOST="${PRODUCTION_SSH_HOST:-47.98.113.167}"
 PRODUCTION_SSH_USER="${PRODUCTION_SSH_USER:-root}"
 PRODUCTION_SSH_PORT="${PRODUCTION_SSH_PORT:-22222}"
 
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 # 颜色
@@ -160,11 +160,11 @@ health_check() {
             web_ok=true
         fi
 
-        # 检查 API docs（生产环境禁用 /docs，404 表示 API 在正常响应，视为健康）
+        # 检查 API docs
         if [ "$api_docs_ok" = false ]; then
             HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --max-time 10 "${PROD_API_URL}/docs" 2>/dev/null || echo "000")
-            if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "404" ]; then
-                log_info "✅ API Docs 检查通过（HTTP $HTTP_CODE）"
+            if [ "$HTTP_CODE" = "200" ]; then
+                log_info "✅ API Docs 检查通过"
                 api_docs_ok=true
             fi
         fi
@@ -232,7 +232,7 @@ set -eu
 
 IMAGE_TAG="$1"
 REGISTRY_TOKEN="$2"
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"

scripts/ci_staging_deploy.sh

@@ -46,7 +46,6 @@ REGISTRY_TOKEN="${ACR_PASSWORD:-${REGISTRY_TOKEN:-}}"
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-staging/.env}"
 GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-staging/generated}"
 LEGACY_ASSETS_DIR="${LEGACY_ASSETS_DIR:-/var/lib/xiaoxia-saas-staging/legacy-assets}"
-NGINX_CONF_FILE="${NGINX_CONF_FILE:-/var/lib/xiaoxia-saas-staging/nginx-staging.conf}"
 
 SKIP_MIGRATION="${SKIP_MIGRATION:-false}"
 SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}"
@@ -56,63 +55,10 @@ if [ -z "$IMAGE_TAG" ]; then
   exit 1
 fi
 
-# .env 文件由 CI 从模板 + Secrets 渲染后通过 SCP 上传到服务器
-# 如果文件不存在，说明 CI 渲染步骤失败或未执行
-if [ ! -f "$ENV_FILE" ]; then
-  echo "ERROR: $ENV_FILE 不存在。CI 应先在 render_env 步骤渲染并上传此文件"
-  exit 1
-fi
-echo "✅ .env file found: $ENV_FILE ($(wc -l < "$ENV_FILE") lines)"
+test -f "$ENV_FILE"
 mkdir -p "$GENERATED_DIR"
 mkdir -p "$LEGACY_ASSETS_DIR"
 
-# ── 写入 Staging Nginx 配置 ──
-# 运行时覆盖 nginx 配置，确保 upstream 指向正确的 staging 网络
-echo "Writing staging nginx config..."
-cat > "$NGINX_CONF_FILE" << 'NGINX_EOF'
-server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_types text/plain text/css text/xml text/javascript application/javascript application/json application/xml+rss;
-
-    client_max_body_size 800m;
-
-    location / {
-        try_files $uri /index.html;
-    }
-
-    resolver 127.0.0.11 valid=10s;
-    resolver_timeout 5s;
-
-    location /api/ {
-        proxy_pass http://xiaoxia-api-staging:8000/api/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_request_buffering off;
-    }
-
-    location /generated-files/ {
-        alias /app/generated/;
-    }
-
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-    }
-}
-NGINX_EOF
-echo "✅ Nginx config written: $NGINX_CONF_FILE"
-
 echo "==========================================="
 echo "  Staging 部署 - $IMAGE_TAG (并行优化版)"
 echo "==========================================="
@@ -213,7 +159,6 @@ rollback() {
       -p 127.0.0.1:3001:80 \
       --restart unless-stopped \
       $LEGACY_VOLUME \
-      -v "$NGINX_CONF_FILE:/etc/nginx/conf.d/default.conf:ro" \
       --health-cmd "wget --spider -q http://127.0.0.1:80" \
       --health-interval 30s \
       --health-timeout 5s \
@@ -516,7 +461,6 @@ docker run -d \
   -p 127.0.0.1:3001:80 \
   --restart unless-stopped \
   $LEGACY_VOLUME \
-  -v "$NGINX_CONF_FILE:/etc/nginx/conf.d/default.conf:ro" \
   --health-cmd "wget --spider -q http://127.0.0.1:80" \
   --health-interval 30s \
   --health-timeout 5s \

scripts/config_diff_check.sh

@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-# ===========================================================
-# config_diff_check.sh — 对比渲染 .env 与服务器当前 .env
-# ===========================================================
-# 用法: scripts/config_diff_check.sh <rendered_file> <current_file>
-#
-# 输出:
-#   + ADDED   渲染文件有、当前文件没有（新增配置）
-#   - REMOVED 当前文件有、渲染文件没有（将被删除）
-#   ~ CHANGED 两边都有但值不同（将被覆盖）
-#
-# 敏感值脱敏：KEY/SECRET/PASSWORD/TOKEN/URL 类变量只显示前4字符+***
-# 退出码: 始终返回 0（仅告警，不阻塞部署）
-# ===========================================================
-set -u
-
-RENDERED_FILE="${1:-}"
-CURRENT_FILE="${2:-}"
-
-if [ -z "$RENDERED_FILE" ] || [ -z "$CURRENT_FILE" ]; then
-  echo "ERROR: 用法: $0 <rendered_file> <current_file>" >&2
-  exit 0
-fi
-
-if [ ! -f "$RENDERED_FILE" ]; then
-  echo "ERROR: 渲染文件不存在: $RENDERED_FILE" >&2
-  exit 0
-fi
-
-# 判断是否为敏感变量（键名包含以下关键词）
-is_sensitive() {
-  local key="$1"
-  case "$key" in
-    *KEY*|*SECRET*|*PASSWORD*|*TOKEN*|*URL*|*BROKER*|*BACKEND*) return 0 ;;
-    *) return 1 ;;
-  esac
-}
-
-# 脱敏：敏感值只显示前4字符+***
-mask_value() {
-  local key="$1"
-  local value="$2"
-  if is_sensitive "$key"; then
-    if [ ${#value} -le 4 ]; then
-      echo "****"
-    else
-      echo "${value:0:4}***"
-    fi
-  else
-    echo "$value"
-  fi
-}
-
-# 解析文件为 KEY=VALUE（忽略注释和空行）
-parse_env() {
-  local file="$1"
-  grep -vE '^\s*#|^\s*$' "$file" 2>/dev/null | while IFS= read -r line; do
-    # 只取第一个 = 之前的部分作为 key
-    key="${line%%=*}"
-    value="${line#*=}"
-    # 跳过无效行
-    if [ -n "$key" ] && [ "$key" != "$line" ]; then
-      echo "${key}=${value}"
-    fi
-  done
-}
-
-echo "=========================================="
-echo "  配置 Diff 检查（检测配置漂移）"
-echo "=========================================="
-echo "渲染文件: $RENDERED_FILE"
-echo "当前文件: $CURRENT_FILE"
-echo ""
-
-# 解析两个文件
-if [ ! -f "$CURRENT_FILE" ] || [ ! -s "$CURRENT_FILE" ]; then
-  # 服务器 .env 不存在或为空（首次部署）
-  echo "⚠️  服务器 .env 不存在或为空（可能是首次部署）"
-  echo "   所有配置项将标记为 ADDED"
-  echo ""
-
-  added=0
-  while IFS='=' read -r key value; do
-    [ -z "$key" ] && continue
-    masked=$(mask_value "$key" "$value")
-    echo "  + ADDED  ${key}=${masked}"
-    added=$((added + 1))
-  done < <(parse_env "$RENDERED_FILE")
-
-  echo ""
-  echo "=========================================="
-  echo "  汇总: 新增 ${added} 项 | 删除 0 项 | 变更 0 项 | 无变化 0 项"
-  echo "=========================================="
-  exit 0
-fi
-
-# 用临时文件存储解析结果
-tmp_rendered=$(mktemp)
-tmp_current=$(mktemp)
-trap "rm -f $tmp_rendered $tmp_current" EXIT
-
-parse_env "$RENDERED_FILE" | sort > "$tmp_rendered"
-parse_env "$CURRENT_FILE" | sort > "$tmp_current"
-
-added=0
-removed=0
-changed=0
-unchanged=0
-
-echo "--- 新增配置（渲染文件有、当前文件无）---"
-# 找 ADDED：渲染文件有但当前文件没有的 key
-while IFS='=' read -r key value; do
-  [ -z "$key" ] && continue
-  current_line=$(grep -m1 "^${key}=" "$tmp_current" 2>/dev/null || true)
-  if [ -z "$current_line" ]; then
-    masked=$(mask_value "$key" "$value")
-    echo "  + ADDED  ${key}=${masked}"
-    added=$((added + 1))
-  fi
-done < "$tmp_rendered"
-
-if [ "$added" -eq 0 ]; then
-  echo "  (无)"
-fi
-
-echo ""
-echo "--- 删除配置（当前文件有、渲染文件无）---"
-# 找 REMOVED：当前文件有但渲染文件没有的 key
-while IFS='=' read -r key value; do
-  [ -z "$key" ] && continue
-  rendered_line=$(grep -m1 "^${key}=" "$tmp_rendered" 2>/dev/null || true)
-  if [ -z "$rendered_line" ]; then
-    masked=$(mask_value "$key" "$value")
-    echo "  - REMOVED  ${key}=${masked}"
-    removed=$((removed + 1))
-  fi
-done < "$tmp_current"
-
-if [ "$removed" -eq 0 ]; then
-  echo "  (无)"
-fi
-
-echo ""
-echo "--- 变更配置（两边都有但值不同）---"
-# 找 CHANGED：两边都有但值不同
-while IFS='=' read -r key value; do
-  [ -z "$key" ] && continue
-  current_line=$(grep -m1 "^${key}=" "$tmp_current" 2>/dev/null || true)
-  if [ -n "$current_line" ]; then
-    current_value="${current_line#*=}"
-    if [ "$value" != "$current_value" ]; then
-      masked_new=$(mask_value "$key" "$value")
-      masked_old=$(mask_value "$key" "$current_value")
-      echo "  ~ CHANGED  ${key}: ${masked_old} → ${masked_new}"
-      changed=$((changed + 1))
-    else
-      unchanged=$((unchanged + 1))
-    fi
-  fi
-done < "$tmp_rendered"
-
-if [ "$changed" -eq 0 ]; then
-  echo "  (无)"
-fi
-
-echo ""
-echo "=========================================="
-echo "  汇总: 新增 ${added} 项 | 删除 ${removed} 项 | 变更 ${changed} 项 | 无变化 ${unchanged} 项"
-echo "=========================================="
-
-if [ "$added" -gt 0 ] || [ "$removed" -gt 0 ] || [ "$changed" -gt 0 ]; then
-  echo "⚠️  检测到配置漂移，请确认以上变更是否符合预期"
-else
-  echo "✅ 配置无漂移，与服务器当前配置一致"
-fi
-
-exit 0

scripts/render_env.sh

@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-# ===========================================================
-# render_env.sh — 从模板 + Secrets 渲染 .env 文件
-# ===========================================================
-# 用法: scripts/render_env.sh <staging|production>
-#
-# 输入: deploy/configs/.env.staging 或 .env.production 模板
-# 输出: .env.rendered（包含真实密钥，切勿提交或打印）
-#
-# 环境变量映射规则:
-#   STAGING_xxx / PRODUCTION_xxx → xxx（去掉环境前缀）
-#   共用 secrets 直接使用（如 OSS_ACCESS_KEY_ID）
-# ===========================================================
-set -eu
-
-TARGET_ENV="${1:-}"
-
-if [ -z "$TARGET_ENV" ] || { [ "$TARGET_ENV" != "staging" ] && [ "$TARGET_ENV" != "production" ]; }; then
-  echo "ERROR: 用法: $0 <staging|production>" >&2
-  exit 1
-fi
-
-TEMPLATE_FILE="deploy/configs/.env.${TARGET_ENV}"
-OUTPUT_FILE=".env.rendered"
-
-if [ ! -f "$TEMPLATE_FILE" ]; then
-  echo "ERROR: 模板文件不存在: $TEMPLATE_FILE" >&2
-  exit 1
-fi
-
-# 构建环境变量映射（带环境前缀的 secrets → 模板变量名）
-ENV_PREFIX=$(echo "$TARGET_ENV" | tr '[:lower:]' '[:upper:]')
-
-# 需要映射的带环境前缀变量
-MAPPED_VARS="DATABASE_URL REDIS_URL CELERY_BROKER_URL CELERY_RESULT_BACKEND JWT_SECRET_KEY"
-
-# Staging 独有的 MinIO 变量
-if [ "$TARGET_ENV" = "staging" ]; then
-  MAPPED_VARS="$MAPPED_VARS MINIO_ENDPOINT MINIO_ACCESS_KEY MINIO_SECRET_KEY"
-fi
-
-# 将带前缀的 secrets 导出为无前缀的环境变量
-for var in $MAPPED_VARS; do
-  prefixed_var="${ENV_PREFIX}_${var}"
-  value="${!prefixed_var:-}"
-  if [ -n "$value" ]; then
-    export "$var=$value"
-  fi
-done
-
-# 特殊映射：CI secret 名称与模板占位符不一致的变量
-# STAGING_MINIO_BUCKET → MINIO_BUCKET_NAME
-if [ "$TARGET_ENV" = "staging" ]; then
-  if [ -n "${STAGING_MINIO_BUCKET:-}" ]; then
-    export "MINIO_BUCKET_NAME=$STAGING_MINIO_BUCKET"
-  fi
-fi
-
-# 共用 secrets 直接导出（如果存在）
-SHARED_SECRETS="OSS_ACCESS_KEY_ID OSS_ACCESS_KEY_SECRET COSYVOICE_API_KEY DASHSCOPE_API_KEY MEDIAKIT_API_KEY"
-for var in $SHARED_SECRETS; do
-  value="${!var:-}"
-  # 已经在环境中了，无需额外操作
-done
-
-# 使用 Python 进行变量替换（Python 在 CI runner 中一定存在）
-python3 - "$TEMPLATE_FILE" "$OUTPUT_FILE" "$ENV_PREFIX" "$MAPPED_VARS" "$SHARED_SECRETS" <<'PYTHON_SCRIPT'
-import sys
-import os
-import re
-
-template_file = sys.argv[1]
-output_file = sys.argv[2]
-env_prefix = sys.argv[3]
-mapped_vars_str = sys.argv[4]
-shared_secrets_str = sys.argv[5]
-
-# 收集所有可用的替换变量
-all_vars = set()
-for v in mapped_vars_str.split():
-    all_vars.add(v)
-for v in shared_secrets_str.split():
-    all_vars.add(v)
-
-# 读取模板
-with open(template_file, 'r') as f:
-    template = f.read()
-
-# 找出模板中所有的 ${VAR} 占位符（仅检查非注释行）
-pattern = re.compile(r'\$\{(\w+)\}')
-placeholders = set()
-for line in template.splitlines():
-    stripped = line.strip()
-    if stripped.startswith('#'):
-        continue
-    placeholders.update(pattern.findall(line))
-
-# 检查必需变量是否已设置
-missing = []
-for var in placeholders:
-    value = os.environ.get(var, '')
-    if not value:
-        missing.append(var)
-
-if missing:
-    print(f"ERROR: 以下变量未设置或为空: {', '.join(sorted(missing))}", file=sys.stderr)
-    print(f"请确认对应的 {env_prefix}_xxx 或共用 secrets 已在 Gitea Secrets 中配置", file=sys.stderr)
-    sys.exit(1)
-
-# 执行替换
-def replace_var(match):
-    var_name = match.group(1)
-    return os.environ.get(var_name, match.group(0))
-
-rendered = pattern.sub(replace_var, template)
-
-# 写入输出文件
-with open(output_file, 'w') as f:
-    f.write(rendered)
-
-# 设置文件权限为仅 owner 可读写
-os.chmod(output_file, 0o600)
-
-print(f"✅ .env 渲染完成: {template_file} → {output_file}")
-print(f"   替换了 {len(placeholders)} 个变量")
-PYTHON_SCRIPT
-
-# 验证输出文件
-if [ ! -f "$OUTPUT_FILE" ]; then
-  echo "ERROR: 渲染失败，输出文件不存在" >&2
-  exit 1
-fi
-
-# 检查输出文件中是否还有未替换的占位符（仅检查非注释行）
-if grep -vE '^\s*#' "$OUTPUT_FILE" | grep -qE '\$\{[A-Z_]+\}'; then
-  echo "ERROR: 输出文件中仍有未替换的占位符:" >&2
-  grep -nE '\$\{[A-Z_]+\}' "$OUTPUT_FILE" | grep -v '^\s*#' >&2
-  exit 1
-fi
-
-echo "✅ 渲染文件校验通过，无残留占位符"
-echo "⚠️  $OUTPUT_FILE 包含敏感信息，请勿提交或打印到日志"

tests/unit/test_cross_video_avoidance.py

@@ -1,334 +0,0 @@
-"""Tests for Issue #1670 — 跨视频片段避让（生成前注入已用区间）."""
-
-from __future__ import annotations
-
-from datetime import datetime, timezone
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
-    SQLAlchemyEditPlanClipRepository,
-)
-from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
-from packages.domain.plan_generator_utils import (
-    _distribute_one_take,
-    distribute_assets,
-)
-
-# ── Repository 层测试 ─────────────────────────────────────────────────────────
-
-
-class TestListUsedSegmentsByUser:
-    """测试 list_used_segments_by_user 方法."""
-
-    def _make_repo(self, session_mock):
-        return SQLAlchemyEditPlanClipRepository(session_mock)
-
-    def test_empty_user_id_returns_empty_dict(self):
-        """空 user_id 直接返回空 dict，不查 DB."""
-        session = MagicMock()
-        repo = self._make_repo(session)
-        result = repo.list_used_segments_by_user("")
-        assert result == {}
-        session.query.assert_not_called()
-
-    def test_no_completed_plans_returns_empty_dict(self):
-        """用户没有已完成的 plan 时返回空 dict."""
-        session = MagicMock()
-        # Mock plan query returns empty
-        plan_query = MagicMock()
-        plan_query.filter.return_value = plan_query
-        plan_query.order_by.return_value = plan_query
-        plan_query.limit.return_value = plan_query
-        plan_query.all.return_value = []
-        session.query.return_value = plan_query
-
-        repo = self._make_repo(session)
-        result = repo.list_used_segments_by_user("user_123")
-        assert result == {}
-
-    def test_aggregates_clips_from_multiple_plans(self):
-        """从多个已完成 plan 的 clips 聚合已用区间."""
-        session = MagicMock()
-
-        # Mock plan query: 2 completed plans
-        plan_query = MagicMock()
-        plan_query.filter.return_value = plan_query
-        plan_query.order_by.return_value = plan_query
-        plan_query.limit.return_value = plan_query
-        plan_query.all.return_value = [("plan_1",), ("plan_2",)]
-        session.query.return_value = plan_query
-
-        # Mock clip query: clips from both plans
-        clip_query = MagicMock()
-        clip_query.filter.return_value = clip_query
-        clip_query.all.return_value = [
-            ("asset_A", 0.0, 5.0),  # plan_1, asset A: 0~5s
-            ("asset_A", 10.0, 3.0),  # plan_1, asset A: 10~13s
-            ("asset_B", 2.0, 4.0),  # plan_2, asset B: 2~6s
-        ]
-        # Second session.query call is for clips
-        session.query.side_effect = [plan_query, clip_query]
-
-        repo = self._make_repo(session)
-        result = repo.list_used_segments_by_user("user_123")
-
-        assert "asset_A" in result
-        assert len(result["asset_A"]) == 2
-        assert result["asset_A"][0] == (0.0, 5.0)
-        assert result["asset_A"][1] == (10.0, 13.0)
-        assert "asset_B" in result
-        assert result["asset_B"][0] == (2.0, 6.0)
-
-    def test_respects_limit_recent_parameter(self):
-        """limit_recent 参数限制查询的 plan 数量."""
-        session = MagicMock()
-
-        plan_query = MagicMock()
-        plan_query.filter.return_value = plan_query
-        plan_query.order_by.return_value = plan_query
-        plan_query.limit.return_value = plan_query
-        plan_query.all.return_value = [("plan_1",)]
-        session.query.return_value = plan_query
-
-        clip_query = MagicMock()
-        clip_query.filter.return_value = clip_query
-        clip_query.all.return_value = [("asset_X", 1.0, 2.0)]
-        session.query.side_effect = [plan_query, clip_query]
-
-        repo = self._make_repo(session)
-        result = repo.list_used_segments_by_user("user_123", limit_recent=10)
-
-        # Verify limit was called with the parameter
-        plan_query.limit.assert_called_once_with(10)
-        assert "asset_X" in result
-
-
-# ── Domain 层测试 ─────────────────────────────────────────────────────────────
-
-
-class TestDistributeAssetsWithExternalSegments:
-    """测试 distribute_assets 传入 external_used_segments 的行为."""
-
-    def _make_clips(self, count: int, duration: float = 3.0) -> list[EditPlanClip]:
-        """创建指定数量的 MAIN 类型 clips."""
-        return [
-            EditPlanClip(
-                id=f"clip_{i}",
-                plan_id="plan_1",
-                clip_type="main",
-                order=i,
-                template_clip_config_id="",
-                asset_id="",
-                text_content="",
-                start_time=0.0,
-                duration=duration,
-                status=EditPlanClipStatus.PENDING,
-            )
-            for i in range(count)
-        ]
-
-    def test_external_used_segments_none_backward_compatible(self):
-        """external_used_segments=None 时行为不变（向后兼容）."""
-        clips = self._make_clips(3)
-        asset_ids = ["asset_1", "asset_2", "asset_3"]
-        asset_durations = {aid: 30.0 for aid in asset_ids}
-
-        # Should not raise
-        distribute_assets(
-            clips,
-            asset_ids,
-            "one_take",
-            asset_durations=asset_durations,
-            external_used_segments=None,
-        )
-
-        # All clips should have assets assigned
-        for clip in clips:
-            assert clip.asset_id != ""
-
-    def test_external_used_segments_avoids_existing_ranges(self):
-        """传入 external_used_segments 后，新分配的 start_time 避开已有区间."""
-        clips = self._make_clips(2, duration=3.0)
-        asset_ids = ["asset_1"]
-        asset_durations = {"asset_1": 30.0}
-
-        # Pretend asset_1 0~10s is already used by another video
-        external = {"asset_1": [(0.0, 10.0)]}
-
-        # Run multiple times to check that start_time always avoids 0~10s
-        # (with some randomness, but the avoidance should be consistent)
-        for _ in range(10):
-            test_clips = self._make_clips(1, duration=3.0)
-            distribute_assets(
-                test_clips,
-                asset_ids,
-                "one_take",
-                asset_durations=asset_durations,
-                external_used_segments=external,
-            )
-            start = test_clips[0].start_time
-            # Start time + duration (3s) should not overlap with 0~10
-            # i.e., start >= 10.0 or start + 3 <= 0.0 (impossible since start >= 0)
-            assert (
-                start >= 10.0 or start + 3.0 <= 0.0 or start >= 10.0
-            ), f"start_time {start} overlaps with existing segment 0~10"
-
-    def test_external_used_segments_deep_copy(self):
-        """external_used_segments 会被深拷贝，不会修改外部数据."""
-        external = {"asset_1": [(0.0, 5.0)]}
-        original = {"asset_1": [(0.0, 5.0)]}
-
-        clips = self._make_clips(1, duration=2.0)
-        asset_ids = ["asset_1"]
-        asset_durations = {"asset_1": 20.0}
-
-        distribute_assets(
-            clips,
-            asset_ids,
-            "one_take",
-            asset_durations=asset_durations,
-            external_used_segments=external,
-        )
-
-        # External dict should be unchanged
-        assert external == original
-
-    def test_empty_external_used_segments_same_as_none(self):
-        """空 dict 的 external_used_segments 行为与 None 相同."""
-        clips = self._make_clips(2, duration=3.0)
-        asset_ids = ["asset_1", "asset_2"]
-        asset_durations = {aid: 30.0 for aid in asset_ids}
-
-        # Should not raise and should assign assets normally
-        distribute_assets(
-            clips,
-            asset_ids,
-            "one_take",
-            asset_durations=asset_durations,
-            external_used_segments={},
-        )
-        for clip in clips:
-            assert clip.asset_id != ""
-
-
-# ── Service 层测试 ────────────────────────────────────────────────────────────
-
-
-class TestServiceLayerIntegration:
-    """测试 _distribute_assets 在 service 层的查询逻辑."""
-
-    def _make_service(self, clip_repo_mock, asset_repo_mock=None):
-        """创建 PlanGeneratorService 并注入 mock repos."""
-
-        from apps.api.app.services.plan_generator_service import PlanGeneratorService
-
-        with (
-            patch("apps.api.app.services.plan_generator_service.SQLAlchemyEditPlanRepository"),
-            patch(
-                "apps.api.app.services.plan_generator_service.SQLAlchemyEditPlanClipRepository",
-                return_value=clip_repo_mock,
-            ),
-        ):
-            db = MagicMock()
-            svc = PlanGeneratorService(db, asset_repo=asset_repo_mock)
-            svc._clip_repo = clip_repo_mock
-        return svc
-
-    def _make_clip(self):
-        return EditPlanClip(
-            id="clip_1",
-            plan_id="plan_1",
-            clip_type="main",
-            order=0,
-            template_clip_config_id="",
-            asset_id="",
-            text_content="",
-            start_time=0.0,
-            duration=3.0,
-            status=EditPlanClipStatus.PENDING,
-        )
-
-    def test_query_called_with_user_id(self):
-        """有 user_id 时调用 list_used_segments_by_user."""
-        clip_repo = MagicMock()
-        clip_repo.list_used_segments_by_user.return_value = {"asset_A": [(0.0, 5.0)]}
-        asset_repo = MagicMock()
-        asset_repo.get.return_value = None  # smart_match fallback
-
-        svc = self._make_service(clip_repo, asset_repo)
-        clips = [self._make_clip()]
-
-        svc._distribute_assets(
-            clips,
-            ["asset_A"],
-            "one_take",
-            asset_durations={"asset_A": 30.0},
-            user_id="user_123",
-        )
-
-        clip_repo.list_used_segments_by_user.assert_called_once_with("user_123", limit_recent=50)
-
-    def test_query_not_called_without_user_id(self):
-        """无 user_id 时不调用查询."""
-        clip_repo = MagicMock()
-        asset_repo = MagicMock()
-        asset_repo.get.return_value = None
-
-        svc = self._make_service(clip_repo, asset_repo)
-        clips = [self._make_clip()]
-
-        svc._distribute_assets(
-            clips,
-            ["asset_A"],
-            "one_take",
-            asset_durations={"asset_A": 30.0},
-            user_id="",
-        )
-
-        clip_repo.list_used_segments_by_user.assert_not_called()
-
-    def test_query_failure_does_not_block_generation(self):
-        """查询失败时不阻塞生成，回退到纯随机."""
-        clip_repo = MagicMock()
-        clip_repo.list_used_segments_by_user.side_effect = Exception("DB error")
-        asset_repo = MagicMock()
-        asset_repo.get.return_value = None
-
-        svc = self._make_service(clip_repo, asset_repo)
-        clips = [self._make_clip()]
-
-        # Should not raise
-        svc._distribute_assets(
-            clips,
-            ["asset_A"],
-            "one_take",
-            asset_durations={"asset_A": 30.0},
-            user_id="user_123",
-        )
-
-        # Clip should still get an asset assigned (fallback to random)
-        assert clips[0].asset_id == "asset_A"
-
-    def test_preview_and_final_both_query(self):
-        """预览和正式生成都触发查询."""
-        for random_selection in [True, False]:
-            clip_repo = MagicMock()
-            clip_repo.list_used_segments_by_user.return_value = {}
-            asset_repo = MagicMock()
-            asset_repo.get.return_value = None
-
-            svc = self._make_service(clip_repo, asset_repo)
-            clips = [self._make_clip()]
-
-            svc._distribute_assets(
-                clips,
-                ["asset_A"],
-                "one_take",
-                random_selection=random_selection,
-                asset_durations={"asset_A": 30.0},
-                user_id="user_123",
-            )
-
-            clip_repo.list_used_segments_by_user.assert_called_once()

tests/unit/test_dedup_engine.py

@@ -285,10 +285,8 @@ class TestVideoDeduplicatorCheckDuplicate:
             result = deduplicator.check_duplicate(fingerprint, "proj-1", mock_session)
             assert result is not None
             assert result["duplicate"] is True
-            assert result["similarity"] == pytest.approx(
-                0.85, abs=0.01
-            )  # combined: 0.7*1.0 + 0.3*0.5 (no hist fallback)
-            assert result["reason"] == "phash_histogram_fusion"
+            assert result["similarity"] == 1.0  # distance=0 → 1.0
+            assert result["reason"] == "phash_similar"
         finally:
             self._restore_repo(mod, orig)
 
@@ -427,11 +425,8 @@ class TestVideoDeduplicatorCheckDuplicate:
             result = deduplicator.check_duplicate(fingerprint, "proj-1", mock_session)
             assert result is not None
             assert result["duplicate"] is True
-            # 新算法: median_distance=1, phash_sim=1-1/64=0.984375
-            # 无直方图 → hist_sim=0.5(fallback)
-            # combined = 0.7*0.984375 + 0.3*0.5 = 0.839062
-            expected_sim = 0.7 * (1.0 - 1.0 / 64) + 0.3 * 0.5
-            assert abs(result["similarity"] - expected_sim) < 1e-6
+            # similarity = 1.0 - (1 / 64) = 0.984375
+            assert abs(result["similarity"] - (1.0 - 1.0 / 64)) < 1e-6
         finally:
             self._restore_repo(mod, orig)
 
@@ -461,9 +456,7 @@ class TestVideoDeduplicatorCheckDuplicate:
             result = deduplicator.check_duplicate(fingerprint, "proj-1", mock_session)
             assert result is not None
             assert result["duplicate"] is True
-            # 新算法: median_distance=0, phash_sim=1.0, hist_sim=0.5(fallback)
-            # combined = 0.7*1.0 + 0.3*0.5 = 0.85
-            assert result["similarity"] == pytest.approx(0.85, abs=0.01)
+            assert result["similarity"] == 1.0  # avg_distance = 0
         finally:
             self._restore_repo(mod, orig)
 
@@ -546,7 +539,7 @@ class TestVideoDeduplicatorCheckBatchDuplicate:
             result = deduplicator.check_batch_duplicate(fingerprint, "batch-1", "vid-self", mock_session)
             assert result is not None
             assert result["duplicate"] is True
-            assert result["reason"] == "batch_phash_histogram_fusion"
+            assert result["reason"] == "batch_phash_similar"
         finally:
             self._restore_repo(mod, orig)
 

tests/unit/test_dedup_helpers_user_id.py

@@ -43,11 +43,7 @@ class TestDedupHelpersUserIdPassthrough:
         mock_deduplicator = MagicMock()
         mock_deduplicator.compute_fingerprint.return_value = mock_fingerprint
         mock_deduplicator.check_duplicate.return_value = None
-        mock_deduplicator.compute_duplicate_rate.return_value = {
-            "duplicate_rate": 42.5,
-            "visual_similarity": 0.7,
-            "match_count": 2,
-        }
+        mock_deduplicator.compute_duplicate_rate.return_value = 42.5
 
         with (
             patch(
@@ -89,11 +85,7 @@ class TestDedupHelpersUserIdPassthrough:
         mock_deduplicator = MagicMock()
         mock_deduplicator.compute_fingerprint.return_value = mock_fingerprint
         mock_deduplicator.check_duplicate.return_value = None
-        mock_deduplicator.compute_duplicate_rate.return_value = {
-            "duplicate_rate": 0.0,
-            "visual_similarity": 0.0,
-            "match_count": 0,
-        }
+        mock_deduplicator.compute_duplicate_rate.return_value = 0.0
 
         with (
             patch(
@@ -132,11 +124,7 @@ class TestDedupHelpersUserIdPassthrough:
         mock_deduplicator = MagicMock()
         mock_deduplicator.compute_fingerprint.return_value = mock_fingerprint
         mock_deduplicator.check_duplicate.return_value = None
-        mock_deduplicator.compute_duplicate_rate.return_value = {
-            "duplicate_rate": 78.5,
-            "visual_similarity": 0.85,
-            "match_count": 3,
-        }
+        mock_deduplicator.compute_duplicate_rate.return_value = 78.5
 
         with (
             patch(

tests/unit/test_dedup_pure.py

@@ -181,68 +181,70 @@ class TestVideoFingerprint:
         assert d["color_histograms"] == []
 
 
-class TestBhattacharyyaCoefficient:
-    """_bhattacharyya_coefficient Bhattacharyya 系数测试."""
+class TestAverageHistogramSimilarity:
+    """_average_histogram_similarity 直方图相似度测试."""
 
     def test_identical_histograms(self):
-        """完全相同的直方图系数为1.0."""
-        hist = [0.5, 0.5, 0.0, 0.3]
-        bc = VideoDeduplicator._bhattacharyya_coefficient(hist, hist)
-        # Σ √(a[i]*a[i]) = Σ a[i] = 1.0 (normalized)
-        assert bc == pytest.approx(sum(h for h in hist))
+        """完全相同的直方图相似度为1.0."""
+        hist = [[0.5, 0.5, 0.0], [0.3, 0.4, 0.3]]
+        sim = VideoDeduplicator._average_histogram_similarity(hist, hist)
+        assert sim == pytest.approx(1.0)
 
-    def test_zero_histograms(self):
-        """全零直方图系数为0."""
-        bc = VideoDeduplicator._bhattacharyya_coefficient([0.0, 0.0], [0.0, 0.0])
-        assert bc == 0.0
-
-    def test_orthogonal_histograms(self):
-        """正交直方图（无重叠）系数为0."""
-        bc = VideoDeduplicator._bhattacharyya_coefficient([1.0, 0.0], [0.0, 1.0])
-        assert bc == pytest.approx(0.0)
-
-    def test_different_lengths(self):
-        """不同长度直方图取最小长度对齐."""
-        bc = VideoDeduplicator._bhattacharyya_coefficient([1.0, 1.0, 0.0, 0.0], [1.0, 1.0])
-        # 对齐到前2维: √(1*1) + √(1*1) = 2.0
-        assert bc == pytest.approx(2.0)
-
-    def test_known_value(self):
-        """已知值验证."""
-        # [0.25, 0.25, 0.25, 0.25] vs [0.25, 0.25, 0.25, 0.25]
-        # BC = 4 * √(0.25 * 0.25) = 4 * 0.25 = 1.0
-        hist = [0.25, 0.25, 0.25, 0.25]
-        bc = VideoDeduplicator._bhattacharyya_coefficient(hist, hist)
-        assert bc == pytest.approx(1.0)
-
-
-class TestComputeHistogramSimilarity:
-    """_compute_histogram_similarity 多帧直方图相似度测试."""
-
-    def test_identical_histogram_groups(self):
-        """完全相同的两组直方图."""
-        hist = [[0.5, 0.5], [0.3, 0.4]]
-        sim = VideoDeduplicator._compute_histogram_similarity(hist, hist)
-        # Each hist finds best match = itself
-        assert sim > 0.0
-
-    def test_empty_first(self):
+    def test_empty_first_list(self):
         """第一组为空返回0."""
-        assert VideoDeduplicator._compute_histogram_similarity([], [[0.5]]) == 0.0
+        sim = VideoDeduplicator._average_histogram_similarity([], [[0.5, 0.5]])
+        assert sim == 0.0
 
-    def test_empty_second(self):
+    def test_empty_second_list(self):
         """第二组为空返回0."""
-        assert VideoDeduplicator._compute_histogram_similarity([[0.5]], []) == 0.0
+        sim = VideoDeduplicator._average_histogram_similarity([[0.5, 0.5]], [])
+        assert sim == 0.0
 
     def test_both_empty(self):
         """两组都为空返回0."""
-        assert VideoDeduplicator._compute_histogram_similarity([], []) == 0.0
+        sim = VideoDeduplicator._average_histogram_similarity([], [])
+        assert sim == 0.0
 
-    def test_best_match_selection(self):
+    def test_orthogonal_histograms(self):
+        """正交直方图相似度为0."""
+        # [1, 0] 和 [0, 1] 正交
+        sim = VideoDeduplicator._average_histogram_similarity([[1.0, 0.0]], [[0.0, 1.0]])
+        assert sim == pytest.approx(0.0)
+
+    def test_partial_similarity(self):
+        """部分相似."""
+        # [1, 1] 和 [1, 0] 的余弦相似度 = 1/√2 ≈ 0.707
+        sim = VideoDeduplicator._average_histogram_similarity([[1.0, 1.0]], [[1.0, 0.0]])
+        assert sim == pytest.approx(1.0 / (2**0.5), rel=0.01)
+
+    def test_multiple_frames_best_match(self):
         """多帧时取最佳匹配."""
-        # ha[0] 与 hb[0] 正交，与 hb[1] 完全相同
-        a = [[1.0, 0.0]]
-        b = [[0.0, 1.0], [1.0, 0.0]]
-        sim = VideoDeduplicator._compute_histogram_similarity(a, b)
-        # Best match for [1,0]: max(BC([1,0],[0,1]), BC([1,0],[1,0])) = max(0, 1) = 1
+        # 第一帧完全不同，第二帧完全相同 → 平均 best = (0 + 1) / 2 = 0.5
+        sim = VideoDeduplicator._average_histogram_similarity(
+            [[1.0, 0.0], [0.0, 1.0]],
+            [[0.0, 1.0]],  # 只有一帧，和第一帧0相似，和第二帧1相似
+        )
+        # 第一帧最佳匹配=0，第二帧最佳匹配=1，平均=0.5
+        assert sim == pytest.approx(0.5)
+
+    def test_zero_norm_histogram_skipped(self):
+        """零范数直方图被跳过."""
+        sim = VideoDeduplicator._average_histogram_similarity([[0.0, 0.0]], [[1.0, 1.0]])
+        # 第一组的零范数被跳过，similarities为空，返回0
+        assert sim == 0.0
+
+    def test_different_length_histograms(self):
+        """不同长度的直方图取最小长度对齐."""
+        sim = VideoDeduplicator._average_histogram_similarity(
+            [[1.0, 1.0, 0.0, 0.0]],  # 4维
+            [[1.0, 1.0]],  # 2维
+        )
+        # 对齐到前2维，都是[1,1]，相似度1.0
         assert sim == pytest.approx(1.0)
+
+    def test_similarity_in_zero_one_range(self):
+        """相似度在[0, 1]范围内."""
+        hist_a = [np.random.rand(96).tolist() for _ in range(5)]
+        hist_b = [np.random.rand(96).tolist() for _ in range(5)]
+        sim = VideoDeduplicator._average_histogram_similarity(hist_a, hist_b)
+        assert 0.0 <= sim <= 1.0

tests/unit/test_dedup_v2.py

@@ -1,532 +0,0 @@
-"""Issue #1659: 动态抽帧 + 滑动窗口时序匹配 单元测试.
-
-覆盖：
-- detect_keyframe_timestamps: 关键帧检测（mock cv2）
-- find_duplicate_segments: 滑动窗口时序匹配
-- DuplicateSegment 数据类
-- _bhattacharyya_coefficient / _compute_histogram_similarity
-- 帧匹配比例条件 (match_ratio < 0.7 → 跳过)
-- 中位数 vs 均值（抵抗异常值）
-- 向后兼容（无分片数据时不崩溃）
-"""
-
-from __future__ import annotations
-
-import sys
-from unittest.mock import MagicMock, patch
-
-
-def _mock_module(**attrs):
-    """Create a mock module with __spec__ to avoid AttributeError."""
-    m = MagicMock()
-    m.__spec__ = None
-    for k, v in attrs.items():
-        setattr(m, k, v)
-    return m
-
-
-# ── Module-level setup: mock deps, import dedup, then restore sys.modules ──
-_SAVED_MODULES_KEYS = set(sys.modules.keys())
-_SAVED_MODULES_VALUES = {
-    k: sys.modules.get(k)
-    for k in [
-        "cv2",
-        "celery",
-        "sqlalchemy",
-        "sqlalchemy.orm",
-        "sqlalchemy.engine",
-        "sqlalchemy.ext",
-        "sqlalchemy.ext.declarative",
-        "worker_app.db",
-        "worker_app.celery_app",
-        "worker_app.core.config",
-        "packages.adapters.sqlalchemy_impl.session",
-        "packages.adapters.sqlalchemy_impl.generated_video_repository",
-        "packages.adapters.sqlalchemy_impl.models",
-        "packages.shared.config",
-        "packages.shared.storage",
-    ]
-}
-
-sys.modules["cv2"] = _mock_module()
-
-_mock_celery = MagicMock()
-_mock_celery.Task = MagicMock
-_mock_celery.Celery = MagicMock
-_mock_celery.__spec__ = None
-sys.modules["celery"] = _mock_celery
-
-_mock_sqla = MagicMock()
-_mock_sqla.__path__ = []
-_mock_sqla.__spec__ = None
-sys.modules["sqlalchemy"] = _mock_sqla
-
-_mock_sqla_orm = MagicMock()
-_mock_sqla_orm.__path__ = []
-_mock_sqla_orm.__spec__ = None
-_mock_sqla_orm.Session = MagicMock
-sys.modules["sqlalchemy.orm"] = _mock_sqla_orm
-sys.modules["sqlalchemy.engine"] = _mock_module()
-sys.modules["sqlalchemy.ext"] = _mock_module()
-sys.modules["sqlalchemy.ext.declarative"] = _mock_module()
-
-sys.modules["worker_app.db"] = _mock_module(SessionLocal=MagicMock())
-sys.modules["worker_app.celery_app"] = _mock_module(celery_app=MagicMock())
-sys.modules["worker_app.core.config"] = _mock_module(get_settings=MagicMock(return_value=MagicMock()))
-
-sys.modules["packages.adapters.sqlalchemy_impl.session"] = _mock_module(
-    Base=MagicMock(),
-    build_engine=MagicMock(),
-    build_session_factory=MagicMock(),
-    ensure_database_exists=MagicMock(),
-    initialize_database=MagicMock(),
-)
-sys.modules["packages.adapters.sqlalchemy_impl.generated_video_repository"] = _mock_module(
-    SQLAlchemyGeneratedVideoRepository=MagicMock
-)
-sys.modules["packages.adapters.sqlalchemy_impl.models"] = _mock_module(
-    VideoFingerprintChunkModel=MagicMock,
-    GeneratedVideoModel=MagicMock,
-)
-sys.modules["packages.shared.config"] = _mock_module(get_shared_settings=MagicMock(return_value=MagicMock()))
-sys.modules["packages.shared.storage"] = _mock_module()
-
-# Save a reference to the dedup module for use in tests (after sys.modules restore)
-import video_processing.dedup as _dedup_mod
-from video_processing.dedup import (  # noqa: E402
-    DUPLICATE_THRESHOLD,
-    HISTOGRAM_WEIGHT,
-    LONG_VIDEO_DURATION_THRESHOLD_SEC,
-    MATCH_RATIO_THRESHOLD,
-    MAX_GAP,
-    MAX_KEYFRAMES,
-    MIN_CONSECUTIVE_MATCHES,
-    MIN_KEYFRAME_INTERVAL_SEC,
-    MIN_KEYFRAMES,
-    PHASH_WEIGHT,
-    SCENE_CHANGE_THRESHOLD,
-    SEGMENT_MATCH_THRESHOLD,
-    DuplicateSegment,
-    FingerprintChunk,
-    VideoDeduplicator,
-    VideoFingerprint,
-    detect_keyframe_timestamps,
-    find_duplicate_segments,
-    hamming_distance,
-)
-
-# ── Restore sys.modules immediately after import ──
-for _key in list(sys.modules.keys()):
-    if _key not in _SAVED_MODULES_KEYS:
-        del sys.modules[_key]
-for _key, _value in _SAVED_MODULES_VALUES.items():
-    if _value is not None:
-        sys.modules[_key] = _value
-    elif _key in sys.modules:
-        del sys.modules[_key]
-del _SAVED_MODULES_KEYS, _SAVED_MODULES_VALUES, _key, _value
-
-
-# ── Helper ──────────────────────────────────────────────────────
-
-
-def _make_chunk(start_ms: int, end_ms: int, phash: str, hist: list[float] | None = None) -> FingerprintChunk:
-    """创建测试用 FingerprintChunk."""
-    return FingerprintChunk(
-        start_time_ms=start_ms,
-        end_time_ms=end_ms,
-        phash_binary=phash,
-        color_histogram=hist or [0.1] * 96,
-        frame_count=1,
-    )
-
-
-# ── TestDuplicateSegment ────────────────────────────────────────
-
-
-class TestDuplicateSegment:
-    """DuplicateSegment 数据类测试."""
-
-    def test_creation(self):
-        """正常创建."""
-        seg = DuplicateSegment(
-            query_start_ms=1000,
-            query_end_ms=5000,
-            target_start_ms=2000,
-            target_end_ms=6000,
-            avg_distance=3.5,
-        )
-        assert seg.query_start_ms == 1000
-        assert seg.avg_distance == 3.5
-
-    def test_fields(self):
-        """所有字段可访问."""
-        seg = DuplicateSegment(0, 1000, 500, 1500, 2.0)
-        assert seg.query_end_ms == 1000
-        assert seg.target_start_ms == 500
-        assert seg.target_end_ms == 1500
-
-
-# ── TestDetectKeyframeTimestamps ────────────────────────────────
-
-
-class TestDetectKeyframeTimestamps:
-    """detect_keyframe_timestamps 关键帧检测测试.
-
-    由于 cv2 在单元测试环境中是 mock，这里只测试边界条件。
-    完整的视频处理测试在集成测试中进行。
-    """
-
-    def test_cannot_open_video_raises(self):
-        """无法打开视频时抛出 RuntimeError."""
-        cv2_mock = _dedup_mod.cv2
-        mock_cap = MagicMock()
-        mock_cap.isOpened.return_value = False
-        cv2_mock.VideoCapture.return_value = mock_cap
-
-        import pytest
-
-        with pytest.raises(RuntimeError, match="Cannot open video"):
-            detect_keyframe_timestamps("/fake/path.mp4")
-
-    def test_zero_duration_returns_empty(self):
-        """视频时长为 0 时返回空列表."""
-        cv2_mock = _dedup_mod.cv2
-        mock_cap = MagicMock()
-        mock_cap.isOpened.return_value = True
-        # cv2.CAP_PROP_FPS etc. are Mock objects; configure get() to return 0 for frame_count
-        mock_cap.get.return_value = 0
-        mock_cap.read.return_value = (False, None)
-        cv2_mock.VideoCapture.return_value = mock_cap
-
-        result = detect_keyframe_timestamps("/fake/zero.mp4")
-        assert result == []
-
-    def test_function_signature(self):
-        """验证函数签名和默认参数."""
-        import inspect
-
-        sig = inspect.signature(detect_keyframe_timestamps)
-        params = sig.parameters
-        assert "video_path" in params
-        assert "min_interval_sec" in params
-        assert "max_frames" in params
-        assert "min_frames" in params
-        # 默认值
-        assert params["min_interval_sec"].default == 1.0
-        assert params["max_frames"].default == 30
-        assert params["min_frames"].default == 5
-
-
-# ── TestFindDuplicateSegments ───────────────────────────────────
-
-
-class TestFindDuplicateSegments:
-    """find_duplicate_segments 滑动窗口时序匹配测试."""
-
-    def test_identical_chunks_full_match(self):
-        """两组完全相同的 chunks → 整段匹配."""
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, "aaaaaaaaaaaaaaaa") for i in range(10)]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, "aaaaaaaaaaaaaaaa") for i in range(10)]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        assert len(segments) >= 1
-        # 应该覆盖大部分范围
-        total_query_range = segments[-1].query_end_ms - segments[0].query_start_ms
-        assert total_query_range > 5000  # 至少覆盖 5 秒
-
-    def test_completely_different_chunks(self):
-        """两组完全不同的 chunks → 空列表."""
-        # 距离都 > 阈值
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, "0000000000000000") for i in range(10)]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, "ffffffffffffffff") for i in range(10)]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        assert segments == []
-
-    def test_partial_overlap(self):
-        """部分重叠 → 只返回重叠段."""
-        # 前 5 帧相同，后 5 帧不同
-        same_hash = "aaaaaaaaaaaaaaaa"
-        diff_hash_a = "0000000000000000"
-        diff_hash_b = "ffffffffffffffff"
-
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, same_hash) for i in range(5)] + [
-            _make_chunk(i * 1000, (i + 1) * 1000, diff_hash_a) for i in range(5, 10)
-        ]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, same_hash) for i in range(5)] + [
-            _make_chunk(i * 1000, (i + 1) * 1000, diff_hash_b) for i in range(5, 10)
-        ]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        # 应该只有前 5 帧的匹配段
-        if segments:
-            assert segments[0].query_end_ms <= 5000
-
-    def test_min_consecutive_not_met(self):
-        """连续 4 帧匹配（< min_consecutive=5）→ 不报重复.
-
-        注意：使用不同的 hash 对，确保后半部分帧距离 > 阈值。
-        """
-        same_hash = "aaaaaaaaaaaaaaaa"
-        # 4 帧匹配，后面 6 帧各自不同（在 query 和 target 中使用不同 hash）
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, same_hash) for i in range(4)] + [
-            _make_chunk(i * 1000, (i + 1) * 1000, "bbbbbbbbbbbbbbbb") for i in range(4, 10)
-        ]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, same_hash) for i in range(4)] + [
-            _make_chunk(i * 1000, (i + 1) * 1000, "cccccccccccccccc") for i in range(4, 10)
-        ]
-
-        # hamming("bbbb...", "cccc...") should be > 8 (SEGMENT_MATCH_THRESHOLD)
-        # b=1011, c=1100 → 4 bits differ per hex digit × 16 digits = 64 bits total? No...
-        # Actually: hamming_distance("bbbbbbbbbbbbbbbb", "cccccccccccccccc")
-        # b=0xb=1011, c=0xc=1100 → XOR=0111=0x7 → 3 bits per digit × 16 = 48
-        # That's > 8 so won't match
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        # 只有 4 帧匹配（< min_consecutive=5），所以不报告
-        assert segments == []
-
-    def test_max_gap_behavior(self):
-        """5 帧匹配 + 1 帧间隙 + 3 帧匹配 → 验证 max_gap 行为.
-
-        关键：间隙帧必须在 query 和 target 中使用不同 hash，使其真正不匹配。
-        """
-        match_hash = "aaaaaaaaaaaaaaaa"
-        gap_hash_a = "bbbbbbbbbbbbbbbb"  # query 端
-        gap_hash_b = "cccccccccccccccc"  # target 端（与 query 端距离 > 8）
-        tail_hash_a = "dddddddddddddddd"
-        tail_hash_b = "eeeeeeeeeeeeeeee"
-
-        # 5 帧匹配, 1 帧间隙, 3 帧匹配, 5 帧不匹配
-        hashes_a = [match_hash] * 5 + [gap_hash_a] + [match_hash] * 3 + [tail_hash_a] * 5
-        hashes_b = [match_hash] * 5 + [gap_hash_b] + [match_hash] * 3 + [tail_hash_b] * 5
-
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, h) for i, h in enumerate(hashes_a)]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, h) for i, h in enumerate(hashes_b)]
-
-        # max_gap=2, 所以 1 帧间隙会被合并
-        segments = find_duplicate_segments(chunks_a, chunks_b, max_gap=2)
-        # 5 match + 1 gap + 3 match = run of 9（间隙被桥接）
-        assert len(segments) == 1
-        # run 覆盖 indices 0-8（5 match + 1 gap + 3 match），但 gap 帧不计入 match
-        # query_start = chunks_a[0].start = 0
-        # query_end = chunks_a[8].end = 9000
-        assert segments[0].query_start_ms == 0
-        assert segments[0].query_end_ms == 9000
-
-    def test_max_gap_exceeded(self):
-        """间隙超过 max_gap → 分成两段."""
-        match_hash = "aaaaaaaaaaaaaaaa"
-        gap_hash_a = "bbbbbbbbbbbbbbbb"
-        gap_hash_b = "cccccccccccccccc"
-        tail_hash_a = "dddddddddddddddd"
-        tail_hash_b = "eeeeeeeeeeeeeeee"
-
-        # 5 帧匹配, 3 帧间隙 (> max_gap=2), 5 帧匹配, 5 帧不匹配
-        hashes_a = [match_hash] * 5 + [gap_hash_a] * 3 + [match_hash] * 5 + [tail_hash_a] * 5
-        hashes_b = [match_hash] * 5 + [gap_hash_b] * 3 + [match_hash] * 5 + [tail_hash_b] * 5
-
-        chunks_a = [_make_chunk(i * 1000, (i + 1) * 1000, h) for i, h in enumerate(hashes_a)]
-        chunks_b = [_make_chunk(i * 1000, (i + 1) * 1000, h) for i, h in enumerate(hashes_b)]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b, max_gap=2)
-        # 3 帧间隙 > max_gap=2 → 分成两段（每段 5 帧匹配）
-        assert len(segments) == 2
-
-    def test_empty_chunks(self):
-        """空 chunks 返回空列表."""
-        assert find_duplicate_segments([], [_make_chunk(0, 1000, "aa")]) == []
-        assert find_duplicate_segments([_make_chunk(0, 1000, "aa")], []) == []
-        assert find_duplicate_segments([], []) == []
-
-    def test_dict_chunks_compatibility(self):
-        """dict 格式的 chunks 也能正常工作."""
-        chunks_a = [
-            {"phash_binary": "aaaaaaaaaaaaaaaa", "start_time_ms": i * 1000, "end_time_ms": (i + 1) * 1000}
-            for i in range(10)
-        ]
-        chunks_b = [
-            {"phash_binary": "aaaaaaaaaaaaaaaa", "start_time_ms": i * 1000, "end_time_ms": (i + 1) * 1000}
-            for i in range(10)
-        ]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        assert len(segments) >= 1
-
-    def test_segment_time_ranges(self):
-        """返回的 segment 时间范围正确.
-
-        每个 query chunk 匹配到 target 中对应的 chunk（相同 hash），
-        确保 target 时间范围正确映射。
-        """
-
-        # 给每个 chunk 唯一的 hash（但保证 query[i] == target[i]）
-        def _unique_hash(i: int) -> str:
-            return format(i, "016x")
-
-        chunks_a = [_make_chunk(i * 2000, (i + 1) * 2000, _unique_hash(i)) for i in range(7)]
-        chunks_b = [_make_chunk(i * 2000, (i + 1) * 2000, _unique_hash(i)) for i in range(7)]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        assert len(segments) >= 1
-        seg = segments[0]
-        assert seg.query_start_ms == 0
-        assert seg.query_end_ms == 14000
-        # target 应该映射到正确的范围
-        assert seg.target_start_ms == 0
-        assert seg.target_end_ms == 14000
-        assert seg.avg_distance == 0.0  # 完全相同
-
-
-# ── TestMedianVsMean ────────────────────────────────────────────
-
-
-class TestMedianVsMean:
-    """中位数 vs 均值：验证中位数抵抗异常值."""
-
-    def test_median_resists_outlier(self):
-        """距离 [3,3,3,3,30]：均值=8.4，中位数=3.
-        中位数 < PHASH_THRESHOLD(10)，均值也 < 10。
-        但更极端的：[3,3,3,3,60]：均值=14.4，中位数=3.
-        """
-        import statistics
-
-        distances = [3, 3, 3, 3, 60]
-        assert statistics.median(distances) == 3
-        assert sum(distances) / len(distances) == 14.4
-        # 中位数 < 10 → 通过阈值
-        assert statistics.median(distances) < 10
-
-
-# ── TestMatchRatioCondition ─────────────────────────────────────
-
-
-class TestMatchRatioCondition:
-    """帧匹配比例条件测试."""
-
-    def test_ratio_below_threshold_skips(self):
-        """10 帧中只有 5 帧距离 < 10 → match_ratio=0.5 < 0.7 → 跳过."""
-        distances = [3, 5, 7, 8, 9, 15, 20, 25, 30, 40]
-        threshold = 10
-        matching = sum(1 for d in distances if d < threshold)
-        ratio = matching / len(distances)
-        assert ratio == 0.5
-        assert ratio < 0.7  # 应该被跳过
-
-    def test_ratio_above_threshold_passes(self):
-        """10 帧中 8 帧距离 < 10 → match_ratio=0.8 >= 0.7 → 通过."""
-        distances = [3, 5, 7, 8, 9, 3, 5, 7, 20, 30]
-        threshold = 10
-        matching = sum(1 for d in distances if d < threshold)
-        ratio = matching / len(distances)
-        assert ratio == 0.8
-        assert ratio >= 0.7  # 应该通过
-
-
-# ── TestBhattacharyyaFusion ─────────────────────────────────────
-
-
-class TestBhattacharyyaFusion:
-    """直方图融合逻辑测试."""
-
-    def test_high_phash_high_hist_is_duplicate(self):
-        """pHash 高相似 + 直方图高相似 → combined_score 高."""
-        phash_similarity = 0.95  # median_distance ≈ 3
-        hist_similarity = 0.90
-        combined = 0.7 * phash_similarity + 0.3 * hist_similarity
-        assert combined > 0.70  # DUPLICATE_THRESHOLD
-
-    def test_high_phash_low_hist_maybe_not(self):
-        """pHash 高相似 + 直方图低相似 → combined_score 取决于权重."""
-        phash_similarity = 0.85  # median_distance ≈ 10
-        hist_similarity = 0.10
-        combined = 0.7 * phash_similarity + 0.3 * hist_similarity
-        # 0.7 * 0.85 + 0.3 * 0.10 = 0.595 + 0.03 = 0.625 < 0.70
-        assert combined < 0.70
-
-    def test_no_histogram_fallback(self):
-        """无直方图数据时 hist_similarity 回退到 0.5."""
-        phash_similarity = 0.90
-        hist_similarity = 0.5  # fallback
-        combined = 0.7 * phash_similarity + 0.3 * hist_similarity
-        # 0.7 * 0.90 + 0.3 * 0.5 = 0.63 + 0.15 = 0.78 > 0.70
-        assert combined > 0.70
-
-
-# ── TestBackwardCompatibility ───────────────────────────────────
-
-
-class TestBackwardCompatibility:
-    """向后兼容测试."""
-
-    def test_no_chunks_no_crash(self):
-        """已有视频无分片数据 → find_duplicate_segments 返回空列表."""
-        # 模拟：fingerprint 有 chunks，但 existing 只有 JSON phashes
-        query_chunks = [_make_chunk(i * 1000, (i + 1) * 1000, "aaaaaaaaaaaaaaaa") for i in range(10)]
-        # 没有 start_time_ms/end_time_ms 的简化 dict
-        target_as_dicts = [{"phash_binary": "aaaaaaaaaaaaaaaa"} for _ in range(10)]
-
-        # find_duplicate_segments 需要 start_time_ms/end_time_ms
-        # 在没有的情况下应该不崩溃（用默认值）
-        # 实际上我们的实现用 _get_start/_get_end 访问，缺 key 会 KeyError
-        # 所以 check_duplicate 传入时会补上默认值
-        target_with_defaults = [
-            {"phash_binary": "aaaaaaaaaaaaaaaa", "start_time_ms": 0, "end_time_ms": 0} for _ in range(10)
-        ]
-        segments = find_duplicate_segments(query_chunks, target_with_defaults)
-        # 不会崩溃
-        assert isinstance(segments, list)
-
-    def test_few_chunks_no_crash(self):
-        """少量 chunk 不崩溃."""
-        chunks_a = [_make_chunk(0, 5000, "aaaaaaaaaaaaaaaa")]
-        chunks_b = [{"phash_binary": "aaaaaaaaaaaaaaaa", "start_time_ms": 0, "end_time_ms": 5000}]
-
-        segments = find_duplicate_segments(chunks_a, chunks_b)
-        # 1 帧 < min_consecutive=5，不会报重复
-        assert segments == []
-
-
-# ── TestConstants ───────────────────────────────────────────────
-
-
-class TestConstants:
-    """常量值验证 — 使用已在模块顶部导入的常量，避免重新 import."""
-
-    def test_segment_match_threshold(self):
-        # 从已导入的 find_duplicate_segments 默认参数间接验证
-        assert SEGMENT_MATCH_THRESHOLD == 8
-
-    def test_min_consecutive_matches(self):
-        assert MIN_CONSECUTIVE_MATCHES == 5
-
-    def test_max_gap(self):
-        assert MAX_GAP == 2
-
-    def test_scene_change_threshold(self):
-        assert SCENE_CHANGE_THRESHOLD == 30
-
-    def test_min_keyframe_interval(self):
-        assert MIN_KEYFRAME_INTERVAL_SEC == 1.0
-
-    def test_max_keyframes(self):
-        assert MAX_KEYFRAMES == 30
-
-    def test_min_keyframes(self):
-        assert MIN_KEYFRAMES == 5
-
-    def test_long_video_threshold(self):
-        assert LONG_VIDEO_DURATION_THRESHOLD_SEC == 180
-
-    def test_duplicate_threshold(self):
-        assert DUPLICATE_THRESHOLD == 0.70
-
-    def test_phash_weight(self):
-        assert PHASH_WEIGHT == 0.7
-
-    def test_histogram_weight(self):
-        assert HISTOGRAM_WEIGHT == 0.3
-
-    def test_match_ratio_threshold(self):
-        assert MATCH_RATIO_THRESHOLD == 0.7

tests/unit/test_duplicate_rate.py

@@ -19,14 +19,14 @@ sys.path.insert(0, str(ROOT / "apps" / "worker"))
 class TestComputeDuplicateRate:
     """Test VideoDeduplicator.compute_duplicate_rate."""
 
-    def _make_fingerprint(self, md5="abc123", phashes=None, duration_ms=10000):
+    def _make_fingerprint(self, md5="abc123", phashes=None):
         from video_processing.dedup import VideoFingerprint
 
         return VideoFingerprint(
             md5=md5,
             keyframe_phashes=phashes or ["ff00ff00ff00ff00"],
             color_histograms=[],
-            duration=duration_ms,
+            duration=10.0,
             resolution=(1920, 1080),
         )
 
@@ -56,116 +56,184 @@ class TestComputeDuplicateRate:
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = []
+            session.query.return_value = query_mock
             rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
 
-        assert rate["duplicate_rate"] == 0.0
-        assert rate["match_count"] == 0
-        assert isinstance(rate, dict)
+        assert rate == 0.0
 
     def test_md5_match_returns_100(self):
         from video_processing.dedup import VideoDeduplicator
 
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+
         deduplicator = VideoDeduplicator()
-        fingerprint = self._make_fingerprint(md5="exact_md5")
+        fingerprint = self._make_fingerprint(md5="exact_match_md5")
         session = MagicMock()
 
-        existing = self._make_existing_video("vid2", {"md5": "exact_md5", "keyframe_phashes": ["aa"]})
+        existing = self._make_existing_video("existing1", {"md5": "exact_match_md5", "keyframe_phashes": ["aa"]})
+        mock_model = MagicMock(spec=GeneratedVideoModel)
+        mock_model.id = existing.id
+        mock_model.project_id = existing.project_id
+        mock_model.video_fingerprint = existing.video_fingerprint
+        mock_model.generated_at = "2026-01-01"
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing]
+            mock_repo._to_domain.return_value = existing
+            # 链式 filter: 第一次 scope filter，第二次 self-exclusion filter
+            # 让 filter() 返回的对象仍然支持 order_by() 链
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock  # filter → filter chainable
+            query_mock.order_by.return_value.limit.return_value.all.return_value = [mock_model]
+            session.query.return_value = query_mock
             rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
 
-        assert rate["duplicate_rate"] == 100.0
-        assert rate["match_count"] == 1
+        assert rate == 100.0
 
     def test_phash_similarity_computed(self):
         from video_processing.dedup import VideoDeduplicator
 
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+
         deduplicator = VideoDeduplicator()
-        # Two very similar phashes
-        fingerprint = self._make_fingerprint(
-            md5="new",
-            phashes=["ff00ff00ff00ff00", "ff00ff00ff00ff01"],
-        )
+        fingerprint = self._make_fingerprint(md5="different_md5", phashes=["ff00ff00ff00ff00"])
         session = MagicMock()
 
         existing = self._make_existing_video(
-            "vid2",
-            {"md5": "other", "keyframe_phashes": ["ff00ff00ff00ff00", "ff00ff00ff00ff02"]},
+            "existing1",
+            {"md5": "other_md5", "keyframe_phashes": ["ff00ff00ff00ff03"]},
         )
+        mock_model = MagicMock(spec=GeneratedVideoModel)
+        mock_model.id = existing.id
+        mock_model.project_id = existing.project_id
+        mock_model.video_fingerprint = existing.video_fingerprint
+        mock_model.generated_at = "2026-01-01"
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing]
-            mock_repo._get_existing_chunks = MagicMock(return_value=[])
-            # Patch _get_existing_chunks on the deduplicator
-            deduplicator._get_existing_chunks = MagicMock(return_value=[])
+            mock_repo._to_domain.return_value = existing
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = [mock_model]
+            session.query.return_value = query_mock
             rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
 
-        # With identical phashes, frame_match_rate should be high
-        assert rate["duplicate_rate"] >= 0.0
-        assert isinstance(rate, dict)
-        assert "visual_similarity" in rate
+        # hamming distance = 2, similarity = (1 - 2/64) * 100 = 96.875
+        assert rate == pytest.approx(96.88, abs=0.1)
+
+    def test_excludes_self_video(self):
+        from video_processing.dedup import VideoDeduplicator
+
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+
+        deduplicator = VideoDeduplicator()
+        fingerprint = self._make_fingerprint(md5="same_md5")
+        session = MagicMock()
+
+        self_video = self._make_existing_video("vid1", {"md5": "same_md5", "keyframe_phashes": ["aa"]})
+        mock_model = MagicMock(spec=GeneratedVideoModel)
+        mock_model.id = self_video.id
+        mock_model.project_id = self_video.project_id
+        mock_model.video_fingerprint = self_video.video_fingerprint
+        mock_model.generated_at = "2026-01-01"
+
+        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
+            mock_repo = MockRepo.return_value
+            mock_repo._to_domain.return_value = self_video
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = [mock_model]
+            session.query.return_value = query_mock
+            rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
+
+        assert rate == 0.0
 
     def test_takes_max_similarity(self):
         from video_processing.dedup import VideoDeduplicator
 
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+
         deduplicator = VideoDeduplicator()
-        fingerprint = self._make_fingerprint(
-            md5="new",
-            phashes=["aa00aa00aa00aa00"],
-        )
+        fingerprint = self._make_fingerprint(md5="new_md5", phashes=["ff00ff00ff00ff00"])
         session = MagicMock()
 
-        # Two existing videos with different phashes
-        existing1 = self._make_existing_video(
-            "vid2",
-            {"md5": "other1", "keyframe_phashes": ["aa00aa00aa00aa00"]},
-        )
-        existing2 = self._make_existing_video(
-            "vid3",
-            {"md5": "other2", "keyframe_phashes": ["ff00ff00ff00ff00"]},
-        )
+        existing1 = self._make_existing_video("e1", {"md5": "md5_1", "keyframe_phashes": ["ff00ff00ff00ff0f"]})
+        existing2 = self._make_existing_video("e2", {"md5": "md5_2", "keyframe_phashes": ["ff00ff00ff00ff01"]})
+        mock_model1 = MagicMock(spec=GeneratedVideoModel)
+        mock_model1.id = existing1.id
+        mock_model1.project_id = existing1.project_id
+        mock_model1.video_fingerprint = existing1.video_fingerprint
+        mock_model1.generated_at = "2026-01-02"
+        mock_model2 = MagicMock(spec=GeneratedVideoModel)
+        mock_model2.id = existing2.id
+        mock_model2.project_id = existing2.project_id
+        mock_model2.video_fingerprint = existing2.video_fingerprint
+        mock_model2.generated_at = "2026-01-01"
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing1, existing2]
-            deduplicator._get_existing_chunks = MagicMock(return_value=[])
+            mock_repo._to_domain.side_effect = [existing1, existing2]
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = [
+                mock_model1,
+                mock_model2,
+            ]
+            session.query.return_value = query_mock
             rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
 
-        # Should take the max across all videos
-        assert rate["duplicate_rate"] >= 0.0
-        assert isinstance(rate["duplicate_rate"], float)
+        # max similarity: e2 distance=1, (1-1/64)*100 = 98.4375
+        assert rate == pytest.approx(98.44, abs=0.1)
 
     def test_user_id_scope_cross_project(self):
+        """传 user_id 时应跨项目查询，而非仅当前项目."""
         from video_processing.dedup import VideoDeduplicator
 
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+
         deduplicator = VideoDeduplicator()
-        fingerprint = self._make_fingerprint(md5="exact_md5_x")
+        fingerprint = self._make_fingerprint(md5="cross_proj_md5")
         session = MagicMock()
 
-        existing = self._make_existing_video("vid2", {"md5": "exact_md5_x", "keyframe_phashes": ["aa"]})
+        # 模拟一个不同项目但同一用户的视频
+        existing = self._make_existing_video(
+            "existing_other_proj", {"md5": "cross_proj_md5", "keyframe_phashes": ["aa"]}
+        )
+        existing.project_id = "proj2"  # 不同项目
+        existing.user_id = "user1"
+
+        mock_model = MagicMock(spec=GeneratedVideoModel)
+        mock_model.id = existing.id
+        mock_model.project_id = existing.project_id
+        mock_model.user_id = existing.user_id
+        mock_model.video_fingerprint = existing.video_fingerprint
+        mock_model.generated_at = "2026-01-01"
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_user.return_value = [existing]
+            mock_repo._to_domain.return_value = existing
+
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = [mock_model]
+            session.query.return_value = query_mock
+
             rate = deduplicator.compute_duplicate_rate(
                 fingerprint,
                 "proj1",
                 "vid1",
                 session,
-                scope="user",
                 user_id="user1",
             )
 
-        # Should use list_by_user and find the match
-        mock_repo.list_by_user.assert_called_once_with("user1")
-        assert rate["duplicate_rate"] == 100.0
+        # 应通过 user_id 过滤，且匹配到跨项目视频
+        assert rate == 100.0
 
-    def test_return_dict_structure(self):
-        """compute_duplicate_rate returns dict with three fields."""
+    def test_user_id_empty_falls_back_to_project(self):
+        """user_id 为空时应回退到 project_id 过滤."""
         from video_processing.dedup import VideoDeduplicator
 
         deduplicator = VideoDeduplicator()
@@ -174,29 +242,58 @@ class TestComputeDuplicateRate:
 
         with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
             mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-            rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
+            query_mock = MagicMock()
+            query_mock.filter.return_value = query_mock
+            query_mock.order_by.return_value.limit.return_value.all.return_value = []
+            session.query.return_value = query_mock
 
-        assert isinstance(rate, dict)
-        assert "duplicate_rate" in rate
-        assert "visual_similarity" in rate
-        assert "match_count" in rate
-        assert isinstance(rate["duplicate_rate"], float)
-        assert isinstance(rate["visual_similarity"], float)
-        assert isinstance(rate["match_count"], int)
+            rate = deduplicator.compute_duplicate_rate(
+                fingerprint,
+                "proj1",
+                "vid1",
+                session,
+                user_id="",
+            )
 
-    def test_backward_compat_no_scope(self):
-        """Not passing scope defaults to project-level."""
-        from video_processing.dedup import VideoDeduplicator
+        assert rate == 0.0
+        # 验证使用的是 project_id 过滤（回退路径）
+        # 通过检查 filter 被调用时的参数来间接验证
 
-        deduplicator = VideoDeduplicator()
-        fingerprint = self._make_fingerprint()
-        session = MagicMock()
 
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-            rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
+class TestDuplicateRateAPI:
+    """Test that duplicate_rate is returned in API responses."""
 
-        mock_repo.list_by_project.assert_called_once_with("proj1")
-        assert rate["duplicate_rate"] == 0.0
+    def test_video_item_response_has_duplicate_rate(self):
+        from app.schemas.video_center import VideoItemResponse
+
+        resp = VideoItemResponse(
+            id="v1",
+            project_id="p1",
+            generation_task_id="t1",
+            name="test.mp4",
+            file_url="https://example.com/test.mp4",
+            file_size=1000,
+            duration=10.0,
+            width=1920,
+            height=1080,
+            fps=25.0,
+            duplicate_rate=75.5,
+        )
+        assert resp.duplicate_rate == 75.5
+
+    def test_video_item_response_duplicate_rate_default_none(self):
+        from app.schemas.video_center import VideoItemResponse
+
+        resp = VideoItemResponse(
+            id="v1",
+            project_id="p1",
+            generation_task_id="t1",
+            name="test.mp4",
+            file_url="https://example.com/test.mp4",
+            file_size=1000,
+            duration=10.0,
+            width=1920,
+            height=1080,
+            fps=25.0,
+        )
+        assert resp.duplicate_rate is None

tests/unit/test_duplicate_rate_scope.py

@@ -1,367 +0,0 @@
-"""Tests for Issue #1660 — 查重率百分比计算 + 跨项目查重."""
-
-import sys
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-sys.modules.setdefault("cv2", MagicMock())
-
-ROOT = Path(__file__).resolve().parents[2]
-sys.path.insert(0, str(ROOT / "apps" / "api"))
-sys.path.insert(0, str(ROOT / "packages"))
-sys.path.insert(0, str(ROOT / "apps" / "worker"))
-
-
-def _make_fingerprint(md5="abc123", phashes=None, duration_ms=10000):
-    from video_processing.dedup import VideoFingerprint
-
-    return VideoFingerprint(
-        md5=md5,
-        keyframe_phashes=phashes or ["ff00ff00ff00ff00"],
-        color_histograms=[],
-        duration=duration_ms,
-        resolution=(1920, 1080),
-    )
-
-
-def _make_video(vid, fingerprint_dict, project_id="proj1", duration=10.0):
-    from packages.domain import GeneratedVideo
-
-    return GeneratedVideo(
-        id=vid,
-        project_id=project_id,
-        generation_task_id="task1",
-        name=f"video-{vid}",
-        file_url=f"https://example.com/{vid}.mp4",
-        file_size=1000,
-        duration=duration,
-        width=1920,
-        height=1080,
-        fps=25.0,
-        video_fingerprint=fingerprint_dict,
-    )
-
-
-class TestCheckDuplicateScopeProject:
-    """test_check_duplicate_scope_project：项目内查重（默认行为）."""
-
-    def test_default_scope_queries_by_project(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint(md5="unique_md5")
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-            result = deduplicator.check_duplicate(fingerprint, "proj1", session)
-
-        mock_repo.list_by_project.assert_called_once_with("proj1")
-        assert result is None
-
-    def test_project_scope_finds_duplicate(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint(md5="same_md5")
-        session = MagicMock()
-
-        existing = _make_video("vid2", {"md5": "same_md5", "keyframe_phashes": ["aa"]})
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing]
-            result = deduplicator.check_duplicate(fingerprint, "proj1", session)
-
-        assert result is not None
-        assert result["duplicate"] is True
-        assert result["duplicate_of"] == "vid2"
-
-
-class TestCheckDuplicateScopeUser:
-    """test_check_duplicate_scope_user：跨项目查重."""
-
-    def test_user_scope_queries_by_user(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint(md5="unique_md5")
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_user.return_value = []
-            result = deduplicator.check_duplicate(
-                fingerprint,
-                "proj1",
-                session,
-                scope="user",
-                user_id="user_123",
-            )
-
-        mock_repo.list_by_user.assert_called_once()
-        assert result is None
-
-    def test_user_scope_finds_cross_project_duplicate(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint(md5="cross_proj_md5")
-        session = MagicMock()
-
-        # Existing video from a different project
-        existing = _make_video("vid_other", {"md5": "cross_proj_md5"}, project_id="proj_other")
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_user.return_value = [existing]
-            result = deduplicator.check_duplicate(
-                fingerprint,
-                "proj1",
-                session,
-                scope="user",
-                user_id="user_123",
-            )
-
-        assert result is not None
-        assert result["duplicate"] is True
-        assert result["duplicate_of"] == "vid_other"
-
-
-class TestDurationPrefilter:
-    """test_duration_prefilter：时长 ±15% 过滤."""
-
-    def test_duration_prefilter_passes_correct_range(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint(duration_ms=30000)  # 30s video
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_user.return_value = []
-            deduplicator.check_duplicate(
-                fingerprint,
-                "proj1",
-                session,
-                scope="user",
-                user_id="user1",
-                duration_sec=30.0,
-            )
-
-        # Should pass duration_min=25.5, duration_max=34.5 (30 ± 15%)
-        call_args = mock_repo.list_by_user.call_args
-        assert call_args[1]["duration_min"] == pytest.approx(25.5, abs=0.1)
-        assert call_args[1]["duration_max"] == pytest.approx(34.5, abs=0.1)
-
-    def test_no_duration_prefilter_when_zero(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint()
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_user.return_value = []
-            deduplicator.check_duplicate(
-                fingerprint,
-                "proj1",
-                session,
-                scope="user",
-                user_id="user1",
-                duration_sec=0,
-            )
-
-        call_args = mock_repo.list_by_user.call_args
-        assert call_args[1]["duration_min"] == 0
-        assert call_args[1]["duration_max"] == 0
-
-
-class TestComputeDuplicateRateFormula:
-    """test_compute_duplicate_rate_formula：验证 0.4 * frame_match_rate + 0.6 * temporal_coverage_rate."""
-
-    def test_formula_with_matching_frames(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        # 10 frames, all identical to existing → frame_match_rate = 1.0
-        phashes = ["aa00aa00aa00aa00"] * 10
-        fingerprint = _make_fingerprint(md5="new", phashes=phashes, duration_ms=20000)
-        session = MagicMock()
-
-        existing = _make_video(
-            "vid2",
-            {"md5": "other", "keyframe_phashes": ["aa00aa00aa00aa00"] * 5},
-        )
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing]
-            deduplicator._get_existing_chunks = MagicMock(return_value=[])
-            rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
-
-        # frame_match_rate=1.0, temporal_coverage depends on segments
-        # duplicate_rate = (1.0 * 0.4 + temporal_coverage * 0.6) * 100
-        assert rate["duplicate_rate"] >= 40.0  # At minimum, frame_match contributes 40%
-
-    def test_no_match_returns_zero(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        # Completely different phashes
-        fingerprint = _make_fingerprint(md5="new", phashes=["ff00ff00ff00ff00"])
-        session = MagicMock()
-
-        existing = _make_video(
-            "vid2",
-            {"md5": "other", "keyframe_phashes": ["00ff00ff00ff00ff"]},
-        )
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = [existing]
-            deduplicator._get_existing_chunks = MagicMock(return_value=[])
-            rate = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
-
-        # Very different phashes, match_ratio < 0.3 → skipped
-        assert rate["duplicate_rate"] == 0.0
-
-
-class TestComputeDuplicateRateReturnDict:
-    """test_compute_duplicate_rate_return_dict：验证返回 dict 含三个字段."""
-
-    def test_return_structure(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint()
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-            result = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
-
-        assert isinstance(result, dict)
-        assert set(result.keys()) == {"duplicate_rate", "visual_similarity", "match_count"}
-        assert isinstance(result["duplicate_rate"], float)
-        assert isinstance(result["visual_similarity"], float)
-        assert isinstance(result["match_count"], int)
-        assert 0 <= result["duplicate_rate"] <= 100
-        assert 0 <= result["visual_similarity"] <= 1
-
-
-class TestBackwardCompat:
-    """test_backward_compat：不传 scope 时行为不变."""
-
-    def test_default_scope_is_project(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint()
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-
-            # Call without scope parameter
-            result = deduplicator.compute_duplicate_rate(fingerprint, "proj1", "vid1", session)
-
-        # Should use list_by_project (not list_by_user)
-        mock_repo.list_by_project.assert_called_once_with("proj1")
-        mock_repo.list_by_user.assert_not_called()
-        assert result["duplicate_rate"] == 0.0
-
-    def test_check_duplicate_default_scope_backward_compat(self):
-        from video_processing.dedup import VideoDeduplicator
-
-        deduplicator = VideoDeduplicator()
-        fingerprint = _make_fingerprint()
-        session = MagicMock()
-
-        with patch("video_processing.dedup.SQLAlchemyGeneratedVideoRepository") as MockRepo:
-            mock_repo = MockRepo.return_value
-            mock_repo.list_by_project.return_value = []
-            result = deduplicator.check_duplicate(fingerprint, "proj1", session)
-
-        mock_repo.list_by_project.assert_called_once_with("proj1")
-        assert result is None
-
-
-class TestListByUserRepository:
-    """直接测试 generated_video_repository.list_by_user() 的真实实现，覆盖 diff 代码行。"""
-
-    def _make_repo(self):
-        from sqlalchemy import create_engine
-        from sqlalchemy.orm import sessionmaker
-
-        from packages.adapters.sqlalchemy_impl.generated_video_repository import SQLAlchemyGeneratedVideoRepository
-        from packages.adapters.sqlalchemy_impl.models import Base, GeneratedVideoModel
-
-        engine = create_engine("sqlite:///:memory:")
-        Base.metadata.create_all(engine)
-        Session = sessionmaker(bind=engine)
-        session = Session()
-        repo = SQLAlchemyGeneratedVideoRepository(session)
-        return repo, session
-
-    def _insert_video(self, session, video_id, user_id, project_id, duration, **kw):
-        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
-
-        row = GeneratedVideoModel(
-            id=video_id,
-            user_id=user_id,
-            project_id=project_id,
-            generation_task_id=f"task-{video_id[:8]}",
-            name=f"video-{video_id[:8]}.mp4",
-            file_url=f"https://example.com/{video_id}.mp4",
-            file_size=1024,
-            duration=duration,
-            width=1280,
-            height=720,
-            fps=25.0,
-            status="completed",
-        )
-        session.add(row)
-        session.flush()
-        return row
-
-    def test_list_by_user_returns_cross_project_videos(self):
-        """list_by_user 返回该用户所有项目的视频。"""
-        repo, session = self._make_repo()
-        self._insert_video(session, "v1", "user-a", "proj-1", 30.0)
-        self._insert_video(session, "v2", "user-a", "proj-2", 45.0)
-        self._insert_video(session, "v3", "user-b", "proj-1", 20.0)
-
-        results = repo.list_by_user("user-a")
-        assert len(results) == 2
-        ids = {r.id for r in results}
-        assert ids == {"v1", "v2"}
-        session.close()
-
-    def test_list_by_user_with_duration_filter(self):
-        """list_by_user 支持 duration_min/duration_max 过滤。"""
-        repo, session = self._make_repo()
-        self._insert_video(session, "v1", "user-a", "proj-1", 10.0)
-        self._insert_video(session, "v2", "user-a", "proj-1", 30.0)
-        self._insert_video(session, "v3", "user-a", "proj-1", 60.0)
-
-        results = repo.list_by_user("user-a", duration_min=20.0, duration_max=50.0)
-        assert len(results) == 1
-        assert results[0].id == "v2"
-        session.close()
-
-    def test_list_by_user_empty_result(self):
-        """list_by_user 无匹配时返回空列表。"""
-        repo, session = self._make_repo()
-        self._insert_video(session, "v1", "user-a", "proj-1", 30.0)
-
-        results = repo.list_by_user("user-nonexistent")
-        assert results == []
-        session.close()

tests/unit/test_duplication_check_worker.py

@@ -1,378 +0,0 @@
-"""#1661 手动查重 worker task 测试：成功/失败/重试/片段映射/schema 字段。"""
-
-import sys
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-# cv2/numpy 在测试环境不可用，提前 mock
-sys.modules.setdefault("cv2", MagicMock())
-
-ROOT = Path(__file__).resolve().parents[2]
-sys.path.insert(0, str(ROOT / "apps" / "api"))
-sys.path.insert(0, str(ROOT / "packages"))
-sys.path.insert(0, str(ROOT / "apps" / "worker"))
-
-
-def _get_task(mod):
-    """返回 (run_callable, real_task)。
-
-    - celery task 环境：run 是 bound method（self 已绑定），retry 用 patch.object 打桩
-    - 原始函数环境：用一个 mock_self 作为 self
-    """
-    task_obj = mod.process_duplication_check
-    real = task_obj._get_current_object() if hasattr(task_obj, "_get_current_object") else task_obj
-    if hasattr(real, "run") and hasattr(real, "retry"):
-        return real.run, real, True  # bound
-    return real, None, False
-
-
-def _run(mod, record_id, retries=0):
-    """执行 task，返回 (result_or_None, raised_exc, mock_self_or_None)。"""
-    from celery.exceptions import Retry as CeleryRetry
-
-    func, real_task, bound = _get_task(mod)
-    raised = None
-    result = None
-    if bound:
-        mock_retry = MagicMock(side_effect=CeleryRetry("retry"))
-        with patch.object(real_task, "retry", mock_retry):
-            real_task.request.retries = retries
-            real_task.max_retries = 3
-            try:
-                result = func(record_id)
-            except CeleryRetry as e:
-                raised = e
-        return result, raised, None
-    mock_self = MagicMock()
-    mock_self.request.retries = retries
-    mock_self.max_retries = 3
-    mock_self.retry = MagicMock(side_effect=CeleryRetry("retry"))
-    try:
-        result = func(mock_self, record_id)
-    except CeleryRetry as e:
-        raised = e
-    return result, raised, mock_self
-
-
-def _make_record(status="pending"):
-    from packages.domain.duplication import DuplicationRecord
-
-    record = DuplicationRecord.create(
-        user_id="user-1",
-        filename="query.mp4",
-        file_size=1024,
-        storage_key="duplication/abc/query.mp4",
-    )
-    if status != "pending":
-        record.status = status
-    return record
-
-
-def _make_fingerprint():
-    from video_processing.dedup import FingerprintChunk, VideoFingerprint
-
-    chunks = [
-        FingerprintChunk(start_time_ms=0, end_time_ms=2000, phash_binary="0" * 16, color_histogram=[], frame_count=1),
-        FingerprintChunk(
-            start_time_ms=2000, end_time_ms=4000, phash_binary="1" * 16, color_histogram=[], frame_count=1
-        ),
-    ]
-    return VideoFingerprint(
-        md5="qmd5",
-        keyframe_phashes=[c.phash_binary for c in chunks],
-        color_histograms=[],
-        duration=10000.0,
-        resolution=(720, 1280),
-        chunks=chunks,
-    )
-
-
-def _patch_common(record, storage=None, dedup=None, session=None):
-    from worker_app.tasks import duplication_check as mod
-
-    fake_repo = MagicMock()
-    fake_repo.get.return_value = record
-    return [
-        patch.object(mod, "SessionLocal", return_value=session or MagicMock()),
-        patch.object(mod, "SQLAlchemyDuplicationRecordRepository", return_value=fake_repo),
-        patch.object(mod, "get_storage_service", return_value=storage or MagicMock()),
-        patch.object(mod, "VideoDeduplicator", return_value=dedup or MagicMock()),
-    ], fake_repo
-
-
-class TestProcessDuplicationCheckSuccess:
-    def test_success_flow_updates_record(self):
-        from worker_app.tasks import duplication_check as mod
-
-        record = _make_record()
-        fake_session = MagicMock()
-        fake_storage = MagicMock()
-        fake_dedup = MagicMock()
-        fake_dedup.compute_fingerprint.return_value = _make_fingerprint()
-        fake_dedup.compute_duplicate_rate.return_value = {
-            "duplicate_rate": 42.5,
-            "visual_similarity": 0.83,
-            "match_count": 1,
-        }
-        patches, fake_repo = _patch_common(record, storage=fake_storage, dedup=fake_dedup, session=fake_session)
-        patches.append(patch.object(mod, "_build_domain_segments", return_value=(["SEG"], 1)))
-        for p in patches:
-            p.start()
-        try:
-            result, raised, _ = _run(mod, record.id)
-        finally:
-            for p in patches:
-                p.stop()
-
-        assert raised is None
-        assert result["ok"] is True
-        assert result["status"] == "completed"
-        assert result["duplicate_rate"] == 42.5
-        assert result["visual_similarity"] == 0.83
-        assert result["match_count"] == 1
-        assert result["segments"] == 1
-
-        assert record.status == "completed"
-        assert record.duplicate_rate == 42.5
-        assert record.visual_similarity == 0.83
-        assert record.match_count == 1
-        assert record.duplicate_count == 1
-        assert record.segments == ["SEG"]
-
-        fake_storage.download_file.assert_called_once()
-        fake_dedup.compute_fingerprint.assert_called_once()
-        _, kwargs = fake_dedup.compute_duplicate_rate.call_args
-        assert kwargs["scope"] == "user"
-        assert kwargs["user_id"] == "user-1"
-        assert kwargs["current_video_id"] is None
-        assert fake_repo.update.call_count >= 2
-        fake_session.commit.assert_called()
-        fake_session.close.assert_called()
-
-    def test_already_completed_is_skipped(self):
-        from worker_app.tasks import duplication_check as mod
-
-        record = _make_record(status="completed")
-        patches, fake_repo = _patch_common(record)
-        for p in patches:
-            p.start()
-        try:
-            result, raised, _ = _run(mod, record.id)
-        finally:
-            for p in patches:
-                p.stop()
-        assert raised is None
-        assert result.get("skipped") is True
-        fake_repo.update.assert_not_called()
-
-
-class TestProcessDuplicationCheckFailure:
-    def test_record_not_found_raises(self):
-        from worker_app.tasks import duplication_check as mod
-
-        fake_repo = MagicMock()
-        fake_repo.get.return_value = None
-        patches = [
-            patch.object(mod, "SessionLocal", return_value=MagicMock()),
-            patch.object(mod, "SQLAlchemyDuplicationRecordRepository", return_value=fake_repo),
-            patch.object(mod, "get_storage_service", return_value=MagicMock()),
-        ]
-        for p in patches:
-            p.start()
-        try:
-            _result, raised, _ = _run(mod, "nope", retries=0)
-        finally:
-            for p in patches:
-                p.stop()
-        # 找不到记录触发异常 → retry（第一次）
-        assert raised is not None
-
-    def test_download_failure_retries_then_marks_failed(self):
-        from worker_app.tasks import duplication_check as mod
-
-        # 第一次失败（retries=0）：保持 pending
-        record = _make_record()
-        fake_storage = MagicMock()
-        fake_storage.download_file.side_effect = RuntimeError("oss network down")
-        patches, _ = _patch_common(record, storage=fake_storage)
-        for p in patches:
-            p.start()
-        try:
-            _, raised, _ = _run(mod, record.id, retries=0)
-        finally:
-            for p in patches:
-                p.stop()
-        assert raised is not None
-        assert record.status == "processing", "首次失败不应标记 failed（已进入 processing 等待重试）"
-
-        # 最后一次（retries==max_retries=3）：标记 failed
-        record2 = _make_record()
-        patches2, fake_repo2 = _patch_common(record2, storage=fake_storage)
-        for p in patches2:
-            p.start()
-        try:
-            _run(mod, record2.id, retries=3)
-        finally:
-            for p in patches2:
-                p.stop()
-        assert record2.status == "failed"
-        assert "查重失败" in record2.error_message
-        fake_repo2.update.assert_called()
-
-    def test_temp_dir_cleaned_after_failure(self):
-        import os
-        import tempfile
-
-        from worker_app.tasks import duplication_check as mod
-
-        record = _make_record()
-        fake_storage = MagicMock()
-        fake_storage.download_file.side_effect = RuntimeError("boom")
-
-        created_dirs = []
-        real_mkdtemp = tempfile.mkdtemp
-
-        def fake_mkdtemp(prefix=None):
-            d = real_mkdtemp(prefix=prefix)
-            created_dirs.append(d)
-            return d
-
-        patches, _ = _patch_common(record, storage=fake_storage)
-        patches.append(patch.object(mod.tempfile, "mkdtemp", fake_mkdtemp))
-        for p in patches:
-            p.start()
-        try:
-            _run(mod, record.id, retries=0)
-        finally:
-            for p in patches:
-                p.stop()
-
-        assert created_dirs, "mkdtemp should have been called"
-        assert not os.path.isdir(created_dirs[0]), "temp dir should be removed in finally"
-
-
-class TestBuildDomainSegments:
-    def test_maps_worker_segments_to_domain_with_seconds_and_percent(self):
-        from video_processing.dedup import DuplicateSegment as WorkerSegment
-        from worker_app.tasks import duplication_check as mod
-
-        fingerprint = _make_fingerprint()
-
-        from packages.domain import GeneratedVideo
-
-        existing = GeneratedVideo(
-            id="vid-1",
-            project_id="proj-1",
-            generation_task_id="t1",
-            name="成片A",
-            file_url="oss://x",
-            file_size=1,
-            duration=10.0,
-            width=720,
-            height=1280,
-            fps=30.0,
-            video_fingerprint={"md5": "x"},
-        )
-        fake_video_repo = MagicMock()
-        fake_video_repo.list_by_user.return_value = [existing]
-
-        fake_dedup = MagicMock()
-        fake_dedup._get_existing_chunks.return_value = [
-            {"phash_binary": "0" * 16, "start_time_ms": 0, "end_time_ms": 2000, "color_histogram": []},
-        ]
-        worker_seg = WorkerSegment(
-            query_start_ms=1000,
-            query_end_ms=3000,
-            target_start_ms=5000,
-            target_end_ms=7000,
-            avg_distance=6.0,
-        )
-
-        with (
-            patch.object(mod, "SQLAlchemyGeneratedVideoRepository", return_value=fake_video_repo),
-            patch.object(mod, "find_duplicate_segments", return_value=[worker_seg]),
-        ):
-            segments, dup_count = mod._build_domain_segments(fingerprint, MagicMock(), fake_dedup, "user-1")
-
-        assert dup_count == 1
-        assert len(segments) == 1
-        seg = segments[0]
-        assert seg.source_start == 1.0
-        assert seg.source_end == 3.0
-        assert seg.matched_start == 5.0
-        assert seg.matched_end == 7.0
-        assert seg.matched_video_id == "vid-1"
-        assert seg.matched_video_name == "成片A"
-        assert abs(seg.similarity - 90.6) < 0.2
-
-    def test_skips_videos_without_chunks(self):
-        from worker_app.tasks import duplication_check as mod
-
-        fingerprint = _make_fingerprint()
-        from packages.domain import GeneratedVideo
-
-        existing = GeneratedVideo(
-            id="vid-2",
-            project_id="p",
-            generation_task_id="t",
-            name="老视频",
-            file_url="oss://x",
-            file_size=1,
-            duration=5.0,
-            width=720,
-            height=1280,
-            fps=30.0,
-            video_fingerprint={"md5": "old"},
-        )
-        fake_video_repo = MagicMock()
-        fake_video_repo.list_by_user.return_value = [existing]
-        fake_dedup = MagicMock()
-        fake_dedup._get_existing_chunks.return_value = []
-
-        with patch.object(mod, "SQLAlchemyGeneratedVideoRepository", return_value=fake_video_repo):
-            segments, dup_count = mod._build_domain_segments(fingerprint, MagicMock(), fake_dedup, "u")
-        assert segments == []
-        assert dup_count == 0
-
-
-class TestDuplicationSchemaAndDomainNewFields:
-    def test_record_response_includes_new_fields(self):
-        from app.schemas.duplication import DuplicationRecordResponse
-
-        resp = DuplicationRecordResponse(
-            id="r1",
-            filename="f.mp4",
-            file_size=1,
-            status="completed",
-            duplicate_rate=10.0,
-            duplicate_count=1,
-            visual_similarity=0.5,
-            match_count=2,
-            created_at="2026-09-04T00:00:00",
-            updated_at="2026-09-04T00:00:00",
-        )
-        assert resp.visual_similarity == 0.5
-        assert resp.match_count == 2
-
-    def test_record_response_new_fields_default_none(self):
-        from app.schemas.duplication import DuplicationRecordResponse
-
-        resp = DuplicationRecordResponse(id="r1", filename="f.mp4", file_size=1, created_at="x", updated_at="y")
-        assert resp.visual_similarity is None
-        assert resp.match_count is None
-
-    def test_domain_mark_completed_accepts_new_fields(self):
-        record = _make_record()
-        record.mark_completed(33.0, 2, [], visual_similarity=0.77, match_count=3)
-        assert record.status == "completed"
-        assert record.visual_similarity == 0.77
-        assert record.match_count == 3
-
-    def test_reset_for_retry_clears_new_fields(self):
-        record = _make_record()
-        record.mark_completed(10.0, 1, [], visual_similarity=0.5, match_count=1)
-        record.status = "failed"
-        record.reset_for_retry()
-        assert record.status == "pending"
-        assert record.visual_similarity is None
-        assert record.match_count is None

tests/unit/test_fingerprint_chunks.py

@@ -1,282 +0,0 @@
-"""分片指纹存储单元测试 — Issue #1657.
-
-覆盖：
-- 分片策略：60秒视频 → 30片，120秒视频 → 24片
-- VideoFingerprint.to_chunk_models() 输出正确
-- _save_fingerprint_chunks 幂等性（已有数据跳过）
-- to_dict() 向后兼容
-"""
-
-from __future__ import annotations
-
-import sys
-from unittest.mock import MagicMock
-
-
-def _mock_module(**attrs):
-    """Create a mock module with __spec__ to avoid AttributeError."""
-    m = MagicMock()
-    m.__spec__ = None
-    for k, v in attrs.items():
-        setattr(m, k, v)
-    return m
-
-
-# ── Module-level setup: mock deps, import dedup, then restore sys.modules ──
-_SAVED_MODULES_KEYS = set(sys.modules.keys())
-_SAVED_MODULES_VALUES = {
-    k: sys.modules.get(k)
-    for k in [
-        "cv2",
-        "celery",
-        "sqlalchemy",
-        "sqlalchemy.orm",
-        "sqlalchemy.engine",
-        "sqlalchemy.ext",
-        "sqlalchemy.ext.declarative",
-        "worker_app.db",
-        "worker_app.celery_app",
-        "worker_app.core.config",
-        "packages.adapters.sqlalchemy_impl.session",
-        "packages.adapters.sqlalchemy_impl.generated_video_repository",
-        "packages.adapters.sqlalchemy_impl.models",
-        "packages.shared.config",
-        "packages.shared.storage",
-    ]
-}
-
-# Set up mocks
-sys.modules["cv2"] = _mock_module()
-
-_mock_celery = MagicMock()
-_mock_celery.Task = MagicMock
-_mock_celery.Celery = MagicMock
-_mock_celery.__spec__ = None
-sys.modules["celery"] = _mock_celery
-
-_mock_sqla = MagicMock()
-_mock_sqla.__path__ = []
-_mock_sqla.__spec__ = None
-sys.modules["sqlalchemy"] = _mock_sqla
-
-_mock_sqla_orm = MagicMock()
-_mock_sqla_orm.__path__ = []
-_mock_sqla_orm.__spec__ = None
-_mock_sqla_orm.Session = MagicMock
-sys.modules["sqlalchemy.orm"] = _mock_sqla_orm
-sys.modules["sqlalchemy.engine"] = _mock_module()
-sys.modules["sqlalchemy.ext"] = _mock_module()
-sys.modules["sqlalchemy.ext.declarative"] = _mock_module()
-
-sys.modules["worker_app.db"] = _mock_module(SessionLocal=MagicMock())
-sys.modules["worker_app.celery_app"] = _mock_module(celery_app=MagicMock())
-sys.modules["worker_app.core.config"] = _mock_module(get_settings=MagicMock(return_value=MagicMock()))
-
-sys.modules["packages.adapters.sqlalchemy_impl.session"] = _mock_module(
-    Base=MagicMock(),
-    build_engine=MagicMock(),
-    build_session_factory=MagicMock(),
-    ensure_database_exists=MagicMock(),
-    initialize_database=MagicMock(),
-)
-sys.modules["packages.adapters.sqlalchemy_impl.generated_video_repository"] = _mock_module()
-
-
-# Mock VideoFingerprintChunkModel with class-level column attributes
-class _FakeChunkModel:
-    video_id = MagicMock()
-    project_id = MagicMock()
-    user_id = MagicMock()
-    start_time_ms = MagicMock()
-    end_time_ms = MagicMock()
-    phash_binary = MagicMock()
-    color_histogram = MagicMock()
-    frame_count = MagicMock()
-    created_at = MagicMock()
-
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-
-sys.modules["packages.adapters.sqlalchemy_impl.models"] = _mock_module(
-    VideoFingerprintChunkModel=_FakeChunkModel,
-)
-sys.modules["packages.shared.config"] = _mock_module(get_shared_settings=MagicMock(return_value=MagicMock()))
-sys.modules["packages.shared.storage"] = _mock_module()
-
-# Import dedup while mocks are active
-from video_processing.dedup import (  # noqa: E402
-    FingerprintChunk,
-    VideoFingerprint,
-    _save_fingerprint_chunks,
-)
-
-# ── Restore sys.modules immediately after import ──
-for _key in list(sys.modules.keys()):
-    if _key not in _SAVED_MODULES_KEYS:
-        del sys.modules[_key]
-for _key, _value in _SAVED_MODULES_VALUES.items():
-    if _value is not None:
-        sys.modules[_key] = _value
-    elif _key in sys.modules:
-        del sys.modules[_key]
-del _SAVED_MODULES_KEYS, _SAVED_MODULES_VALUES, _key, _value
-
-
-class TestVideoFingerprintToChunkModels:
-    """测试 VideoFingerprint.to_chunk_models() 输出。"""
-
-    def test_to_chunk_models_output(self):
-        """to_chunk_models 返回正确的 Model 列表。"""
-        fp = VideoFingerprint(
-            md5="abc123",
-            keyframe_phashes=["a1b2", "c3d4"],
-            color_histograms=[[0.1] * 96, [0.2] * 96],
-            duration=10.0,
-            resolution=(1920, 1080),
-            chunks=[
-                FingerprintChunk(start_time_ms=0, end_time_ms=2000, phash_binary="a1b2", color_histogram=[0.1] * 96),
-                FingerprintChunk(start_time_ms=2000, end_time_ms=4000, phash_binary="c3d4", color_histogram=[0.2] * 96),
-            ],
-        )
-
-        models = fp.to_chunk_models(video_id="v1", project_id="p1", user_id="u1")
-
-        assert len(models) == 2
-        assert models[0].video_id == "v1"
-        assert models[0].project_id == "p1"
-        assert models[0].user_id == "u1"
-        assert models[0].start_time_ms == 0
-        assert models[0].end_time_ms == 2000
-        assert models[0].phash_binary == "a1b2"
-        assert models[1].start_time_ms == 2000
-        assert models[1].end_time_ms == 4000
-        assert models[1].phash_binary == "c3d4"
-
-    def test_to_chunk_models_empty_chunks(self):
-        """空 chunks 列表返回空 Model 列表。"""
-        fp = VideoFingerprint(
-            md5="abc",
-            keyframe_phashes=[],
-            color_histograms=[],
-            duration=0,
-            resolution=(0, 0),
-            chunks=[],
-        )
-
-        models = fp.to_chunk_models(video_id="v1", project_id="p1")
-        assert models == []
-
-
-class TestSaveFingerprintChunksIdempotent:
-    """测试 _save_fingerprint_chunks 幂等性。"""
-
-    def test_save_skips_existing(self):
-        """已有分片数据时跳过写入。"""
-        fp = VideoFingerprint(
-            md5="abc",
-            keyframe_phashes=["a1b2"],
-            color_histograms=[[0.1] * 96],
-            duration=5.0,
-            resolution=(1920, 1080),
-            chunks=[
-                FingerprintChunk(start_time_ms=0, end_time_ms=2000, phash_binary="a1b2", color_histogram=[0.1] * 96),
-            ],
-        )
-
-        session = MagicMock()
-        # Mock: 已有 1 条分片数据
-        session.query.return_value.filter.return_value.count.return_value = 1
-
-        _save_fingerprint_chunks(fp, video_id="v1", project_id="p1", user_id="u1", session=session)
-
-        # bulk_save_objects 不应被调用
-        session.bulk_save_objects.assert_not_called()
-
-    def test_save_writes_new(self):
-        """无分片数据时写入。"""
-        fp = VideoFingerprint(
-            md5="abc",
-            keyframe_phashes=["a1b2"],
-            color_histograms=[[0.1] * 96],
-            duration=5.0,
-            resolution=(1920, 1080),
-            chunks=[
-                FingerprintChunk(start_time_ms=0, end_time_ms=2000, phash_binary="a1b2", color_histogram=[0.1] * 96),
-            ],
-        )
-
-        session = MagicMock()
-        # Mock: 无分片数据
-        session.query.return_value.filter.return_value.count.return_value = 0
-
-        _save_fingerprint_chunks(fp, video_id="v1", project_id="p1", user_id="u1", session=session)
-
-        # bulk_save_objects 应被调用一次
-        session.bulk_save_objects.assert_called_once()
-        saved_models = session.bulk_save_objects.call_args[0][0]
-        assert len(saved_models) == 1
-        assert saved_models[0].video_id == "v1"
-        assert saved_models[0].phash_binary == "a1b2"
-
-    def test_save_skips_no_chunks(self):
-        """指纹无 chunks 时跳过。"""
-        fp = VideoFingerprint(
-            md5="abc",
-            keyframe_phashes=[],
-            color_histograms=[],
-            duration=0,
-            resolution=(0, 0),
-            chunks=[],
-        )
-
-        session = MagicMock()
-        session.query.return_value.filter.return_value.count.return_value = 0
-
-        _save_fingerprint_chunks(fp, video_id="v1", project_id="p1", user_id="u1", session=session)
-
-        # bulk_save_objects 不应被调用
-        session.bulk_save_objects.assert_not_called()
-
-
-class TestFingerprintToDictBackwardCompat:
-    """测试 to_dict() 向后兼容性。"""
-
-    def test_to_dict_includes_chunks(self):
-        """to_dict() 包含 chunks 字段。"""
-        fp = VideoFingerprint(
-            md5="abc123",
-            keyframe_phashes=["a1b2"],
-            color_histograms=[[0.1] * 96],
-            duration=5.0,
-            resolution=(1920, 1080),
-            chunks=[
-                FingerprintChunk(start_time_ms=0, end_time_ms=2000, phash_binary="a1b2", color_histogram=[0.1] * 96),
-            ],
-        )
-
-        d = fp.to_dict()
-
-        assert "chunks" in d
-        assert len(d["chunks"]) == 1
-        assert d["chunks"][0]["start_time_ms"] == 0
-        assert d["chunks"][0]["end_time_ms"] == 2000
-        assert d["chunks"][0]["phash_binary"] == "a1b2"
-
-    def test_to_dict_preserves_legacy_fields(self):
-        """to_dict() 保留 keyframe_phashes 和 color_histograms 字段。"""
-        fp = VideoFingerprint(
-            md5="abc",
-            keyframe_phashes=["a1b2", "c3d4"],
-            color_histograms=[[0.1] * 96, [0.2] * 96],
-            duration=10.0,
-            resolution=(1920, 1080),
-        )
-
-        d = fp.to_dict()
-
-        assert "keyframe_phashes" in d
-        assert "color_histograms" in d
-        assert len(d["keyframe_phashes"]) == 2
-        assert len(d["color_histograms"]) == 2

tests/unit/test_form_upload_routes.py

@@ -104,31 +104,11 @@ def _make_library(
     return AssetLibrary(id=id, name="Test Library", project_id=project_id, kind=kind)
 
 
-class StubAssetRepository:
-    """Minimal asset repository stub for upload tests."""
-    def __init__(self):
-        self._assets = {}
-
-    def create(self, asset):
-        self._assets[asset.id] = asset
-        return asset
-
-    def find_by_storage_key(self, storage_key):
-        for a in self._assets.values():
-            if a.storage_key == storage_key:
-                return a
-        return None
-
-    def find_by_library_and_file_hash(self, library_id, file_hash):
-        return None
-
-
 def _build_app(
     project_repo: StubProjectRepository | None = None,
     library_repo: StubAssetLibraryRepository | None = None,
     storage: MagicMock | None = None,
     ingest_repo: StubIngestJobRepository | None = None,
-    asset_repo: StubAssetRepository | None = None,
 ) -> FastAPI:
     """构建一个最小化的 FastAPI app，只注册 upload 路由。"""
     from app.api.routes.upload import router
@@ -136,7 +116,6 @@ def _build_app(
     from app.core.storage import get_storage_service
     from app.dependencies import (
         get_asset_library_repository,
-        get_asset_repository,
         get_ingest_job_repository,
         get_project_repository,
     )
@@ -150,21 +129,17 @@ def _build_app(
     storage.is_configured = True
     storage.upload_file.return_value = "https://bucket.oss.example.com/uploads/test.mp4"
     ingest_repo = ingest_repo or StubIngestJobRepository()
-    asset_repo = asset_repo or StubAssetRepository()
 
     # Mock auth
     mock_user = MagicMock(spec=AuthenticatedUser)
     mock_user.id = "user-1"
     mock_user.email = "test@example.com"
-    mock_user.user = MagicMock()
-    mock_user.user.id = "user-1"
 
     app.dependency_overrides[get_current_user] = lambda: mock_user
     app.dependency_overrides[get_project_repository] = lambda: project_repo
     app.dependency_overrides[get_asset_library_repository] = lambda: library_repo
     app.dependency_overrides[get_storage_service] = lambda: storage
     app.dependency_overrides[get_ingest_job_repository] = lambda: ingest_repo
-    app.dependency_overrides[get_asset_repository] = lambda: asset_repo
 
     return app
 

tests/unit/test_generated_video_creation_logic.py

@@ -359,11 +359,6 @@ class TestThumbnailInDedupHelpers:
                 mock_dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
                 mock_dedup.check_duplicate.return_value = None
                 mock_dedup.check_batch_duplicate.return_value = None
-                mock_dedup.compute_duplicate_rate.return_value = {
-                    "duplicate_rate": 0.0,
-                    "visual_similarity": 0.0,
-                    "match_count": 0,
-                }
 
                 result = create_video_record_and_dedup(
                     generation_task_id="task-thumb-reuse",
@@ -406,11 +401,6 @@ class TestThumbnailInDedupHelpers:
                 mock_dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
                 mock_dedup.check_duplicate.return_value = None
                 mock_dedup.check_batch_duplicate.return_value = None
-                mock_dedup.compute_duplicate_rate.return_value = {
-                    "duplicate_rate": 0.0,
-                    "visual_similarity": 0.0,
-                    "match_count": 0,
-                }
 
                 result = create_video_record_and_dedup(
                     generation_task_id="task-thumb-gen",
@@ -453,11 +443,6 @@ class TestThumbnailInDedupHelpers:
                 mock_dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
                 mock_dedup.check_duplicate.return_value = None
                 mock_dedup.check_batch_duplicate.return_value = None
-                mock_dedup.compute_duplicate_rate.return_value = {
-                    "duplicate_rate": 0.0,
-                    "visual_similarity": 0.0,
-                    "match_count": 0,
-                }
 
                 result = create_video_record_and_dedup(
                     generation_task_id="task-thumb-fail",

tests/unit/test_phash_threshold_calibration_1658.py

@@ -1,273 +0,0 @@
-"""Issue #1658: pHash 阈值校准 + 颜色直方图融合 — 单元测试.
-
-在 #1659（动态抽帧+滑动窗口）与 #1660（查重率）已合入 develop 的基础上，
-本测试覆盖 #1658 的最小增量改动：
-
-1. PHASH_THRESHOLD 由 10 收紧到 8（核心校准）
-2. 融合权重常量 MATCH_RATIO_THRESHOLD / PHASH_WEIGHT / HISTOGRAM_WEIGHT 实际生效
-   （不再是硬编码魔法数字）
-3. VideoDeduplicator._compute_fusion_score 统一融合得分方法：
-   - 无直方图数据时回退中性值 0.5
-   - DB NULL（None）显式回退空列表，不崩溃
-   - 全零直方图（全黑视频）为有效数据，参与 Bhattacharyya 计算
-   - 返回 0~1 原始得分，判重由调用方与 DUPLICATE_THRESHOLD 比较
-4. Bhattacharyya 系数对上游异常负值有 sqrt domain 防御
-"""
-
-from __future__ import annotations
-
-import sys
-from unittest.mock import MagicMock
-
-import pytest
-
-
-def _mock_module(**attrs):
-    """Create a mock module with __spec__ to avoid AttributeError."""
-    m = MagicMock()
-    m.__spec__ = None
-    for k, v in attrs.items():
-        setattr(m, k, v)
-    return m
-
-
-# ── Module-level setup: mock deps, import dedup, then restore sys.modules ──
-_SAVED_MODULES_KEYS = set(sys.modules.keys())
-_SAVED_MODULES_VALUES = {
-    k: sys.modules.get(k)
-    for k in [
-        "cv2",
-        "celery",
-        "sqlalchemy",
-        "sqlalchemy.orm",
-        "sqlalchemy.engine",
-        "sqlalchemy.ext",
-        "sqlalchemy.ext.declarative",
-        "worker_app.db",
-        "worker_app.celery_app",
-        "worker_app.core.config",
-        "packages.adapters.sqlalchemy_impl.session",
-        "packages.adapters.sqlalchemy_impl.generated_video_repository",
-        "packages.adapters.sqlalchemy_impl.models",
-        "packages.shared.config",
-        "packages.shared.storage",
-    ]
-}
-
-sys.modules["cv2"] = _mock_module()
-
-_mock_celery = MagicMock()
-_mock_celery.Task = MagicMock
-_mock_celery.Celery = MagicMock
-_mock_celery.__spec__ = None
-sys.modules["celery"] = _mock_celery
-
-_mock_sqla = MagicMock()
-_mock_sqla.__path__ = []
-_mock_sqla.__spec__ = None
-sys.modules["sqlalchemy"] = _mock_sqla
-
-_mock_sqla_orm = MagicMock()
-_mock_sqla_orm.__path__ = []
-_mock_sqla_orm.__spec__ = None
-_mock_sqla_orm.Session = MagicMock
-sys.modules["sqlalchemy.orm"] = _mock_sqla_orm
-sys.modules["sqlalchemy.engine"] = _mock_module()
-sys.modules["sqlalchemy.ext"] = _mock_module()
-sys.modules["sqlalchemy.ext.declarative"] = _mock_module()
-
-sys.modules["worker_app.db"] = _mock_module(SessionLocal=MagicMock())
-sys.modules["worker_app.celery_app"] = _mock_module(celery_app=MagicMock())
-sys.modules["worker_app.core.config"] = _mock_module(get_settings=MagicMock(return_value=MagicMock()))
-
-sys.modules["packages.adapters.sqlalchemy_impl.session"] = _mock_module(
-    Base=MagicMock(),
-    build_engine=MagicMock(),
-    build_session_factory=MagicMock(),
-    ensure_database_exists=MagicMock(),
-    initialize_database=MagicMock(),
-)
-sys.modules["packages.adapters.sqlalchemy_impl.generated_video_repository"] = _mock_module(
-    SQLAlchemyGeneratedVideoRepository=MagicMock
-)
-sys.modules["packages.adapters.sqlalchemy_impl.models"] = _mock_module(
-    VideoFingerprintChunkModel=MagicMock,
-    GeneratedVideoModel=MagicMock,
-)
-sys.modules["packages.shared.config"] = _mock_module(get_shared_settings=MagicMock(return_value=MagicMock()))
-sys.modules["packages.shared.storage"] = _mock_module()
-
-import video_processing.dedup as _dedup_mod  # noqa: E402
-from video_processing.dedup import (  # noqa: E402
-    DUPLICATE_THRESHOLD,
-    HISTOGRAM_WEIGHT,
-    MATCH_RATIO_THRESHOLD,
-    PHASH_WEIGHT,
-    VideoDeduplicator,
-)
-
-# ── Restore sys.modules immediately after import ──
-for _key in list(sys.modules.keys()):
-    if _key not in _SAVED_MODULES_KEYS:
-        del sys.modules[_key]
-for _key, _value in _SAVED_MODULES_VALUES.items():
-    if _value is not None:
-        sys.modules[_key] = _value
-    elif _key in sys.modules:
-        del sys.modules[_key]
-del _SAVED_MODULES_KEYS, _SAVED_MODULES_VALUES, _key, _value
-
-
-# ── 测试夹具 ─────────────────────────────────────────────────────
-
-_UNIFORM_HIST = [1.0 / 96] * 96  # 归一化均匀直方图，sum=1.0，自相似度≈1.0
-_ZERO_HIST = [0.0] * 96  # 全黑视频的全零直方图（有效数据）
-
-
-# ── TestThresholdCalibration：#1658 核心校准 ────────────────────
-
-
-class TestThresholdCalibration:
-    """pHash 阈值由 10 收紧到 8（Issue #1658）。"""
-
-    def test_phash_threshold_is_8(self):
-        """PHASH_THRESHOLD 必须为 8（旧值 10 会放过 8~9 汉明距离的不同视频）。"""
-        assert VideoDeduplicator.PHASH_THRESHOLD == 8
-
-    def test_match_ratio_threshold_constant(self):
-        assert MATCH_RATIO_THRESHOLD == 0.7
-
-    def test_duplicate_threshold_constant(self):
-        assert DUPLICATE_THRESHOLD == 0.70
-
-    def test_fusion_weights(self):
-        assert PHASH_WEIGHT == 0.7
-        assert HISTOGRAM_WEIGHT == 0.3
-
-    def test_threshold_tightening_excludes_distance_8_and_9(self):
-        """距离 8、9 的帧：旧阈值 10 下算匹配，新阈值 8 下不算匹配。
-
-        场景：5 个关键帧距离为 [7, 7, 7, 9, 9]。
-        - 旧阈值 10：5 帧全部 < 10 → match_ratio = 1.0（误放过）
-        - 新阈值 8：仅 3 帧 < 8 → match_ratio = 0.6 < 0.7（正确跳过）
-        """
-        distances = [7, 7, 7, 9, 9]
-
-        matched_old = sum(1 for d in distances if d < 10)
-        assert matched_old == 5  # 旧行为：全匹配 → 误判风险
-
-        matched_new = sum(1 for d in distances if d < VideoDeduplicator.PHASH_THRESHOLD)
-        assert matched_new == 3
-        assert matched_new / len(distances) == 0.6
-        assert matched_new / len(distances) < MATCH_RATIO_THRESHOLD  # 被帧比例门槛拦截
-
-
-# ── TestComputeFusionScore：统一融合得分方法 ────────────────────
-
-
-class TestComputeFusionScore:
-    """_compute_fusion_score(median_distance, histograms_a, histograms_b)。"""
-
-    def test_no_histogram_falls_back_to_neutral_05(self):
-        """双方均无直方图 → hist_similarity 回退 0.5。
-
-        d=0: 0.7*1.0 + 0.3*0.5 = 0.85
-        """
-        score = VideoDeduplicator._compute_fusion_score(0, [], [])
-        assert score == pytest.approx(0.85, abs=1e-6)
-
-    def test_none_histograms_treated_as_empty(self):
-        """DB NULL（None）必须显式回退空列表，不得 len(None) 崩溃。"""
-        score_none = VideoDeduplicator._compute_fusion_score(0, [], None)
-        score_empty = VideoDeduplicator._compute_fusion_score(0, [], [])
-        assert score_none == pytest.approx(score_empty, abs=1e-9)
-        assert score_none == pytest.approx(0.85, abs=1e-6)
-
-    def test_none_histograms_on_query_side_no_crash(self):
-        """查询侧直方图为 None 时同样不崩溃。"""
-        score = VideoDeduplicator._compute_fusion_score(0, None, [_UNIFORM_HIST])
-        # 查询侧无直方图 → 平均相似度为 0（无 ha 可匹配）→ 0.7*1.0 + 0.3*0 = 0.7
-        assert score == pytest.approx(0.7, abs=1e-6)
-
-    def test_identical_uniform_histograms_score_near_1(self):
-        """完全相同的归一化直方图：Bhattacharyya≈1.0 → 融合分≈1.0。"""
-        score = VideoDeduplicator._compute_fusion_score(0, [_UNIFORM_HIST], [_UNIFORM_HIST])
-        assert score == pytest.approx(1.0, abs=1e-6)
-
-    def test_all_zero_histogram_is_valid_data(self):
-        """全零直方图（全黑视频）是有效数据，Bhattacharyya=0，不得走 0.5 回退。
-
-        若错误地用 `if histograms_b` 之外的 `or []` 把全零列表清空，
-        会错误回退到 0.5，把全黑视频的相似度抬高 0.15。
-        d=0 时：正确行为 hist_sim=0 → 0.7*1.0 + 0.3*0 = 0.7；
-        若全零直方图被错误清空回退 0.5 → 0.85。
-        """
-        score = VideoDeduplicator._compute_fusion_score(0, [_ZERO_HIST], [_ZERO_HIST])
-        assert score == pytest.approx(0.7, abs=1e-6)
-        # 与错误回退值 0.85 明确区分开
-        assert abs(score - 0.85) > 0.1
-        # 注：d=0 时 phash 满分 0.7 恰达 DUPLICATE_THRESHOLD，全黑+完全相同 phash 仍判重，符合预期
-        assert score >= DUPLICATE_THRESHOLD - 1e-9
-
-    def test_score_range_within_0_1(self):
-        for d in (0, 8, 16, 32, 64):
-            score = VideoDeduplicator._compute_fusion_score(d, [_UNIFORM_HIST], [_UNIFORM_HIST])
-            assert 0.0 <= score <= 1.0
-
-    def test_formula_matches_weights(self):
-        """得分 = PHASH_WEIGHT * (1 - d/64) + HISTOGRAM_WEIGHT * hist_sim。"""
-        d = 6  # phash_sim = 1 - 6/64 = 0.90625
-        score = VideoDeduplicator._compute_fusion_score(d, [], [])  # hist 回退 0.5
-        expected = PHASH_WEIGHT * (1 - d / 64) + HISTOGRAM_WEIGHT * 0.5
-        assert score == pytest.approx(expected, abs=1e-9)
-        # 0.7*0.90625 + 0.15 = 0.634375 + 0.15 = 0.784375
-        assert score == pytest.approx(0.784375, abs=1e-6)
-
-
-# ── TestBhattacharyyaDefense：负值/异常输入防御 ─────────────────
-
-
-class TestBhattacharyyaDefense:
-    """Bhattacharyya 系数对异常输入的防御。"""
-
-    def test_negative_values_do_not_raise(self):
-        """上游异常负值不得触发 sqrt domain error（max(0.0, ai*bi) 保护）。"""
-        bad_hist = [-0.01] * 96  # 异常负值
-        coeff = VideoDeduplicator._bhattacharyya_coefficient(bad_hist, _UNIFORM_HIST)
-        # 负值乘积被钳为 0，系数为 0 而不是抛 ValueError
-        assert coeff == pytest.approx(0.0, abs=1e-9)
-
-    def test_normal_histograms_coefficient_near_1(self):
-        coeff = VideoDeduplicator._bhattacharyya_coefficient(_UNIFORM_HIST, _UNIFORM_HIST)
-        assert coeff == pytest.approx(1.0, abs=1e-6)
-
-    def test_disjoint_histograms_coefficient_0(self):
-        """完全不重叠的直方图（前半 vs 后半非零）系数为 0。"""
-        hist_a = [0.0] * 96
-        hist_b = [0.0] * 96
-        for i in range(48):
-            hist_a[i] = 1.0 / 48
-        for i in range(48, 96):
-            hist_b[i] = 1.0 / 48
-        coeff = VideoDeduplicator._bhattacharyya_coefficient(hist_a, hist_b)
-        assert coeff == pytest.approx(0.0, abs=1e-9)
-
-
-# ── TestHistogramSimilarityEdgeCases ────────────────────────────
-
-
-class TestHistogramSimilarityEdgeCases:
-    """_compute_histogram_similarity 的边界行为。"""
-
-    def test_empty_either_side_returns_0(self):
-        assert VideoDeduplicator._compute_histogram_similarity([], [_UNIFORM_HIST]) == 0.0
-        assert VideoDeduplicator._compute_histogram_similarity([_UNIFORM_HIST], []) == 0.0
-
-    def test_best_match_per_histogram(self):
-        """每个查询直方图取与目标集合的最佳匹配，再取平均。"""
-        h1 = _UNIFORM_HIST
-        h2 = [0.0] * 96
-        h2[0] = 1.0  # 与均匀直方图完全不重叠
-        # 查询侧两张直方图：h1 最佳匹配≈1.0，h2 最佳匹配≈sqrt(1/96)≈0.102
-        sim = VideoDeduplicator._compute_histogram_similarity([h1, h2], [h1])
-        assert sim == pytest.approx((1.0 + (1.0 / 96) ** 0.5) / 2, abs=1e-3)

tests/unit/test_plan_generator.py

@@ -1007,162 +1007,3 @@ class TestAssetDurationsAlwaysFetched:
             call_kwargs = mock_distribute.call_args
             asset_durations = call_kwargs.kwargs.get("asset_durations", call_kwargs[1].get("asset_durations"))
             assert asset_durations is None
-
-
-# ---------------------------------------------------------------------------
-# 测试：正式生成片段随机重排（Issue #1663）
-# ---------------------------------------------------------------------------
-
-
-class TestFormalGenerationShuffle:
-    """验证正式生成时片段顺序随机化。
-
-    Issue #1663: 正式生成时 smart_match 排序后对 asset_ids 做 random.shuffle，
-    使得同一批素材每次生成的视频片段顺序不同，有利于查重降重。
-    """
-
-    def _make_service_with_asset_repo(self):
-        """创建带 mock asset_repo 的 PlanGeneratorService（复用 TestAssetDurationsAlwaysFetched 模式）"""
-        from apps.api.app.services.plan_generator_service import PlanGeneratorService
-
-        plan_repo = StubEditPlanRepository()
-        clip_repo = StubEditPlanClipRepository()
-
-        asset_repo = MagicMock()
-
-        def fake_get(asset_id):
-            mock_asset = MagicMock()
-            mock_asset.duration = 30.0
-            mock_asset.quality_score = None
-            mock_asset.created_at = None
-            mock_asset.metadata = {}
-            return mock_asset
-
-        asset_repo.get = MagicMock(side_effect=fake_get)
-
-        with (
-            patch(
-                "apps.api.app.services.plan_generator_service.SQLAlchemyEditPlanRepository",
-                return_value=plan_repo,
-            ),
-            patch(
-                "apps.api.app.services.plan_generator_service.SQLAlchemyEditPlanClipRepository",
-                return_value=clip_repo,
-            ),
-        ):
-            db = MagicMock()
-            svc = PlanGeneratorService(db, asset_repo=asset_repo)
-            svc._plan_repo = plan_repo
-            svc._clip_repo = clip_repo
-
-        return svc, asset_repo
-
-    def test_formal_generation_shuffles_asset_ids(self):
-        """正式生成路径下 asset_ids 应被打乱，多次调用顺序应不同"""
-        svc, _ = self._make_service_with_asset_repo()
-
-        template = _make_template("one_take")
-        # 6 个 clip 容纳 6 个素材
-        clip_configs = _make_clip_configs(
-            template_id=template.id,
-            specs=[
-                {"clip_type": ClipType.MAIN, "order": i, "min_duration": 3.0, "max_duration": 5.0} for i in range(6)
-            ],
-        )
-
-        asset_ids = ["a1", "a2", "a3", "a4", "a5", "a6"]
-
-        # 收集多次调用中 distribute_assets 收到的 asset_ids 顺序
-        captured_orders = []
-        with patch(
-            "apps.api.app.services.plan_generator_service.distribute_assets",
-            side_effect=lambda clips, asset_ids, *a, **kw: captured_orders.append(list(asset_ids)),
-        ):
-            # mock _sort_assets_by_smart_score 返回固定顺序，验证 shuffle 会打乱
-            with patch.object(
-                svc,
-                "_sort_assets_by_smart_score",
-                side_effect=lambda ids: list(ids),  # 原样返回
-            ):
-                with patch.object(
-                    svc,
-                    "_fetch_asset_scene_points",
-                    return_value={},
-                ):
-                    for _ in range(10):
-                        svc.generate_from_template(
-                            template=template,
-                            clip_configs=clip_configs,
-                            asset_ids=list(asset_ids),  # 每次传新列表
-                            random_preview=False,  # 正式生成
-                        )
-
-        assert len(captured_orders) == 10
-        # 每次 order 应该是 asset_ids 的一个排列
-        expected_set = set(asset_ids)
-        for order in captured_orders:
-            assert set(order) == expected_set
-
-        # 10 次调用中应至少出现 2 种不同顺序（概率 > 99.9%）
-        unique_orders = set(tuple(o) for o in captured_orders)
-        assert (
-            len(unique_orders) >= 2
-        ), f"Expected shuffled orders to vary, but got only {len(unique_orders)} unique order(s): {unique_orders}"
-
-    def test_formal_generation_does_not_mutate_original_list(self):
-        """shuffle 不应修改调用方的原始 asset_ids 列表"""
-        svc, _ = self._make_service_with_asset_repo()
-
-        template = _make_template("one_take")
-        clip_configs = _make_clip_configs(
-            template_id=template.id,
-            specs=[
-                {"clip_type": ClipType.MAIN, "order": i, "min_duration": 3.0, "max_duration": 5.0} for i in range(4)
-            ],
-        )
-
-        original = ["a1", "a2", "a3", "a4"]
-        original_copy = list(original)
-
-        with patch("apps.api.app.services.plan_generator_service.distribute_assets"):
-            with patch.object(svc, "_sort_assets_by_smart_score", side_effect=lambda ids: list(ids)):
-                with patch.object(svc, "_fetch_asset_scene_points", return_value={}):
-                    svc.generate_from_template(
-                        template=template,
-                        clip_configs=clip_configs,
-                        asset_ids=original,
-                        random_preview=False,
-                    )
-
-        assert original == original_copy, "Original asset_ids list should not be mutated"
-
-    def test_preview_random_mode_unaffected_by_shuffle(self):
-        """预览随机模式不走 shuffle 路径，行为不变"""
-        svc, _ = self._make_service_with_asset_repo()
-
-        template = _make_template("one_take")
-        clip_configs = _make_clip_configs(
-            template_id=template.id,
-            specs=[
-                {"clip_type": ClipType.MAIN, "order": i, "min_duration": 3.0, "max_duration": 5.0} for i in range(4)
-            ],
-        )
-
-        asset_ids = ["a1", "a2", "a3", "a4"]
-
-        captured_orders = []
-        with patch(
-            "apps.api.app.services.plan_generator_service.distribute_assets",
-            side_effect=lambda clips, asset_ids, *a, **kw: captured_orders.append(list(asset_ids)),
-        ):
-            for _ in range(5):
-                svc.generate_from_template(
-                    template=template,
-                    clip_configs=clip_configs,
-                    asset_ids=list(asset_ids),
-                    random_preview=True,  # 预览随机模式
-                )
-
-        assert len(captured_orders) == 5
-        # 预览模式下 random.shuffle 不应被调用（在 _distribute_assets 的 if not random_selection 块内）
-        # 所以 asset_ids 应该保持调用方传入的顺序（可能已由上层 shuffle 过）