4.6.5- CoreferenceResolution Module (#631)

projects/app/src/web/common/file/utils.ts

@@ -2,6 +2,7 @@ import mammoth from 'mammoth';
 import Papa from 'papaparse';
 import { compressBase64ImgAndUpload } from './controller';
 import { simpleMarkdownText } from '@fastgpt/global/common/string/markdown';
+import { htmlStr2Md } from '@fastgpt/web/common/string/markdown';
 
 /**
  * 读取 txt 文件内容
@@ -115,12 +116,13 @@ export const readDocContent = (file: File, metadata: Record<string, any>) =>
       reader.onload = async ({ target }) => {
         if (!target?.result) return reject('读取 doc 文件失败');
         try {
-          // @ts-ignore
-          const res = await mammoth.convertToMarkdown({
-            arrayBuffer: target.result as ArrayBuffer
+          const buffer = target.result as ArrayBuffer;
+          const { value: html } = await mammoth.convertToHtml({
+            arrayBuffer: buffer
           });
+          const md = htmlStr2Md(html);
 
-          const rawText = await formatMarkdown(res?.value, metadata);
+          const rawText = await formatMarkdown(md, metadata);
 
           resolve(rawText);
         } catch (error) {
@@ -198,9 +200,9 @@ export const formatMarkdown = async (rawText: string = '', metadata: Record<stri
   );
 
   // Remove white space on both sides of the picture
-  const trimReg = /\s*(!\[.*\]\(.*\))\s*/g;
+  const trimReg = /(!\[.*\]\(.*\))\s*/g;
   if (trimReg.test(rawText)) {
-    rawText = rawText.replace(/\s*(!\[.*\]\(.*\))\s*/g, '$1');
+    rawText = rawText.replace(trimReg, '$1');
   }
 
   return simpleMarkdownText(rawText);

projects/app/src/web/common/system/staticData.ts

@@ -2,53 +2,49 @@ import type { InitDateResponse } from '@/global/common/api/systemRes';
 import { getSystemInitData } from '@/web/common/system/api';
 import { delay } from '@fastgpt/global/common/system/utils';
 import type { FeConfigsType } from '@fastgpt/global/common/system/types/index.d';
-import {
-  defaultChatModels,
-  defaultQAModels,
-  defaultCQModels,
-  defaultExtractModels,
-  defaultQGModels,
-  defaultVectorModels,
-  defaultAudioSpeechModels,
-  defaultReRankModels
-} from '@fastgpt/global/core/ai/model';
 import { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/type';
+import type {
+  ChatModelItemType,
+  FunctionModelItemType,
+  LLMModelItemType,
+  ReRankModelItemType,
+  VectorModelItemType,
+  AudioSpeechModelType
+} from '@fastgpt/global/core/ai/model.d';
 
 export let feConfigs: FeConfigsType = {};
 export let priceMd = '';
 export let systemVersion = '0.0.0';
 
-export let vectorModelList = defaultVectorModels;
-export let chatModelList = defaultChatModels;
-export let qaModelList = defaultQAModels;
-export let cqModelList = defaultCQModels;
-export let extractModelList = defaultExtractModels;
-export let qgModelList = defaultQGModels;
-export let audioSpeechModels = defaultAudioSpeechModels;
+export let chatModelList: ChatModelItemType[] = [];
+export let vectorModelList: VectorModelItemType[] = [];
+export let qaModelList: LLMModelItemType[] = [];
+export let cqModelList: FunctionModelItemType[] = [];
+export let extractModelList: FunctionModelItemType[] = [];
+export let audioSpeechModels: AudioSpeechModelType[] = [];
+export let reRankModelList: ReRankModelItemType[] = [];
+
 export let simpleModeTemplates: AppSimpleEditConfigTemplateType[] = [];
-export let reRankModelList = defaultReRankModels;
 
 let retryTimes = 3;
 
 export const clientInitData = async (): Promise<InitDateResponse> => {
   try {
     const res = await getSystemInitData();
+    feConfigs = res.feConfigs;
 
     chatModelList = res.chatModels ?? chatModelList;
+    vectorModelList = res.vectorModels ?? vectorModelList;
+
     qaModelList = res.qaModels ?? qaModelList;
     cqModelList = res.cqModels ?? cqModelList;
     extractModelList = res.extractModels ?? extractModelList;
 
-    vectorModelList = res.vectorModels ?? vectorModelList;
-
+    audioSpeechModels = res.audioSpeechModels ?? audioSpeechModels;
     reRankModelList = res.reRankModels ?? reRankModelList;
 
-    audioSpeechModels = res.audioSpeechModels ?? audioSpeechModels;
-
-    feConfigs = res.feConfigs;
     priceMd = res.priceMd;
     systemVersion = res.systemVersion;
-
     simpleModeTemplates = res.simpleModeTemplates;
 
     return res;