fix(viral-video): 6 E2E bug fixes (fusion_level/concat/ingest/duplicated URL/TTS/Seedance ratio) (#2113)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>
2026-10-01 05:12:35 +08:00
parent 5cefbc9c05
commit fc6ebbecb6
10 changed files with 106 additions and 20 deletions
@@ -191,6 +191,23 @@ def _find_duplicate_asset(
    return None


+
+def _get_existing_asset_url(existing: Any, storage_service: Any) -> str:
+    """安全获取已存在素材的公网 URL，兼容 domain Asset（无 file_url 字段）和 ORM model。"""
+    # Domain Asset 只有 storage_key 字段；ORM model 有 file_url 但存的也是 storage_key
+    key = ""
+    for attr in ("storage_key", "file_url"):
+        v = getattr(existing, attr, None)
+        if v:
+            key = v
+            break
+    if not key:
+        return ""
+    try:
+        return storage_service.get_url(key) or ""
+    except Exception:
+        return ""
+
 def _create_pending_asset(
    asset_repository,
    project_id,
@@ -390,7 +407,7 @@ async def prepare_direct_upload(
                duplicated=True,
                skip_transfer=True,
                asset_id=existing.id,
-                url=existing.file_url or storage_service.get_url(existing.storage_key) or "",
+                url=_get_existing_asset_url(existing, storage_service),
            )

    file_id = uuid4().hex[:8]