Merge branch 'feature/deepseek_rag_2.0' into debug

controllers/llm/promote_controller.go

@@ -51,6 +51,11 @@ func (pCtrl *PromoteController) GenerateContent() {
 		br.ErrMsg = "公众号文章编号非法"
 		return
 	}
+	if gcReq.LLMModel == "" {
+		br.Msg = "LLM模型不能为空"
+		br.ErrMsg = "LLM模型不能为空"
+		return
+	}
 	userSendTime := time.Now()
 	userContent := llm_http.Content{
 		Content:  gcReq.Promote,

services/llm/facade/llm_service.go

@@ -161,20 +161,13 @@ func AIGCBaseOnPromote(aigc AIGC) (resp bus_response.AIGCEtaResponse, err error)
 				utils.FileLog.Error("打开文件失败,err:", err)
 				return
 			}
-			uploadResp, httpErr := llmService.UploadFileToTemplate([]*os.File{file}, param)
+			_, httpErr = llmService.UploadFileToTemplate([]*os.File{file}, param)
 			if httpErr != nil {
 				utils.FileLog.Error("上传文件失败,err:", err.Error())
 				err = fmt.Errorf("上传文件失败,err:%v", httpErr)
 				return
 			}
-			data := uploadResp.(eta_llm_http.UploadDocsResponse)
-			//保存映射关系到数据库
-			if data.Id == "" {
-				utils.FileLog.Error("上传文件失败,向量库Id获取失败")
-				err = fmt.Errorf("上传文件失败,向量库Id获取失败")
-				return
-			}
-			fmt.Println(data.Id)
+
 			response, httpErr = llmService.FileChat(aigc.Promote, kbId, aigc.LLMModel, nil)
 			if httpErr != nil {
 				utils.FileLog.Error("内容生成失败,err:%v", httpErr.Error())