Browse Source

fix:文件与内容做汇总处理

Roc 1 year ago
parent
commit
ecafdea9e3
2 changed files with 16 additions and 8 deletions
  1. 13 6
      controllers/ai/ai_file.go
  2. 3 2
      models/aimod/ai.go

+ 13 - 6
controllers/ai/ai_file.go

@@ -310,22 +310,29 @@ func (this *AiFileController) FileRetrieve() {
 		}
 
 		frList := make([]aimod.HistoryChat, 0)
-		frItem := new(aimod.HistoryChat)
-		frItem.Ask = req.Ask
-		frItem.Answer = ""
-		frList = append(frList, *frItem)
-		req.OpenaiFileId = []string{}
+		tmpFileIdList := make([]string, 0)
 
+		// 历史消息
 		for _, v := range historyList {
 			if v.OpenaiFileId != "" {
-				req.OpenaiFileId = append(req.OpenaiFileId, v.OpenaiFileId)
+				tmpFileIdList = append(tmpFileIdList, v.OpenaiFileId)
 			} else {
+				tmpFileIdList = []string{}
 				historyFr := new(aimod.HistoryChat)
 				historyFr.Ask = v.Ask
 				historyFr.Answer = v.Answer
+				historyFr.OpenaiFileId = tmpFileIdList
 				frList = append(frList, *historyFr)
 			}
 		}
+		// 当前的消息
+		{
+			frItem := new(aimod.HistoryChat)
+			frItem.Ask = req.Ask
+			frItem.Answer = ""
+			frItem.OpenaiFileId = tmpFileIdList
+			frList = append(frList, *frItem)
+		}
 
 		//var assistantId,threadId string
 		fileRetrieveResp, err := aiser.FileRetrieve(assistantId, threadId, frList, req.OpenaiFileId)

+ 3 - 2
models/aimod/ai.go

@@ -163,8 +163,9 @@ func (obj *AiChatTopic) GetAiChatTopicById() (item *AiChatTopicView, err error)
 }
 
 type HistoryChat struct {
-	Ask    string
-	Answer string
+	Ask          string
+	Answer       string
+	OpenaiFileId []string `description:"文件ID"`
 }
 
 // 修改