refactor(prompt): 重构异步模型字段和提示词构建服务

service/prompt/prompt_build_service.go

@@ -26,16 +26,16 @@ func buildInferenceRequest(ctx context.Context, req *dto.ComposeMessagesReq, cha
 
 	switch req.BuildType {
 	case public.BuildTypePrompt:
-		return buildPromptTypeRequest(ctx, processedReq, targetModel, history, ir, totalBatches)
+		return buildPromptTypeRequest(ctx, processedReq, targetModel, chatModel, history, ir, totalBatches)
 	case public.BuildTypeNode:
-		return buildNodeTypeRequest(ctx, req, ir)
+		return buildNodeTypeRequest(ctx, req, chatModel, ir)
 	default:
 		return nil, errors.New("不支持的构建类型")
 	}
 }
 
 // buildPromptTypeRequest 构建提示词类型请求（BuildType=1）
-func buildPromptTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, targetModel *entity.AsynchModel, history []map[string]any, ir *PromptIR, totalBatches int) (map[string]any, error) {
+func buildPromptTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, targetModel *entity.AsynchModel, chatModel *entity.AsynchModel, history []map[string]any, ir *PromptIR, totalBatches int) (map[string]any, error) {
 	systemPrompt := promptBuildWithRounds(ctx, req, targetModel, totalBatches)
 	ir.AddSystem(systemPrompt)
 
@@ -49,42 +49,23 @@ func buildPromptTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, ta
 
 	userPrompt := buildUserPrompt(ctx, req, util.GetModelPrompt(ctx, targetModel.ModelType))
 	ir.AddUser(userPrompt)
-
 	if !checkOverallContent(ir, targetModel) {
 		availableWindow := util.GetAvailableWindow(targetModel.TokenConfig)
 		return nil, fmt.Errorf("整体内容超出模型窗口大小限制(可用窗口=%d tokens)，请精简后重试", availableWindow)
 	}
 
-	return compileToProviderRequest(ctx, ir, targetModel.OperatorName, targetModel)
+	return compileToProviderRequest(ctx, ir, targetModel.OperatorName, targetModel.ModelName, chatModel)
 }
 
 // buildNodeTypeRequest 构建节点类型请求（BuildType=2）
-func buildNodeTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, ir *PromptIR) (map[string]any, error) {
+func buildNodeTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *entity.AsynchModel, ir *PromptIR) (map[string]any, error) {
 	ir.AddUser(NodeBuild(ctx, req))
 
-	protocol, err := GetProtocolByProvider(ctx, req.ModelName)
-	if err != nil {
-		return nil, fmt.Errorf("获取协议配置失败: %w", err)
-	}
-	if protocol == nil {
-		return nil, errors.New("协议配置不存在")
-	}
-
-	providerReq, err := Compile(ir, protocol, nil)
-	if err != nil {
-		return nil, fmt.Errorf("编译请求失败: %w", err)
-	}
-
-	return map[string]any{
-		"modelName":      req.ModelName,
-		"bizName":        "prompts-core",
-		"callbackUrl":    "/prompt/callback",
-		"requestPayload": providerReq,
-	}, nil
+	return compileToProviderRequest(ctx, ir, req.ModelName, req.ModelName, chatModel)
 }
 
 // compileToProviderRequest 编译为 Provider 请求
