Perf input guide (#1557)

* perf: input guide code

* perf: input guide ui

* Chat input guide api

* Update app chat config store

* perf: app chat config field

* perf: app context

* perf: params

* fix: ts

* perf: filter private config

* perf: filter private config

* perf: import workflow

* perf: limit max tip amount

packages/service/core/app/controller.ts

@@ -2,7 +2,7 @@ import { AppSchema } from '@fastgpt/global/core/app/type';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { getLLMModel } from '../ai/model';
-import { MongoAppVersion } from './versionSchema';
+import { MongoAppVersion } from './version/schema';
 
 export const beforeUpdateAppFormat = <T extends AppSchema['modules'] | undefined>({
   nodes
@@ -55,11 +55,13 @@ export const getAppLatestVersion = async (appId: string, app?: AppSchema) => {
   if (version) {
     return {
       nodes: version.nodes,
-      edges: version.edges
+      edges: version.edges,
+      chatConfig: version.chatConfig || app?.chatConfig || {}
     };
   }
   return {
     nodes: app?.modules || [],
-    edges: app?.edges || []
+    edges: app?.edges || [],
+    chatConfig: app?.chatConfig || {}
   };
 };

packages/service/core/app/qGuideSchema.ts

@@ -1,40 +0,0 @@
-import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
-import { connectionMongo, type Model } from '../../common/mongo';
-const { Schema, model, models } = connectionMongo;
-
-export const AppQGuideCollectionName = 'app_question_guides';
-
-type AppQGuideSchemaType = {
-  _id: string;
-  appId: string;
-  teamId: string;
-  text: string;
-};
-
-const AppQGuideSchema = new Schema({
-  appId: {
-    type: Schema.Types.ObjectId,
-    ref: AppQGuideCollectionName,
-    required: true
-  },
-  teamId: {
-    type: Schema.Types.ObjectId,
-    ref: TeamCollectionName,
-    required: true
-  },
-  text: {
-    type: String,
-    default: ''
-  }
-});
-
-try {
-  AppQGuideSchema.index({ appId: 1 });
-} catch (error) {
-  console.log(error);
-}
-
-export const MongoAppQGuide: Model<AppQGuideSchemaType> =
-  models[AppQGuideCollectionName] || model(AppQGuideCollectionName, AppQGuideSchema);
-
-MongoAppQGuide.syncIndexes();

packages/service/core/app/schema.ts

@@ -10,6 +10,16 @@ import {
 
 export const AppCollectionName = 'apps';
 
+export const chatConfigType = {
+  welcomeText: String,
+  variables: Array,
+  questionGuide: Boolean,
+  ttsConfig: Object,
+  whisperConfig: Object,
+  scheduledTriggerConfig: Object,
+  chatInputGuide: Object
+};
+
 const AppSchema = new Schema({
   teamId: {
     type: Schema.Types.ObjectId,
@@ -47,6 +57,16 @@ const AppSchema = new Schema({
     default: () => new Date()
   },
 
+  // role and auth
+  permission: {
+    type: String,
+    enum: Object.keys(PermissionTypeMap),
+    default: PermissionTypeEnum.private
+  },
+  teamTags: {
+    type: [String]
+  },
+
   // tmp store
   modules: {
     type: Array,
@@ -56,6 +76,10 @@ const AppSchema = new Schema({
     type: Array,
     default: []
   },
+  chatConfig: {
+    type: chatConfigType,
+    default: {}
+  },
 
   scheduledTriggerConfig: {
     cronString: {
@@ -74,14 +98,6 @@ const AppSchema = new Schema({
 
   inited: {
     type: Boolean
-  },
-  permission: {
-    type: String,
-    enum: Object.keys(PermissionTypeMap),
-    default: PermissionTypeEnum.private
-  },
-  teamTags: {
-    type: [String]
   }
 });
 

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

@@ -1,6 +1,7 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { AppVersionSchemaType } from '@fastgpt/global/core/app/version';
+import { chatConfigType } from '../schema';
 
 export const AppVersionCollectionName = 'app_versions';
 
@@ -21,6 +22,10 @@ const AppVersionSchema = new Schema({
   edges: {
     type: Array,
     default: []
+  },
+  chatConfig: {
+    type: chatConfigType,
+    default: {}
   }
 });
 

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

@@ -0,0 +1,29 @@
+import { AppCollectionName } from '../../app/schema';
+import { connectionMongo, type Model } from '../../../common/mongo';
+const { Schema, model, models } = connectionMongo;
+import type { ChatInputGuideSchemaType } from '@fastgpt/global/core/chat/inputGuide/type.d';
+
+export const ChatInputGuideCollectionName = 'chat_input_guides';
+
+const ChatInputGuideSchema = new Schema({
+  appId: {
+    type: Schema.Types.ObjectId,
+    ref: AppCollectionName,
+    required: true
+  },
+  text: {
+    type: String,
+    default: ''
+  }
+});
+
+try {
+  ChatInputGuideSchema.index({ appId: 1, text: 1 }, { unique: true });
+} catch (error) {
+  console.log(error);
+}
+
+export const MongoChatInputGuide: Model<ChatInputGuideSchemaType> =
+  models[ChatInputGuideCollectionName] || model(ChatInputGuideCollectionName, ChatInputGuideSchema);
+
+MongoChatInputGuide.syncIndexes();

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

@@ -168,7 +168,8 @@ export async function pushDataListToTrainingQueue({
         indexes: item.indexes
       })),
       {
-        session
+        session,
+        ordered: false
       }
     );
   } catch (error: any) {

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

@@ -44,6 +44,7 @@ import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
 import { dispatchSystemConfig } from './init/systemConfig';
 import { dispatchUpdateVariable } from './tools/runUpdateVar';
+import { addLog } from '../../../common/system/log';
 
 const callbackMap: Record<FlowNodeTypeEnum, Function> = {
   [FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart,
@@ -137,7 +138,6 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     }
     if (nodeDispatchUsages) {
       chatNodeUsages = chatNodeUsages.concat(nodeDispatchUsages);
-      props.maxRunTimes -= nodeDispatchUsages.length;
     }
     if (toolResponses !== undefined) {
       if (Array.isArray(toolResponses) && toolResponses.length === 0) return;
@@ -213,9 +213,11 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
         });
 
         if (status === 'run') {
+          addLog.info(`[dispatchWorkFlow] nodeRunWithActive: ${node.name}`);
           return nodeRunWithActive(node);
         }
         if (status === 'skip') {
+          addLog.info(`[dispatchWorkFlow] nodeRunWithActive: ${node.name}`);
           return nodeRunWithSkip(node);
         }
 
@@ -275,6 +277,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       });
     }
 
+    props.maxRunTimes--;
+
     // get node running params
     const params = getNodeRunParams(node);