fix(1978): GPU lipsync 结果 URL 签 7 天 + 外部 TTS 音频转存自家 OSS

Bug1: _submit_to_gpu 用 _sign_media_url 签 GPU 结果，但 result_url 是裸 OSS key（gpu-lipsync/results/{task}.mp4，无 host），_sign_media_url 只对自家 host 的 URL 签名，裸 key 原样返回导致前端无法播放。改为直接调 storage.get_download_url(key, expires_seconds=MEDIAKIT_URL_TTL_SECONDS=7天)。 Bug2: 预合成 TTS 音频 audio_url 是 dashscope-result 第三方临时 OSS 地址， RTX2060 家庭网络拉不到，3 次失败后回退 MediaKit。创建 GPU 任务前新增 _persist_external_audio_for_gpu：非自家 OSS 域名音频下载转存 lipsync-tts/{user_id}/{job_id}.mp3，用自家 URL 建任务；转存失败回退原 URL 不阻断；自家 key/URL 不重复转存。测试：test_lipsync_gpu_integration 新增 3 用例（外部音频转存/自家不转存/ 转存失败兜底），成功路径断言 7 天签名。
2026-09-19 23:43:35 +08:00
parent 112f0eb277
commit d5a4a40f2a
2 changed files with 172 additions and 16 deletions
@@ -20,7 +20,7 @@ def fake_mediakit():
    return client


-def _make_job(video_url="oss://video.mp4", audio_url="oss://audio.wav"):
+def _make_job(video_url="videos/video.mp4", audio_url="audios/audio.wav"):
    job = MagicMock()
    job.id = "job-1"
    job.user_id = "u1"
@@ -42,6 +42,14 @@ def _make_svc(db, mediakit, use_gpu=False):
    return svc


+def _patch_storage(public_url="https://own-bucket.oss-cn-beijing.aliyuncs.com", signed_suffix="?signed-7d"):
+    """patch get_shared_storage_service，返回自家 OSS storage mock."""
+    storage = MagicMock()
+    storage.public_url = public_url
+    storage.get_download_url.side_effect = lambda key_or_url, expires_seconds=3600: key_or_url + signed_suffix
+    return patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage)
+
+
 class TestGpuFallback:
    def test_switch_off_uses_mediakit(self, fake_db, fake_mediakit):
        """开关关闭时直接走 MediaKit，不调用 _submit_to_gpu."""
@@ -66,26 +74,34 @@ class TestGpuFallback:
        assert job.status == "submitted"

    def test_gpu_success_marks_completed(self, fake_db, fake_mediakit):
-        """GPU 路径成功：job 直接 completed，不调 MediaKit."""
+        """GPU 路径成功：job 直接 completed，不调 MediaKit；结果 key 由 storage 签 7 天 URL."""
        svc = _make_svc(fake_db, fake_mediakit, use_gpu=True)
        gpu_done = MagicMock(
            id="gpu-task-1",
            status="done",
-            result_url="oss://gpu-results/r.mp4",
+            result_url="gpu-lipsync/results/gpu-task-1.mp4",
            result_duration=12.5,
        )
        fake_gpu_svc = MagicMock()
        fake_gpu_svc.has_available_worker.return_value = True
        fake_gpu_svc.create_task.return_value = MagicMock(id="gpu-task-1")
        fake_gpu_svc.wait_for_result.return_value = gpu_done
-        with patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc):
+        with (
+            _patch_storage() as storage_p,
+            patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc),
+        ):
+            storage = storage_p()
            job = _make_job()
            svc._submit_audio_direct(job=job)
        fake_gpu_svc.create_task.assert_called_once()
        fake_mediakit.submit_lipsync.assert_not_called()
        assert job.status == "completed"
        assert job.output_duration == 12.5
-        assert "?signed" in job.output_video_url
+        # Bug1 回归：裸 result key 必须经 storage.get_download_url 签 7 天，前端才可播放
+        storage.get_download_url.assert_called_once_with(
+            "gpu-lipsync/results/gpu-task-1.mp4", expires_seconds=7 * 24 * 3600
+        )
+        assert job.output_video_url == "gpu-lipsync/results/gpu-task-1.mp4?signed-7d"
        fake_db.commit.assert_called()

    def test_gpu_timeout_falls_back(self, fake_db, fake_mediakit):
@@ -120,12 +136,85 @@ class TestGpuFallback:
        fake_gpu_svc = MagicMock()
        fake_gpu_svc.has_available_worker.return_value = True
        fake_gpu_svc.create_task.side_effect = RuntimeError("DB down")
-        with patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc):
+        with _patch_storage(), patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc):
            job = _make_job()
            svc._submit_audio_direct(job=job)
        fake_mediakit.submit_lipsync.assert_called_once()
        assert job.status == "submitted"

