diff --git a/internal/application/service/chat_pipeline/query_understand.go b/internal/application/service/chat_pipeline/query_understand.go index 04766faa..795b379c 100644 --- a/internal/application/service/chat_pipeline/query_understand.go +++ b/internal/application/service/chat_pipeline/query_understand.go @@ -3,6 +3,7 @@ package chatpipeline import ( "context" "encoding/json" + "fmt" "regexp" "strings" "time" @@ -317,9 +318,17 @@ func (p *PluginQueryUnderstand) buildPrompts(chatManage *types.ChatManage, histo conversationText := formatConversationHistory(historyList) + queryContent := chatManage.Query + if len(chatManage.Images) > 0 { + queryContent += fmt.Sprintf("\n\n", len(chatManage.Images)) + } + if len(chatManage.Attachments) > 0 { + queryContent += chatManage.Attachments.BuildPrompt() + } + vals := types.PlaceholderValues{ "conversation": conversationText, - "query": chatManage.Query, + "query": queryContent, "language": chatManage.Language, } diff --git a/internal/types/message.go b/internal/types/message.go index 62184431..8d69fb05 100644 --- a/internal/types/message.go +++ b/internal/types/message.go @@ -88,26 +88,30 @@ func (attachments MessageAttachments) BuildPrompt() string { } var sb strings.Builder - sb.WriteString("\n\n## 用户上传的附件\n\n") + sb.WriteString("\n\n\n") for i, att := range attachments { - sb.WriteString(fmt.Sprintf("### 附件 %d: %s\n\n", i+1, att.FileName)) - sb.WriteString(fmt.Sprintf("- **文件类型**: %s\n", att.FileType)) - sb.WriteString(fmt.Sprintf("- **文件大小**: %.2f KB\n\n", float64(att.FileSize)/1024)) + sb.WriteString(fmt.Sprintf("\n", i+1, att.FileName)) + sb.WriteString("\n") + sb.WriteString(fmt.Sprintf("%s\n", att.FileType)) + sb.WriteString(fmt.Sprintf("%.2f\n", float64(att.FileSize)/1024)) + sb.WriteString("\n") if att.Content != "" { - sb.WriteString("**文件内容**:\n\n") + sb.WriteString("\n") sb.WriteString(att.Content) - sb.WriteString("\n\n") + sb.WriteString("\n\n") if att.IsTruncated { - sb.WriteString(fmt.Sprintf("*注意: 此文件共有 %d 行,已截取前 500 行显示。*\n\n", + sb.WriteString(fmt.Sprintf("This file has a total of %d lines, truncated to show only the first 500 lines.\n", att.LineCount)) } } else { - sb.WriteString("*此文件内容提取失败或不支持。*\n\n") + sb.WriteString("File content extraction failed or is unsupported.\n") } + sb.WriteString("\n") } + sb.WriteString("\n\n") return sb.String() }