!67 fix: 修复管线context取消、添加FIFO任务队列、移除重复提示词优化

Merge pull request !67 from 郭永昊/fix/pipeline-queue-context-dedup
This commit is contained in:
2026-05-25 11:13:02 +00:00
committed by Gitee
12 changed files with 935 additions and 86 deletions
+29 -9
View File
@@ -16,6 +16,14 @@ import (
"github.com/gin-gonic/gin"
)
// generateQueue 全局生成任务队列,由 main 通过 SetGenerateQueue 注入。
var generateQueue *service.TaskQueue
// SetGenerateQueue 设置生成任务队列。
func SetGenerateQueue(q *service.TaskQueue) {
generateQueue = q
}
// GenerateRequest 素材生成请求。
type GenerateRequest struct {
ProjectID string `json:"projectId"`
@@ -43,7 +51,7 @@ type AssetsResponse struct {
}
// Generate 素材生成接口(异步)。
// 立即返回 taskId,后台执行管线,前端通过 GET /tasks/:taskId 轮询进度。
// 立即返回 taskId,任务进入 FIFO 队列串行执行,前端通过 GET /tasks/:taskId 轮询进度。
func Generate(c *gin.Context) {
var req GenerateRequest
if err := c.ShouldBindJSON(&req); err != nil {
@@ -57,18 +65,29 @@ func Generate(c *gin.Context) {
}
taskID := fmt.Sprintf("task-%d", time.Now().UnixMilli())
// 保存任务到数据库
// 保存任务到数据库,初始状态为 pending
if err := saveTaskToDB(c.Request.Context(), projectID, taskID, req); err != nil {
logger.FromCtx(c.Request.Context()).Error("failed to save task", "error", err)
c.JSON(http.StatusInternalServerError, model.Fail(http.StatusInternalServerError, "创建任务失败"))
return
}
// 返回 taskId
c.JSON(http.StatusOK, model.OK(GenerateResponse{TaskID: taskID}))
// 加入 FIFO 队列
queuePos := 1
if generateQueue != nil {
queuePos = generateQueue.Enqueue(&service.TaskJob{
Ctx: context.Background(),
ProjectID: projectID,
TaskID: taskID,
Execute: func(ctx context.Context) error {
runPipelineBg(ctx, projectID, taskID, req)
return nil
},
})
}
// 后台执行管线
go runPipelineBg(c.Request.Context(), projectID, taskID, req)
c.JSON(http.StatusOK, model.OK(GenerateResponse{TaskID: taskID}))
_ = queuePos
}
// runPipelineBg 后台执行生成管线,更新任务状态。
@@ -82,6 +101,7 @@ func runPipelineBg(ctx context.Context, projectID, taskID string, req GenerateRe
updateTaskInDB(ctx, taskID, "running", stage, "", progress)
})
// 队列调度后才标记为 running,初始写入时是 pending
updateTaskInDB(ctx, taskID, "running", "prompt_builder", "", 5)
in := service.PipelineInput{
@@ -240,9 +260,9 @@ func saveTaskToDB(ctx context.Context, projectID, taskID string, req GenerateReq
ProjectID: uint(projectIDUint),
Prompt: req.Prompt,
AssetType: req.AssetType,
Status: "running",
Progress: 5,
Stage: "prompt_builder",
Status: "pending",
Progress: 0,
Stage: "",
RetryCount: 0,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),