4.8.6 fix (#1963)

* feat: log store

* fix: full text search match query

* perf: mongo schema import, Avoid duplicate import

.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "inlang.vs-code-extension"
-  ]
-}

.vscode/settings.json

@@ -2,7 +2,7 @@
     "editor.formatOnSave": true,
     "editor.mouseWheelZoom": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "prettier.prettierPath": "../node_modules/prettier",
+    "prettier.prettierPath": "node_modules/prettier",
     "typescript.tsdk": "node_modules/typescript/lib",
     "i18n-ally.localesPaths": [
         "packages/web/i18n",

docSite/content/zh-cn/docs/development/openapi/dataset.md

@@ -13,7 +13,7 @@ weight: 853
 
 
 
-## 创建训练订单(4.6.9地址发生改动)
+## 创建训练订单
 
 {{< tabs tabTotal="2" >}}
 {{< tab tabName="请求示例" >}}
@@ -26,6 +26,7 @@ curl --location --request POST 'https://api.fastgpt.in/api/support/wallet/usage/
 --header 'Authorization: Bearer {{apikey}}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
+    "datasetId": "知识库 ID",
     "name": "可选，自定义订单名称，例如：文档训练-fastgpt.docx"
 }'
 ```

docSite/content/zh-cn/docs/development/upgrading/486.md

@@ -38,5 +38,7 @@ curl --location --request POST 'https://{{host}}/api/admin/initv486' \
 3. 新增 - 网页抓取和数学计算器系统插件
 4. 新增 - 移动文本加工和自定义反馈到基础节点中
 5. 优化 - Read file 默认选中从节点，实现 MongoDB 读写分离，减轻主节点压力
-6. 修复 - 工作流中团队插件加载异常
-7. 修复 - 知识库集合目录导航失效
+6. 优化 - 知识库导入接口，返回值对齐
+7. 修复 - 工作流中团队插件加载异常
+8. 修复 - 知识库集合目录导航失效
+9. 修复 - 通过 API 调用 chat 接口，传递 System 异常

files/docker/docker-compose-milvus.yml

@@ -156,6 +156,7 @@ services:
       - SANDBOX_URL=http://sandbox:3000
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info
+      - STORE_LOG_LEVEL=warn
     volumes:
       - ./config.json:/app/data/config.json
 

files/docker/docker-compose-pgvector.yml

@@ -113,6 +113,7 @@ services:
       - SANDBOX_URL=http://sandbox:3000
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info
+      - STORE_LOG_LEVEL=warn
     volumes:
       - ./config.json:/app/data/config.json
 

files/docker/docker-compose-zilliz.yml

@@ -94,6 +94,7 @@ services:
       - SANDBOX_URL=http://sandbox:3000
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info
+      - STORE_LOG_LEVEL=warn
     volumes:
       - ./config.json:/app/data/config.json
 

packages/global/core/ai/prompt/AIChat.ts

@@ -100,7 +100,7 @@ export const Prompt_QuotePromptList: PromptTemplateItem[] = [
 
 <QA>
 {{quote}}
-</QA>}
+</QA>
 
 思考流程：
 1. 判断问题是否与 <QA></QA> 标记中的内容有关。
@@ -109,7 +109,12 @@ export const Prompt_QuotePromptList: PromptTemplateItem[] = [
 4. 如果有相同的问题，直接输出对应答案。
 5. 如果只有相近的问题，请把相近的问题和答案一起输出。
 
-最后，避免提及你是从 QA 获取的知识，只需要回复答案。
+回答要求：
+- 如果没有相关的问答对，你需要澄清。
+- 回答的内容应尽可能与 <QA></QA> 标记中的内容一致。
+- 避免提及你是从 QA 获取的知识，只需要回复答案。
+- 使用 Markdown 语法优化回答格式。
+- 使用与问题相同的语言回答。
 
 问题:"""{{question}}"""`
   }

packages/global/core/chat/utils.ts

@@ -3,6 +3,17 @@ import { FlowNodeTypeEnum } from '../workflow/node/constant';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from './constants';
 import { ChatHistoryItemResType, ChatItemType, UserChatItemValueItemType } from './type.d';
 
+// Concat 2 -> 1, and sort by role
+export const concatHistories = (histories1: ChatItemType[], histories2: ChatItemType[]) => {
+  const newHistories = [...histories1, ...histories2];
+  return newHistories.sort((a, b) => {
+    if (a.obj === ChatRoleEnum.System) {
+      return -1;
+    }
+    return 1;
+  });
+};
+
 export const getChatTitleFromChatMessage = (message?: ChatItemType, defaultValue = '新对话') => {
   // @ts-ignore
   const textMsg = message?.value.find((item) => item.type === ChatItemValueTypeEnum.text);

packages/global/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends":"../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "baseUrl": "."
   },

packages/plugins/src/fetchUrl/template.json

@@ -88,7 +88,7 @@
           "x": 1050.9890727421412,
           "y": -415.2085119990912
         },
