V4.9.6 feature (#4565)

* Dashboard submenu (#4545) * add app submenu (#4452) * add app submenu * fix * width & i18n * optimize submenu code (#4515) * optimize submenu code * fix * fix * fix * fix ts * perf: dashboard sub menu * doc --------- Co-authored-by: heheer <heheer@sealos.io> * feat: value format test * doc * Mcp export (#4555) * feat: mcp server * feat: mcp server * feat: mcp server build * update doc * perf: path selector (#4556) * perf: path selector * fix: docker file path * perf: add image endpoint to dataset search (#4557) * perf: add image endpoint to dataset search * fix: mcp_server url * human in loop (#4558) * Support interactive nodes for loops, and enhance the function of merging nested and loop node history messages. (#4552) * feat: add LoopInteractive definition * feat: Support LoopInteractive type and update related logic * fix: Refactor loop handling logic and improve output value initialization * feat: Add mergeSignId to dispatchLoop and dispatchRunAppNode responses * feat: Enhance mergeChatResponseData to recursively merge plugin details and improve response handling * refactor: Remove redundant comments in mergeChatResponseData for clarity * perf: loop interactive * perf: human in loop --------- Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com> * mcp server ui * integrate mcp (#4549) * integrate mcp * delete unused code * fix ts * bug fix * fix * support whole mcp tools * add try catch * fix * fix * fix ts * fix test * fix ts * fix: interactive in v1 completions * doc * fix: router path * fix mcp integrate (#4563) * fix mcp integrate * fix ui * fix: mcp ux * feat: mcp call title * remove repeat loading * fix mcp tools avatar (#4564) * fix * fix avatar * fix update version * update doc * fix: value format * close server and remove cache * perf: avatar --------- Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com>
2025-07-23 13:03:50 +00:00 · 2025-04-16 22:18:51 +08:00
parent ab799e13cd
commit 952412f648
166 changed files with 6318 additions and 1263 deletions
--- a/packages/service/core/app/controller.ts
+++ b/packages/service/core/app/controller.ts
@@ -86,3 +86,19 @@ export async function findAppAndAllChildren({

  return [app, ...childDatasets];
 }
+
+export const getAppBasicInfoByIds = async ({ teamId, ids }: { teamId: string; ids: string[] }) => {
+  const apps = await MongoApp.find(
+    {
+      teamId,
+      _id: { $in: ids }
+    },
+    '_id name avatar'
+  ).lean();
+
+  return apps.map((item) => ({
+    id: item._id,
+    name: item.name,
+    avatar: item.avatar
+  }));
+};
--- a/packages/service/core/app/plugin/controller.ts
+++ b/packages/service/core/app/plugin/controller.ts
@@ -1,6 +1,11 @@
 import { FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
 import { FlowNodeTypeEnum, defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
-import { appData2FlowNodeIO, pluginData2FlowNodeIO } from '@fastgpt/global/core/workflow/utils';
+import {
+  appData2FlowNodeIO,
+  pluginData2FlowNodeIO,
+  toolData2FlowNodeIO,
+  toolSetData2FlowNodeIO
+} from '@fastgpt/global/core/workflow/utils';
 import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
 import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
 import { getHandleConfig } from '@fastgpt/global/core/workflow/template/utils';
@@ -128,11 +133,41 @@ export async function getChildAppPreviewNode({
    (node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput
  );

+  const isTool =
+    !!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.tool) &&
+    app.workflow.nodes.length === 1;
+
+  const isToolSet =
+    !!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.toolSet) &&
+    app.workflow.nodes.length === 1;
+
+  const { flowNodeType, nodeIOConfig } = (() => {
+    if (isToolSet)
+      return {
+        flowNodeType: FlowNodeTypeEnum.toolSet,
+        nodeIOConfig: toolSetData2FlowNodeIO({ nodes: app.workflow.nodes })
+      };
+    if (isTool)
+      return {
+        flowNodeType: FlowNodeTypeEnum.tool,
+        nodeIOConfig: toolData2FlowNodeIO({ nodes: app.workflow.nodes })
+      };
+    if (isPlugin)
+      return {
+        flowNodeType: FlowNodeTypeEnum.pluginModule,
+        nodeIOConfig: pluginData2FlowNodeIO({ nodes: app.workflow.nodes })
+      };
+    return {
+      flowNodeType: FlowNodeTypeEnum.appModule,
+      nodeIOConfig: appData2FlowNodeIO({ chatConfig: app.workflow.chatConfig })
+    };
+  })();
+
  return {
    id: getNanoid(),
    pluginId: app.id,
    templateType: app.templateType,
-    flowNodeType: isPlugin ? FlowNodeTypeEnum.pluginModule : FlowNodeTypeEnum.appModule,
+    flowNodeType,
    avatar: app.avatar,
    name: app.name,
    intro: app.intro,
@@ -141,11 +176,13 @@ export async function getChildAppPreviewNode({
    showStatus: app.showStatus,
    isTool: true,
    version: app.version,
-    sourceHandle: getHandleConfig(true, true, true, true),
-    targetHandle: getHandleConfig(true, true, true, true),
-    ...(isPlugin
-      ? pluginData2FlowNodeIO({ nodes: app.workflow.nodes })
-      : appData2FlowNodeIO({ chatConfig: app.workflow.chatConfig }))
+    sourceHandle: isToolSet
+      ? getHandleConfig(false, false, false, false)
+      : getHandleConfig(true, true, true, true),
+    targetHandle: isToolSet
+      ? getHandleConfig(false, false, false, false)
+      : getHandleConfig(true, true, true, true),
+    ...nodeIOConfig
  };
 }