From b8788d7b74cb3692f82eaa8666e6acc05e8d30c2 Mon Sep 17 00:00:00 2001 From: chenzh Date: Wed, 18 Oct 2023 17:06:59 +0800 Subject: [PATCH 1/2] fix upload docs --- modules/llm_chat/resty.go | 60 ++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/modules/llm_chat/resty.go b/modules/llm_chat/resty.go index e1b50f799e..013f7babe6 100644 --- a/modules/llm_chat/resty.go +++ b/modules/llm_chat/resty.go @@ -483,30 +483,50 @@ func GetUploadDocUrl() (string, error) { return endpoint, nil } -func UploadDocs(modelName string, form api.LLMChatUploadForm) (*map[string]interface{}, error) { - log.Info("######### received by resty\n") +func writeDocs(fileHeader *multipart.FileHeader, writer *multipart.Writer) error { + filename := fileHeader.Filename + file, err := fileHeader.Open() + if err != nil { + log.Error(err.Error()) + return err + } + defer file.Close() + part, err := writer.CreateFormFile("files", filename) + if err != nil { + log.Error("Error creating form file:", err) + return err + } + _, err = io.Copy(part, file) + return nil +} - var requestBody bytes.Buffer - writer := multipart.NewWriter(&requestBody) - writer.WriteField("knowledge_base_name", form.KnowledgeBaseName) +func writeBody(requestBody *bytes.Buffer, form api.LLMChatUploadForm) (string, error) { + writer := multipart.NewWriter(requestBody) + defer writer.Close() + err := writer.WriteField("knowledge_base_name", form.KnowledgeBaseName) + if err != nil { + log.Error("failed to create upload_doc() writer") + return "", err + } for _, fileHeader := range form.Files { - filename := fileHeader.Filename - file, err := fileHeader.Open() + err = writeDocs(fileHeader, writer) if err != nil { - log.Info(err.Error()) - return nil, err + log.Error("Error getting doc content: %s", err) + return "", err } - defer file.Close() - part, err := writer.CreateFormFile("files", filename) - if err != nil { - log.Info("Error creating form file:", err) - return nil, err - } - _, err = io.Copy(part, file) - log.Info("########## Added to writer: %s\n", filename) } - writer.Close() - //fmt.Printf("################ whole request body: %s\n", requestBody.String()) + return writer.FormDataContentType(), nil +} + +func UploadDocs(modelName string, form api.LLMChatUploadForm) (*map[string]interface{}, error) { + log.Info("######### received by resty\n") + + var requestBody bytes.Buffer + headerValue, err := writeBody(&requestBody, form) + if err != nil { + log.Error("upload docs write body failed.") + return nil, err + } endpoint := GetEndpoint(modelName) req, err := http.NewRequest("POST", endpoint+urlKnowledgeBaseUploadDoc, &requestBody) @@ -515,7 +535,7 @@ func UploadDocs(modelName string, form api.LLMChatUploadForm) (*map[string]inter return nil, err } - req.Header.Set("Content-Type", writer.FormDataContentType()) + req.Header.Set("Content-Type", headerValue) client := &http.Client{} resp, err := client.Do(req) -- 2.34.1 From caca6581297349ea1f978995daf558bc70f16d6e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 18 Oct 2023 17:13:04 +0800 Subject: [PATCH 2/2] fix issue --- web_src/vuepages/pages/model/llms/App.vue | 1 - web_src/vuepages/pages/model/llms/componenes/headerModel.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/vuepages/pages/model/llms/App.vue b/web_src/vuepages/pages/model/llms/App.vue index fca5819502..6731ca4e5d 100644 --- a/web_src/vuepages/pages/model/llms/App.vue +++ b/web_src/vuepages/pages/model/llms/App.vue @@ -194,7 +194,6 @@ export default { }, }, async mounted() { - const urlParams = new URLSearchParams(location.search) if(urlParams.has('model_name')){ this.modelName = urlParams.get('model_name') diff --git a/web_src/vuepages/pages/model/llms/componenes/headerModel.vue b/web_src/vuepages/pages/model/llms/componenes/headerModel.vue index 61b60bf55a..389d8a7631 100644 --- a/web_src/vuepages/pages/model/llms/componenes/headerModel.vue +++ b/web_src/vuepages/pages/model/llms/componenes/headerModel.vue @@ -44,7 +44,7 @@ export default { 'llama2-7b-chat-hf':this.$t('modelSquare.llama2') }, modelUrl:{ - 'chatglm2-6b':'FoundationModel/ChatGLM2-6B/modelmanage/model_readme_tmpl?name=ChatGLM2-6B', + 'chatglm2-6b':'/FoundationModel/ChatGLM2-6B/modelmanage/model_readme_tmpl?name=ChatGLM2-6B', 'llama2-7b-chat-hf': '/FoundationModel/llama2/modelmanage/model_readme_tmpl?name=llama2-7b-chat-hf' } -- 2.34.1