feat: support system toolset

Author: FinleyGe

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

@@ -1,5 +1,8 @@
 import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeTypeEnum
+} from '@fastgpt/global/core/workflow/node/constant';
 import {
   appData2FlowNodeIO,
   pluginData2FlowNodeIO,
@@ -25,14 +28,15 @@ import {
   NodeInputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
-import { getSystemToolList } from '../tool/api';
+import { APIGetSystemToolList } from '../tool/api';
 import { Types } from '../../../common/mongo';
 import type { SystemPluginConfigSchemaType } from './type';
 import type {
   FlowNodeInputItemType,
   FlowNodeOutputItemType
 } from '@fastgpt/global/core/workflow/type/io';
 import { isProduction } from '@fastgpt/global/common/system/constants';
+import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type';
 
 /**
   plugin id rule:
@@ -78,7 +82,7 @@ export const getSystemPluginByIdAndVersionId = async (
   versionId?: string
 ): Promise<ChildAppType> => {
   const plugin = await (async (): Promise<ChildAppType> => {
-    const plugin = await getSystemPluginById(pluginId);
+    const plugin = await getSystemToolById(pluginId);
 
     // Admin selected system tool
     if (plugin.associatedPluginId) {
@@ -127,6 +131,17 @@ export const getSystemPluginByIdAndVersionId = async (
       : plugin.versionList?.[0];
     const lastVersion = plugin.versionList?.[0];
 
+    // concat parent (is exists) input config
+    const parent = plugin.parentId ? await getSystemToolById(plugin.parentId) : undefined;
+    if (parent && parent.inputList) {
+      plugin?.inputs?.push({
+        key: 'system_input_config',
+        label: '',
+        renderTypeList: [FlowNodeInputTypeEnum.hidden],
+        inputList: parent.inputList
+      });
+    }
+
     return {
       ...plugin,
       version: versionId ? version?.value : '',
@@ -195,11 +210,34 @@ export async function getChildAppPreviewNode({
 
   const { flowNodeType, nodeIOConfig } = await (async () => {
     if (source === PluginSourceEnum.systemTool) {
+      const children = (await getSystemTools()).filter((item) => item.parentId === pluginId);
       return {
-        flowNodeType: FlowNodeTypeEnum.tool,
+        flowNodeType: app.isFolder ? FlowNodeTypeEnum.toolSet : FlowNodeTypeEnum.tool,
         nodeIOConfig: {
-          inputs: app.inputs!,
-          outputs: app.outputs!,
+          inputs: app.isFolder
+            ? ([
+                {
+                  value: {
+                    toolList: children.map((item) => ({
+                      name: parseI18nString(item.name, lang),
+                      description: parseI18nString(item.intro, lang)
+                    }))
+                  },
+                  renderTypeList: [FlowNodeInputTypeEnum.hidden]
+                },
+                ...(app.inputList
+                  ? [
+                      {
+                        key: NodeInputKeyEnum.systemInputConfig,
+                        label: '',
+                        renderTypeList: [FlowNodeInputTypeEnum.hidden],
+                        inputList: app.inputList
+                      }
+                    ]
+                  : [])
+              ] as FlowNodeInputItemType[])
+            : app.inputs ?? [],
+          outputs: app.outputs ?? [],
           toolConfig: {
             systemTool: {
               toolId: app.id
@@ -274,11 +312,15 @@ export async function getChildAppPreviewNode({
   System plugin: plugin id
   Personal plugin: Version id
 */
-export async function getChildAppRuntimeById(
-  id: string,
-  versionId?: string,
-  lang: localeType = 'en'
-): Promise<PluginRuntimeType> {
+export async function getChildAppRuntimeById({
+  id,
+  versionId,
+  lang = 'en'
+}: {
+  id: string;
+  versionId?: string;
+  lang?: localeType;
+}): Promise<PluginRuntimeType> {
   const app = await (async () => {
     const { source, pluginId } = splitCombinePluginId(id);
 
@@ -331,6 +373,30 @@ export async function getChildAppRuntimeById(
   };
 }
 
+export async function getSystemPluginRuntimeNodeById(
+  pluginId: string
+): Promise<RuntimeNodeItemType> {
+  const { source } = splitCombinePluginId(pluginId);
+  if (source === PluginSourceEnum.systemTool) {
+    const tool = await getSystemPluginByIdAndVersionId(pluginId);
+    return {
+      ...tool,
+      name: parseI18nString(tool.name),
+      intro: parseI18nString(tool.intro),
+      inputs: tool.inputs ?? [],
+      outputs: tool.outputs ?? [],
+      flowNodeType: FlowNodeTypeEnum.tool,
+      nodeId: getNanoid(),
+      toolConfig: {
+        systemTool: {
+          toolId: pluginId
+        }
+      }
+    };
+  }
+  return Promise.reject(PluginErrEnum.unExist);
+}
+
 const dbPluginFormat = (item: SystemPluginConfigSchemaType): SystemPluginTemplateItemType => {
   const { name, avatar, intro, version, weight, templateType, associatedPluginId, userGuide } =
     item.customConfig!;
@@ -385,11 +451,11 @@ export const refetchSystemPlugins = () => {
   });
 };
 
-export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[]> => {
+export const getSystemTools = async (): Promise<SystemPluginTemplateItemType[]> => {
   if (getCachedSystemPlugins().expires > Date.now() && isProduction) {
     return getCachedSystemPlugins().data;
   } else {
-    const tools = await getSystemToolList();
+    const tools = await APIGetSystemToolList();
 
     // 从数据库里加载插件配置进行替换
     const systemPluginsArray = await MongoSystemPlugin.find({}).lean();
@@ -418,33 +484,18 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[]
       const outputs = item.versionList[0]?.outputs as FlowNodeOutputItemType[];
 
       return {
-        isActive: item.isActive,
-        id: item.id,
-        parentId: item.parentId,
+        ...item,
         isFolder: tools.some((tool) => tool.parentId === item.id),
-        name: item.name,
-        avatar: item.avatar,
-        intro: item.intro,
-        author: item.author,
-        courseUrl: item.courseUrl,
         showStatus: true,
-        weight: item.weight,
-        templateType: item.templateType,
-        originCost: item.originCost,
-        currentCost: item.currentCost,
-        hasTokenFee: item.hasTokenFee,
-        pluginOrder: item.pluginOrder,
-
         workflow: {
           nodes: [],
           edges: []
         },
-        versionList: item.versionList,
         inputs,
         outputs,
-
-        inputList: inputs?.find((input) => input.key === NodeInputKeyEnum.systemInputConfig)
-          ?.inputList as any,
+        inputList:
+          inputs?.find((input) => input.key === NodeInputKeyEnum.systemInputConfig)?.inputList ??
+          item?.inputConfig?.inputList,
         hasSystemSecret: !!dbPluginConfig?.inputListVal
       };
     });
@@ -465,10 +516,10 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[]
   }
 };
 
-export const getSystemPluginById = async (id: string): Promise<SystemPluginTemplateItemType> => {
+export const getSystemToolById = async (id: string): Promise<SystemPluginTemplateItemType> => {
   const { source, pluginId } = splitCombinePluginId(id);
   if (source === PluginSourceEnum.systemTool) {
-    const tools = await getSystemPlugins();
+    const tools = await getSystemTools();
     const tool = tools.find((item) => item.id === pluginId);
     if (tool) {
       return tool;

packages/service/core/app/tool/api.ts

@@ -6,7 +6,7 @@ const client = createClient({
   token: process.env.PLUGIN_TOKEN || ''
 });
 
-export async function getSystemToolList() {
+export async function APIGetSystemToolList() {
   const res = await client.tool.list();
 
   if (res.status === 200) {
@@ -26,7 +26,7 @@ export async function getSystemToolList() {
   return Promise.reject(res.body);
 }
 
-export async function runTool({
+export async function APIRunTool({
   toolId,
   inputs,
   systemVar

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

@@ -74,7 +74,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
   if (!fileUrlInput || !fileUrlInput.value || fileUrlInput.value.length === 0) {
     fileLinks = undefined;
   }
-  console.log(fileLinks, 22);
 
   const toolNodeIds = filterToolNodeIdByEdges({ nodeId, edges: runtimeEdges });
 
@@ -358,7 +357,7 @@ const getMultiInput = async ({
   };
 };
 
-/* 
+/*
 Tool call， auth add file prompt to question。
 Guide the LLM to call tool.
 */

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

@@ -143,7 +143,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
   } = data;
   const startTime = Date.now();
 
-  rewriteRuntimeWorkFlow(runtimeNodes, runtimeEdges);
+  await rewriteRuntimeWorkFlow(runtimeNodes, runtimeEdges);
 
   // 初始化深度和自动增加深度，避免无限嵌套
   if (!props.workflowDispatchDeep) {

packages/service/core/workflow/dispatch/plugin/run.ts

@@ -53,7 +53,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     });
   }
 
-  /* 
+  /*
     1. Team app
     2. Admin selected system tool
   */
@@ -66,7 +66,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
     per: ReadPermissionVal
   });
 
-  const plugin = await getChildAppRuntimeById(pluginId, version);
+  const plugin = await getChildAppRuntimeById({ id: pluginId, versionId: version });
 
   const outputFilterMap =
     plugin.nodes

packages/service/core/workflow/dispatch/plugin/runTool.ts

@@ -9,11 +9,11 @@ import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { MCPClient } from '../../../app/mcp';
 import { getSecretValue } from '../../../../common/secret/utils';
 import type { McpToolDataType } from '@fastgpt/global/core/app/mcpTools/type';
-import { runTool } from '../../../app/tool/api';
+import { APIRunTool } from '../../../app/tool/api';
 import { MongoSystemPlugin } from '../../../app/plugin/systemPluginSchema';
 import { SystemToolInputTypeEnum } from '@fastgpt/global/core/app/systemTool/constants';
 import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type';
-import { getSystemPluginById, splitCombinePluginId } from '../../../app/plugin/controller';
+import { getSystemToolById, splitCombinePluginId } from '../../../app/plugin/controller';
 
 type SystemInputConfigType = {
   type: SystemToolInputTypeEnum;
@@ -42,10 +42,12 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
     node: { name, avatar, toolConfig, version }
   } = props;
 
+  console.log('run tool', params, props.node);
+
   try {
     // run system tool
     if (toolConfig?.systemTool?.toolId) {
-      const tool = await getSystemPluginById(toolConfig.systemTool!.toolId);
+      const tool = await getSystemToolById(toolConfig.systemTool!.toolId);
 
       const inputConfigParams = await (async () => {
         switch (params.system_input_config?.type) {
@@ -73,7 +75,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
       };
 
       const formatToolId = tool.id.split('-')[1];
-      const result = await runTool({
+      const result = await APIRunTool({
         toolId: formatToolId,
         inputs,
         systemVar: {