|
@@ -302,12 +302,12 @@ func (this *AiFileController) FileRetrieve() {
|
|
|
} else {
|
|
|
//获取主题下的所有信息
|
|
|
//AiChatTopicId
|
|
|
- //historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
|
|
|
- //if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
- // br.Msg = "获取主题历史数据失败!"
|
|
|
- // br.ErrMsg = "获取主题历史数据失败,Err:" + err.Error()
|
|
|
- // return
|
|
|
- //}
|
|
|
+ historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取主题历史数据失败!"
|
|
|
+ br.ErrMsg = "获取主题历史数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
frList := make([]aimod.HistoryChat, 0)
|
|
|
frItem := new(aimod.HistoryChat)
|
|
@@ -315,20 +315,20 @@ func (this *AiFileController) FileRetrieve() {
|
|
|
frItem.Answer = ""
|
|
|
frList = append(frList, *frItem)
|
|
|
|
|
|
- //for _, v := range historyList {
|
|
|
- // if v.OpenaiFileId != "" {
|
|
|
- // req.OpenaiFileId = append(req.OpenaiFileId, v.OpenaiFileId)
|
|
|
- // } else {
|
|
|
- // historyFr := new(aimod.HistoryChat)
|
|
|
- // historyFr.Ask = v.Ask
|
|
|
- // historyFr.Answer = v.Answer
|
|
|
- // frList = append(frList, *historyFr)
|
|
|
- // }
|
|
|
- //}
|
|
|
+ for _, v := range historyList {
|
|
|
+ if v.OpenaiFileId != "" {
|
|
|
+ //req.OpenaiFileId = append(req.OpenaiFileId, v.OpenaiFileId)
|
|
|
+ } else {
|
|
|
+ historyFr := new(aimod.HistoryChat)
|
|
|
+ historyFr.Ask = v.Ask
|
|
|
+ historyFr.Answer = v.Answer
|
|
|
+ frList = append(frList, *historyFr)
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//var assistantId,threadId string
|
|
|
- //fileRetrieveResp, err := aiser.FileRetrieve(assistantId, threadId, frList, req.OpenaiFileId)
|
|
|
- fileRetrieveResp, err := aiser.FileRetrieve(assistantId, threadId, frList, []string{})
|
|
|
+ fileRetrieveResp, err := aiser.FileRetrieve(assistantId, threadId, frList, req.OpenaiFileId)
|
|
|
+ //fileRetrieveResp, err := aiser.FileRetrieve(assistantId, threadId, frList, []string{})
|
|
|
if err != nil {
|
|
|
br.Msg = "获取数据失败!"
|
|
|
br.ErrMsg = "获取数据失败,FileRetrieve,Err:" + err.Error()
|