生成项目任务/chat任务软删|生成资源管控回收|生成资源token验签API预处理

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

@@ -9,7 +9,11 @@ from sqlalchemy import select
 from app.models.base import async_session
 from app.models.generation_record import GenerationRecord
 from app.services.video_gen import get_active_engine, poll_task_status, download_video, _log_video_response
-from app.services.image_gen import get_active_image_engine, poll_image_task_status, download_image
+from app.services.image_gen import get_active_image_engine, download_image
+from app.services.resource_accounting_service import (
+    record_generation_record_generated_resource,
+    safe_file_size,
+)
 from app.config import settings
 
 logger = logging.getLogger("videogen")
@@ -35,6 +39,7 @@ class TaskQueue:
                 select(GenerationRecord).where(
                     GenerationRecord.status == "generating",
                     GenerationRecord.seedance_task_id.isnot(None),
+                    GenerationRecord.deleted_at.is_(None),
                 )
             )
             records = result.scalars().all()
@@ -66,7 +71,10 @@ class TaskQueue:
         """Process a single record: poll status and update DB."""
         async with async_session() as db:
             result = await db.execute(
-                select(GenerationRecord).where(GenerationRecord.id == record_id)
+                select(GenerationRecord).where(
+                    GenerationRecord.id == record_id,
+                    GenerationRecord.deleted_at.is_(None),
+                )
             )
             record = result.scalar_one_or_none()
             if not record or record.status != "generating":
@@ -114,6 +122,8 @@ class TaskQueue:
 
         if status == "succeeded":
             file_url = poll_result.get("video_url", "")
+            storage_path = None
+            file_size_bytes = 0
             if settings.STORAGE_TYPE == "local" and file_url:
                 try:
                     date_dir = datetime.now().strftime("%Y/%m/%d")
@@ -121,7 +131,9 @@ class TaskQueue:
                     os.makedirs(dest_dir, exist_ok=True)
                     dest = os.path.join(dest_dir, f"{record_id}.mp4")
                     await download_video(file_url, dest)
-                    record.video_url = f"/videos/{date_dir}/{record_id}.mp4"
+                    record.video_url = f"/generate/videos/{date_dir}/{record_id}.mp4"
+                    storage_path = dest
+                    file_size_bytes = safe_file_size(dest)
                 except Exception as e:
                     logger.warning(f"Download failed, using remote URL: {e}")
                     record.video_url = file_url
@@ -130,6 +142,16 @@ class TaskQueue:
             record.video_tokens_used = poll_result.get("video_tokens", 0)
             record.status = "completed"
             record.generated_at = datetime.now()
+            if record.video_url:
+                await record_generation_record_generated_resource(
+                    db,
+                    record,
+                    resource_url=record.video_url,
+                    storage_path=storage_path,
+                    file_size_bytes=file_size_bytes,
+                    remote_url=file_url,
+                    generated_at=record.generated_at,
+                )
             self._active.pop(record_id, None)
             await db.commit()
             logger.info(f"Video task completed: {record_id}")
@@ -158,29 +180,44 @@ class TaskQueue:
     async def _process_image(self, db, record):
         """Process image generation task - calls API directly."""
         record_id = record.id
-        from app.services.image_gen import submit_image_task, download_image, _log_image_response
+        from app.services.image_gen import submit_image_task, _log_image_response
 
         try:
             engine = await get_active_image_engine(db)
             poll_result = await asyncio.to_thread(submit_image_task, db, engine, record)
 
             if poll_result["error"] == "":
-                if settings.STORAGE_TYPE == "local" and poll_result.get("image_url"):
+                remote_url = poll_result.get("image_url")
+                storage_path = None
+                file_size_bytes = 0
+                if settings.STORAGE_TYPE == "local" and remote_url:
                     try:
                         date_dir = datetime.now().strftime("%Y/%m/%d")
                         dest_dir = os.path.join(settings.STORAGE_IMAGE_LOCAL_PATH, date_dir)
                         os.makedirs(dest_dir, exist_ok=True)
                         dest = os.path.join(dest_dir, f"{record_id}.png")
-                        await download_image(poll_result.get("image_url"), dest)
-                        record.image_url = f"/images/{date_dir}/{record_id}.png"
+                        await download_image(remote_url, dest)
+                        record.image_url = f"/generate/images/{date_dir}/{record_id}.png"
+                        storage_path = dest
+                        file_size_bytes = safe_file_size(dest)
                     except Exception as e:
                         logger.warning(f"Download failed, using remote URL: {e}")
-                        record.image_url = poll_result.get("image_url")
+                        record.image_url = remote_url
                 else:
-                    record.image_url = poll_result.get("image_url")
+                    record.image_url = remote_url
                 record.image_tokens_used = poll_result.get("image_tokens", 0)
                 record.status = "completed"
                 record.generated_at = datetime.now()
+                if record.image_url:
+                    await record_generation_record_generated_resource(
+                        db,
+                        record,
+                        resource_url=record.image_url,
+                        storage_path=storage_path,
+                        file_size_bytes=file_size_bytes,
+                        remote_url=remote_url,
+                        generated_at=record.generated_at,
+                    )
                 await db.commit()
                 logger.info(f"Image task completed: {record_id}")
             else: