refactor(task): 重构任务处理逻辑并移除文件类型检测功能

service/task/task_service.go

@@ -6,6 +6,9 @@ import (
 	"fmt"
 	"model-gateway/common/util"
 	"model-gateway/consts/public"
+	"model-gateway/service/gateway"
+	"model-gateway/service/prompt"
+	"sync"
 	"time"
 
 	"model-gateway/dao"
@@ -15,7 +18,9 @@ import (
 	"gitea.redpowerfuture.com/red-future/common/beans"
 	"gitea.redpowerfuture.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/grpool"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
 )
@@ -142,7 +147,6 @@ func (s *taskService) buildResult(ctx context.Context, req *dto.BuildMessagesReq
 			State:          public.TaskStatusRunning,
 			BizName:        "model-gateway",
 			RequestPayload: reqBody,
-			BuildType:      req.BuildType,
 		}
 		id, err := dao.ModelGatewayTask.Insert(ctx, task)
 		if err != nil {
@@ -150,7 +154,7 @@ func (s *taskService) buildResult(ctx context.Context, req *dto.BuildMessagesReq
 		}
 		task.Id = id
 
-		rawData, err := AsyncWorker.callModel(chatModel, reqBody)
+		rawData, err := InvokeModel(ctx, chatModel, reqBody)
 		if err != nil {
 			task.State = public.TaskStatusFailed
 			task.ErrorMsg = err.Error()
@@ -158,13 +162,10 @@ func (s *taskService) buildResult(ctx context.Context, req *dto.BuildMessagesReq
 			return nil, err
 		}
 
-		mapped, err := util.MapResponsePayload(chatModel.ResponseMapping, rawData)
+		mapped, err := util.MapResponsePayload(chatModel.ResponseMapping, gjson.New(string(rawData)).Map())
 		if err != nil {
 			return nil, err
 		}
-		if _, ok := mapped[entity.TotalTokens]; ok {
-			task.ExpendTokens = gconv.Int64(mapped[entity.TotalTokens])
-		}
 
 		var rounds []map[string]any
 		contentStr := gjson.New(mapped).Get(entity.ResponseBody).String()
@@ -240,15 +241,12 @@ func (s *taskService) Create(ctx context.Context, req *dto.CreateTaskReq) (res *
 
 	// 3) 构建任务实体
 	task := &entity.ModelGatewayTask{
-		ModelName:   model.ModelName,
-		TaskID:      taskID,
-		State:       public.TaskStatusRunning,
-		BizName:     req.BizName,
-		CallbackURL: req.CallbackUrl,
-		RequestPayload: &entity.RequestPayload{
-			Body:    req.RequestPayload,
-			Headers: util.ParseHeadMsgHeaders(model.HeadMsg),
-		},
+		ModelName:      model.ModelName,
+		TaskID:         taskID,
+		State:          public.TaskStatusRunning,
+		BizName:        req.BizName,
+		CallbackURL:    req.CallbackUrl,
+		RequestPayload: req.RequestPayload,
 		EpicycleId:     req.EpicycleId,
 		BuildModelName: req.BuildModelName,
 	}
@@ -295,7 +293,7 @@ func (s *taskService) Create(ctx context.Context, req *dto.CreateTaskReq) (res *
 	}
 
 	// 7) 异步执行任务
-	go AsyncWorker.handleOne(util.AsyncCtx(ctx), task, model, req)
+	go AsyncWorker.handleOne(util.AsyncCtx(ctx), task, model)
 
 	return &dto.CreateTaskRes{TaskID: taskID}, nil
 }
@@ -430,7 +428,7 @@ func (s *taskService) GetBatch(ctx context.Context, req *dto.GetTaskBatchReq) (r
 		if t == nil {
 			continue
 		}
-		if t.State != public.BuildTypeNode {
+		if t.State != 2 {
 			continue
 		}
 		_ = dao.ModelGatewayTask.MarkDownloadedByID(ctx, t.Id)
@@ -446,10 +444,9 @@ func (s *taskService) GetBatch(ctx context.Context, req *dto.GetTaskBatchReq) (r
 			continue
 		}
 		items = append(items, dto.GetTaskBatchItem{
-			TaskID:     t.TaskID,
-			State:      t.State,
-			OssFile:    t.ResultFile.OssFile,
-			TextResult: t.TextResult,
+			TaskID:  t.TaskID,
+			State:   t.State,
+			OssFile: t.ResultFile.OssFile,
 		})
 	}
 	return &dto.GetTaskBatchRes{List: items}, nil

service/task/worker.go

@@ -6,18 +6,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"model-gateway/common/util"
+	"model-gateway/consts/public"
+	"model-gateway/dao"
+	"model-gateway/model/entity"
+	"model-gateway/service/gateway"
 	"net/http"
 	"strings"
 	"sync"
 	"time"
-	"unicode/utf8"
-
-	"model-gateway/common/util"
-	"model-gateway/consts/public"
-	"model-gateway/dao"
-	"model-gateway/model/dto"
-	"model-gateway/model/entity"
-	"model-gateway/service/gateway"
 
 	"gitea.redpowerfuture.com/red-future/common/beans"
 	"github.com/gogf/gf/v2/encoding/gjson"
@@ -31,9 +28,9 @@ type asyncWorker struct {
 }
 
 // handleOne 执行一次完整的任务
-func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTask, model *entity.ModelGatewayModel, req *dto.CreateTaskReq) {
+func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTask, model *entity.ModelGatewayModel) {
 	var (
-		body      = task.RequestPayload.Body
+		body      = task.RequestPayload
 		maxRetry  = model.RetryTimes
 		startTime = time.Now()
 		rawData   []byte
@@ -46,7 +43,7 @@ func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTa
 	// ============================================
 	// 1) 查询余额
 	// ============================================
-	surplus, _ = gateway.GetTenantSurplus(ctx, model.TenantId)
+	surplus, _ := gateway.GetTenantSurplus(ctx, model.TenantId)
 	if surplus <= 0 {
 		w.failTask(ctx, task, startTime, "租户余额不足")
 		return
@@ -64,11 +61,11 @@ func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTa
 
 		rawData, err = InvokeModel(ctx, model, body)
 		switch {
-		case model.CallMode != nil && *model.CallMode == public.CallModeStream:
+		case model.CallMode != nil && *model.CallMode == public.CallModeStream: // 流式
 			if err == nil {
 				result, err = util.ParseStreamResponse(rawData, model.StreamConfig)
 			}
-		case model.CallMode != nil && *model.CallMode == public.CallModeAsync:
+		case model.CallMode != nil && *model.CallMode == public.CallModeAsync: // 异步
 			if err == nil {
 				result = gjson.New(string(rawData)).Map()
 				result, err = util.PullTaskResult(ctx, result, model.QueryConfig, model.HeadMsg)
@@ -133,7 +130,6 @@ func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTa
 		}
 	}
 
-	task.ExpendTokens = gconv.Int64(mapped[entity.TotalTokens])
 	if _, err = dao.ModelGatewayTask.Update(ctx, task); err != nil {
 		g.Log().Errorf(ctx, "[handleOne] 更新DB失败 taskId=%s err=%v", task.TaskID, err)
 		return
@@ -142,10 +138,9 @@ func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTa
 	// ============================================
 	// 4) 处理提示词相关数据解析涵盖重试
 	// ============================================
-	if req.BuildType == public.BuildTypePrompt {
+	if task.BizName == "prompts-core" {
 		mapped, err = w.parseAndRetry(ctx, mapped, model, task, maxRetry)
 		if err != nil {
-			task.TextResult = mapped
 			w.failTask(ctx, task, startTime, err.Error())
 			return
 		}
@@ -180,15 +175,14 @@ func (w *asyncWorker) handleOne(ctx context.Context, task *entity.ModelGatewayTa
 		FileType: oss.FileFormat,
 		FileSize: int64(oss.FileSize),
 	}
-	task.TextResult = mapped
 	if _, err = dao.ModelGatewayTask.Update(ctx, task); err != nil {
 		g.Log().Errorf(ctx, "[handleOne] 更新DB失败 taskId=%s err=%v", task.TaskID, err)
 		return
 	}
 
 	go gateway.TriggerCallback(util.AsyncCtx(ctx), task)
-	if req.EpicycleId != 0 {
-		go gateway.TriggerPromptsCallback(util.AsyncCtx(ctx), task, req.EpicycleId)
+	if task.EpicycleId != 0 {
+		go gateway.TriggerPromptsCallback(util.AsyncCtx(ctx), task)
 	}
 
 	g.Log().Infof(ctx, "[handleOne] 成功 taskId=%s duration=%ds fileType=%s",
@@ -269,13 +263,8 @@ func NotifyAsyncResult(taskID string, result map[string]any, err error) {
 
 // parseAndRetry 解析模型返回结果，并重试
 func (w *asyncWorker) parseAndRetry(ctx context.Context, body map[string]any, model *entity.ModelGatewayModel, task *entity.ModelGatewayTask, maxRetry int) (map[string]any, error) {
-	// 获取构建模型的必填字段
-	user, err := utils.GetUserInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
 	buildModel, err := dao.ModelGatewayModels.Get(ctx, &entity.ModelGatewayModel{
-		SQLBaseDO: beans.SQLBaseDO{TenantId: user.TenantId, Creator: user.UserName},
+		SQLBaseDO: beans.SQLBaseDO{TenantId: model.TenantId, Creator: model.Creator},
 		ModelName: task.BuildModelName,
 	})
 	if err != nil {
@@ -305,7 +294,7 @@ func (w *asyncWorker) parseAndRetry(ctx context.Context, body map[string]any, mo
 		task.RetryCount++
 		_, _ = dao.ModelGatewayTask.Update(ctx, task)
 
-		reqBody := injectErrorMessage(task.RequestPayload.Body, lastErr)
+		reqBody := injectErrorMessage(task.RequestPayload, lastErr)
 		rawData, callErr := InvokeModel(ctx, model, reqBody)
 		if callErr != nil {
 			g.Log().Warningf(ctx, "[执行任务][重调模型失败] taskId=%s attempt=%d/%d err=%v", task.TaskID, attempt, maxRetry, callErr)
@@ -343,11 +332,9 @@ func (w *asyncWorker) parseAndRetry(ctx context.Context, body map[string]any, mo
 				}
 			}
 
-			task.ExpendTokens += gconv.Int64(mapped[entity.TotalTokens])
 			_, _ = dao.ModelGatewayTask.Update(ctx, &entity.ModelGatewayTask{
-				SQLBaseDO:    beans.SQLBaseDO{Id: task.Id},
-				BillingData:  task.BillingData,
-				ExpendTokens: task.ExpendTokens,
+				SQLBaseDO:   beans.SQLBaseDO{Id: task.Id},
+				BillingData: task.BillingData,
 			})
 		}