，6、列表使用
需要配图：N 张
N 是这条文案需要的图片数量，只能是数字，不能是其他文字，11、只输出 HTML 结构，不输出任何额外文字" - resultUserFrom["prompt"] = contentStr - - req := flowDto.ComposeMessagesReq{ - BuildType: 1, - ModelName: nodeInput.Config.ModelConfig.ModelName, - SkillName: skillName, - Cause: "文案节点", - Form: resultFrom, - UserForm: resultUserFrom, - UserFiles: nodeInput.Global.FileUrl, - SessionId: nodeInput.Global.SessionId, - } - - msg, err := ComposeMessages(ctx, &req) + skillName, from, userFrom := BuildParam(nodeInput) + outputRes, err := TextNode(ctx, nodeInput.Global.SessionId, nodeInput.Config.ModelConfig.ModelName, skillName, from, userFrom, nodeInput.Config.ModelConfig.ModelResponse, nodeInput.Global.FileUrl) if err != nil { return nil, err } - if g.IsEmpty(msg.Messages) { - return nil, fmt.Errorf("msg is empty") - } - taskResult, err := GatewayTask(ctx, msg.EpicycleId, nodeInput.Config.ModelConfig.ModelName, msg.Messages) - if err != nil { - return nil, err - } - - result, err := GetTaskResult(ctx, taskResult) - if err != nil { - return "", err - } - mapTaskResult := gconv.Map(result.Text) - - resultContent := "" - for key, _ := range nodeInput.Config.ModelConfig.ModelResponse { - resultContent = gconv.String(mapTaskResult[key]) - } - - // 拆分多条文案 - contentList := SplitMultiContents(resultContent) - - outputRes := make([]node.NodeFormField, 0) - for i, content := range contentList { - // 文案内容：content_0, content_1, content_2... - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("text_content_%d", i), - Value: content, - Label: fmt.Sprintf("文案内容_%d", i), - Type: "string", - Expand: ExtractImageCount(content), - }) - - // 1. 去掉 HTML 标签，生成纯文本 - //plainText := StripHtmlTags(content, true) - plainText := BuildText(content) - // 2. 上传纯文本到 OSS - textFileName := fmt.Sprintf("ai_text_%d_%d.inc", time.Now().UnixMilli(), i) - textUrl, err := Upload(ctx, &dto.UploadFileBytesReq{ - FileBytes: []byte(plainText), - FileName: textFileName, - }) - if err != nil { - return nil, err - } - // 3. 把纯文本地址存入输出 - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("text_url_%d", i), - Value: textUrl.FileURL, - Label: fmt.Sprintf("文案纯文本_txt_%d", i), - Type: "string", - Expand: ExtractImageCount(content), - }) - } nodeInput.Config.OutputResult = outputRes - return nodeInput, nil } @@ -359,145 +136,13 @@ func ImageModelLambda(ctx context.Context, input any) (any, error) { if !ok { return nil, fmt.Errorf("入参类型错误") } - // 1. 直接用你原来的方法（返回两个 map） - inputMap, outputMap, modelMap := GetNodeContextContent(nodeInput.Global, nodeInput.Config) - var outputResult []node.NodeFormField - for _, valueAny := range inputMap { - if field, ok := valueAny.(node.NodeFormField); ok { - outputResult = append(outputResult, field) - } - } - - resultUserFrom := make(map[string]any) - - for _, valueAny := range outputMap { - if field, ok := valueAny.(node.NodeFormField); ok { - if !strings.Contains(field.Field, "text_url") && !strings.Contains(field.Field, "img_url") { - if strings.Contains(field.Field, "text_content") { - field.Value = StripHtmlTags(field.Value, false) - } - resultUserFrom[field.Label] = field - } - } - } - for _, valueAny := range modelMap { - if field, ok := valueAny.(node.NodeFormField); ok { - outputResult = append(outputResult, field) - } - } - - if !nodeInput.Global.IsDialogue { - for _, item := range outputResult { - resultUserFrom[item.Label] = item - } - for _, item := range nodeInput.Config.FormConfig { - resultUserFrom[item.Label] = item - } - } - if !g.IsEmpty(nodeInput.Global.Desc) { - resultUserFrom["desc"] = node.NodeFormField{ - Value: nodeInput.Global.Desc, - Field: "desc", - Label: "描述", - Type: "text", - } - } - resultFrom := make(map[string]any) - for key, item := range nodeInput.Config.ModelConfig.ModelForm { - resultFrom[key] = map[string]any{ - "value": item, - } - } - var skillName = nodeInput.Config.SkillName - if g.IsEmpty(nodeInput.Config.SkillName) { - skillName = nodeInput.Global.SkillName - } - - req := flowDto.ComposeMessagesReq{ - BuildType: 1, - ModelName: nodeInput.Config.ModelConfig.ModelName, - SkillName: skillName, - Cause: "图片节点", - Form: resultFrom, - UserForm: resultUserFrom, - UserFiles: nodeInput.Global.FileUrl, - SessionId: nodeInput.Global.SessionId, - } - msg, err := ComposeMessages(ctx, &req) + skillName, from, userFrom := BuildParam(nodeInput) + outputRes, err := ImgNode(ctx, nodeInput.Global.SessionId, nodeInput.Config.ModelConfig.ModelName, skillName, from, userFrom, nodeInput.Config.ModelConfig.ModelResponse, nodeInput.Global.FileUrl) if err != nil { return nil, err } - if g.IsEmpty(msg.Messages) { - return nil, fmt.Errorf("msg is empty") - } - taskResult, err := GatewayTask(ctx, msg.EpicycleId, nodeInput.Config.ModelConfig.ModelName, msg.Messages) - if err != nil { - return "", err - } - - result, err := GetTaskResult(ctx, taskResult) - if err != nil { - return "", err - } - - mapTaskResult := gconv.Map(result.Text) - - imgs := []string{} - for key, _ := range nodeInput.Config.ModelConfig.ModelResponse { - imgs = gconv.Strings(mapTaskResult[key]) - } - - var images []string - for _, item := range imgs { - mapItem := gconv.Map(item) - for _, value := range mapItem { - values, imgOk := value.(string) - if !imgOk { - return nil, fmt.Errorf("图片地址类型错误") - } - // 下载官方临时图片 - imgBytes, _, err := GetImageBytesFromURL(values) - if err != nil { - return nil, fmt.Errorf("下载图片失败: %w", err) - } - // 构造文件名 - fileName := fmt.Sprintf("ai_image_%d.png", time.Now().UnixMilli()) - // 上传到你的OSS（你项目已有的Upload方法） - upResp, err := Upload(ctx, &dto.UploadFileBytesReq{ - FileName: fileName, - FileBytes: imgBytes, - }) - if err != nil { - return nil, fmt.Errorf("上传OSS失败: %w", err) - } - images = append(images, upResp.FileURL) - } - } - - url, err := utils.GetFileAddressPrefix(ctx) - if err != nil { - return nil, err - } - outputRes := make([]node.NodeFormField, 0) - - for i, item := range images { - // 图片：image_0, image_1, image_2... - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("image_%d", i), - Value: fmt.Sprintf("%s%s", url, item), - Label: fmt.Sprintf("图片_%d", i), - Type: "string", - }) - // 额外存储关联关系 - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("%v:img_url:%d", nodeInput.Config.Id, i), - Value: fmt.Sprintf("%s%s", url, item), - Label: fmt.Sprintf("图片_img_%d关联文案ID", i), - Type: "string", - }) - } nodeInput.Config.OutputResult = outputRes - return input, nil + return nodeInput, nil } func MergeLambda(ctx context.Context, input any) (any, error) { @@ -529,7 +174,7 @@ func MergeLambda(ctx context.Context, input any) (any, error) { // 3. 提取所有图片：image_0,1,2... var images []string for i := 0; ; i++ { - key := fmt.Sprintf("image_%d", i) + key := fmt.Sprintf("img_url%d", i) val, has := dataMap[key] if !has || val.Value == "" { break @@ -579,12 +224,16 @@ func MergeLambda(ctx context.Context, input any) (any, error) { // 🔥 把现有数据转换成通用 Item 列表（支持：纯文案、纯图片、图文任意组合） var allItems []Item + url, err := utils.GetFileAddressPrefix(ctx) + if err != nil { + return nil, err + } // 情况1：有文案 → 按文案条目生成 Item（每条文案+对应图片） if len(contents) > 0 { for i, val := range contents { item := Item{ - Content: val.Value, // 文案 - Images: textImgMap[i], // 自动绑定该条目的图片（没有则为空切片） + Content: url + val.Value, // 文案 + Images: textImgMap[i], // 自动绑定该条目的图片（没有则为空切片） } allItems = append(allItems, item) } @@ -637,13 +286,13 @@ func MergeLambda(ctx context.Context, input any) (any, error) { Type: "text", }, node.NodeFormField{ - Field: fmt.Sprintf("item_text_%d", idx), + Field: fmt.Sprintf("item_txt_url_%d", idx), Value: item.Content, Label: fmt.Sprintf("条目%d 文案", idx+1), Type: "text", }, node.NodeFormField{ - Field: fmt.Sprintf("item_images_%d", idx), + Field: fmt.Sprintf("item_image_url_%d", idx), Value: strings.Join(item.Images, ","), Label: fmt.Sprintf("条目%d 图片", idx+1), Type: "text", @@ -744,171 +393,3 @@ func CustomLambda(ctx context.Context, input any) (any, error) { fmt.Println("CustomLambda:", input) return input, nil } - -func TextNode(ctx context.Context, nodeId, sessionId, modelName, skillName string, from, userFrom, modelResponse map[string]any, fileUrl []string) ([]node.NodeFormField, error) { - contentStr := "你是专业内容生成助手，请严格按以下规则输出内容：1、输出标准 HTML 片段，不要 Markdown，不要 ``` 符号，不要多余解释，2、整体用，6、列表使用
需要配图：N 张
N 是这条文案需要的图片数量，只能是数字，不能是其他文字，11、只输出 HTML 结构，不输出任何额外文字" - userFrom["prompt"] = contentStr - - textMsgReq := flowDto.ComposeMessagesReq{ - BuildType: 1, - ModelName: modelName, - SkillName: skillName, - Cause: "文案节点", - Form: from, - UserForm: userFrom, - UserFiles: fileUrl, - SessionId: sessionId, - } - msg, err := ComposeMessages(ctx, &textMsgReq) - if err != nil { - return nil, err - } - if g.IsEmpty(msg.Messages) { - return nil, fmt.Errorf("msg is empty") - } - - var taskResult any - taskResult, err = GatewayTask(ctx, msg.EpicycleId, modelName, msg.Messages) - if err != nil { - return nil, err - } - var getTaskResult *flowDto.TaskCallback - getTaskResult, err = GetTaskResult(ctx, taskResult) - if err != nil { - return nil, err - } - mapTaskResult := gconv.Map(getTaskResult.Text) - - resultContent := "" - for key, _ := range modelResponse { - resultContent = gconv.String(mapTaskResult[key]) - } - - // 拆分多条文案 - contentList := SplitMultiContents(resultContent) - - outputRes := make([]node.NodeFormField, 0) - for i, contentItem := range contentList { - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("text_content_%d", i), - Value: contentItem, - Label: fmt.Sprintf("文案内容_%d", i), - Type: "string", - Expand: ExtractImageCount(contentItem), - }) - - // 1. 去掉 HTML 标签，生成纯文本 - //plainText := StripHtmlTags(contentItem, true) - plainText := BuildHtml(contentItem, nil) - // 2. 上传纯文本到 OSS - textFileName := fmt.Sprintf("ai_text_%d_%d.md", time.Now().UnixMilli(), i) - var textUrl *dto.UploadFileBytesRes - textUrl, err = Upload(ctx, &dto.UploadFileBytesReq{ - FileBytes: []byte(plainText), - FileName: textFileName, - }) - if err != nil { - return nil, err - } - // 3. 把纯文本地址存入输出 - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("%v:text_url:%d", nodeId, i), - Value: textUrl.FileURL, - Label: fmt.Sprintf("文案纯文本_txt_%d", i), - Type: "string", - Expand: ExtractImageCount(contentItem), - }) - } - return outputRes, nil -} - -func ImgNode(ctx context.Context, nodeId, sessionId, modelName, skillName string, form, userForm, modelResponse map[string]any, fileUrl []string) ([]node.NodeFormField, error) { - imgMsgReq := flowDto.ComposeMessagesReq{ - BuildType: 1, - ModelName: modelName, - SkillName: skillName, - Cause: "图片节点", - Form: form, - UserForm: userForm, - UserFiles: fileUrl, - SessionId: sessionId, - } - msg, err := ComposeMessages(ctx, &imgMsgReq) - if err != nil { - return nil, err - } - if g.IsEmpty(msg.Messages) { - return nil, fmt.Errorf("msg is empty") - } - var taskResult any - taskResult, err = GatewayTask(ctx, msg.EpicycleId, modelName, msg.Messages) - if err != nil { - return nil, err - } - var getTaskResult *flowDto.TaskCallback - getTaskResult, err = GetTaskResult(ctx, taskResult) - if err != nil { - return nil, err - } - mapTaskResult := gconv.Map(getTaskResult.Text) - - var resultContent []string - for key, _ := range modelResponse { - resultContent = gconv.Strings(mapTaskResult[key]) - } - - var images []string - for _, item := range resultContent { - mapItem := gconv.Map(item) - for _, value := range mapItem { - values, ok := value.(string) - if !ok { - return nil, fmt.Errorf("图片地址类型错误") - } - // 下载官方临时图片 - var imgBytes []byte - imgBytes, _, err = GetImageBytesFromURL(values) - if err != nil { - return nil, fmt.Errorf("下载图片失败: %w", err) - } - // 构造文件名 - fileName := fmt.Sprintf("ai_image_%d.png", time.Now().UnixMilli()) - // 上传到你的OSS（你项目已有的Upload方法） - var upResp *dto.UploadFileBytesRes - upResp, err = Upload(ctx, &dto.UploadFileBytesReq{ - FileName: fileName, - FileBytes: imgBytes, - }) - if err != nil { - return nil, fmt.Errorf("上传OSS失败: %w", err) - } - images = append(images, upResp.FileURL) - } - } - - var url string - url, err = utils.GetFileAddressPrefix(ctx) - if err != nil { - return nil, err - } - outputRes := make([]node.NodeFormField, 0) - - for i, item := range images { - // 图片：image_0, image_1, image_2... - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("image_%d", i), - Value: fmt.Sprintf("%s%s", url, item), - Label: fmt.Sprintf("图片_%d", i), - Type: "string", - }) - // 额外存储关联关系 - outputRes = append(outputRes, node.NodeFormField{ - Field: fmt.Sprintf("%v:img_url:%d", nodeId, i), - Value: fmt.Sprintf("%s%s", url, item), - Label: fmt.Sprintf("图片_img_%d关联文案ID", i), - Type: "string", - }) - } - - return outputRes, nil -} diff --git a/workflow/service/flow/lambda_node_util.go b/workflow/service/flow/lambda_node_util.go index 6cae42a..419615e 100644 --- a/workflow/service/flow/lambda_node_util.go +++ b/workflow/service/flow/lambda_node_util.go @@ -33,6 +33,66 @@ func GetIsChatModel(ctx context.Context) (res *flowDto.GetIsChatModelRes, err er return } +func ComposeMessages(ctx context.Context, req *flowDto.ComposeMessagesReq) (res *flowDto.ComposeMessagesRes, err error) { + headers := make(map[string]string) + if r := g.RequestFromCtx(ctx); r != nil { + for k, v := range r.Request.Header { + if len(v) > 0 { + headers[k] = v[0] + } + } + } + res = new(flowDto.ComposeMessagesRes) + err = commonHttp.Post(ctx, "prompts-core/prompt/composeMessages", headers, res, &req) + return +} + +func GetModelResult(ctx context.Context, modelName, skillName string, form, userFrom map[string]any, fileUrl []string, sessionId string, cause string) (mapTaskResult map[string]any, err error) { + msgReq := flowDto.ComposeMessagesReq{ + BuildType: 1, + ModelName: modelName, + SkillName: skillName, + Cause: cause, + Form: form, + UserForm: userFrom, + UserFiles: fileUrl, + SessionId: sessionId, + } + msg, err := ComposeMessages(ctx, &msgReq) + if err != nil { + return + } + if g.IsEmpty(msg.Messages) { + return nil, fmt.Errorf("msg is empty") + } + var taskResult any + taskResult, err = GatewayTask(ctx, msg.EpicycleId, modelName, msg.Messages) + if err != nil { + return + } + var getTaskResult *flowDto.TaskCallback + getTaskResult, err = GetTaskResult(ctx, taskResult) + if err != nil { + return + } + mapTaskResult = gconv.Map(getTaskResult.Text) + return mapTaskResult, nil +} + +func GatewayTask(ctx context.Context, epicycleId int64, model string, content map[string]any) (any, error) { + modelTaskId, err := CreateGatewayTask(ctx, &flowDto.CreateTaskReq{ + ModelName: model, + BizName: g.Cfg().MustGet(ctx, "server.name").String(), + CallbackUrl: "/flow/execution/modelCallback", + RequestPayload: content, + EpicycleId: epicycleId, + }) + if err != nil { + return nil, err + } + return Wait(ctx, modelTaskId) +} + func CreateGatewayTask(ctx context.Context, req *flowDto.CreateTaskReq) (string, error) { headers := make(map[string]string) if r := g.RequestFromCtx(ctx); r != nil { @@ -51,34 +111,6 @@ func CreateGatewayTask(ctx context.Context, req *flowDto.CreateTaskReq) (string, return res.TaskId, nil } -func ComposeMessages(ctx context.Context, req *flowDto.ComposeMessagesReq) (res *flowDto.ComposeMessagesRes, err error) { - headers := make(map[string]string) - if r := g.RequestFromCtx(ctx); r != nil { - for k, v := range r.Request.Header { - if len(v) > 0 { - headers[k] = v[0] - } - } - } - res = new(flowDto.ComposeMessagesRes) - err = commonHttp.Post(ctx, "prompts-core/prompt/composeMessages", headers, res, &req) - return -} - -func GatewayTask(ctx context.Context, epicycleId int64, model string, content map[string]any) (any, error) { - modelTaskId, err := CreateGatewayTask(ctx, &flowDto.CreateTaskReq{ - ModelName: model, - BizName: g.Cfg().MustGet(ctx, "server.name").String(), - CallbackUrl: "/flow/execution/modelCallback", - RequestPayload: content, - EpicycleId: epicycleId, - }) - if err != nil { - return nil, err - } - return Wait(ctx, modelTaskId) -} - func GetTaskResult(ctx context.Context, result any) (*flowDto.TaskCallback, error) { task := new(flowDto.TaskCallback) if err := gconv.Struct(result, task); err != nil { @@ -116,17 +148,22 @@ func FetchRemoteJsonFile(ctx context.Context, fileUrl string) ([]byte, error) { return io.ReadAll(resp.Body) } -func GetImageBytesFromURL(url string) (all []byte, contentType string, err error) { +func GetFileBytesFromURL(url string) (all []byte, err error) { resp, err := http.Get(url) if err != nil { + fmt.Printf("请求失败 %s: %v", url, err) return } defer resp.Body.Close() - all, err = io.ReadAll(resp.Body) - if err != nil { + if resp.StatusCode != http.StatusOK { + fmt.Printf("请求失败，状态码: %d\n", resp.StatusCode) + return + } + all, err = io.ReadAll(resp.Body) + if err != nil { + fmt.Printf("读取内容失败 %s: %v", url, err) return } - contentType = resp.Header.Get("Content-Type") return } @@ -197,24 +234,24 @@ func BuildText(text string) string { .item { padding: 30px; } - .image-group { - margin-bottom: 25px; - } .image-group img { width: 100%; height: auto; display: block; - margin-bottom: 15px; + margin-bottom: 6px; border-radius: 8px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); } .image-group img:last-child { margin-bottom: 0; } + .image-group { + margin-bottom: 25px; + } .text { padding: 0; font-size: 15px; - line-height: 1.8; + line-height: 1.4; color: #555; } .text h2 { @@ -222,7 +259,7 @@ func BuildText(text string) string { font-weight: bold; color: #1a1a1a; margin-bottom: 15px; - line-height: 1.4; + line-height: 1.2; } .text h3 { font-size: 20px; @@ -233,7 +270,7 @@ func BuildText(text string) string { border-left: 4px solid #409eff; } .text p { - margin-bottom: 15px; + margin-bottom: 12px; text-align: justify; } .text strong { @@ -243,12 +280,12 @@ func BuildText(text string) string { .text ul { list-style: none; padding: 0; - margin: 15px 0; + margin: 8px 0; } .text ul li { padding: 10px 0 10px 30px; position: relative; - line-height: 1.6; + line-height: 1.2; } .text ul li:before { content: "●"; @@ -262,9 +299,6 @@ func BuildText(text string) string { body { padding: 10px; } - .item { - padding: 20px; - } .text h2 { font-size: 24px; } @@ -278,27 +312,11 @@ func BuildText(text string) string {需要配图：X 张
if text != "" { - // 正则删除整行 - imageTagRegex := regexp.MustCompile(`[\s\S]*?
`) - //re := regexp.MustCompile(`需要配图：\d+ 张
`) - cleanContent := imageTagRegex.ReplaceAllString(text, "") - // 写入清理后的文案 - htmlBuilder.WriteString(fmt.Sprintf(`