+    def test_gpu_external_audio_persisted_to_own_oss(self, fake_db, fake_mediakit):
+        """Bug2 回归：dashscope 临时音频 URL 在创建 GPU 任务前转存自家 OSS。"""
+        svc = _make_svc(fake_db, fake_mediakit, use_gpu=True)
+        dashscope_url = "https://dashscope-result-bj.oss-cn-beijing.aliyuncs.com/tmp/abc.mp3"
+        job = _make_job(audio_url=dashscope_url)
+        gpu_done = MagicMock(id="gpu-task-2", status="done", result_url="gpu-lipsync/results/gpu-task-2.mp4")
+        fake_gpu_svc = MagicMock()
+        fake_gpu_svc.has_available_worker.return_value = True
+        fake_gpu_svc.create_task.return_value = MagicMock(id="gpu-task-2")
+        fake_gpu_svc.wait_for_result.return_value = gpu_done
+        with (
+            _patch_storage() as storage_p,
+            patch("app.services.lipsync_service.safe_download_bytes", return_value=b"FAKE-MP3") as m_dl,
+            patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc),
+        ):
+            storage = storage_p()
+            storage.upload_file.return_value = "https://own-bucket.oss-cn-beijing.aliyuncs.com/lipsync-tts/u1/job-1.mp3"
+            svc._submit_audio_direct(job=job)
+        # 外部音频在 GPU 分支被额外下载（purpose 区分于前置 ffprobe 下载）并转存到约定 key
+        gpu_dl_calls = [c for c in m_dl.call_args_list if c.kwargs.get("purpose") == "lipsync_gpu_tts_audio"]
+        assert len(gpu_dl_calls) == 1
+        assert gpu_dl_calls[0].args[0] == dashscope_url
+        storage.upload_file.assert_called_once()
+        args, kwargs = storage.upload_file.call_args
+        assert args[1] == "lipsync-tts/u1/job-1.mp3"
+        assert kwargs.get("content_type") == "audio/mpeg"
+        # 创建 GPU 任务时用的是自家 OSS URL，Worker 可经预签名下载
+        kwargs_create = fake_gpu_svc.create_task.call_args.kwargs
+        assert kwargs_create["audio_url"] == ("https://own-bucket.oss-cn-beijing.aliyuncs.com/lipsync-tts/u1/job-1.mp3")
+        assert kwargs_create["audio_url"] != dashscope_url
+
+    def test_gpu_own_audio_not_repersisted(self, fake_db, fake_mediakit):
+        """Bug2：已是自家 OSS 的音频（含裸 key）不重复下载转存。"""
+        svc = _make_svc(fake_db, fake_mediakit, use_gpu=True)
+        job = _make_job(audio_url="lipsync-tts/u1/job-1.mp3")
+        gpu_done = MagicMock(id="gpu-task-3", status="done", result_url="gpu-lipsync/results/gpu-task-3.mp4")
+        fake_gpu_svc = MagicMock()
+        fake_gpu_svc.has_available_worker.return_value = True
+        fake_gpu_svc.create_task.return_value = MagicMock(id="gpu-task-3")
+        fake_gpu_svc.wait_for_result.return_value = gpu_done
+        with (
+            _patch_storage() as storage_p,
+            patch("app.services.lipsync_service.safe_download_bytes") as m_dl,
+            patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc),
+        ):
+            storage = storage_p()
+            svc._submit_audio_direct(job=job)
+        # 前置 ffprobe 下载允许发生，但 GPU 转存分支不应再下载/上传
+        gpu_dl_calls = [c for c in m_dl.call_args_list if c.kwargs.get("purpose") == "lipsync_gpu_tts_audio"]
+        assert gpu_dl_calls == []
+        storage.upload_file.assert_not_called()
+        assert fake_gpu_svc.create_task.call_args.kwargs["audio_url"] == "lipsync-tts/u1/job-1.mp3"
+
+    def test_gpu_external_audio_persist_fail_falls_back_original_url(self, fake_db, fake_mediakit):
+        """Bug2：外部音频转存失败不阻断，用原始 URL 建任务（失败后服务端重试/回退 MediaKit）。"""
+        svc = _make_svc(fake_db, fake_mediakit, use_gpu=True)
+        dashscope_url = "https://dashscope-result-bj.oss-cn-beijing.aliyuncs.com/tmp/abc.mp3"
+        job = _make_job(audio_url=dashscope_url)
+        gpu_done = MagicMock(id="gpu-task-4", status="done", result_url="gpu-lipsync/results/gpu-task-4.mp4")
+        fake_gpu_svc = MagicMock()
+        fake_gpu_svc.has_available_worker.return_value = True
+        fake_gpu_svc.create_task.return_value = MagicMock(id="gpu-task-4")
+        fake_gpu_svc.wait_for_result.return_value = gpu_done
+        with (
+            _patch_storage() as storage_p,
+            patch("app.services.lipsync_service.safe_download_bytes", side_effect=RuntimeError("network blocked")),
+            patch("app.services.gpu_lipsync_service.GpuLipsyncService", return_value=fake_gpu_svc),
+        ):
+            storage = storage_p()
+            svc._submit_audio_direct(job=job)
+        storage.upload_file.assert_not_called()
+        assert fake_gpu_svc.create_task.call_args.kwargs["audio_url"] == dashscope_url
+

 class TestGpuServiceHelpers:
    """GpuLipsyncService.has_available_worker 测试."""