fix: plugin not get system input config (#5363)

* doc

* fix: action

* fix: plugin not get system input config

* perf: rewrite toolset

packages/global/core/app/plugin/type.d.ts

@@ -24,8 +24,6 @@ export type PluginRuntimeType = {
 
 // system plugin
 export type SystemPluginTemplateItemType = WorkflowTemplateType & {
-  parentId?: ParentIdType;
-  isFolder?: boolean;
   templateType: string;
 
   // FastGPT-plugin tool

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

@@ -129,9 +129,9 @@ export const getSystemPluginByIdAndVersionId = async (
 
   // concat parent (if exists) input config
   const parent = plugin.parentId ? await getSystemToolById(plugin.parentId) : undefined;
-  if (parent && parent.inputList) {
-    plugin?.inputs?.push({
-      key: 'system_input_config',
+  if (parent?.inputList) {
+    version?.inputs?.unshift({
+      key: NodeInputKeyEnum.systemInputConfig,
       label: '',
       renderTypeList: [FlowNodeInputTypeEnum.hidden],
       inputList: parent.inputList
@@ -140,8 +140,8 @@ export const getSystemPluginByIdAndVersionId = async (
 
   return {
     ...plugin,
-    inputs: version.inputs,
-    outputs: version.outputs,
+    inputs: version.inputs ?? [],
+    outputs: version.outputs ?? [],
     version: versionId ? version?.value : '',
     versionLabel: versionId ? version?.value : '',
     isLatestVersion: !version || !lastVersion || version.value === lastVersion?.value
@@ -448,36 +448,6 @@ export async function getChildAppRuntimeById({
   };
 }
 
-export async function getSystemPluginRuntimeNodeById({
-  pluginId,
-  name,
-  intro
-}: {
-  pluginId: string;
-  name: string;
-  intro: string;
-}): Promise<RuntimeNodeItemType> {
-  const { source } = splitCombinePluginId(pluginId);
-  if (source === PluginSourceEnum.systemTool) {
-    const tool = await getSystemPluginByIdAndVersionId(pluginId);
-    return {
-      ...tool,
-      name,
-      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!;
@@ -563,20 +533,30 @@ export const getSystemTools = async (): Promise<SystemPluginTemplateItemType[]>
       const dbPluginConfig = systemPlugins.get(item.id);
 
       const versionList = (item.versionList as SystemPluginTemplateItemType['versionList']) || [];
-      const inputs = versionList[0]?.inputs ?? [];
-      const outputs = versionList[0]?.outputs ?? [];
 
       return {
-        ...item,
+        id: item.id,
+        parentId: item.parentId,
         isFolder: tools.some((tool) => tool.parentId === item.id),
-        showStatus: true,
+
+        name: item.name,
+        avatar: item.avatar,
+        intro: item.description,
+
+        author: item.author,
+        courseUrl: item.courseUrl,
+        weight: item.weight,
+
         workflow: {
           nodes: [],
           edges: []
         },
         versionList,
-        inputs,
-        outputs,
+
+        templateType: item.templateType,
+        showStatus: true,
+
+        isActive: item.isActive,
         inputList: item?.secretInputConfig,
         hasSystemSecret: !!dbPluginConfig?.inputListVal
       };

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

@@ -1,7 +1,7 @@
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
-import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import {
   type RuntimeEdgeItemType,
   type RuntimeNodeItemType,
@@ -17,12 +17,9 @@ import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { type SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import { getMCPToolRuntimeNode } from '@fastgpt/global/core/app/mcpTools/utils';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
-import {
-  getSystemPluginRuntimeNodeById,
-  getSystemTools
-} from '../../../core/app/plugin/controller';
 import { MongoApp } from '../../../core/app/schema';
 import { getMCPChildren } from '../../../core/app/mcp';
+import { getSystemToolRunTimeNodeFromSystemToolset } from '../utils';
 
 export const getWorkflowResponseWrite = ({
   res,
@@ -197,29 +194,13 @@ export const rewriteRuntimeWorkFlow = async ({
 
     // systemTool
     if (systemToolId) {
-      const toolsetInputConfig = toolSetNode.inputs.find(
-        (item) => item.key === NodeInputKeyEnum.systemInputConfig
-      );
-      const tools = await getSystemTools();
-      const children = tools.filter((item) => item.parentId === systemToolId);
-      for (const child of children) {
-        const toolListItem = toolSetNode.toolConfig?.systemToolSet?.toolList.find(
-          (item) => item.toolId === child.id
-        )!;
-        const newNode = await getSystemPluginRuntimeNodeById({
-          pluginId: child.id,
-          name: toolListItem?.name,
-          intro: toolListItem?.description
-        });
-        const newNodeInputConfig = newNode.inputs.find(
-          (item) => item.key === NodeInputKeyEnum.systemInputConfig
-        );
-        if (newNodeInputConfig) {
-          newNodeInputConfig.value = toolsetInputConfig?.value;
-        }
-        nodes.push(newNode);
-        pushEdges(newNode.nodeId);
-      }
+      const children = await getSystemToolRunTimeNodeFromSystemToolset({
+        toolSetNode
+      });
+      children.forEach((node) => {
+        nodes.push(node);
+        pushEdges(node.nodeId);
+      });
     } else if (mcpToolsetVal) {
       const app = await MongoApp.findOne({ _id: toolSetNode.pluginId }).lean();
       if (!app) continue;

packages/service/core/workflow/utils.ts

@@ -1,5 +1,11 @@
 import { type SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import { countPromptTokens } from '../../common/string/tiktoken/index';
+import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type';
+import { getSystemPluginByIdAndVersionId, getSystemTools } from '../app/plugin/controller';
+import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { parseI18nString } from '@fastgpt/global/common/i18n/utils';
 
 /* filter search result */
 export const filterSearchResultsByMaxChars = async (
@@ -23,3 +29,52 @@ export const filterSearchResultsByMaxChars = async (
 
   return results.length === 0 ? list.slice(0, 1) : results;
 };
+
+export async function getSystemToolRunTimeNodeFromSystemToolset({
+  toolSetNode
+}: {
+  toolSetNode: RuntimeNodeItemType;
+}): Promise<RuntimeNodeItemType[]> {
+  const systemToolId = toolSetNode.toolConfig?.systemToolSet?.toolId!;
+
+  const toolsetInputConfig = toolSetNode.inputs.find(
+    (item) => item.key === NodeInputKeyEnum.systemInputConfig
+  );
+  const tools = await getSystemTools();
+  const children = tools.filter((item) => item.parentId === systemToolId);
+
+  const nodes = await Promise.all(
+    children.map(async (child) => {
+      const toolListItem = toolSetNode.toolConfig?.systemToolSet?.toolList.find(
+        (item) => item.toolId === child.id
+      )!;
+
+      const tool = await getSystemPluginByIdAndVersionId(child.id);
+
+      const inputs = tool.inputs ?? [];
+      if (toolsetInputConfig?.value) {
+        const configInput = inputs.find((item) => item.key === NodeInputKeyEnum.systemInputConfig);
+        if (configInput) {
+          configInput.value = toolsetInputConfig.value;
+        }
+      }
+
+      return {
+        ...tool,
+        inputs,
+        outputs: tool.outputs ?? [],
+        name: toolListItem.name ?? parseI18nString(tool.name, 'en'),
+        intro: toolListItem.description ?? parseI18nString(tool.intro, 'en'),
+        flowNodeType: FlowNodeTypeEnum.tool,
+        nodeId: getNanoid(),
+        toolConfig: {
+          systemTool: {
+            toolId: child.id
+          }
+        }
+      };
+    })
+  );
+
+  return nodes;
+}

packages/service/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "type": "module",
   "dependencies": {
-    "@fastgpt-sdk/plugin": "^0.1.4",
+    "@fastgpt-sdk/plugin": "^0.1.7",
     "@fastgpt/global": "workspace:*",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "@node-rs/jieba": "2.0.1",