-func compileToProviderRequest(ctx context.Context, ir *PromptIR, providerName string, model *entity.AsynchModel) (map[string]any, error) {
+func compileToProviderRequest(ctx context.Context, ir *PromptIR, providerName string, modelName string, chatModel *entity.AsynchModel) (map[string]any, error) {
 	protocol, err := GetProtocolByProvider(ctx, providerName)
 	if err != nil {
 		return nil, fmt.Errorf("获取协议配置失败: %w", err)
@@ -92,17 +73,15 @@ func compileToProviderRequest(ctx context.Context, ir *PromptIR, providerName st
 	if protocol == nil {
 		return nil, errors.New("协议配置不存在")
 	}
-
-	providerReq, err := Compile(ir, protocol, model)
+	providerReq, err := Compile(ir, protocol, chatModel)
 	if err != nil {
 		return nil, fmt.Errorf("编译请求失败: %w", err)
 	}
 
-	fmt.Println("providerReq打印:", util.MustMarshal(providerReq))
 	return map[string]any{
-		"modelName":      model.ModelName,
+		"modelName":      modelName,
 		"bizName":        "prompts-core",
-		"callbackUrl":    "/prompt/callback",
+		"callbackUrl":    util.GetCallbackURL(ctx, "/prompt/callback"),
 		"requestPayload": providerReq,
 	}, nil
 }

service/prompt/prompt_compose_service.go

@@ -30,6 +30,7 @@ func ComposeMessages(ctx context.Context, req *dto.ComposeMessagesReq) (*dto.Com
 	if err = validateUserForm(ctx, req, aiModel); err != nil {
 		return nil, err
 	}
+	fmt.Printf("req打印%+v", req)
 	switch req.BuildType {
 	case public.BuildTypePrompt:
 		return handlePromptBuild(ctx, req, chatModel, aiModel) // 提示词构建
@@ -85,13 +86,13 @@ func handlePromptBuild(ctx context.Context, req *dto.ComposeMessagesReq, chatMod
 			g.Log().Errorf(ctx, "保存任务记录失败(第%d次): %v", attempt+1, err)
 			continue
 		}
-
+		//等待结果
 		taskRecord, err = waitForResult(ctx, taskID)
 		if err != nil {
 			g.Log().Errorf(ctx, "等待结果失败(第%d次): %v", attempt+1, err)
 			continue
 		}
-
+		//处理结果
 		message = parsePromptBuild(taskRecord, chatModel)
 		if message != nil {
 			break
@@ -244,93 +245,87 @@ func callInferenceModel(ctx context.Context, req *dto.ComposeMessagesReq, chatMo
 func waitForResult(ctx context.Context, taskID string) (*entity.ComposeTask, error) {
 	timeout := time.Duration(g.Cfg().MustGet(ctx, "task.waitTimeoutSeconds", 300).Int()) * time.Second
 	pollInterval := time.Duration(g.Cfg().MustGet(ctx, "task.pollIntervalMillis", 500).Int()) * time.Millisecond
-
 	deadline := time.Now().Add(timeout)
-	ticker := time.NewTicker(pollInterval)
-	defer ticker.Stop()
 
 	for {
+		// ===================== 修复点 1：检查上下文是否取消 =====================
+		select {
+		case <-ctx.Done():
+			// 请求已被取消，直接返回，不继续查库
+			return nil, ctx.Err()
+		default:
+		}
+
+		// 1. 查数据库
 		record, err := dao.ComposeTask.Get(ctx, &entity.ComposeTask{
 			TaskId: taskID,
 		})
 		if err != nil {
+			// ===================== 修复点 2：如果是上下文取消，直接返回 =====================
 			if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
 				return nil, err
 			}
-			return nil, fmt.Errorf("查询任务失败: %w", err)
+			return nil, err
 		}
-
 		if record != nil {
-			if completed, result := checkTaskCompletion(record); completed {
-				return result, nil
+			switch record.Status {
+			case public.ComposeStatusSuccess:
+				return record, nil
+			case public.ComposeStatusFailed:
+				if strings.TrimSpace(record.ErrorMessage) == "" {
+					return nil, fmt.Errorf("任务失败(taskId=%s)", taskID)
+				}
+				return nil, fmt.Errorf("任务失败(taskId=%s): %s", taskID, record.ErrorMessage)
 			}
 		}
 
-		if err = syncGatewayTaskState(ctx, taskID, record); err != nil {
-			g.Log().Warningf(ctx, "[waitForResult] 同步网关状态失败 taskId=%s err=%v", taskID, err)
+		// 2. 查网关状态
+		state, err := gateway.QueryGatewayTaskState(ctx, taskID)
+		if err != nil {
+			// 网关不可达不终止，继续轮询
+			g.Log().Warningf(ctx, "[waitForResult] 查询网关失败 taskId=%s err=%v", taskID, err)
+		} else {
+			switch state {
+			case 2: // 网关成功
+				// 网关已成功，主动更新数据库
+				if record != nil {
+					_, err = dao.ComposeTask.Update(ctx, &entity.ComposeTask{
+						TaskId: taskID,
+						Status: public.ComposeStatusSuccess,
+					})
+					if err != nil {
+						g.Log().Warningf(ctx, "[waitForResult] 更新任务状态失败 taskId=%s err=%v", taskID, err)
+					}
+				}
+			case 3: // 网关失败
+				if record != nil {
+					_, err = dao.ComposeTask.Update(ctx, &entity.ComposeTask{
+						TaskId:       taskID,
+						Status:       public.ComposeStatusFailed,
+						ErrorMessage: "model-gateway 任务执行失败",
+					})
+					if err != nil {
+						g.Log().Warningf(ctx, "[waitForResult] 更新任务状态失败 taskId=%s err=%v", taskID, err)
+					}
+				}
+				return nil, fmt.Errorf("model-gateway 任务执行失败(taskId=%s)", taskID)
+			}
 		}
 
+		// 3. 超时检查
 		if time.Now().After(deadline) {
 			return nil, fmt.Errorf("等待任务回调超时(taskId=%s)", taskID)
 		}
 
+		// ===================== 修复点3：sleep 也要监听 ctx 取消 =====================
 		select {
 		case <-ctx.Done():
 			return nil, ctx.Err()
-		case <-ticker.C:
+		case <-time.After(pollInterval):
 		}
 	}
 }
 
-// checkTaskCompletion 检查任务是否完成
-func checkTaskCompletion(record *entity.ComposeTask) (bool, *entity.ComposeTask) {
-	if record == nil {
-		return false, nil
-	}
-	switch record.Status {
-	case public.ComposeStatusSuccess:
-		return true, record
-	case public.ComposeStatusFailed:
-		errMsg := strings.TrimSpace(record.ErrorMessage)
-		if errMsg == "" {
-			return true, nil
-		}
-		return true, nil
-	default:
-		return false, nil
-	}
-}
-
-// syncGatewayTaskState 同步网关任务状态
-func syncGatewayTaskState(ctx context.Context, taskID string, record *entity.ComposeTask) error {
-	state, err := gateway.QueryGatewayTaskState(ctx, taskID)
-	if err != nil {
-		return fmt.Errorf("查询网关状态失败: %w", err)
-	}
-	switch state {
-	case 2:
-		return updateTaskStatus(ctx, taskID, public.ComposeStatusSuccess, "")
-	case 3:
-		updateTaskStatus(ctx, taskID, public.ComposeStatusFailed, "model-gateway 任务执行失败")
-		return fmt.Errorf("model-gateway 任务执行失败(taskId=%s)", taskID)
-	}
-	return nil
-}
-
-// updateTaskStatus 更新任务状态
-func updateTaskStatus(ctx context.Context, taskID string, status string, errorMsg string) error {
-	task := &entity.ComposeTask{
-		TaskId: taskID,
-		Status: status,
-	}
-	if errorMsg != "" {
-		task.ErrorMessage = errorMsg
-	}
-
-	_, err := dao.ComposeTask.Update(ctx, task)
-	return err
-}
-
 // parsePromptBuild 解析提示词构建结果（BuildType == 1）
 func parsePromptBuild(taskRecord *entity.ComposeTask, model *entity.AsynchModel) *dto.MultiRoundResult {
 	if taskRecord == nil {

service/prompt/prompt_ir_service.go

@@ -159,7 +159,6 @@ func GetProtocolByProvider(ctx context.Context, providerName string) (*ProviderP
 	if err != nil || entity == nil {
 		return nil, err
 	}
-	fmt.Println("entity打印", entity)
 	return parseProtocol(entity), nil
 }
 
@@ -183,7 +182,6 @@ func Compile(ir *PromptIR, p *ProviderProtocol, chatModel *entity.AsynchModel) (
 	if ir == nil || p == nil {
 		return nil, fmt.Errorf("ir and protocol are required")
 	}
-
 	messages := mergeByOrder(ir, p.MergeOrder)
 	messages = mapRoles(messages, p.RoleMapping)
 	messages = mapContent(messages, p.ContentMapping)
@@ -279,7 +277,9 @@ func renderTemplate(tmpl map[string]any, messages []map[string]any, chatModel *e
 	b, _ := json.Marshal(tmpl)
 	str := string(b)
 
-	str = strings.ReplaceAll(str, `"{{model}}"`, `"`+chatModel.ModelName+`"`)
+	if chatModel != nil {
+		str = strings.ReplaceAll(str, `"{{model}}"`, `"`+chatModel.ModelName+`"`)
+	}
 
 	msgBytes, _ := json.Marshal(messages)
 	str = strings.ReplaceAll(str, `"{{messages}}"`, string(msgBytes))