生成任务失败积分回退

video-gen-api/app/api/v1/generation_ai.py

@@ -26,7 +26,13 @@ from app.services.generation_ai_service import (
     record_to_out,
     soft_delete_chat_generation_task,
 )
+from app.services.generation_billing_service import (
+    OWNER_CHAT_GENERATION_TASK,
+    charge_generation_media_by_params,
+    get_next_credit_attempt_no,
+)
 from app.services.generation_log_service import log_task_event
+from app.services.generation_refund_service import mark_chat_generation_task_failed_and_refund_once
 from app.tasks.celery_app import celery_app
 
 router = APIRouter(
@@ -149,7 +155,18 @@ async def create_task(
 
     from app.tasks.generation_create_tasks import chatapi_create_generation_task
 
-    chatapi_create_generation_task.delay(task.id)
+    try:
+        chatapi_create_generation_task.delay(task.id)
+    except Exception as exc:
+        await mark_chat_generation_task_failed_and_refund_once(
+            db,
+            task_id=task.id,
+            error_message=f"任务队列投递失败: {exc}",
+            pipeline_stage="failed",
+        )
+        await db.commit()
+        raise HTTPException(status_code=503, detail="任务队列投递失败，请稍后重试")
+
     return record_to_out(task)
 
 
@@ -538,6 +555,7 @@ async def retry_task(
             ChatGenerationTask.generation_mode == "chatapi_async",
             ChatGenerationTask.deleted_at.is_(None),
         )
+        .with_for_update()
         .limit(1)
     )
     task = result.scalar_one_or_none()
@@ -546,41 +564,60 @@ async def retry_task(
     if task.status != "failed":
         raise HTTPException(status_code=400, detail="只有失败任务可以重试")
 
+    attempt_no = await get_next_credit_attempt_no(
+        db,
+        owner_type=OWNER_CHAT_GENERATION_TASK,
+        owner_id=task.id,
+    )
+    media_billing = await charge_generation_media_by_params(
+        db,
+        user_id=task.user_id,
+        record_id=task.id,
+        gen_type=task.gen_type,
+        image_size=task.image_size,
+        duration=task.duration,
+        resolution=task.resolution,
+        engine_id=task.engine_id,
+        project_name="AI生成任务",
+        description_prefix="Chat任务重试",
+        owner_type=OWNER_CHAT_GENERATION_TASK,
+        attempt_no=attempt_no,
+    )
+
     task.status = "generating"
+    task.pipeline_stage = "queued"
     task.error_message = None
-    task.retry_count = (task.retry_count or 0) + 1
-    if task.retry_count > 3:
-        raise HTTPException(status_code=400, detail="任务已超过最大重试次数")
-
-    # Resume from the earliest missing stage.
-    if not task.optimized_prompt:
-        task.pipeline_stage = "queued"
-        from app.tasks.generation_create_tasks import chatapi_create_generation_task
-
-        chatapi_create_generation_task.delay(task.id)
-    elif not task.seedance_task_id and not task.remote_result_url:
-        task.pipeline_stage = "creating_provider_task"
-        from app.tasks.generation_create_tasks import chatapi_create_generation_task
-
-        chatapi_create_generation_task.delay(task.id)
-    elif task.seedance_task_id and not task.remote_result_url:
-        task.pipeline_stage = "waiting_remote"
-        from app.tasks.generation_poll_tasks import poll_generation_task
-
-        poll_generation_task.delay(task.id)
-    elif task.remote_result_url and not (task.image_url or task.video_url):
-        task.pipeline_stage = "result_ready"
-        from app.tasks.generation_download_tasks import download_generation_result_task
-
-        download_generation_result_task.delay(task.id)
-    else:
-        task.status = "completed"
-        task.pipeline_stage = "done"
+    task.poll_count = 0
+    task.last_poll_at = None
+    task.provider_task_id = None
+    task.seedance_task_id = None
+    task.remote_result_url = None
+    task.provider_response_json = None
+    task.image_url = None
+    task.video_url = None
+    task.video_cover_url = None
+    task.generated_at = None
+    task.credits_cost = round(float(task.credits_cost or 0) + media_billing.total_charged, 2)
 
     await db.commit()
+
+    from app.tasks.generation_create_tasks import chatapi_create_generation_task
+
+    try:
+        chatapi_create_generation_task.delay(task.id)
+    except Exception as exc:
+        await mark_chat_generation_task_failed_and_refund_once(
+            db,
+            task_id=task.id,
+            error_message=f"任务队列投递失败: {exc}",
+            pipeline_stage="failed",
+        )
+        await db.commit()
+        raise HTTPException(status_code=503, detail="任务队列投递失败，请稍后重试")
+
     return GenerationAIRetryOut(
         id=task.id,
         status=task.status,
         pipeline_stage=task.pipeline_stage,
-        message="任务已重新投递",
-    )
+        message="任务已重新扣费并重新投递",
+    )