素材列表增加返回文件名称

video-gen-api/app/services/generation_ai_service.py

@@ -32,6 +32,7 @@ from app.services.resource_accounting_service import (
     SOURCE_MODEL_CHAT_TASK,
     SOURCE_MODEL_GENERATION_RECORD,
     batch_get_generated_resource_id_map,
+    batch_get_generated_resource_info_map,
     soft_delete_chat_task_resources,
 )
 from app.services.resource_signed_url_service import build_resource_signed_url
@@ -510,6 +511,7 @@ def generation_record_to_history_out(
     record: GenerationRecord,
     project_name: str | None = None,
     generated_resource_id: str | None = None,
+    file_name: str | None = None,
 ) -> GenerationAIRecordHistoryItemOut:
     refs = _parse_json(record.media_references)
     return GenerationAIRecordHistoryItemOut(
@@ -518,6 +520,7 @@ def generation_record_to_history_out(
         project_id=record.project_id,
         project_name=project_name,
         generated_resource_id=generated_resource_id,
+        file_name=file_name,
         gen_type=record.gen_type,
         generation_mode="generation_record",
         pipeline_stage=None,
@@ -615,7 +618,7 @@ async def list_generation_record_history_grouped_days(
         raw_groups.append((generated_day, day_total, rows))
         all_record_ids.extend(record.id for record, _project_name in rows)
 
-    resource_id_map = await batch_get_generated_resource_id_map(
+    resource_info_map = await batch_get_generated_resource_info_map(
         db,
         source_model=SOURCE_MODEL_GENERATION_RECORD,
         source_ids=all_record_ids,
@@ -630,7 +633,8 @@ async def list_generation_record_history_grouped_days(
                 generation_record_to_history_out(
                     record,
                     project_name,
-                    generated_resource_id=resource_id_map.get(record.id),
+                    generated_resource_id=resource_info_map.get(record.id, {}).get("resource_id"),
+                    file_name=resource_info_map.get(record.id, {}).get("file_name"),
                 )
                 for record, project_name in rows
             ],
@@ -687,7 +691,7 @@ async def list_generation_record_history_day_items(
     )
 
     rows = result.all()
-    resource_id_map = await batch_get_generated_resource_id_map(
+    resource_info_map = await batch_get_generated_resource_info_map(
         db,
         source_model=SOURCE_MODEL_GENERATION_RECORD,
         source_ids=[record.id for record, _project_name in rows],
@@ -703,7 +707,8 @@ async def list_generation_record_history_day_items(
             generation_record_to_history_out(
                 record,
                 project_name,
-                generated_resource_id=resource_id_map.get(record.id),
+                generated_resource_id=resource_info_map.get(record.id, {}).get("resource_id"),
+                file_name=resource_info_map.get(record.id, {}).get("file_name"),
             )
             for record, project_name in rows
         ],

video-gen-api/app/services/resource_accounting_service.py

@@ -372,6 +372,50 @@ async def batch_get_generated_resource_id_map(
     return resource_id_map
 
 
+async def batch_get_generated_resource_info_map(
+    db: AsyncSession,
+    *,
+    source_model: str,
+    source_ids: Sequence[str] | Iterable[str],
+    resource_type: str | None = None,
+) -> dict[str, dict[str, str | None]]:
+    """批量查询来源记录对应的 GeneratedResource 信息（id 和 file_name）。
+
+    用于历史列表接口批量回填资源账本信息，避免按记录一条条查询。
+    如果历史脏数据存在同一个 source_id 对应多条未软删资源账本，按 created_at 倒序取最新一条。
+
+    返回格式: {source_id: {"resource_id": "...", "file_name": "..."}}
+    """
+    ids = list(dict.fromkeys(str(item) for item in source_ids if item))
+    if not ids:
+        return {}
+
+    normalized_resource_type = (resource_type or "").lower().strip()
+    query = select(GeneratedResource).where(
+        GeneratedResource.source_model == source_model,
+        GeneratedResource.source_id.in_(ids),
+        GeneratedResource.deleted_at.is_(None),
+    )
+    if normalized_resource_type in ("image", "video"):
+        query = query.where(GeneratedResource.resource_type == normalized_resource_type)
+
+    result = await db.execute(
+        query.order_by(
+            GeneratedResource.source_id.asc(),
+            GeneratedResource.created_at.desc(),
+        )
+    )
+
+    resource_info_map: dict[str, dict[str, str | None]] = {}
+    for resource in result.scalars().all():
+        if resource.source_id not in resource_info_map:
+            resource_info_map[resource.source_id] = {
+                "resource_id": resource.id,
+                "file_name": resource.file_name,
+            }
+    return resource_info_map
+
+
 async def soft_delete_resources_by_source(
     db: AsyncSession,
     *,