-        "version": "486",
+        "version": "481",
         "inputs": [
           {
             "key": "system_addInputParam",

packages/service/common/buffer/rawText/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../mongo';
 const { Schema, model, models } = connectionMongo;
 import { RawTextBufferSchemaType } from './type';
 
@@ -28,6 +28,7 @@ try {
   console.log(error);
 }
 
-export const MongoRawTextBuffer: Model<RawTextBufferSchemaType> =
-  models[collectionName] || model(collectionName, RawTextBufferSchema);
-MongoRawTextBuffer.syncIndexes();
+export const MongoRawTextBuffer = getMongoModel<RawTextBufferSchemaType>(
+  collectionName,
+  RawTextBufferSchema
+);

packages/service/common/buffer/tts/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TTSBufferSchemaType } from './type.d';
 
@@ -31,6 +31,4 @@ try {
   console.log(error);
 }
 
-export const MongoTTSBuffer: Model<TTSBufferSchemaType> =
-  models[collectionName] || model(collectionName, TTSBufferSchema);
-MongoTTSBuffer.syncIndexes();
+export const MongoTTSBuffer = getMongoModel<TTSBufferSchemaType>(collectionName, TTSBufferSchema);

packages/service/common/file/gridfs/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../mongo';
 const { Schema, model, models } = connectionMongo;
 
 const FileSchema = new Schema({});
@@ -10,6 +10,4 @@ try {
   console.log(error);
 }
 
-export const MongoFileSchema = models['dataset.files'] || model('dataset.files', FileSchema);
-
-MongoFileSchema.syncIndexes();
+export const MongoFileSchema = getMongoModel('dataset.files', FileSchema);

packages/service/common/file/image/schema.ts

@@ -1,5 +1,5 @@
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
-import { connectionMongo, type Model } from '../../mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../mongo';
 import { MongoImageSchemaType } from '@fastgpt/global/common/file/image/type.d';
 import { mongoImageTypeMap } from '@fastgpt/global/common/file/image/constants';
 const { Schema, model, models } = connectionMongo;
@@ -41,7 +41,4 @@ try {
   console.log(error);
 }
 
-export const MongoImage: Model<MongoImageSchemaType> =
-  models['image'] || model('image', ImageSchema);
-
-MongoImage.syncIndexes();
+export const MongoImage = getMongoModel<MongoImageSchemaType>('image', ImageSchema);

packages/service/common/mongo/index.ts

@@ -1,7 +1,5 @@
-import mongoose from 'mongoose';
-
-export default mongoose;
-export * from 'mongoose';
+import { addLog } from '../../common/system/log';
+import mongoose, { Model } from 'mongoose';
 
 export const connectionMongo = (() => {
   if (!global.mongodb) {
@@ -11,4 +9,68 @@ export const connectionMongo = (() => {
   return global.mongodb;
 })();
 
-export const ReadPreference = mongoose.mongo.ReadPreference;
+export default mongoose;
+export * from 'mongoose';
+
+const addCommonMiddleware = (schema: mongoose.Schema) => {
+  const operations = [
+    /^find/,
+    'save',
+    'create',
+    /^update/,
+    /^delete/,
+    'aggregate',
+    'count',
+    'countDocuments',
+    'estimatedDocumentCount',
+    'distinct',
+    'insertMany'
+  ];
+
+  operations.forEach((op: any) => {
+    schema.pre(op, function (this: any, next) {
+      this._startTime = Date.now();
+      this._query = this.getQuery ? this.getQuery() : null;
+
+      next();
+    });
+
+    schema.post(op, function (this: any, result: any, next) {
+      if (this._startTime) {
+        const duration = Date.now() - this._startTime;
+
+        const warnLogData = {
+          query: this._query,
+          op,
+          duration
+        };
+
+        if (duration > 1000) {
+          addLog.warn(`Slow operation ${duration}ms`, warnLogData);
+        } else if (duration > 300) {
+          addLog.error(`Slow operation ${duration}ms`, warnLogData);
+        }
+      }
+      next();
+    });
+  });
+
+  return schema;
+};
+
+export const getMongoModel = <T>(name: string, schema: mongoose.Schema) => {
+  if (connectionMongo.models[name]) return connectionMongo.models[name] as Model<T>;
+  console.log('Load model======', name);
+  addCommonMiddleware(schema);
+
+  const model = connectionMongo.model<T>(name, schema);
+  try {
+    model.syncIndexes();
+  } catch (error) {
+    addLog.error('Create index error', error);
+  }
+
+  return model;
+};
+
+export const ReadPreference = connectionMongo.mongo.ReadPreference;

packages/service/common/system/config/schema.ts

@@ -1,5 +1,5 @@
 import { SystemConfigsType } from '@fastgpt/global/common/system/config/type';
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 import { SystemConfigsTypeMap } from '@fastgpt/global/common/system/config/constants';
 
 const { Schema, model, models } = connectionMongo;
@@ -27,6 +27,7 @@ try {
   console.log(error);
 }
 
-export const MongoSystemConfigs: Model<SystemConfigsType> =
-  models[collectionName] || model(collectionName, systemConfigSchema);
-MongoSystemConfigs.syncIndexes();
+export const MongoSystemConfigs = getMongoModel<SystemConfigsType>(
+  collectionName,
+  systemConfigSchema
+);

packages/service/common/system/log.ts

@@ -1,13 +1,9 @@
 import dayjs from 'dayjs';
 import chalk from 'chalk';
-import { isProduction } from './constants';
+import { LogLevelEnum } from './log/constant';
+// import { MongoLog } from './log/schema';
+import connectionMongo from '../mongo/index';
 
-enum LogLevelEnum {
-  debug = 0,
-  info = 1,
-  warn = 2,
-  error = 3
-}
 const logMap = {
   [LogLevelEnum.debug]: {
     levelLog: chalk.green('[Debug]')
@@ -23,23 +19,26 @@ const logMap = {
   }
 };
 const envLogLevelMap: Record<string, number> = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3
+  debug: LogLevelEnum.debug,
+  info: LogLevelEnum.info,
+  warn: LogLevelEnum.warn,
+  error: LogLevelEnum.error
 };
 
-const logLevel = (() => {
-  if (!isProduction) return LogLevelEnum.debug;
-  const envLogLevel = (process.env.LOG_LEVEL || 'info').toLocaleLowerCase();
-  if (!envLogLevel || envLogLevelMap[envLogLevel] === undefined) return LogLevelEnum.info;
-  return envLogLevelMap[envLogLevel];
+const { LOG_LEVEL, STORE_LOG_LEVEL } = (() => {
+  const LOG_LEVEL = (process.env.LOG_LEVEL || 'info').toLocaleLowerCase();
+  const STORE_LOG_LEVEL = (process.env.STORE_LOG_LEVEL || '').toLocaleLowerCase();
+
+  return {
+    LOG_LEVEL: envLogLevelMap[LOG_LEVEL] || LogLevelEnum.info,
+    STORE_LOG_LEVEL: envLogLevelMap[STORE_LOG_LEVEL] ?? 99
+  };
 })();
 
 /* add logger */
 export const addLog = {
   log(level: LogLevelEnum, msg: string, obj: Record<string, any> = {}) {
-    if (level < logLevel) return;
+    if (level < LOG_LEVEL) return;
 
     const stringifyObj = JSON.stringify(obj);
     const isEmpty = Object.keys(obj).length === 0;
@@ -52,35 +51,15 @@ export const addLog = {
 
     level === LogLevelEnum.error && console.error(obj);
 
-    const lokiUrl = process.env.LOKI_LOG_URL as string;
-    if (!lokiUrl) return;
-
-    try {
-      fetch(lokiUrl, {
-        method: 'POST',
-        headers: {
-          'Content-type': 'application/json'
-        },
-        body: JSON.stringify({
-          streams: [
-            {
-              stream: {
-                level
-              },
-              values: [
-                [
-                  `${Date.now() * 1000000}`,
-                  JSON.stringify({
-                    message: msg,
-                    ...obj
-                  })
-                ]
-              ]
-            }
-          ]
-        })
-      });
-    } catch (error) {}
+    // store
+    // if (level >= STORE_LOG_LEVEL && connectionMongo.connection.readyState === 1) {
+    //   // store log
+    //   MongoLog.create({
+    //     text: msg,
+    //     level,
+    //     metadata: obj
+    //   });
+    // }
   },
   debug(msg: string, obj?: Record<string, any>) {
     this.log(LogLevelEnum.debug, msg, obj);

packages/service/common/system/log/constant.ts

@@ -0,0 +1,10 @@
+export enum LogLevelEnum {
+  debug = 0,
+  info = 1,
+  warn = 2,
+  error = 3
+}
+
+export enum LogSignEnum {
+  slowOperation = 'slowOperation'
+}

packages/service/common/system/log/schema.ts

@@ -0,0 +1,27 @@
+import { getMongoModel, Schema } from '../../../common/mongo';
+import { SystemLogType } from './type';
+import { LogLevelEnum } from './constant';
+
+export const LogCollectionName = 'system_logs';
+
+const SystemLogSchema = new Schema({
+  text: {
+    type: String,
+    required: true
+  },
+  level: {
+    type: String,
+    required: true,
+    enum: Object.values(LogLevelEnum)
+  },
+  time: {
+    type: Date,
+    default: () => new Date()
+  },
+  metadata: Object
+});
+
+SystemLogSchema.index({ time: 1 }, { expires: '15d' });
+SystemLogSchema.index({ level: 1 });
+
+export const MongoLog = getMongoModel<SystemLogType>(LogCollectionName, SystemLogSchema);

packages/service/common/system/log/type.d.ts

@@ -0,0 +1,9 @@
+import { LogLevelEnum, LogSignEnum } from './constant';
+
+export type SystemLogType = {
+  _id: string;
+  text: string;
+  level: LogLevelEnum;
+  time: Date;
+  metadata?: Record<string, any>;
+};

packages/service/common/system/timerLock/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../mongo';
 import { timerIdMap } from './constants';
 const { Schema, model, models } = connectionMongo;
 import { TimerLockSchemaType } from './type.d';
@@ -24,6 +24,4 @@ try {
   console.log(error);
 }
 
-export const MongoTimerLock: Model<TimerLockSchemaType> =
-  models[collectionName] || model(collectionName, TimerLockSchema);
-MongoTimerLock.syncIndexes();
+export const MongoTimerLock = getMongoModel<TimerLockSchemaType>(collectionName, TimerLockSchema);

packages/service/core/app/schema.ts

@@ -1,6 +1,5 @@
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
-import { connectionMongo, type Model } from '../../common/mongo';
-const { Schema, model, models } = connectionMongo;
+import { Schema, getMongoModel } from '../../common/mongo';
 import type { AppSchema as AppType } from '@fastgpt/global/core/app/type.d';
 import {
   TeamCollectionName,
@@ -21,6 +20,7 @@ export const chatConfigType = {
   chatInputGuide: Object
 };
 
+// schema
 const AppSchema = new Schema({
   parentId: {
     type: Schema.Types.ObjectId,
@@ -112,15 +112,8 @@ const AppSchema = new Schema({
   ...getPermissionSchema(AppDefaultPermissionVal)
 });
 
-try {
-  AppSchema.index({ updateTime: -1 });
-  AppSchema.index({ teamId: 1, type: 1 });
-  AppSchema.index({ scheduledTriggerConfig: 1, intervalNextTime: -1 });
-} catch (error) {
-  console.log(error);
-}
+AppSchema.index({ updateTime: -1 });
+AppSchema.index({ teamId: 1, type: 1 });
+AppSchema.index({ scheduledTriggerConfig: 1, intervalNextTime: -1 });
 
-export const MongoApp: Model<AppType> =
-  models[AppCollectionName] || model(AppCollectionName, AppSchema);
-
-MongoApp.syncIndexes();
+export const MongoApp = getMongoModel<AppType>(AppCollectionName, AppSchema);

packages/service/core/app/version/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { AppVersionSchemaType } from '@fastgpt/global/core/app/version';
 import { chatConfigType } from '../schema';
@@ -34,7 +34,7 @@ try {
   console.log(error);
 }
 
-export const MongoAppVersion: Model<AppVersionSchemaType> =
-  models[AppVersionCollectionName] || model(AppVersionCollectionName, AppVersionSchema);
-
-MongoAppVersion.syncIndexes();
+export const MongoAppVersion = getMongoModel<AppVersionSchemaType>(
+  AppVersionCollectionName,
+  AppVersionSchema
+);

packages/service/core/chat/chatItemSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { ChatItemSchema as ChatItemType } from '@fastgpt/global/core/chat/type';
 import { ChatRoleMap } from '@fastgpt/global/core/chat/constants';
@@ -9,7 +9,6 @@ import {
 } from '@fastgpt/global/support/user/team/constant';
 import { AppCollectionName } from '../app/schema';
 import { userCollectionName } from '../../support/user/schema';
-import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 
 export const ChatItemCollectionName = 'chatitems';
@@ -99,7 +98,4 @@ try {
   console.log(error);
 }
 
-export const MongoChatItem: Model<ChatItemType> =
-  models[ChatItemCollectionName] || model(ChatItemCollectionName, ChatItemSchema);
-
-MongoChatItem.syncIndexes();
+export const MongoChatItem = getMongoModel<ChatItemType>(ChatItemCollectionName, ChatItemSchema);

packages/service/core/chat/chatSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { ChatSchema as ChatType } from '@fastgpt/global/core/chat/type.d';
 import { ChatSourceMap } from '@fastgpt/global/core/chat/constants';
@@ -98,6 +98,4 @@ try {
   console.log(error);
 }
 
-export const MongoChat: Model<ChatType> =
-  models[chatCollectionName] || model(chatCollectionName, ChatSchema);
-MongoChat.syncIndexes();
+export const MongoChat = getMongoModel<ChatType>(chatCollectionName, ChatSchema);

packages/service/core/chat/controller.ts

@@ -13,24 +13,24 @@ export async function getChatItems({
   chatId?: string;
   limit?: number;
   field: string;
-}): Promise<{ history: ChatItemType[] }> {
+}): Promise<{ histories: ChatItemType[] }> {
   if (!chatId) {
-    return { history: [] };
+    return { histories: [] };
   }
 
-  const history = await MongoChatItem.find({ appId, chatId }, field)
+  const histories = await MongoChatItem.find({ appId, chatId }, field)
     .sort({ _id: -1 })
     .limit(limit)
     .lean();
 
-  history.reverse();
+  histories.reverse();
 
-  history.forEach((item) => {
+  histories.forEach((item) => {
     // @ts-ignore
     item.value = adaptStringValue(item.value);
   });
 
-  return { history };
+  return { histories };
 }
 /* 临时适配旧的对话记录 */
 export const adaptStringValue = (value: any): ChatItemValueItemType[] => {

packages/service/core/chat/inputGuide/schema.ts

@@ -1,5 +1,5 @@
 import { AppCollectionName } from '../../app/schema';
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { ChatInputGuideSchemaType } from '@fastgpt/global/core/chat/inputGuide/type.d';
 
@@ -23,7 +23,7 @@ try {
   console.log(error);
 }
 
-export const MongoChatInputGuide: Model<ChatInputGuideSchemaType> =
-  models[ChatInputGuideCollectionName] || model(ChatInputGuideCollectionName, ChatInputGuideSchema);
-
-MongoChatInputGuide.syncIndexes();
+export const MongoChatInputGuide = getMongoModel<ChatInputGuideSchemaType>(
+  ChatInputGuideCollectionName,
+  ChatInputGuideSchema
+);

packages/service/core/dataset/collection/controller.ts

@@ -75,54 +75,9 @@ export async function createOneCollection({
     { session }
   );
 
-  // create default collection
-  if (type === DatasetCollectionTypeEnum.folder) {
-    await createDefaultCollection({
-      datasetId,
-      parentId: collection._id,
-      teamId,
-      tmbId,
-      session
-    });
-  }
-
   return collection;
 }
 
-// create default collection
-export function createDefaultCollection({
-  name = '手动录入',
-  datasetId,
-  parentId,
-  teamId,
-  tmbId,
-  session
-}: {
-  name?: '手动录入' | '手动标注';
-  datasetId: string;
-  parentId?: string;
-  teamId: string;
-  tmbId: string;
-  session?: ClientSession;
-}) {
-  return MongoDatasetCollection.create(
-    [
-      {
-        name,
-        teamId,
-        tmbId,
-        datasetId,
-        parentId,
-        type: DatasetCollectionTypeEnum.virtual,
-        trainingType: TrainingModeEnum.chunk,
-        chunkSize: 0,
-        updateTime: new Date('2099')
-      }
-    ],
-    { session }
-  );
-}
-
 /* delete collection related images/files */
 export const delCollectionRelatedSource = async ({
   collections,

packages/service/core/dataset/collection/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { DatasetCollectionSchemaType } from '@fastgpt/global/core/dataset/type.d';
 import { TrainingTypeMap, DatasetCollectionTypeMap } from '@fastgpt/global/core/dataset/constants';
@@ -94,9 +94,6 @@ const DatasetCollectionSchema = new Schema({
   }
 });
 
-export const MongoDatasetCollection: Model<DatasetCollectionSchemaType> =
-  models[DatasetColCollectionName] || model(DatasetColCollectionName, DatasetCollectionSchema);
-
 try {
   // auth file
   DatasetCollectionSchema.index({ teamId: 1, fileId: 1 });
@@ -111,8 +108,11 @@ try {
 
   // get forbid
   // DatasetCollectionSchema.index({ teamId: 1, datasetId: 1, forbid: 1 });
-
-  MongoDatasetCollection.syncIndexes({ background: true });
 } catch (error) {
   console.log(error);
 }
+
+export const MongoDatasetCollection = getMongoModel<DatasetCollectionSchemaType>(
+  DatasetColCollectionName,
+  DatasetCollectionSchema
+);

packages/service/core/dataset/collection/utils.ts

@@ -10,6 +10,7 @@ import {
 } from '@fastgpt/global/core/dataset/constants';
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import { ClientSession } from '../../../common/mongo';
+import { PushDatasetDataResponse } from '@fastgpt/global/core/dataset/api';
 
 /**
  * get all collection by top collectionId
@@ -138,7 +139,7 @@ export const reloadCollectionChunks = async ({
   billId?: string;
   rawText?: string;
   session: ClientSession;
-}) => {
+}): Promise<PushDatasetDataResponse> => {
   const {
     title,
     rawText: newRawText,
@@ -149,7 +150,10 @@ export const reloadCollectionChunks = async ({
     newRawText: rawText
   });
 
-  if (isSameRawText) return;
+  if (isSameRawText)
+    return {
+      insertLen: 0
+    };
 
   // split data
   const { chunks } = splitText2Chunks({
@@ -164,7 +168,7 @@ export const reloadCollectionChunks = async ({
     return Promise.reject('Training model error');
   })();
 
-  await MongoDatasetTraining.insertMany(
+  const result = await MongoDatasetTraining.insertMany(
     chunks.map((item, i) => ({
       teamId: col.teamId,
       tmbId,
@@ -191,4 +195,8 @@ export const reloadCollectionChunks = async ({
     },
     { session }
   );
+
+  return {
+    insertLen: result.length
+  };
 };

packages/service/core/dataset/data/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { DatasetDataSchemaType } from '@fastgpt/global/core/dataset/type.d';
 import {
@@ -77,27 +77,23 @@ const DatasetDataSchema = new Schema({
   rebuilding: Boolean
 });
 
-export const MongoDatasetData: Model<DatasetDataSchemaType> =
-  models[DatasetDataCollectionName] || model(DatasetDataCollectionName, DatasetDataSchema);
+// list collection and count data; list data; delete collection(relate data)
+DatasetDataSchema.index({
+  teamId: 1,
+  datasetId: 1,
+  collectionId: 1,
+  chunkIndex: 1,
+  updateTime: -1
+});
+// full text index
+DatasetDataSchema.index({ teamId: 1, datasetId: 1, fullTextToken: 'text' });
+// Recall vectors after data matching
+DatasetDataSchema.index({ teamId: 1, datasetId: 1, collectionId: 1, 'indexes.dataId': 1 });
+DatasetDataSchema.index({ updateTime: 1 });
+// rebuild data
+DatasetDataSchema.index({ rebuilding: 1, teamId: 1, datasetId: 1 });
 
-try {
-  // list collection and count data; list data; delete collection(relate data)
-  DatasetDataSchema.index({
-    teamId: 1,
-    datasetId: 1,
-    collectionId: 1,
-    chunkIndex: 1,
-    updateTime: -1
-  });
-  // full text index
-  DatasetDataSchema.index({ teamId: 1, datasetId: 1, fullTextToken: 'text' });
-  // Recall vectors after data matching
-  DatasetDataSchema.index({ teamId: 1, datasetId: 1, collectionId: 1, 'indexes.dataId': 1 });
-  DatasetDataSchema.index({ updateTime: 1 });
-  // rebuild data
-  DatasetDataSchema.index({ rebuilding: 1, teamId: 1, datasetId: 1 });
-
-  MongoDatasetData.syncIndexes({ background: true });
-} catch (error) {
-  console.log(error);
-}
+export const MongoDatasetData = getMongoModel<DatasetDataSchemaType>(
+  DatasetDataCollectionName,
+  DatasetDataSchema
+);

packages/service/core/dataset/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { DatasetSchemaType } from '@fastgpt/global/core/dataset/type.d';
 import {
@@ -11,7 +11,6 @@ import {
   TeamCollectionName,
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
-import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
 import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant';
 
 export const DatasetCollectionName = 'datasets';
@@ -99,6 +98,4 @@ try {
   console.log(error);
 }
 
-export const MongoDataset: Model<DatasetSchemaType> =
-  models[DatasetCollectionName] || model(DatasetCollectionName, DatasetSchema);
-MongoDataset.syncIndexes();
+export const MongoDataset = getMongoModel<DatasetSchemaType>(DatasetCollectionName, DatasetSchema);

packages/service/core/dataset/search/controller.ts

@@ -212,7 +212,7 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
                   {
                     $match: {
                       $expr: { $eq: ['$_id', '$$collectionId'] },
-                      forbid: { $eq: false } // 直接在lookup阶段过滤
+                      forbid: { $eq: true } // 匹配被禁用的数据
                     }
                   },
                   {
@@ -226,7 +226,7 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
             },
             {
               $match: {
-                collection: { $ne: [] }
+                collection: { $eq: [] } // 没有 forbid=true 的数据
               }
             },
             {

packages/service/core/dataset/training/schema.ts

@@ -1,5 +1,5 @@
 /* 模型的知识库 */
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { DatasetTrainingSchemaType } from '@fastgpt/global/core/dataset/type';
 import { TrainingTypeMap } from '@fastgpt/global/core/dataset/constants';
@@ -103,7 +103,7 @@ try {
   console.log(error);
 }
 
-export const MongoDatasetTraining: Model<DatasetTrainingSchemaType> =
-  models[DatasetTrainingCollectionName] || model(DatasetTrainingCollectionName, TrainingDataSchema);
-
-MongoDatasetTraining.syncIndexes();
+export const MongoDatasetTraining = getMongoModel<DatasetTrainingSchemaType>(
+  DatasetTrainingCollectionName,
+  TrainingDataSchema
+);

packages/service/core/workflow/dispatch/agent/extract.ts

@@ -198,7 +198,7 @@ ${description ? `- ${description}` : ''}
       required: []
     }
   };
-  console.log(properties);
+
   return {
     filterMessages,
     agentFunction

packages/service/core/workflow/dispatch/utils.ts

@@ -1,12 +1,11 @@
 import { getErrText } from '@fastgpt/global/common/error/utils';
-import { replaceSensitiveText } from '@fastgpt/global/common/string/tools';
+import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import {
   WorkflowIOValueTypeEnum,
   NodeOutputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
 import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/runtime/type';
-import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io';
 
 export const filterToolNodeIdByEdges = ({
   nodeId,
@@ -45,10 +44,16 @@ export const filterToolNodeIdByEdges = ({
 
 export const getHistories = (history?: ChatItemType[] | number, histories: ChatItemType[] = []) => {
   if (!history) return [];
-  if (typeof history === 'number') return histories.slice(-(history * 2));
-  if (Array.isArray(history)) return history;
 
-  return [];
+  const systemHistories = histories.filter((item) => item.obj === ChatRoleEnum.System);
+
+  const filterHistories = (() => {
+    if (typeof history === 'number') return histories.slice(-(history * 2));
+    if (Array.isArray(history)) return history;
+    return [];
+  })();
+
+  return [...systemHistories, ...filterHistories];
 };
 
 /* value type format */

packages/service/support/activity/promotion/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { PromotionRecordSchema as PromotionRecordType } from '@fastgpt/global/support/activity/type.d';
 
@@ -29,6 +29,7 @@ const PromotionRecordSchema = new Schema({
   }
 });
 
-export const MongoPromotionRecord: Model<PromotionRecordType> =
-  models['promotionRecord'] || model('promotionRecord', PromotionRecordSchema);
-MongoPromotionRecord.syncIndexes();
+export const MongoPromotionRecord = getMongoModel<PromotionRecordType>(
+  'promotionRecord',
+  PromotionRecordSchema
+);

packages/service/support/openapi/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { OpenApiSchema } from '@fastgpt/global/support/openapi/type';
 import {
@@ -64,6 +64,4 @@ try {
   console.log(error);
 }
 
-export const MongoOpenApi: Model<OpenApiSchema> =
-  models['openapi'] || model('openapi', OpenApiSchema);
-MongoOpenApi.syncIndexes();
+export const MongoOpenApi = getMongoModel<OpenApiSchema>('openapi', OpenApiSchema);

packages/service/support/outLink/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { OutLinkSchema as SchemaType } from '@fastgpt/global/support/outLink/type';
 import {
@@ -90,7 +90,4 @@ try {
   console.log(error);
 }
 
-export const MongoOutLink: Model<SchemaType> =
-  models['outlinks'] || model('outlinks', OutLinkSchema);
-
-MongoOutLink.syncIndexes();
+export const MongoOutLink = getMongoModel<SchemaType>('outlinks', OutLinkSchema);

packages/service/support/permission/schema.ts

@@ -2,7 +2,7 @@ import {
   TeamCollectionName,
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
-import { Model, connectionMongo } from '../../common/mongo';
+import { Model, connectionMongo, getMongoModel } from '../../common/mongo';
 import type { ResourcePermissionType } from '@fastgpt/global/support/permission/type';
 import { PerResourceTypeEnum } from '@fastgpt/global/support/permission/constant';
 const { Schema, model, models } = connectionMongo;
@@ -54,8 +54,7 @@ try {
   console.log(error);
 }
 
-export const MongoResourcePermission: Model<ResourcePermissionType> =
-  models[ResourcePermissionCollectionName] ||
-  model(ResourcePermissionCollectionName, ResourcePermissionSchema);
-
-MongoResourcePermission.syncIndexes();
+export const MongoResourcePermission = getMongoModel<ResourcePermissionType>(
+  ResourcePermissionCollectionName,
+  ResourcePermissionSchema
+);

packages/service/support/user/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import type { UserModelSchema } from '@fastgpt/global/support/user/type';
@@ -74,6 +74,4 @@ try {
   console.log(error);
 }
 
-export const MongoUser: Model<UserModelSchema> =
-  models[userCollectionName] || model(userCollectionName, UserSchema);
-MongoUser.syncIndexes();
+export const MongoUser = getMongoModel<UserModelSchema>(userCollectionName, UserSchema);

packages/service/support/user/team/teamMemberSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamMemberSchema as TeamMemberType } from '@fastgpt/global/support/user/team/type.d';
 import { userCollectionName } from '../../user/schema';
@@ -49,5 +49,7 @@ try {
   console.log(error);
 }
 
-export const MongoTeamMember: Model<TeamMemberType> =
-  models[TeamMemberCollectionName] || model(TeamMemberCollectionName, TeamMemberSchema);
+export const MongoTeamMember = getMongoModel<TeamMemberType>(
+  TeamMemberCollectionName,
+  TeamMemberSchema
+);

packages/service/support/user/team/teamSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamSchema as TeamType } from '@fastgpt/global/support/user/team/type.d';
 import { userCollectionName } from '../../user/schema';
@@ -61,5 +61,4 @@ try {
   console.log(error);
 }
 
-export const MongoTeam: Model<TeamType> =
-  models[TeamCollectionName] || model(TeamCollectionName, TeamSchema);
+export const MongoTeam = getMongoModel<TeamType>(TeamCollectionName, TeamSchema);

packages/service/support/user/team/teamTagsSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamTagSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
 import {
@@ -32,5 +32,7 @@ try {
   console.log(error);
 }
 
-export const MongoTeamTags: Model<TeamTagsSchemaType> =
-  models[TeamTagsCollectionName] || model(TeamTagsCollectionName, TeamTagSchema);
+export const MongoTeamTags = getMongoModel<TeamTagsSchemaType>(
+  TeamTagsCollectionName,
+  TeamTagSchema
+);

packages/service/support/wallet/sub/schema.ts

@@ -3,7 +3,7 @@
   1. type=standard: There will only be 1, and each team will have one
   2. type=extraDatasetSize/extraPoints: Can buy multiple
 */
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
 import {
@@ -93,5 +93,4 @@ try {
   console.log(error);
 }
 
-export const MongoTeamSub: Model<TeamSubSchema> =
-  models[subCollectionName] || model(subCollectionName, SubSchema);
+export const MongoTeamSub = getMongoModel<TeamSubSchema>(subCollectionName, SubSchema);

packages/service/support/wallet/usage/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { UsageSchemaType } from '@fastgpt/global/support/wallet/usage/type';
 import { UsageSourceMap } from '@fastgpt/global/support/wallet/usage/constants';
@@ -70,6 +70,4 @@ try {
   console.log(error);
 }
 
-export const MongoUsage: Model<UsageSchemaType> =
-  models[UsageCollectionName] || model(UsageCollectionName, UsageSchema);
-MongoUsage.syncIndexes();
+export const MongoUsage = getMongoModel<UsageSchemaType>(UsageCollectionName, UsageSchema);

projects/app/.env.template

@@ -33,6 +33,6 @@ PRO_URL=
 # 首页路径
 HOME_URL=/
 # 日志等级: debug, info, warn, error
-LOG_LEVEL=info
-# Loki Log Path
-# LOKI_LOG_URL=
+LOG_LEVEL=debug
+STORE_LOG_LEVEL=warn
+# Loki Log Path

projects/app/src/components/ChatBox/hooks/useChatBox.tsx

@@ -41,7 +41,6 @@ export const useChatBox = () => {
 
       const map: Record<ExportChatType, () => void> = {
         md: () => {
-          console.log(history);
           fileDownload({
             text: history
               .map((item) => {

projects/app/src/global/core/dataset/api.d.ts

@@ -1,4 +1,7 @@
-import { PushDatasetDataChunkProps } from '@fastgpt/global/core/dataset/api';
+import {
+  PushDatasetDataChunkProps,
+  PushDatasetDataResponse
+} from '@fastgpt/global/core/dataset/api';
 import {
   DatasetSearchModeEnum,
   DatasetSourceReadTypeEnum,
@@ -31,6 +34,10 @@ export type RebuildEmbeddingProps = {
 };
 
 /* ================= collection ===================== */
+export type CreateCollectionResponse = Promise<{
+  collectionId: string;
+  results: PushDatasetDataResponse;
+}>;
 
 /* ================= data ===================== */
 export type InsertOneDatasetDataProps = PushDatasetDataChunkProps & {

projects/app/src/pages/api/core/app/update.ts

@@ -154,10 +154,8 @@ async function handler(req: ApiRequestProps<AppUpdateParams, { appId: string }>)
 
       return onUpdate(session);
     });
-  }
-
-  // Update default permission
-  if (isDefaultPermissionChanged) {
+  } else if (isDefaultPermissionChanged) {
+    // Update default permission
     await mongoSessionRun(async (session) => {
       if (isFolder) {
         // Sync children default permission
@@ -193,6 +191,8 @@ async function handler(req: ApiRequestProps<AppUpdateParams, { appId: string }>)
 
       return onUpdate(session, defaultPermission);
     });
+  } else {
+    return onUpdate();
   }
 }
 

projects/app/src/pages/api/core/chat/init.ts

@@ -42,7 +42,7 @@ async function handler(
   }
 
   // get app and history
-  const [{ history }, { nodes }] = await Promise.all([
+  const [{ histories }, { nodes }] = await Promise.all([
     getChatItems({
       appId,
       chatId,
@@ -60,7 +60,7 @@ async function handler(
     title: chat?.title || '新对话',
     userAvatar: undefined,
     variables: chat?.variables || {},
-    history,
+    history: histories,
     app: {
       chatConfig: getAppChatConfig({
         chatConfig: app.chatConfig,

projects/app/src/pages/api/core/chat/outLink/init.ts

@@ -41,7 +41,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       throw new Error(ChatErrEnum.unAuthChat);
     }
 
-    const [{ history }, { nodes }] = await Promise.all([
+    const [{ histories }, { nodes }] = await Promise.all([
       getChatItems({
         appId: app._id,
         chatId,
@@ -56,7 +56,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     ]);
 
     // pick share response field
-    history.forEach((item) => {
+    histories.forEach((item) => {
       if (item.obj === ChatRoleEnum.AI) {
         item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData });
       }
@@ -70,7 +70,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         //@ts-ignore
         userAvatar: tmb?.userId?.avatar,
         variables: chat?.variables || {},
-        history,
+        history: histories,
         app: {
           chatConfig: getAppChatConfig({
             chatConfig: app.chatConfig,

projects/app/src/pages/api/core/chat/team/init.ts

@@ -47,7 +47,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     // get app and history
-    const [{ history }, { nodes }] = await Promise.all([
+    const [{ histories }, { nodes }] = await Promise.all([
       getChatItems({
         appId,
         chatId,
@@ -58,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     ]);
 
     // pick share response field
-    history.forEach((item) => {
+    histories.forEach((item) => {
       if (item.obj === ChatRoleEnum.AI) {
         item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData });
       }
@@ -71,7 +71,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         title: chat?.title || '新对话',
         userAvatar: team?.avatar,
         variables: chat?.variables || {},
-        history,
+        history: histories,
         app: {
           chatConfig: getAppChatConfig({
             chatConfig: app.chatConfig,

projects/app/src/pages/api/core/dataset/collection/create/csvTable.ts

@@ -18,8 +18,9 @@ import { getLLMModel, getVectorModel } from '@fastgpt/service/core/ai/model';
 import { rawText2Chunks } from '@fastgpt/service/core/dataset/read';
 import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
 import { NextAPI } from '@/service/middleware/entry';
+import { CreateCollectionResponse } from '@/global/core/dataset/api';
 
-async function handler(req: NextApiRequest) {
+async function handler(req: NextApiRequest): CreateCollectionResponse {
   const { datasetId, parentId, fileId } = req.body as FileIdCreateDatasetCollectionParams;
   const trainingType = TrainingModeEnum.chunk;
   const { teamId, tmbId, dataset } = await authDataset({
@@ -50,7 +51,7 @@ async function handler(req: NextApiRequest) {
     insertLen: predictDataLimitLength(trainingType, chunks)
   });
 
-  await mongoSessionRun(async (session) => {
+  return mongoSessionRun(async (session) => {
     // 4. create collection
     const { _id: collectionId } = await createOneCollection({
       teamId,
@@ -80,7 +81,7 @@ async function handler(req: NextApiRequest) {
     });
 
     // 6. insert to training queue
-    await pushDataListToTrainingQueue({
+    const insertResult = await pushDataListToTrainingQueue({
       teamId,
       tmbId,
       datasetId: dataset._id,
@@ -97,7 +98,7 @@ async function handler(req: NextApiRequest) {
       session
     });
 
-    return collectionId;
+    return { collectionId, results: insertResult };
   });
 }
 export default NextAPI(handler);

projects/app/src/pages/api/core/dataset/collection/create/link.ts

@@ -15,8 +15,9 @@ import { reloadCollectionChunks } from '@fastgpt/service/core/dataset/collection
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
 import { NextAPI } from '@/service/middleware/entry';
 import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+import { CreateCollectionResponse } from '@/global/core/dataset/api';
 
-async function handler(req: NextApiRequest) {
+async function handler(req: NextApiRequest): CreateCollectionResponse {
   const {
     link,
     trainingType = TrainingModeEnum.chunk,
@@ -40,7 +41,7 @@ async function handler(req: NextApiRequest) {
     insertLen: predictDataLimitLength(trainingType, new Array(10))
   });
 
-  await mongoSessionRun(async (session) => {
+  return mongoSessionRun(async (session) => {
     // 2. create collection
     const collection = await createOneCollection({
       ...body,
@@ -70,7 +71,7 @@ async function handler(req: NextApiRequest) {
     });
 
     // load
-    await reloadCollectionChunks({
+    const result = await reloadCollectionChunks({
       collection: {
         ...collection.toObject(),
         datasetId: dataset
@@ -80,7 +81,12 @@ async function handler(req: NextApiRequest) {
       session
     });
 
-    return collection;
+    return {
+      collectionId: collection._id,
+      results: {
+        insertLen: result.insertLen
+      }
+    };
   });
 }
 

projects/app/src/pages/api/core/dataset/collection/create/localFile.ts

@@ -23,8 +23,9 @@ import { MongoImage } from '@fastgpt/service/common/file/image/schema';
 import { readRawTextByLocalFile } from '@fastgpt/service/common/file/read/utils';
 import { NextAPI } from '@/service/middleware/entry';
 import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+import { CreateCollectionResponse } from '@/global/core/dataset/api';
 
-async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCollectionResponse {
   /**
    * Creates the multer uploader
    */

projects/app/src/pages/api/core/dataset/collection/create/text.ts

@@ -17,8 +17,9 @@ import { getLLMModel, getVectorModel } from '@fastgpt/service/core/ai/model';
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
 import { NextAPI } from '@/service/middleware/entry';
 import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
+import { CreateCollectionResponse } from '@/global/core/dataset/api';
 
-async function handler(req: NextApiRequest) {
+async function handler(req: NextApiRequest): CreateCollectionResponse {
   const {
     name,
     text,

projects/app/src/pages/api/core/dataset/create.ts

@@ -1,7 +1,6 @@
 import type { NextApiRequest } from 'next';
 import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
 import type { CreateDatasetParams } from '@/global/core/dataset/api.d';
-import { createDefaultCollection } from '@fastgpt/service/core/dataset/collection/controller';
 import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
 import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { getLLMModel, getVectorModel, getDatasetModel } from '@fastgpt/service/core/ai/model';
@@ -50,14 +49,6 @@ async function handler(req: NextApiRequest) {
     defaultPermission
   });
 
-  if (type === DatasetTypeEnum.dataset) {
-    await createDefaultCollection({
-      datasetId: _id,
-      teamId,
-      tmbId
-    });
-  }
-
   return _id;
 }
 

projects/app/src/pages/api/v1/chat/completions.ts

@@ -26,6 +26,7 @@ import requestIp from 'request-ip';
 import { getUsageSourceByAuthType } from '@fastgpt/global/support/wallet/usage/tools';
 import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
 import {
+  concatHistories,
   filterPublicNodeResponseData,
   removeEmptyUserInput
 } from '@fastgpt/global/core/chat/utils';
@@ -119,6 +120,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
     let startTime = Date.now();
 
+    // Web chat params: [Human, AI]
     const chatMessages = GPTMessages2Chats(messages);
     if (chatMessages[chatMessages.length - 1].obj !== ChatRoleEnum.Human) {
       chatMessages.pop();
@@ -170,7 +172,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
     // 1. get and concat history; 2. get app workflow
     const limit = getMaxHistoryLimitFromNodes(app.modules);
-    const [{ history }, { nodes, edges, chatConfig }] = await Promise.all([
+    const [{ histories }, { nodes, edges, chatConfig }] = await Promise.all([
       getChatItems({
         appId: app._id,
         chatId,
@@ -179,7 +181,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       }),
       getAppLatestVersion(app._id, app)
     ]);
-    const concatHistories = history.concat(chatMessages);
+    const newHistories = concatHistories(histories, chatMessages);
     const responseChatItemId: string | undefined = messages[messages.length - 1].dataId;
 
     /* start flow controller */
@@ -198,7 +200,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           runtimeEdges: initWorkflowEdgeStatus(edges),
           variables,
           query: removeEmptyUserInput(question.value),
-          histories: concatHistories,
+          histories: newHistories,
           stream,
           detail,
           maxRunTimes: 200
@@ -217,7 +219,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
         modules: setEntryEntries(app.modules),
         variables,
         inputFiles: files,
-        histories: concatHistories,
+        histories: newHistories,
         startParams: {
           userChatInput: text
         },

projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx

@@ -10,7 +10,6 @@ import {
   Checkbox,
   ModalFooter
 } from '@chakra-ui/react';
-import { DragHandleIcon } from '@chakra-ui/icons';
 import { useRouter } from 'next/router';
 import { AppSchema } from '@fastgpt/global/core/app/type.d';
 import { useTranslation } from 'next-i18next';
@@ -28,11 +27,13 @@ import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { postTransition2Workflow } from '@/web/core/app/api/app';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
+import { useSystem } from '@fastgpt/web/hooks/useSystem';
 
 const AppCard = () => {
   const router = useRouter();
   const { t } = useTranslation();
   const { appT } = useI18n();
+  const { isPc } = useSystem();
 
   const { appDetail, setAppDetail, onOpenInfoEdit, onDelApp } = useContextSelector(
     AppContext,
@@ -68,7 +69,7 @@ const AppCard = () => {
   return (
     <>
       {/* basic info */}
-      <Box px={6} py={4} position={'relative'}>
+      <Box px={[4, 6]} py={4} position={'relative'}>
         <Flex alignItems={'center'}>
           <Avatar src={appDetail.avatar} borderRadius={'md'} w={'28px'} />
           <Box ml={3} fontWeight={'bold'} fontSize={'md'} flex={'1 0 0'} color={'myGray.900'}>
@@ -149,13 +150,15 @@ const AppCard = () => {
             />
           )}
           <Box flex={1} />
-          <MyTag
-            type="borderFill"
-            colorSchema="gray"
-            onClick={() => (appDetail.permission.hasManagePer ? onOpenInfoEdit() : undefined)}
-          >
-            <PermissionIconText defaultPermission={appDetail.defaultPermission} />
-          </MyTag>
+          {isPc && (
+            <MyTag
+              type="borderFill"
+              colorSchema="gray"
+              onClick={() => (appDetail.permission.hasManagePer ? onOpenInfoEdit() : undefined)}
+            >
+              <PermissionIconText defaultPermission={appDetail.defaultPermission} />
+            </MyTag>
+          )}
         </HStack>
       </Box>
       {TeamTagsSet && <TagsEditModal onClose={() => setTeamTagsSet(undefined)} />}

projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx

@@ -29,7 +29,6 @@ import type { SettingAIDataType } from '@fastgpt/global/core/app/type.d';
 import DeleteIcon, { hoverDeleteStyles } from '@fastgpt/web/components/common/Icon/delete';
 import { TTSTypeEnum } from '@/web/core/app/constants';
 import { getSystemVariables } from '@/web/core/app/utils';
-import { useUpdate } from 'ahooks';
 import { useI18n } from '@/web/context/I18n';
 import { useContextSelector } from 'use-context-selector';
 import { AppContext } from '@/pages/app/detail/components/context';
@@ -49,7 +48,7 @@ const ScheduledTriggerConfig = dynamic(
 const WelcomeTextConfig = dynamic(() => import('@/components/core/app/WelcomeTextConfig'));
 
 const BoxStyles: BoxProps = {
-  px: 5,
+  px: [4, 6],
   py: '16px',
   borderBottomWidth: '1px',
   borderBottomColor: 'borderColor.low'

projects/app/src/pages/chat/components/ChatHistorySlider.tsx

@@ -140,7 +140,7 @@ const ChatHistorySlider = ({
             fontSize={'sm'}
             onClick={() =>
               canRouteToDetail &&
-              router.replace({
+              router.push({
                 pathname: '/app/detail',
                 query: { appId }
               })
@@ -156,27 +156,26 @@ const ChatHistorySlider = ({
 
       {/* menu */}
       <Flex w={'100%'} px={[2, 5]} h={'36px'} my={5} alignItems={'center'}>
-        <Box flex={'1 0 0'}>
-          {!isPc && appId && (
-            <LightRowTabs<TabEnum>
-              mr={1}
-              inlineStyles={{
-                px: 1
-              }}
-              list={[
-                { label: t('core.chat.Recent use'), value: TabEnum.recently },
-                ...(!isTeamChat ? [{ label: t('App'), value: TabEnum.app }] : []),
-                { label: t('core.chat.History'), value: TabEnum.history }
-              ]}
-              value={currentTab}
-              onChange={setCurrentTab}
-            />
-          )}
-        </Box>
+        {!isPc && appId && (
+          <LightRowTabs<TabEnum>
+            flex={'1 0 0'}
+            mr={1}
+            inlineStyles={{
+              px: 1
+            }}
+            list={[
+              { label: t('core.chat.Recent use'), value: TabEnum.recently },
+              ...(!isTeamChat ? [{ label: t('App'), value: TabEnum.app }] : []),
+              { label: t('core.chat.History'), value: TabEnum.history }
+            ]}
+            value={currentTab}
+            onChange={setCurrentTab}
+          />
+        )}
 
         <Button
           variant={'whitePrimary'}
-          flex={['auto', 1]}
+          flex={[appId ? '0 0 auto' : 1, 1]}
           h={'100%'}
           color={'primary.600'}
           borderRadius={'xl'}

projects/app/src/pages/chat/components/ToolMenu.tsx

@@ -11,7 +11,7 @@ const ToolMenu = ({ history }: { history: ChatItemType[] }) => {
   const { t } = useTranslation();
   const { onExportChat } = useChatBox();
   const router = useRouter();
-  console.log(history);
+
   return history.length > 0 ? (
     <MyMenu
       Button={

projects/app/src/service/core/dataset/data/controller.ts

@@ -34,7 +34,6 @@ export async function insertData2Dataset({
   session?: ClientSession;
 }) {
   if (!q || !datasetId || !collectionId || !model) {
-    console.log(q, a, datasetId, collectionId, model);
     return Promise.reject('q, datasetId, collectionId, model is required');
   }
   if (String(teamId) === String(tmbId)) {
@@ -140,7 +139,7 @@ export async function updateData2Dataset({
     formatIndexes.unshift(defaultIndex ? defaultIndex : getDefaultIndex({ q, a }));
   }
   formatIndexes = formatIndexes.slice(0, 6);
-  console.log(formatIndexes);
+
   // patch indexes, create, update, delete
   const patchResult: PatchIndexesProps[] = [];
 

projects/app/src/web/core/workflow/utils.ts

@@ -441,41 +441,46 @@ export const compareWorkflow = (workflow1: WorkflowType, workflow2: WorkflowType
     return false;
   }
 
-  const node1 = clone1.nodes.filter(Boolean).map((node) => ({
-    flowNodeType: node.flowNodeType,
-    inputs: node.inputs.map((input) => ({
-      ...input,
-      value: input.value ?? undefined
-    })),
-    outputs: node.outputs.map((input) => ({
-      ...input,
-      value: input.value ?? undefined
-    })),
-    name: node.name,
-    intro: node.intro,
-    avatar: node.avatar,
-    version: node.version,
-    position: node.position
-  }));
-  const node2 = clone2.nodes.filter(Boolean).map((node) => ({
-    flowNodeType: node.flowNodeType,
-    inputs: node.inputs.map((input) => ({
-      ...input,
-      value: input.value ?? undefined
-    })),
-    outputs: node.outputs.map((input) => ({
-      ...input,
-      value: input.value ?? undefined
-    })),
-    name: node.name,
-    intro: node.intro,
-    avatar: node.avatar,
-    version: node.version,
-    position: node.position
-  }));
+  const formatNodes = (nodes: StoreNodeItemType[]) => {
+    return nodes
+      .filter((node) => {
+        if (!node) return;
+        if ([FlowNodeTypeEnum.systemConfig].includes(node.flowNodeType)) return;
+
+        return true;
+      })
+      .map((node) => ({
+        flowNodeType: node.flowNodeType,
+        inputs: node.inputs.map((input) => ({
+          key: input.key,
+          selectedTypeIndex: input.selectedTypeIndex ?? 0,
+          renderTypeLis: input.renderTypeList,
+          valueType: input.valueType,
+          value: input.value ?? undefined
+        })),
+        outputs: node.outputs.map((item) => ({
+          key: item.key,
+          type: item.type,
+          value: item.value ?? undefined
+        })),
+        name: node.name,
+        intro: node.intro,
+        avatar: node.avatar,
+        version: node.version,
+        position: node.position
+      }));
+  };
+  const node1 = formatNodes(clone1.nodes);
+  const node2 = formatNodes(clone2.nodes);
 
   // console.log(node1);
   // console.log(node2);
 
+  node1.forEach((node, i) => {
+    if (!isEqual(node, node2[i])) {
+      console.log('node not equal');
+    }
+  });
+
   return isEqual(node1, node2);
 };