fix: system tool config

Author: FinleyGe

packages/global/core/app/plugin/utils.ts

@@ -1,6 +1,7 @@
 import { type StoreNodeItemType } from '../../workflow/type/node';
 import { type FlowNodeInputItemType } from '../../workflow/type/io';
 import { FlowNodeTypeEnum } from '../../workflow/node/constant';
+import { PluginSourceEnum } from './constants';
 
 export const getPluginInputsFromStoreNodes = (nodes: StoreNodeItemType[]) => {
   return nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput)?.inputs || [];
@@ -22,3 +23,34 @@ export const getPluginRunContent = ({
   });
   return JSON.stringify(pluginInputsWithValue);
 };
+
+/**
+  plugin id rule:
+  - personal: ObjectId
+  - commercial: commercial-ObjectId
+  - systemtool: systemTool-id
+  (deprecated) community: community-id
+*/
+export 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 | undefined];
+  if (!source || !pluginId) throw new Error('pluginId not found');
+
+  // 兼容4.10.0 之前的插件
+  if (source === 'community' || id === 'commercial-dalle3') {
+    return {
+      source: PluginSourceEnum.systemTool,
+      pluginId: `${PluginSourceEnum.systemTool}-${pluginId}`
+    };
+  }
+
+  return { source, pluginId: id };
+}

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

@@ -37,37 +37,7 @@ import type {
 } 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:
-  - personal: ObjectId
-  - commercial: commercial-ObjectId
-  - systemtool: systemTool-id
-  (deprecated) community: community-id
-*/
-export 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 | undefined];
-  if (!source || !pluginId) throw new Error('pluginId not found');
-
-  // 兼容4.10.0 之前的插件
-  if (source === 'community' || id === 'commercial-dalle3') {
-    return {
-      source: PluginSourceEnum.systemTool,
-      pluginId: `${PluginSourceEnum.systemTool}-${pluginId}`
-    };
-  }
-
-  return { source, pluginId: id };
-}
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
 type ChildAppType = SystemPluginTemplateItemType & {
   teamId?: string;

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

@@ -1,9 +1,9 @@
 import { type ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
 import { type PluginRuntimeType } from '@fastgpt/global/core/app/plugin/type';
-import { splitCombinePluginId } from './controller';
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
-/* 
+/*
   Plugin points calculation:
   1. 系统插件/商业版插件：
     - 有错误：返回 0

packages/service/core/app/utils.ts

@@ -3,11 +3,12 @@ import { getEmbeddingModel } from '../ai/model';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
-import { getChildAppPreviewNode, splitCombinePluginId } from './plugin/controller';
+import { getChildAppPreviewNode } from './plugin/controller';
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { authAppByTmbId } from '../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { getErrText } from '@fastgpt/global/common/error/utils';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
 export async function listAppDatasetDataByTeamIdAndDatasetIds({
   teamId,

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

@@ -1,4 +1,7 @@
-import { getPluginInputsFromStoreNodes } from '@fastgpt/global/core/app/plugin/utils';
+import {
+  getPluginInputsFromStoreNodes,
+  splitCombinePluginId
+} from '@fastgpt/global/core/app/plugin/utils';
 import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
@@ -16,7 +19,7 @@ import { computedPluginUsage } from '../../../app/plugin/utils';
 import { filterSystemVariables } from '../utils';
 import { getPluginRunUserQuery } from '@fastgpt/global/core/workflow/utils';
 import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
-import { getChildAppRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller';
+import { getChildAppRuntimeById } from '../../../app/plugin/controller';
 import { dispatchWorkFlow } from '../index';
 import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
 import { dispatchRunTool } from './runTool';

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

@@ -13,7 +13,7 @@ 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 { getSystemToolById, splitCombinePluginId } from '../../../app/plugin/controller';
+import { getSystemToolById } from '../../../app/plugin/controller';
 
 type SystemInputConfigType = {
   type: SystemToolInputTypeEnum;

packages/service/support/permission/app/auth.ts

@@ -10,10 +10,10 @@ import { AppPermission } from '@fastgpt/global/support/permission/app/controller
 import { type PermissionValueType } from '@fastgpt/global/support/permission/type';
 import { AppFolderTypeList } from '@fastgpt/global/core/app/constants';
 import { type ParentIdType } from '@fastgpt/global/common/parentFolder/type';
-import { splitCombinePluginId } from '../../../core/app/plugin/controller';
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { type AuthModeType, type AuthResponseType } from '../type';
 import { AppDefaultPermissionVal } from '@fastgpt/global/support/permission/app/constant';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
 export const authPluginByTmbId = async ({
   tmbId,

projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts

@@ -3,16 +3,14 @@
  */
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
-import {
-  getChildAppPreviewNode,
-  splitCombinePluginId
-} from '@fastgpt/service/core/app/plugin/controller';
+import { getChildAppPreviewNode } from '@fastgpt/service/core/app/plugin/controller';
 import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
 import { NextAPI } from '@/service/middleware/entry';
 import { type ApiRequestProps } from '@fastgpt/service/type/next';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import type { NextApiResponse } from 'next';
 import { getLocale } from '@fastgpt/service/common/middle/i18n';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
 export type GetPreviewNodeQuery = { appId: string; versionId?: string };
 

projects/app/src/pages/api/core/app/plugin/getVersionList.ts

@@ -6,13 +6,11 @@ import { type ApiRequestProps } from '@fastgpt/service/type/next';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { parsePaginationRequest } from '@fastgpt/service/common/api/pagination';
-import {
-  getSystemPluginByIdAndVersionId,
-  splitCombinePluginId
-} from '@fastgpt/service/core/app/plugin/controller';
+import { getSystemPluginByIdAndVersionId } from '@fastgpt/service/core/app/plugin/controller';
 import { PluginSourceEnum } from '@fastgpt/global/core/app/plugin/constants';
 import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin';
 import { Types } from '@fastgpt/service/common/mongo';
+import { splitCombinePluginId } from '@fastgpt/global/core/app/plugin/utils';
 
 export type getToolVersionListProps = PaginationProps<{
   pluginId?: string;