Concat plugin to app (#1799)

packages/service/core/app/plugin/controller.ts

@@ -0,0 +1,99 @@
+import { FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/index.d';
+import { FlowNodeTypeEnum, defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
+import { pluginData2FlowNodeIO } from '@fastgpt/global/core/workflow/utils';
+import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
+import type { PluginRuntimeType, PluginTemplateType } from '@fastgpt/global/core/plugin/type.d';
+import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
+import { getHandleConfig } from '@fastgpt/global/core/workflow/template/utils';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { cloneDeep } from 'lodash';
+import { MongoApp } from '../schema';
+
+/* 
+  plugin id rule:
+  personal: id
+  community: community-id
+  commercial: commercial-id
+*/
+
+export async function splitCombinePluginId(id: string) {
+  const splitRes = id.split('-');
+  if (splitRes.length === 1) {
+    // app id
+    return {
+      source: PluginSourceEnum.personal,
+      pluginId: id
+    };
+  }
+
+  const [source, pluginId] = id.split('-') as [`${PluginSourceEnum}`, string];
+  if (!source || !pluginId) return Promise.reject('pluginId not found');
+
+  return { source, pluginId: id };
+}
+
+const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> => {
+  const { source, pluginId } = await splitCombinePluginId(id);
+
+  if (source === PluginSourceEnum.community) {
+    const item = global.communityPlugins?.find((plugin) => plugin.id === pluginId);
+    if (!item) return Promise.reject('plugin not found');
+
+    return cloneDeep(item);
+  }
+  if (source === PluginSourceEnum.personal) {
+    const item = await MongoApp.findById(id).lean();
+    if (!item) return Promise.reject('plugin not found');
+
+    return {
+      id: String(item._id),
+      teamId: String(item.teamId),
+      name: item.name,
+      avatar: item.avatar,
+      intro: item.intro,
+      showStatus: true,
+      source: PluginSourceEnum.personal,
+      nodes: item.modules,
+      edges: item.edges,
+      templateType: FlowNodeTemplateTypeEnum.personalPlugin,
+      isTool: true,
+      version: item?.pluginData?.nodeVersion || defaultNodeVersion
+    };
+  }
+  return Promise.reject('plugin not found');
+};
+
+/* format plugin modules to plugin preview module */
+export async function getPluginPreviewNode({ id }: { id: string }): Promise<FlowNodeTemplateType> {
+  const plugin = await getPluginTemplateById(id);
+
+  return {
+    id: getNanoid(),
+    pluginId: plugin.id,
+    templateType: plugin.templateType,
+    flowNodeType: FlowNodeTypeEnum.pluginModule,
+    avatar: plugin.avatar,
+    name: plugin.name,
+    intro: plugin.intro,
+    showStatus: plugin.showStatus,
+    isTool: plugin.isTool,
+    version: plugin.version,
+    sourceHandle: getHandleConfig(true, true, true, true),
+    targetHandle: getHandleConfig(true, true, true, true),
+    ...pluginData2FlowNodeIO(plugin.nodes)
+  };
+}
+
+/* run plugin time */
+export async function getPluginRuntimeById(id: string): Promise<PluginRuntimeType> {
+  const plugin = await getPluginTemplateById(id);
+
+  return {
+    teamId: plugin.teamId,
+    name: plugin.name,
+    avatar: plugin.avatar,
+    showStatus: plugin.showStatus,
+    nodes: plugin.nodes,
+    edges: plugin.edges
+  };
+}

packages/service/core/app/schema.ts

@@ -1,8 +1,7 @@
-import { AppTypeEnum, AppTypeMap } from '@fastgpt/global/core/app/constants';
+import { AppTypeEnum } 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';
-import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
 import {
   TeamCollectionName,
   TeamMemberCollectionName
@@ -43,7 +42,7 @@ const AppSchema = new Schema({
   },
   type: {
     type: String,
-    default: AppTypeEnum.advanced,
+    default: AppTypeEnum.workflow,
     enum: Object.values(AppTypeEnum)
   },
   version: {
@@ -64,16 +63,11 @@ const AppSchema = new Schema({
   },
 
   // role and auth
-  permission: {
-    type: String,
-    enum: Object.keys(PermissionTypeMap),
-    default: PermissionTypeEnum.private
-  },
   teamTags: {
     type: [String]
   },
 
-  // tmp store
+  // save app(Not publish)
   modules: {
     type: Array,
     default: []
@@ -83,8 +77,16 @@ const AppSchema = new Schema({
     default: []
   },
   chatConfig: {
-    type: chatConfigType,
-    default: {}
+    type: chatConfigType
+  },
+  // plugin config
+  pluginData: {
+    type: {
+      nodeVersion: String,
+      pluginUniId: String,
+      apiSchemaStr: String, // http plugin
+      customHeaders: String // http plugin
+    }
   },
 
   scheduledTriggerConfig: {

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

@@ -24,8 +24,7 @@ const AppVersionSchema = new Schema({
     default: []
   },
   chatConfig: {
-    type: chatConfigType,
-    default: {}
+    type: chatConfigType
   }
 });