Feat: App folder and permission (#1726)

* app folder

* feat: app foldere

* fix: run app param error

* perf: select app ux

* perf: folder rerender

* fix: ts

* fix: parentId

* fix: permission

* perf: loading ux

* perf: per select ux

* perf: clb context

* perf: query extension tip

* fix: ts

* perf: app detail per

* perf: default per

packages/service/core/app/controller.ts

@@ -3,6 +3,7 @@ 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 './version/schema';
+import { MongoApp } from './schema';
 
 export const beforeUpdateAppFormat = <T extends AppSchema['modules'] | undefined>({
   nodes
@@ -65,3 +66,40 @@ export const getAppLatestVersion = async (appId: string, app?: AppSchema) => {
     chatConfig: app?.chatConfig || {}
   };
 };
+
+/* Get apps */
+export async function findAppAndAllChildren({
+  teamId,
+  appId,
+  fields
+}: {
+  teamId: string;
+  appId: string;
+  fields?: string;
+}): Promise<AppSchema[]> {
+  const find = async (id: string) => {
+    const children = await MongoApp.find(
+      {
+        teamId,
+        parentId: id
+      },
+      fields
+    ).lean();
+
+    let apps = children;
+
+    for (const child of children) {
+      const grandChildrenIds = await find(child._id);
+      apps = apps.concat(grandChildrenIds);
+    }
+
+    return apps;
+  };
+  const [app, childDatasets] = await Promise.all([MongoApp.findById(appId, fields), find(appId)]);
+
+  if (!app) {
+    return Promise.reject('Dataset not found');
+  }
+
+  return [app, ...childDatasets];
+}

packages/service/core/app/schema.ts

@@ -1,4 +1,4 @@
-import { AppTypeMap } from '@fastgpt/global/core/app/constants';
+import { AppTypeEnum, AppTypeMap } from '@fastgpt/global/core/app/constants';
 import { connectionMongo, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { AppSchema as AppType } from '@fastgpt/global/core/app/type.d';
@@ -7,7 +7,7 @@ import {
   TeamCollectionName,
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
-import { AppDefaultPermission } from '@fastgpt/global/support/permission/app/constant';
+import { AppDefaultPermissionVal } from '@fastgpt/global/support/permission/app/constant';
 
 export const AppCollectionName = 'apps';
 
@@ -22,6 +22,11 @@ export const chatConfigType = {
 };
 
 const AppSchema = new Schema({
+  parentId: {
+    type: Schema.Types.ObjectId,
+    ref: AppCollectionName,
+    default: null
+  },
   teamId: {
     type: Schema.Types.ObjectId,
     ref: TeamCollectionName,
@@ -38,8 +43,8 @@ const AppSchema = new Schema({
   },
   type: {
     type: String,
-    default: 'advanced',
-    enum: Object.keys(AppTypeMap)
+    default: AppTypeEnum.advanced,
+    enum: Object.values(AppTypeEnum)
   },
   version: {
     type: String,
@@ -104,13 +109,13 @@ const AppSchema = new Schema({
   // the default permission of a app
   defaultPermission: {
     type: Number,
-    default: AppDefaultPermission
+    default: AppDefaultPermissionVal
   }
 });
 
 try {
   AppSchema.index({ updateTime: -1 });
-  AppSchema.index({ teamId: 1 });
+  AppSchema.index({ teamId: 1, type: 1 });
   AppSchema.index({ scheduledTriggerConfig: 1, intervalNextTime: -1 });
 } catch (error) {
   console.log(error);

packages/service/core/workflow/dispatch/tools/runApp.ts

@@ -17,6 +17,8 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti
 import { getHistories } from '../utils';
 import { chatValue2RuntimePrompt, runtimePrompt2ChatsValue } from '@fastgpt/global/core/chat/adapt';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
+import { authAppByTmbId } from '../../../../support/permission/app/auth';
+import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 
 type Props = ModuleDispatchProps<{
   [NodeInputKeyEnum.userChatInput]: string;
@@ -32,27 +34,25 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
   const {
     res,
     teamId,
+    tmbId,
     stream,
     detail,
     histories,
     query,
     params: { userChatInput, history, app }
   } = props;
-  let start = Date.now();
 
   if (!userChatInput) {
     return Promise.reject('Input is empty');
   }
 
-  const appData = await MongoApp.findOne({
-    _id: app.id,
-    teamId
+  const { app: appData } = await authAppByTmbId({
+    appId: app.id,
+    teamId,
+    tmbId,
+    per: ReadPermissionVal
   });
 
-  if (!appData) {
-    return Promise.reject('App not found');
-  }
-
   if (res && stream) {
     responseWrite({
       res,
@@ -64,6 +64,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
   }
 
   const chatHistories = getHistories(history, histories);
+  const { files } = chatValue2RuntimePrompt(query);
 
   const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
     ...props,
@@ -71,11 +72,11 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
     runtimeNodes: storeNodes2RuntimeNodes(appData.modules, getDefaultEntryNodeIds(appData.modules)),
     runtimeEdges: initWorkflowEdgeStatus(appData.edges),
     histories: chatHistories,
-    query,
-    variables: {
-      ...props.variables,
-      userChatInput
-    }
+    query: runtimePrompt2ChatsValue({
+      files,
+      text: userChatInput
+    }),
+    variables: props.variables
   });
 
   const completeMessages = chatHistories.concat([