修复爆款开头复刻/拆镜复刻软删步骤时未处理生成资源|素材云记录追加资源数据ID

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

@@ -28,7 +28,12 @@ from app.services.generation_billing_service import (
     OWNER_CHAT_GENERATION_TASK,
     charge_generation_media_by_params,
 )
-from app.services.resource_accounting_service import soft_delete_chat_task_resources
+from app.services.resource_accounting_service import (
+    SOURCE_MODEL_CHAT_TASK,
+    SOURCE_MODEL_GENERATION_RECORD,
+    batch_get_generated_resource_id_map,
+    soft_delete_chat_task_resources,
+)
 from app.services.resource_signed_url_service import build_resource_signed_url
 from app.utils.id_gen import generate_id
 
@@ -320,7 +325,11 @@ async def create_async_generation_task(db: AsyncSession, current_user: User, req
     return task
 
 
-def record_to_out(task: ChatGenerationTask, is_admin: bool = False) -> GenerationAITaskOut:
+def record_to_out(
+    task: ChatGenerationTask,
+    is_admin: bool = False,
+    generated_resource_id: str | None = None,
+) -> GenerationAITaskOut:
     refs = _parse_json(task.media_references)
     snapshot = engine_snapshot_out(_parse_json(task.engine_snapshot_json))
     return GenerationAITaskOut(
@@ -328,6 +337,7 @@ def record_to_out(task: ChatGenerationTask, is_admin: bool = False) -> Generatio
         user_id=task.user_id if is_admin else None,
         user_name=getattr(task, "username", None) if is_admin else None,
         project_id=None,
+        generated_resource_id=generated_resource_id,
         gen_type=task.gen_type,
         generation_mode=task.generation_mode,
         pipeline_stage=task.pipeline_stage,
@@ -499,6 +509,7 @@ def _generation_record_history_base_filters(user_id: str, gen_type: str):
 def generation_record_to_history_out(
     record: GenerationRecord,
     project_name: str | None = None,
+    generated_resource_id: str | None = None,
 ) -> GenerationAIRecordHistoryItemOut:
     refs = _parse_json(record.media_references)
     return GenerationAIRecordHistoryItemOut(
@@ -506,6 +517,7 @@ def generation_record_to_history_out(
         source_type="generation_record",
         project_id=record.project_id,
         project_name=project_name,
+        generated_resource_id=generated_resource_id,
         gen_type=record.gen_type,
         generation_mode="generation_record",
         pipeline_stage=None,
@@ -586,7 +598,8 @@ async def list_generation_record_history_grouped_days(
     )
     day_rows = day_rows_result.all()
 
-    groups = []
+    raw_groups = []
+    all_record_ids: list[str] = []
     for generated_day, day_total in day_rows:
         item_result = await db.execute(
             select(GenerationRecord, Project.name.label("project_name"))
@@ -599,17 +612,31 @@ async def list_generation_record_history_grouped_days(
             .limit(HISTORY_GROUP_ITEM_LIMIT)
         )
         rows = item_result.all()
+        raw_groups.append((generated_day, day_total, rows))
+        all_record_ids.extend(record.id for record, _project_name in rows)
 
-        groups.append(
-            {
-                "generated_date": _history_day_to_str(generated_day),
-                "total": int(day_total or 0),
-                "items": [
-                    generation_record_to_history_out(record, project_name)
-                    for record, project_name in rows
-                ],
-            }
-        )
+    resource_id_map = await batch_get_generated_resource_id_map(
+        db,
+        source_model=SOURCE_MODEL_GENERATION_RECORD,
+        source_ids=all_record_ids,
+        resource_type=gen_type,
+    )
+
+    groups = [
+        {
+            "generated_date": _history_day_to_str(generated_day),
+            "total": int(day_total or 0),
+            "items": [
+                generation_record_to_history_out(
+                    record,
+                    project_name,
+                    generated_resource_id=resource_id_map.get(record.id),
+                )
+                for record, project_name in rows
+            ],
+        }
+        for generated_day, day_total, rows in raw_groups
+    ]
 
     return {
         "total_days": int(total_days or 0),
@@ -660,6 +687,12 @@ async def list_generation_record_history_day_items(
     )
 
     rows = result.all()
+    resource_id_map = await batch_get_generated_resource_id_map(
+        db,
+        source_model=SOURCE_MODEL_GENERATION_RECORD,
+        source_ids=[record.id for record, _project_name in rows],
+        resource_type=gen_type,
+    )
 
     return {
         "generated_date": target_day.strftime("%Y-%m-%d"),
@@ -667,7 +700,11 @@ async def list_generation_record_history_day_items(
         "page": page,
         "page_size": page_size,
         "items": [
-            generation_record_to_history_out(record, project_name)
+            generation_record_to_history_out(
+                record,
+                project_name,
+                generated_resource_id=resource_id_map.get(record.id),
+            )
             for record, project_name in rows
         ],
     }
@@ -729,7 +766,8 @@ async def list_generation_history_grouped_days(
     )
     day_rows = day_rows_result.all()
 
-    groups = []
+    raw_groups = []
+    all_task_ids: list[str] = []
     for generated_day, day_total in day_rows:
         item_result = await db.execute(
             select(ChatGenerationTask)
@@ -741,14 +779,30 @@ async def list_generation_history_grouped_days(
             .limit(HISTORY_GROUP_ITEM_LIMIT)
         )
         tasks = list(item_result.scalars().all())
+        raw_groups.append((generated_day, day_total, tasks))
+        all_task_ids.extend(task.id for task in tasks)
 
-        groups.append(
-            {
-                "generated_date": _history_day_to_str(generated_day),
-                "total": int(day_total or 0),
-                "items": [record_to_out(task) for task in tasks],
-            }
-        )
+    resource_id_map = await batch_get_generated_resource_id_map(
+        db,
+        source_model=SOURCE_MODEL_CHAT_TASK,
+        source_ids=all_task_ids,
+        resource_type=gen_type,
+    )
+
+    groups = [
+        {
+            "generated_date": _history_day_to_str(generated_day),
+            "total": int(day_total or 0),
+            "items": [
+                record_to_out(
+                    task,
+                    generated_resource_id=resource_id_map.get(task.id),
+                )
+                for task in tasks
+            ],
+        }
+        for generated_day, day_total, tasks in raw_groups
+    ]
 
     return {
         "total_days": int(total_days or 0),
@@ -812,13 +866,25 @@ async def list_generation_history_day_items(
     )
 
     tasks = list(result.scalars().all())
+    resource_id_map = await batch_get_generated_resource_id_map(
+        db,
+        source_model=SOURCE_MODEL_CHAT_TASK,
+        source_ids=[task.id for task in tasks],
+        resource_type=gen_type,
+    )
 
     return {
         "generated_date": target_day.strftime("%Y-%m-%d"),
         "total": int(total or 0),
         "page": page,
         "page_size": page_size,
-        "items": [record_to_out(task) for task in tasks],
+        "items": [
+            record_to_out(
+                task,
+                generated_resource_id=resource_id_map.get(task.id),
+            )
+            for task in tasks
+        ],
     }
 
 async def soft_delete_chat_generation_task(