v4.6.9-alpha (#918)

Co-authored-by: Mufei <327958099@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

packages/service/common/mongo/init.ts

@@ -34,6 +34,12 @@ export async function connectMongo({
       retryReads: true
     });
 
+    mongoose.connection.on('error', (error) => {
+      console.log('mongo error', error);
+      global.mongodb?.disconnect();
+      global.mongodb = undefined;
+    });
+
     console.log('mongo connected');
 
     afterHook && (await afterHook());

packages/service/common/system/log.ts

@@ -3,9 +3,12 @@ import dayjs from 'dayjs';
 /* add logger */
 export const addLog = {
   log(level: 'info' | 'warn' | 'error', msg: string, obj: Record<string, any> = {}) {
+    const stringifyObj = JSON.stringify(obj);
+    const isEmpty = Object.keys(obj).length === 0;
+
     console.log(
       `[${level.toLocaleUpperCase()}] ${dayjs().format('YYYY-MM-DD HH:mm:ss')} ${msg} ${
-        level !== 'error' ? JSON.stringify(obj) : ''
+        level !== 'error' && !isEmpty ? stringifyObj : ''
       }`
     );
 

packages/service/common/system/tools.ts

@@ -11,6 +11,7 @@ export const initFastGPTConfig = (config?: FastGPTConfigFileType) => {
   if (!config) return;
 
   global.feConfigs = config.feConfigs;
+  global.systemEnv = config.systemEnv;
   global.subPlans = config.subPlans;
 
   global.llmModels = config.llmModels;

packages/service/common/vectorStore/controller.ts

@@ -22,7 +22,7 @@ export const insertDatasetDataVector = async ({
   query: string;
   model: VectorModelItemType;
 }) => {
-  const { vectors, charsLength } = await getVectorsByText({
+  const { vectors, tokens } = await getVectorsByText({
     model,
     input: query
   });
@@ -32,27 +32,7 @@ export const insertDatasetDataVector = async ({
   });
 
   return {
-    charsLength,
+    tokens,
     insertId
   };
 };
-
-// export const updateDatasetDataVector = async ({
-//   id,
-//   ...props
-// }: InsertVectorProps & {
-//   id: string;
-//   query: string;
-//   model: VectorModelItemType;
-// }) => {
-//   // insert new vector
-//   const { charsLength, insertId } = await insertDatasetDataVector(props);
-
-//   // delete old vector
-//   await deleteDatasetDataVector({
-//     teamId: props.teamId,
-//     id
-//   });
-
-//   return { charsLength, insertId };
-// };