fix

controllers/ai/ai_summary.go

@@ -1017,8 +1017,8 @@ func (this *AiController) GenerateAiSummary() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.Ask == "" {
-		br.Msg = "请输入问题"
+	if req.Prompt == "" {
+		br.Msg = "请输入提示词"
 		br.IsSendEmail = false
 		return
 	}
@@ -1059,7 +1059,7 @@ func (this *AiController) GenerateAiSummary() {
 		// 直接提问的方式
 
 		//根据提问，获取信息
-		req.Ask = req.Prompt + req.OriginContent
+		ask := req.Prompt + req.OriginContent
 
 		var answer string
 		//answerArr := []string{
@@ -1082,19 +1082,19 @@ func (this *AiController) GenerateAiSummary() {
 			historyChatList = append(historyChatList, *historyChat)
 		}
 
-		answer, err = aiser.ChatAutoMsg(req.Ask, historyChatList, req.Model)
+		answer, err = aiser.ChatAutoMsg(ask, historyChatList, req.Model)
 		if err != nil {
 			br.Msg = "获取数据失败！"
 			br.ErrMsg = "获取数据失败,ChatAutoMsg，Err:" + err.Error()
 			return
 		}
 
-		resp.Ask = req.Ask
+		resp.Ask = ask
 		resp.Answer = answer
 		resp.Model = req.Model
 
 		topic := new(aimod.AiChatTopic)
-		topic.TopicName = req.Ask
+		topic.TopicName = ask
 		topic.SysUserId = this.SysUser.AdminId
 		topic.SysUserRealName = this.SysUser.RealName
 		topic.CreateTime = time.Now()
@@ -1108,8 +1108,8 @@ func (this *AiController) GenerateAiSummary() {
 		resp.AiChatTopicId = int(topicId)
 		chatItem := new(aimod.AiChat)
 		chatItem.AiChatTopicId = resp.AiChatTopicId
-		chatItem.Ask = req.Ask
-		chatItem.AskUuid = utils.MD5(req.Ask)
+		chatItem.Ask = ask
+		chatItem.AskUuid = utils.MD5(ask)
 		chatItem.Answer = answer
 		chatItem.Model = EnabledModelsForMap[req.Model]
 		chatItem.SysUserId = this.SysUser.AdminId
@@ -1126,7 +1126,9 @@ func (this *AiController) GenerateAiSummary() {
 	} else if len(req.OpenaiFileId) > 0 {
 		// 走文件上传的方式
 		//根据提问，获取信息
-		askUuid := utils.MD5(req.Ask)
+
+		ask := req.Prompt
+		askUuid := utils.MD5(ask)
 
 		var assistantId, threadId string
 		if req.AiChatTopicId > 0 {
@@ -1150,33 +1152,33 @@ func (this *AiController) GenerateAiSummary() {
 		var answer string
 		//获取主题下的所有信息
 		//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)
 		tmpFileIdList := make([]string, 0)
-
-		// 历史消息
-		for _, v := range historyList {
-			if v.OpenaiFileId != "" {
-				tmpFileIdList = append(tmpFileIdList, v.OpenaiFileId)
-			} else {
-				historyFr := new(aimod.HistoryChat)
-				historyFr.Ask = v.Ask
-				historyFr.Answer = v.Answer
-				historyFr.OpenaiFileId = tmpFileIdList
-				frList = append(frList, *historyFr)
-				tmpFileIdList = []string{}
-			}
-		}
+		tmpFileIdList = append(tmpFileIdList, req.OpenaiFileId...)
+		//// 历史消息
+		//for _, v := range historyList {
+		//	if v.OpenaiFileId != "" {
+		//		tmpFileIdList = append(tmpFileIdList, v.OpenaiFileId)
+		//	} else {
+		//		historyFr := new(aimod.HistoryChat)
+		//		historyFr.Ask = v.Ask
+		//		historyFr.Answer = v.Answer
+		//		historyFr.OpenaiFileId = tmpFileIdList
+		//		frList = append(frList, *historyFr)
+		//		tmpFileIdList = []string{}
+		//	}
+		//}
 		// 当前的消息
 		{
 			frItem := new(aimod.HistoryChat)
-			frItem.Ask = req.Ask
+			frItem.Ask = ask
 			frItem.Answer = ""
 			frItem.OpenaiFileId = tmpFileIdList
 			frList = append(frList, *frItem)
@@ -1203,7 +1205,7 @@ func (this *AiController) GenerateAiSummary() {
 
 		if req.AiChatTopicId <= 0 { //新增
 			topic := new(aimod.AiChatTopic)
-			topic.TopicName = req.Ask
+			topic.TopicName = ask
 			topic.SysUserId = this.SysUser.AdminId
 			topic.SysUserRealName = this.SysUser.RealName
 			topic.CreateTime = time.Now()
@@ -1218,8 +1220,8 @@ func (this *AiController) GenerateAiSummary() {
 			}
 			chatItem := new(aimod.AiChat)
 			chatItem.AiChatTopicId = int(topicId)
-			chatItem.Ask = req.Ask
-			chatItem.AskUuid = utils.MD5(req.Ask)
+			chatItem.Ask = ask
+			chatItem.AskUuid = utils.MD5(ask)
 			chatItem.Answer = answer
 			chatItem.Model = EnabledModelsForMap[req.Model]
 			chatItem.SysUserId = this.SysUser.AdminId
@@ -1236,7 +1238,7 @@ func (this *AiController) GenerateAiSummary() {
 		} else {
 			chatItem := new(aimod.AiChat)
 			chatItem.AiChatTopicId = req.AiChatTopicId
-			chatItem.Ask = req.Ask
+			chatItem.Ask = ask
 			chatItem.AskUuid = askUuid
 			chatItem.Answer = answer
 			chatItem.Model = EnabledModelsForMap[req.Model]
@@ -1270,7 +1272,7 @@ func (this *AiController) GenerateAiSummary() {
 		}
 		resp.Model = aimod.ModelViewMap[req.Model]
 		resp.AiChatTopicId = req.AiChatTopicId
-		resp.Ask = req.Ask
+		resp.Ask = ask
 		resp.Answer = answer
 	}
 

models/ai_summary/ai_summary.go

@@ -139,7 +139,6 @@ type GenerateAiSummaryReq struct {
 	AiChatTopicId int      `description:"主题id"`
 	OriginContent string   // 原始内容
 	OpenaiFileId  []string `description:"openai返回的文件id"`
-	Ask           string   `description:"提问问题,如果是上传文件，则填入文件名称"`
 	Model         string   `description:"模型名称"`
 	Prompt        string   `description:"提示词"`
 }