Просмотр исходного кода

fix:知识库深度问答,显示效果完成,模型管理问题

hanyang 1 год назад
Родитель
Сommit
f4904d9792

+ 1 - 0
public/i18n/lang-en.json

@@ -476,6 +476,7 @@
     "download": "Download",
     "please_input_text": "Please enter text",
     "please_upload_file": "Please upload the file",
+    "back_welcome": "Back to Home",
     "deep_think": "Deep Think",
     "internet_search": "Internet Search",
     "knowledge_base": "Knowledge Base",

+ 1 - 0
public/i18n/lang-zh.json

@@ -476,6 +476,7 @@
     "download": "下载",
     "please_input_text": "请输入文字",
     "please_upload_file": "请上传文件",
+    "back_welcome": "回到首页",
 
     "deep_think": "深度思考",
     "internet_search": "联网搜索",

+ 17 - 1
src/modules/conversation-dialog/format-dialog-answer-from-sse_receive_message.js

@@ -153,7 +153,23 @@ export default function formatDialogAnswerFromSseReceiveMessage(message_obj, pre
   if (resType === 'message') {
     // 消息
     chat_status = 1;
-    currentMsg.answer = resMessage;
+    // currentMsg.answer = resMessage;
+    console.log(resMessage.includes('</think>'));
+    if (message_obj.isDeep) {
+      if (!fountThink) {
+        currentMsg.client_custom_chat_deep_loading = true;
+        currentMsg.deep_answer = currentMsg.deep_answer = res_content.answer;
+        if (resMessage.includes('</think>')) {
+          currentMsg.client_custom_chat_deep_loading = false;
+          fountThink = true;
+        }
+      } else {
+        currentMsg.deep_answer = res_content.answer.split('</think>')[0];
+        currentMsg.answer = res_content.answer.split('</think>')[1];
+      }
+    } else {
+      currentMsg.answer = currentMsg.answer += res_content.answer;
+    }
     // currentMsg.client_custom_running_msg = ''; // 已有正常消息,系统消息置空,不再显示
 
     if (resExcelUrl && resExcelName) {

+ 8 - 1
src/modules/model-manage/ragflow/ModalAdd_1.vue

@@ -106,7 +106,14 @@ const model_types = computed(() => {
 const handleOk = async () => {
   if (form.value.model_type && form.value.llm_name && form.value.api_base && form.value.max_tokens) {
     loading.value = true;
-    const res = await addModelRGFun(form.value);
+    const data = {
+      ...form.value
+    };
+    if (!data.api_key) {
+      delete data.api_key;
+    }
+
+    const res = await addModelRGFun(data);
     if (res.code / 1 === 0) {
       Message.success('添加成功');
       emit('updateModelList');