fix(P0): 修复取消链路断裂，前端取消后 GPU 仍继续推理 (#2009)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>
2026-09-22 01:24:07 +08:00
parent 9927413370
commit f032152eaa
13 changed files with 457 additions and 35 deletions
@@ -248,3 +248,41 @@ class TestSignMediaUrl:
        with patch.object(task_mod, "get_shared_storage_service", side_effect=RuntimeError("x")):
            url = "https://own-bucket.oss-cn-beijing.aliyuncs.com/a.wav"
            assert task_mod._sign_media_url(url) == url
+
+
+def test_cancelled_gpu_task_does_not_fallback_mediakit(monkeypatch):
+    """GPU 任务被用户取消 → Celery 任务直接标记 cancelled，不回退 MediaKit。"""
+    job = MagicMock()
+    job.id = "job-1"
+    job.status = "processing"
+    job.mediakit_task_id = "gpu:gpu-task-1"
+
+    gpu_task = MagicMock()
+    gpu_task.status = "cancelled"
+    gpu_task.error_msg = "用户取消"
+
+    fake_gpu_svc = MagicMock()
+    fake_gpu_svc.wait_for_result.return_value = gpu_task
+    gpu_service_cls = MagicMock(return_value=fake_gpu_svc)
+
+    fake_db = MagicMock()
+    fake_db.query.return_value.filter_by.return_value.first.return_value = job
+
+    # 直接替换 sys.modules 里的 gpu_lipsync_service 模块（全量跑时它可能已被
+    # 其他测试换成 MagicMock），保证任务函数内 from...import 一定拿到我们的类；
+    # 并替换 _get_db_session 绕开 worker_app / app.db 两条 import 分支。
+    import sys
+    from types import SimpleNamespace
+
+    fake_mod = SimpleNamespace(GpuLipsyncService=gpu_service_cls)
+    monkeypatch.setitem(sys.modules, "app.services.gpu_lipsync_service", fake_mod)
+    monkeypatch.setattr(task_mod, "_get_db_session", lambda: fake_db)
+    monkeypatch.setattr(task_mod, "logger", MagicMock())
+
+    task_mod.lipsync_gpu_process_async.run("job-1", "u1", "gpu-task-1")
+
+    assert job.status == "cancelled"
+    assert not str(job.mediakit_task_id).startswith("mk-")
+    fake_db.commit.assert_called()
+    fake_gpu_svc.wait_for_result.assert_called_once()
+    gpu_service_cls.assert_called_once_with(fake_db)