From 43674e463aff5d0f107573581e7f16e2e2fa6ab8 Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Thu, 11 Jul 2024 17:58:16 +0800 Subject: [PATCH 01/11] feat: system plugin (#2024) --- packages/global/core/plugin/type.d.ts | 2 +- .../global/core/workflow/runtime/type.d.ts | 3 +- packages/global/core/workflow/type/index.d.ts | 12 +++ packages/plugins/register.ts | 90 +++++++++++++------ packages/plugins/type.d.ts | 6 +- .../service/core/app/plugin/controller.ts | 22 ++--- packages/service/core/app/plugin/utils.ts | 21 +++++ .../core/workflow/dispatch/plugin/run.ts | 27 +++--- .../core/workflow/dispatch/tools/http468.ts | 4 +- .../service/support/permission/app/auth.ts | 21 +++++ .../web/components/common/Avatar/index.tsx | 22 +++++ .../app/plugin/getSystemPluginTemplates.ts | 29 +++--- 12 files changed, 190 insertions(+), 69 deletions(-) create mode 100644 packages/service/core/app/plugin/utils.ts create mode 100644 packages/web/components/common/Avatar/index.tsx diff --git a/packages/global/core/plugin/type.d.ts b/packages/global/core/plugin/type.d.ts index 361df1cf5ac..38215640e4e 100644 --- a/packages/global/core/plugin/type.d.ts +++ b/packages/global/core/plugin/type.d.ts @@ -32,7 +32,7 @@ export type PluginItemSchema = { export type PluginTemplateType = PluginRuntimeType & { author?: string; id: string; - source: `${PluginSourceEnum}`; + source: PluginSourceEnum; templateType: FlowNodeTemplateType['templateType']; intro: string; version: string; diff --git a/packages/global/core/workflow/runtime/type.d.ts b/packages/global/core/workflow/runtime/type.d.ts index a3c944335f9..6022bbb2bbc 100644 --- a/packages/global/core/workflow/runtime/type.d.ts +++ b/packages/global/core/workflow/runtime/type.d.ts @@ -67,11 +67,12 @@ export type RuntimeNodeItemType = { }; export type PluginRuntimeType = { + id: string; teamId?: string; name: string; avatar: string; showStatus?: boolean; - isTool?: boolean; + currentCost?: number; nodes: StoreNodeItemType[]; edges: StoreEdgeItemType[]; }; diff --git a/packages/global/core/workflow/type/index.d.ts b/packages/global/core/workflow/type/index.d.ts index 07031270c11..0ac8a810167 100644 --- a/packages/global/core/workflow/type/index.d.ts +++ b/packages/global/core/workflow/type/index.d.ts @@ -42,17 +42,29 @@ export type WorkflowTemplateType = { workflow: WorkflowTemplateBasicType; }; + // template market export type TemplateMarketItemType = WorkflowTemplateType & { tags?: { id: string; label: string }[]; }; + // system plugin export type SystemPluginTemplateItemType = WorkflowTemplateType & { templateType: FlowNodeTemplateTypeEnum; isTool?: boolean; + // commercial plugin config originCost: number; // n points/one time currentCost: number; + isActive?: boolean; + inputConfig?: { + // Render config input form. Find the corresponding node and replace the variable directly + key: string; + label: string; + description: string; + value?: any; + }[]; + workflow: WorkflowTemplateBasicType; }; diff --git a/packages/plugins/register.ts b/packages/plugins/register.ts index bb8f1f74459..9a0befbd866 100644 --- a/packages/plugins/register.ts +++ b/packages/plugins/register.ts @@ -3,36 +3,39 @@ import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constant import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { SystemPluginResponseType } from './type'; import { NodeTemplateListItemType } from '@fastgpt/global/core/workflow/type/node'; -import { isProduction } from '../service/common/system/constants'; +import { FastGPTProUrl, isProduction } from '../service/common/system/constants'; +import { GET, POST } from '@fastgpt/service/common/api/plusRequest'; +import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; let list = ['getTime', 'fetchUrl', 'mathExprVal']; +/* Get plugins */ export const getCommunityPlugins = () => { - if (isProduction && global.communitySystemPlugins) return global.communitySystemPlugins; - - global.communitySystemPlugins = list.map((name) => ({ + return list.map((name) => ({ ...require(`./src/${name}/template.json`), - id: `${PluginSourceEnum.community}-${name}` + id: `${PluginSourceEnum.community}-${name}`, + isActive: true })); - - return global.communitySystemPlugins; }; +const getCommercialPlugins = () => { + return GET('/core/app/plugin/getSystemPlugins'); +}; +export const getSystemPluginTemplates = async () => { + if (global.systemPlugins) return global.systemPlugins; -export const getCommunityPluginsTemplateList = () => { - return getCommunityPlugins().map((plugin) => ({ - id: plugin.id, - templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other, - flowNodeType: FlowNodeTypeEnum.pluginModule, - avatar: plugin.avatar, - name: plugin.name, - intro: plugin.intro, - isTool: plugin.isTool - })); + try { + global.systemPlugins = []; + global.systemPlugins = FastGPTProUrl ? await getCommercialPlugins() : getCommunityPlugins(); + + return global.systemPlugins; + } catch (error) { + //@ts-ignore + global.systemPlugins = undefined; + return Promise.reject(error); + } }; export const getCommunityCb = async () => { - if (isProduction && global.communitySystemPluginCb) return global.communitySystemPluginCb; - // Do not modify the following code const loadModule = async (name: string) => { const module = await import(`./src/${name}/index`); @@ -46,12 +49,47 @@ export const getCommunityCb = async () => { })) ); - global.communitySystemPluginCb = result.reduce< - Record SystemPluginResponseType> - >((acc, { name, cb }) => { - acc[name] = cb; - return acc; - }, {}); + return result.reduce SystemPluginResponseType>>( + (acc, { name, cb }) => { + acc[name] = cb; + return acc; + }, + {} + ); +}; +const getCommercialCb = async () => { + const plugins = await getSystemPluginTemplates(); + const result = plugins.map((plugin) => { + const name = plugin.id.split('-')[1]; + + return { + name, + cb: (e: any) => + POST>('/core/app/plugin/run', { + pluginName: name, + data: e + }) + }; + }); + + return result.reduce SystemPluginResponseType>>( + (acc, { name, cb }) => { + acc[name] = cb; + return acc; + }, + {} + ); +}; +export const getSystemPluginCb = async () => { + if (isProduction && global.systemPluginCb) return global.systemPluginCb; - return global.communitySystemPluginCb; + try { + global.systemPluginCb = {}; + global.systemPluginCb = FastGPTProUrl ? await getCommercialCb() : await getCommunityCb(); + return global.systemPluginCb; + } catch (error) { + //@ts-ignore + global.systemPluginCb = undefined; + return Promise.reject(error); + } }; diff --git a/packages/plugins/type.d.ts b/packages/plugins/type.d.ts index 28252f5281a..271e8e1ca0a 100644 --- a/packages/plugins/type.d.ts +++ b/packages/plugins/type.d.ts @@ -1,7 +1,9 @@ +import { PluginTemplateType } from '@fastgpt/global/core/plugin/type.d'; import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; + export type SystemPluginResponseType = Promise>; declare global { - var communitySystemPlugins: SystemPluginTemplateItemType[]; - var communitySystemPluginCb: Record SystemPluginResponseType>; + var systemPlugins: SystemPluginTemplateItemType[]; + var systemPluginCb: Record SystemPluginResponseType>; } diff --git a/packages/service/core/app/plugin/controller.ts b/packages/service/core/app/plugin/controller.ts index 1536388fafc..ea69a878671 100644 --- a/packages/service/core/app/plugin/controller.ts +++ b/packages/service/core/app/plugin/controller.ts @@ -9,7 +9,7 @@ import { getNanoid } from '@fastgpt/global/common/string/tools'; import { cloneDeep } from 'lodash'; import { MongoApp } from '../schema'; import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; -import { getCommunityPlugins } from '@fastgpt/plugins/register'; +import { getSystemPluginTemplates } from '@fastgpt/plugins/register'; /* plugin id rule: @@ -28,7 +28,7 @@ export async function splitCombinePluginId(id: string) { }; } - const [source, pluginId] = id.split('-') as [`${PluginSourceEnum}`, string]; + const [source, pluginId] = id.split('-') as [PluginSourceEnum, string]; if (!source || !pluginId) return Promise.reject('pluginId not found'); return { source, pluginId: id }; @@ -39,14 +39,6 @@ const getPluginTemplateById = async ( ): Promise => { const { source, pluginId } = await splitCombinePluginId(id); - if (source === PluginSourceEnum.community) { - const item = [...global.communityPlugins, ...getCommunityPlugins()].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'); @@ -68,8 +60,14 @@ const getPluginTemplateById = async ( originCost: 0, currentCost: 0 }; + } else { + const item = [...global.communityPlugins, ...(await getSystemPluginTemplates())].find( + (plugin) => plugin.id === pluginId + ); + if (!item) return Promise.reject('plugin not found'); + + return cloneDeep(item); } - return Promise.reject('plugin not found'); }; /* format plugin modules to plugin preview module */ @@ -98,10 +96,12 @@ export async function getPluginRuntimeById(id: string): Promise { + const { source } = await splitCombinePluginId(plugin.id); + + if (source === PluginSourceEnum.commercial) { + return plugin.currentCost ?? 0; + } + + return childrenUsage.reduce((sum, item) => sum + (item.totalPoints || 0), 0); +}; diff --git a/packages/service/core/workflow/dispatch/plugin/run.ts b/packages/service/core/workflow/dispatch/plugin/run.ts index 416a2a35613..c88406af257 100644 --- a/packages/service/core/workflow/dispatch/plugin/run.ts +++ b/packages/service/core/workflow/dispatch/plugin/run.ts @@ -2,7 +2,7 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/ import { dispatchWorkFlow } from '../index'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; -import { getPluginRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller'; +import { getPluginRuntimeById } from '../../../app/plugin/controller'; import { getDefaultEntryNodeIds, initWorkflowEdgeStatus, @@ -10,9 +10,9 @@ import { } from '@fastgpt/global/core/workflow/runtime/utils'; import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type'; import { updateToolInputValue } from '../agent/runTool/utils'; -import { authAppByTmbId } from '../../../../support/permission/app/auth'; +import { authPluginByTmbId } from '../../../../support/permission/app/auth'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; -import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants'; +import { computedPluginUsage } from '../../../app/plugin/utils'; type RunPluginProps = ModuleDispatchProps<{ [key: string]: any; @@ -33,14 +33,12 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise sum + (item.totalPoints || 0), 0), + totalPoints: usagePoints, pluginOutput: output?.pluginOutput, pluginDetail: mode === 'test' && plugin.teamId === teamId @@ -96,8 +96,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise sum + (item.totalPoints || 0), 0), - model: plugin.name, + totalPoints: usagePoints, tokens: 0 } ], diff --git a/packages/service/core/workflow/dispatch/tools/http468.ts b/packages/service/core/workflow/dispatch/tools/http468.ts index d2ff91d66f0..534d2dffd9f 100644 --- a/packages/service/core/workflow/dispatch/tools/http468.ts +++ b/packages/service/core/workflow/dispatch/tools/http468.ts @@ -16,7 +16,7 @@ import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/ty import { getErrText } from '@fastgpt/global/common/error/utils'; import { responseWrite } from '../../../../common/response'; import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils'; -import { getCommunityCb } from '@fastgpt/plugins/register'; +import { getSystemPluginCb } from '@fastgpt/plugins/register'; type PropsArrType = { key: string; @@ -121,7 +121,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise { - const communityPluginCb = await getCommunityCb(); + const communityPluginCb = await getSystemPluginCb(); if (communityPluginCb[httpReqUrl]) { const pluginResult = await communityPluginCb[httpReqUrl](requestBody); return { diff --git a/packages/service/support/permission/app/auth.ts b/packages/service/support/permission/app/auth.ts index bc0c4d38494..4a08c16005b 100644 --- a/packages/service/support/permission/app/auth.ts +++ b/packages/service/support/permission/app/auth.ts @@ -12,6 +12,27 @@ import { AuthResponseType } from '../type/auth.d'; import { PermissionValueType } from '@fastgpt/global/support/permission/type'; import { AppFolderTypeList } from '@fastgpt/global/core/app/constants'; import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; +import { splitCombinePluginId } from '../../../core/app/plugin/controller'; +import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants'; + +export const authPluginByTmbId = async ({ + tmbId, + appId, + per +}: { + tmbId: string; + appId: string; + per: PermissionValueType; +}) => { + const { source } = await splitCombinePluginId(appId); + if (source === PluginSourceEnum.personal) { + await authAppByTmbId({ + appId, + tmbId, + per + }); + } +}; export const authAppByTmbId = async ({ tmbId, diff --git a/packages/web/components/common/Avatar/index.tsx b/packages/web/components/common/Avatar/index.tsx new file mode 100644 index 00000000000..a5d96e26f2b --- /dev/null +++ b/packages/web/components/common/Avatar/index.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import { Image } from '@chakra-ui/react'; +import type { ImageProps } from '@chakra-ui/react'; +import { LOGO_ICON } from '@fastgpt/global/common/system/constants'; + +const Avatar = ({ w = '30px', src, ...props }: ImageProps) => { + return ( + + ); +}; + +export default Avatar; diff --git a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts index 8257459425e..bcb5413e5a6 100644 --- a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts +++ b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts @@ -2,7 +2,9 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { NodeTemplateListItemType } from '@fastgpt/global/core/workflow/type/node.d'; import { NextAPI } from '@/service/middleware/entry'; -import { getCommunityPluginsTemplateList } from '@fastgpt/plugins/register'; +import { getSystemPluginTemplates } from '@fastgpt/plugins/register'; +import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants'; +import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; async function handler( req: NextApiRequest, @@ -10,17 +12,20 @@ async function handler( ): Promise { await authCert({ req, authToken: true }); - // const data: NodeTemplateListItemType[] = - // global.communityPlugins?.map((plugin) => ({ - // id: plugin.id, - // templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other, - // flowNodeType: FlowNodeTypeEnum.pluginModule, - // avatar: plugin.avatar, - // name: plugin.name, - // intro: plugin.intro - // })) || []; - - return getCommunityPluginsTemplateList(); + return getSystemPluginTemplates().then((res) => + res + // Just show the active plugins + .filter((item) => item.isActive) + .map((plugin) => ({ + id: plugin.id, + templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other, + flowNodeType: FlowNodeTypeEnum.pluginModule, + avatar: plugin.avatar, + name: plugin.name, + intro: plugin.intro, + isTool: plugin.isTool + })) + ); } export default NextAPI(handler); From ad693aed9dac8ae970d8afb201d99ac661ab4929 Mon Sep 17 00:00:00 2001 From: heheer <71265218+newfish-cmyk@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:17:00 +0800 Subject: [PATCH 02/11] add plugin cost & change plugin avatar (#2030) * add plugin cost & change plugin avatar * add author --- packages/global/core/workflow/type/node.d.ts | 1 + packages/plugins/src/fetchUrl/template.json | 2 +- packages/plugins/src/getTime/template.json | 4 +- .../plugins/src/mathExprVal/template.json | 2 +- .../web/components/common/Icon/constants.ts | 474 +++++++++--------- .../common/Icon/icons/plugins/textEditor.svg | 1 + packages/web/i18n/en/common.json | 4 +- packages/web/i18n/zh/common.json | 4 +- .../app/public/imgs/workflow/fetchUrl.png | Bin 0 -> 1272 bytes .../app/public/imgs/workflow/fetchUrl.svg | 1 - .../public/imgs/workflow/getCurrentTime.png | Bin 0 -> 1407 bytes .../public/imgs/workflow/getCurrentTime.svg | 7 - .../app/public/imgs/workflow/mathExprEval.png | Bin 0 -> 518 bytes .../app/public/imgs/workflow/mathExprEval.svg | 1 - .../app/plugin/getSystemPluginTemplates.ts | 4 +- .../SimpleApp/components/ToolSelectModal.tsx | 137 +++-- .../Flow/NodeTemplatesModal.tsx | 64 ++- 17 files changed, 389 insertions(+), 317 deletions(-) create mode 100644 packages/web/components/common/Icon/icons/plugins/textEditor.svg create mode 100644 projects/app/public/imgs/workflow/fetchUrl.png delete mode 100644 projects/app/public/imgs/workflow/fetchUrl.svg create mode 100644 projects/app/public/imgs/workflow/getCurrentTime.png delete mode 100644 projects/app/public/imgs/workflow/getCurrentTime.svg create mode 100644 projects/app/public/imgs/workflow/mathExprEval.png delete mode 100644 projects/app/public/imgs/workflow/mathExprEval.svg diff --git a/packages/global/core/workflow/type/node.d.ts b/packages/global/core/workflow/type/node.d.ts index 745df557ef5..4705541b6e9 100644 --- a/packages/global/core/workflow/type/node.d.ts +++ b/packages/global/core/workflow/type/node.d.ts @@ -79,6 +79,7 @@ export type NodeTemplateListItemType = { isTool?: boolean; author?: string; unique?: boolean; // 唯一的 + currentCost?: number; // 当前积分消耗 }; export type NodeTemplateListType = { diff --git a/packages/plugins/src/fetchUrl/template.json b/packages/plugins/src/fetchUrl/template.json index 324bcc74542..b0798c1c932 100644 --- a/packages/plugins/src/fetchUrl/template.json +++ b/packages/plugins/src/fetchUrl/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "网页内容抓取", - "avatar": "/imgs/workflow/fetchUrl.svg", + "avatar": "/imgs/workflow/fetchUrl.png", "intro": "可获取一个网页链接内容，并以 Markdown 格式输出，仅支持获取静态网站。", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/getTime/template.json b/packages/plugins/src/getTime/template.json index 51352918eb3..f402d875939 100644 --- a/packages/plugins/src/getTime/template.json +++ b/packages/plugins/src/getTime/template.json @@ -1,9 +1,9 @@ { - "author": "FastGPT Team", + "author": "FastGPT", "version": "481", "templateType": "tools", "name": "获取当前时间", - "avatar": "/imgs/workflow/getCurrentTime.svg", + "avatar": "/imgs/workflow/getCurrentTime.png", "intro": "获取用户当前时区的时间。", "showStatus": false, "isTool": true, diff --git a/packages/plugins/src/mathExprVal/template.json b/packages/plugins/src/mathExprVal/template.json index 846261ce84e..dbcc0bff8e5 100644 --- a/packages/plugins/src/mathExprVal/template.json +++ b/packages/plugins/src/mathExprVal/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "数学公式执行", - "avatar": "/imgs/workflow/mathExprEval.svg", + "avatar": "/imgs/workflow/mathExprEval.png", "intro": "用于执行数学表达式的工具，通过 js 的 expr-eval 库运行表达式并返回结果。", "showStatus": false, "weight": 10, diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts index 57068fed4a1..de6d21d18b3 100644 --- a/packages/web/components/common/Icon/constants.ts +++ b/packages/web/components/common/Icon/constants.ts @@ -1,241 +1,237 @@ // @ts-nocheck -export const iconPaths = { - book: () => import('./icons/book.svg'), - change: () => import('./icons/change.svg'), - chatSend: () => import('./icons/chatSend.svg'), - closeSolid: () => import('./icons/closeSolid.svg'), - collectionLight: () => import('./icons/collectionLight.svg'), - collectionSolid: () => import('./icons/collectionSolid.svg'), - 'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'), - 'common/addLight': () => import('./icons/common/addLight.svg'), - 'common/backFill': () => import('./icons/common/backFill.svg'), - 'common/backLight': () => import('./icons/common/backLight.svg'), - 'common/clearLight': () => import('./icons/common/clearLight.svg'), - 'common/closeLight': () => import('./icons/common/closeLight.svg'), - 'common/confirm/commonTip': () => import('./icons/common/confirm/commonTip.svg'), - 'common/confirm/deleteTip': () => import('./icons/common/confirm/deleteTip.svg'), - 'common/confirm/rightTip': () => import('./icons/common/confirm/rightTip.svg'), - 'common/courseLight': () => import('./icons/common/courseLight.svg'), - 'common/customTitleLight': () => import('./icons/common/customTitleLight.svg'), - 'common/data': () => import('./icons/common/data.svg'), - 'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'), - 'common/errorFill': () => import('./icons/common/errorFill.svg'), - 'common/file/move': () => import('./icons/common/file/move.svg'), - 'common/folderFill': () => import('./icons/common/folderFill.svg'), - 'common/fullScreenLight': () => import('./icons/common/fullScreenLight.svg'), - 'common/gitFill': () => import('./icons/common/gitFill.svg'), - 'common/gitInlight': () => import('./icons/common/gitInlight.svg'), - 'common/gitLight': () => import('./icons/common/gitLight.svg'), - 'common/googleFill': () => import('./icons/common/googleFill.svg'), - 'common/importLight': () => import('./icons/common/importLight.svg'), - 'common/inviteLight': () => import('./icons/common/inviteLight.svg'), - 'common/language/en': () => import('./icons/common/language/en.svg'), - 'common/language/zh': () => import('./icons/common/language/zh.svg'), - 'common/leftArrowLight': () => import('./icons/common/leftArrowLight.svg'), - 'common/linkBlue': () => import('./icons/common/linkBlue.svg'), - 'common/loading': () => import('./icons/common/loading.svg'), - 'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'), - 'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'), - 'common/openai': () => import('./icons/common/openai.svg'), - 'common/overviewLight': () => import('./icons/common/overviewLight.svg'), - 'common/paramsLight': () => import('./icons/common/paramsLight.svg'), - 'common/playFill': () => import('./icons/common/playFill.svg'), - 'common/playLight': () => import('./icons/common/playLight.svg'), - 'common/publishFill': () => import('./icons/common/publishFill.svg'), - 'common/questionLight': () => import('./icons/common/questionLight.svg'), - 'common/refreshLight': () => import('./icons/common/refreshLight.svg'), - 'common/resultLight': () => import('./icons/common/resultLight.svg'), - 'common/retryLight': () => import('./icons/common/retryLight.svg'), - 'common/rightArrowFill': () => import('./icons/common/rightArrowFill.svg'), - 'common/rightArrowLight': () => import('./icons/common/rightArrowLight.svg'), - 'common/routePushLight': () => import('./icons/common/routePushLight.svg'), - 'common/saveFill': () => import('./icons/common/saveFill.svg'), - 'common/searchLight': () => import('./icons/common/searchLight.svg'), - 'common/select': () => import('./icons/common/select.svg'), - 'common/selectLight': () => import('./icons/common/selectLight.svg'), - 'common/settingLight': () => import('./icons/common/settingLight.svg'), - 'common/text/t': () => import('./icons/common/text/t.svg'), - 'common/tickFill': () => import('./icons/common/tickFill.svg'), - 'common/trash': () => import('./icons/common/trash.svg'), - 'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'), - 'common/viewLight': () => import('./icons/common/viewLight.svg'), - 'common/voiceLight': () => import('./icons/common/voiceLight.svg'), - 'common/wechatFill': () => import('./icons/common/wechatFill.svg'), - copy: () => import('./icons/copy.svg'), - 'core/app/aiFill': () => import('./icons/core/app/aiFill.svg'), - 'core/app/aiLight': () => import('./icons/core/app/aiLight.svg'), - 'core/app/appApiLight': () => import('./icons/core/app/appApiLight.svg'), - 'core/app/customFeedback': () => import('./icons/core/app/customFeedback.svg'), - 'core/app/headphones': () => import('./icons/core/app/headphones.svg'), - 'core/app/inputGuides': () => import('./icons/core/app/inputGuides.svg'), - 'core/app/logsLight': () => import('./icons/core/app/logsLight.svg'), - 'core/app/markLight': () => import('./icons/core/app/markLight.svg'), - 'core/app/publish/lark': () => import('./icons/core/app/publish/lark.svg'), - 'core/app/questionGuide': () => import('./icons/core/app/questionGuide.svg'), - 'core/app/schedulePlan': () => import('./icons/core/app/schedulePlan.svg'), - 'core/app/simpleBot': () => import('./icons/core/app/simpleBot.svg'), - 'core/app/simpleMode/ai': () => import('./icons/core/app/simpleMode/ai.svg'), - 'core/app/simpleMode/chat': () => import('./icons/core/app/simpleMode/chat.svg'), - 'core/app/simpleMode/dataset': () => import('./icons/core/app/simpleMode/dataset.svg'), - 'core/app/simpleMode/template': () => import('./icons/core/app/simpleMode/template.svg'), - 'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'), - 'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'), - 'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'), - 'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'), - 'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'), - 'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'), - 'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'), - 'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'), - 'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'), - 'core/app/type/simple': () => import('./icons/core/app/type/simple.svg'), - 'core/app/type/workflow': () => import('./icons/core/app/type/workflow.svg'), - 'core/app/type/workflowFill': () => import('./icons/core/app/type/workflowFill.svg'), - 'core/app/variable/external': () => import('./icons/core/app/variable/external.svg'), - 'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'), - 'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'), - 'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'), - 'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'), - 'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'), - 'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'), - 'core/chat/chatLight': () => import('./icons/core/chat/chatLight.svg'), - 'core/chat/chatModelTag': () => import('./icons/core/chat/chatModelTag.svg'), - 'core/chat/export/pdf': () => import('./icons/core/chat/export/pdf.svg'), - 'core/chat/feedback/badLight': () => import('./icons/core/chat/feedback/badLight.svg'), - 'core/chat/feedback/goodLight': () => import('./icons/core/chat/feedback/goodLight.svg'), - 'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'), - 'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'), - 'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'), - 'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'), - 'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'), - 'core/chat/sendFill': () => import('./icons/core/chat/sendFill.svg'), - 'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'), - 'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'), - 'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'), - 'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'), - 'core/dataset/commonDataset': () => import('./icons/core/dataset/commonDataset.svg'), - 'core/dataset/datasetFill': () => import('./icons/core/dataset/datasetFill.svg'), - 'core/dataset/datasetLight': () => import('./icons/core/dataset/datasetLight.svg'), - 'core/dataset/externalDataset': () => import('./icons/core/dataset/externalDataset.svg'), - 'core/dataset/fileCollection': () => import('./icons/core/dataset/fileCollection.svg'), - 'core/dataset/fullTextRecall': () => import('./icons/core/dataset/fullTextRecall.svg'), - 'core/dataset/manualCollection': () => import('./icons/core/dataset/manualCollection.svg'), - 'core/dataset/mixedRecall': () => import('./icons/core/dataset/mixedRecall.svg'), - 'core/dataset/modeEmbedding': () => import('./icons/core/dataset/modeEmbedding.svg'), - 'core/dataset/rerank': () => import('./icons/core/dataset/rerank.svg'), - 'core/dataset/splitLight': () => import('./icons/core/dataset/splitLight.svg'), - 'core/dataset/tableCollection': () => import('./icons/core/dataset/tableCollection.svg'), - 'core/dataset/websiteDataset': () => import('./icons/core/dataset/websiteDataset.svg'), - 'core/modules/basicNode': () => import('./icons/core/modules/basicNode.svg'), - 'core/modules/fixview': () => import('./icons/core/modules/fixview.svg'), - 'core/modules/flowLight': () => import('./icons/core/modules/flowLight.svg'), - 'core/modules/previewLight': () => import('./icons/core/modules/previewLight.svg'), - 'core/modules/systemPlugin': () => import('./icons/core/modules/systemPlugin.svg'), - 'core/modules/teamPlugin': () => import('./icons/core/modules/teamPlugin.svg'), - 'core/modules/variable': () => import('./icons/core/modules/variable.svg'), - 'core/modules/welcomeText': () => import('./icons/core/modules/welcomeText.svg'), - 'core/workflow/closeEdge': () => import('./icons/core/workflow/closeEdge.svg'), - 'core/workflow/debug': () => import('./icons/core/workflow/debug.svg'), - 'core/workflow/debugBlue': () => import('./icons/core/workflow/debugBlue.svg'), - 'core/workflow/debugNext': () => import('./icons/core/workflow/debugNext.svg'), - 'core/workflow/debugResult': () => import('./icons/core/workflow/debugResult.svg'), - 'core/workflow/edgeArrow': () => import('./icons/core/workflow/edgeArrow.svg'), - 'core/workflow/grout': () => import('./icons/core/workflow/grout.svg'), - 'core/workflow/inputType/dynamic': () => import('./icons/core/workflow/inputType/dynamic.svg'), - 'core/workflow/inputType/input': () => import('./icons/core/workflow/inputType/input.svg'), - 'core/workflow/inputType/jsonEditor': () => - import('./icons/core/workflow/inputType/jsonEditor.svg'), - 'core/workflow/inputType/numberInput': () => - import('./icons/core/workflow/inputType/numberInput.svg'), - 'core/workflow/inputType/reference': () => - import('./icons/core/workflow/inputType/reference.svg'), - 'core/workflow/inputType/select': () => import('./icons/core/workflow/inputType/select.svg'), - 'core/workflow/inputType/selectApp': () => - import('./icons/core/workflow/inputType/selectApp.svg'), - 'core/workflow/inputType/selectDataset': () => - import('./icons/core/workflow/inputType/selectDataset.svg'), - 'core/workflow/inputType/selectLLM': () => - import('./icons/core/workflow/inputType/selectLLM.svg'), - 'core/workflow/inputType/switch': () => import('./icons/core/workflow/inputType/switch.svg'), - 'core/workflow/inputType/textarea': () => import('./icons/core/workflow/inputType/textarea.svg'), - 'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'), - 'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'), - 'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'), - 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), - 'core/workflow/running': () => import('./icons/core/workflow/running.svg'), - 'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'), - date: () => import('./icons/date.svg'), - delete: () => import('./icons/delete.svg'), - edit: () => import('./icons/edit.svg'), - empty: () => import('./icons/empty.svg'), - export: () => import('./icons/export.svg'), - 'file/csv': () => import('./icons/file/csv.svg'), - 'file/fill/csv': () => import('./icons/file/fill/csv.svg'), - 'file/fill/doc': () => import('./icons/file/fill/doc.svg'), - 'file/fill/file': () => import('./icons/file/fill/file.svg'), - 'file/fill/folder': () => import('./icons/file/fill/folder.svg'), - 'file/fill/html': () => import('./icons/file/fill/html.svg'), - 'file/fill/manual': () => import('./icons/file/fill/manual.svg'), - 'file/fill/markdown': () => import('./icons/file/fill/markdown.svg'), - 'file/fill/pdf': () => import('./icons/file/fill/pdf.svg'), - 'file/fill/ppt': () => import('./icons/file/fill/ppt.svg'), - 'file/fill/txt': () => import('./icons/file/fill/txt.svg'), - 'file/fill/xlsx': () => import('./icons/file/fill/xlsx.svg'), - 'file/html': () => import('./icons/file/html.svg'), - 'file/indexImport': () => import('./icons/file/indexImport.svg'), - 'file/manualImport': () => import('./icons/file/manualImport.svg'), - 'file/markdown': () => import('./icons/file/markdown.svg'), - 'file/pdf': () => import('./icons/file/pdf.svg'), - 'file/qaImport': () => import('./icons/file/qaImport.svg'), - 'file/uploadFile': () => import('./icons/file/uploadFile.svg'), - history: () => import('./icons/history.svg'), - kbTest: () => import('./icons/kbTest.svg'), - menu: () => import('./icons/menu.svg'), - minus: () => import('./icons/minus.svg'), - 'modal/AddClb': () => import('./icons/modal/AddClb.svg'), - 'modal/concat': () => import('./icons/modal/concat.svg'), - 'modal/confirmPay': () => import('./icons/modal/confirmPay.svg'), - 'modal/edit': () => import('./icons/modal/edit.svg'), - 'modal/manualDataset': () => import('./icons/modal/manualDataset.svg'), - 'modal/selectSource': () => import('./icons/modal/selectSource.svg'), - 'modal/setting': () => import('./icons/modal/setting.svg'), - 'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'), - more: () => import('./icons/more.svg'), - moreLine: () => import('./icons/moreLine.svg'), - out: () => import('./icons/out.svg'), - 'phoneTabbar/me': () => import('./icons/phoneTabbar/me.svg'), - 'phoneTabbar/tool': () => import('./icons/phoneTabbar/tool.svg'), - 'phoneTabbar/toolFill': () => import('./icons/phoneTabbar/toolFill.svg'), - 'price/bg': () => import('./icons/price/bg.svg'), - 'price/right': () => import('./icons/price/right.svg'), - save: () => import('./icons/save.svg'), - stop: () => import('./icons/stop.svg'), - 'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'), - 'support/account/passwordLogin': () => import('./icons/support/account/passwordLogin.svg'), - 'support/account/plans': () => import('./icons/support/account/plans.svg'), - 'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'), - 'support/bill/extraDatasetsize': () => import('./icons/support/bill/extraDatasetsize.svg'), - 'support/bill/extraPoints': () => import('./icons/support/bill/extraPoints.svg'), - 'support/bill/payRecordLight': () => import('./icons/support/bill/payRecordLight.svg'), - 'support/bill/priceLight': () => import('./icons/support/bill/priceLight.svg'), - 'support/bill/shoppingCart': () => import('./icons/support/bill/shoppingCart.svg'), - 'support/outlink/apikeyFill': () => import('./icons/support/outlink/apikeyFill.svg'), - 'support/outlink/apikeyLight': () => import('./icons/support/outlink/apikeyLight.svg'), - 'support/outlink/iframeLight': () => import('./icons/support/outlink/iframeLight.svg'), - 'support/outlink/share': () => import('./icons/support/outlink/share.svg'), - 'support/outlink/shareLight': () => import('./icons/support/outlink/shareLight.svg'), - 'support/permission/collaborator': () => import('./icons/support/permission/collaborator.svg'), - 'support/permission/privateLight': () => import('./icons/support/permission/privateLight.svg'), - 'support/permission/publicLight': () => import('./icons/support/permission/publicLight.svg'), - 'support/team/key': () => import('./icons/support/team/key.svg'), - 'support/team/memberLight': () => import('./icons/support/team/memberLight.svg'), - 'support/usage/usageRecordLight': () => import('./icons/support/usage/usageRecordLight.svg'), - 'support/user/individuation': () => import('./icons/support/user/individuation.svg'), - 'support/user/informLight': () => import('./icons/support/user/informLight.svg'), - 'support/user/userFill': () => import('./icons/support/user/userFill.svg'), - 'support/user/userLight': () => import('./icons/support/user/userLight.svg'), - text: () => import('./icons/text.svg'), - union: () => import('./icons/union.svg'), - user: () => import('./icons/user.svg'), - wx: () => import('./icons/wx.svg') -}; + export const iconPaths = { + 'book': () => import('./icons/book.svg'), + 'change': () => import('./icons/change.svg'), + 'chatSend': () => import('./icons/chatSend.svg'), + 'closeSolid': () => import('./icons/closeSolid.svg'), + 'collectionLight': () => import('./icons/collectionLight.svg'), + 'collectionSolid': () => import('./icons/collectionSolid.svg'), + 'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'), + 'common/addLight': () => import('./icons/common/addLight.svg'), + 'common/backFill': () => import('./icons/common/backFill.svg'), + 'common/backLight': () => import('./icons/common/backLight.svg'), + 'common/clearLight': () => import('./icons/common/clearLight.svg'), + 'common/closeLight': () => import('./icons/common/closeLight.svg'), + 'common/confirm/commonTip': () => import('./icons/common/confirm/commonTip.svg'), + 'common/confirm/deleteTip': () => import('./icons/common/confirm/deleteTip.svg'), + 'common/confirm/rightTip': () => import('./icons/common/confirm/rightTip.svg'), + 'common/courseLight': () => import('./icons/common/courseLight.svg'), + 'common/customTitleLight': () => import('./icons/common/customTitleLight.svg'), + 'common/data': () => import('./icons/common/data.svg'), + 'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'), + 'common/errorFill': () => import('./icons/common/errorFill.svg'), + 'common/file/move': () => import('./icons/common/file/move.svg'), + 'common/folderFill': () => import('./icons/common/folderFill.svg'), + 'common/fullScreenLight': () => import('./icons/common/fullScreenLight.svg'), + 'common/gitFill': () => import('./icons/common/gitFill.svg'), + 'common/gitInlight': () => import('./icons/common/gitInlight.svg'), + 'common/gitLight': () => import('./icons/common/gitLight.svg'), + 'common/googleFill': () => import('./icons/common/googleFill.svg'), + 'common/importLight': () => import('./icons/common/importLight.svg'), + 'common/inviteLight': () => import('./icons/common/inviteLight.svg'), + 'common/language/en': () => import('./icons/common/language/en.svg'), + 'common/language/zh': () => import('./icons/common/language/zh.svg'), + 'common/leftArrowLight': () => import('./icons/common/leftArrowLight.svg'), + 'common/linkBlue': () => import('./icons/common/linkBlue.svg'), + 'common/loading': () => import('./icons/common/loading.svg'), + 'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'), + 'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'), + 'common/openai': () => import('./icons/common/openai.svg'), + 'common/overviewLight': () => import('./icons/common/overviewLight.svg'), + 'common/paramsLight': () => import('./icons/common/paramsLight.svg'), + 'common/playFill': () => import('./icons/common/playFill.svg'), + 'common/playLight': () => import('./icons/common/playLight.svg'), + 'common/publishFill': () => import('./icons/common/publishFill.svg'), + 'common/questionLight': () => import('./icons/common/questionLight.svg'), + 'common/refreshLight': () => import('./icons/common/refreshLight.svg'), + 'common/resultLight': () => import('./icons/common/resultLight.svg'), + 'common/retryLight': () => import('./icons/common/retryLight.svg'), + 'common/rightArrowFill': () => import('./icons/common/rightArrowFill.svg'), + 'common/rightArrowLight': () => import('./icons/common/rightArrowLight.svg'), + 'common/routePushLight': () => import('./icons/common/routePushLight.svg'), + 'common/saveFill': () => import('./icons/common/saveFill.svg'), + 'common/searchLight': () => import('./icons/common/searchLight.svg'), + 'common/select': () => import('./icons/common/select.svg'), + 'common/selectLight': () => import('./icons/common/selectLight.svg'), + 'common/settingLight': () => import('./icons/common/settingLight.svg'), + 'common/text/t': () => import('./icons/common/text/t.svg'), + 'common/tickFill': () => import('./icons/common/tickFill.svg'), + 'common/trash': () => import('./icons/common/trash.svg'), + 'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'), + 'common/viewLight': () => import('./icons/common/viewLight.svg'), + 'common/voiceLight': () => import('./icons/common/voiceLight.svg'), + 'common/wechatFill': () => import('./icons/common/wechatFill.svg'), + 'copy': () => import('./icons/copy.svg'), + 'core/app/aiFill': () => import('./icons/core/app/aiFill.svg'), + 'core/app/aiLight': () => import('./icons/core/app/aiLight.svg'), + 'core/app/appApiLight': () => import('./icons/core/app/appApiLight.svg'), + 'core/app/customFeedback': () => import('./icons/core/app/customFeedback.svg'), + 'core/app/headphones': () => import('./icons/core/app/headphones.svg'), + 'core/app/inputGuides': () => import('./icons/core/app/inputGuides.svg'), + 'core/app/logsLight': () => import('./icons/core/app/logsLight.svg'), + 'core/app/markLight': () => import('./icons/core/app/markLight.svg'), + 'core/app/publish/lark': () => import('./icons/core/app/publish/lark.svg'), + 'core/app/questionGuide': () => import('./icons/core/app/questionGuide.svg'), + 'core/app/schedulePlan': () => import('./icons/core/app/schedulePlan.svg'), + 'core/app/simpleBot': () => import('./icons/core/app/simpleBot.svg'), + 'core/app/simpleMode/ai': () => import('./icons/core/app/simpleMode/ai.svg'), + 'core/app/simpleMode/chat': () => import('./icons/core/app/simpleMode/chat.svg'), + 'core/app/simpleMode/dataset': () => import('./icons/core/app/simpleMode/dataset.svg'), + 'core/app/simpleMode/template': () => import('./icons/core/app/simpleMode/template.svg'), + 'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'), + 'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'), + 'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'), + 'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'), + 'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'), + 'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'), + 'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'), + 'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'), + 'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'), + 'core/app/type/simple': () => import('./icons/core/app/type/simple.svg'), + 'core/app/type/workflow': () => import('./icons/core/app/type/workflow.svg'), + 'core/app/type/workflowFill': () => import('./icons/core/app/type/workflowFill.svg'), + 'core/app/variable/external': () => import('./icons/core/app/variable/external.svg'), + 'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'), + 'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'), + 'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'), + 'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'), + 'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'), + 'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'), + 'core/chat/chatLight': () => import('./icons/core/chat/chatLight.svg'), + 'core/chat/chatModelTag': () => import('./icons/core/chat/chatModelTag.svg'), + 'core/chat/export/pdf': () => import('./icons/core/chat/export/pdf.svg'), + 'core/chat/feedback/badLight': () => import('./icons/core/chat/feedback/badLight.svg'), + 'core/chat/feedback/goodLight': () => import('./icons/core/chat/feedback/goodLight.svg'), + 'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'), + 'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'), + 'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'), + 'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'), + 'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'), + 'core/chat/sendFill': () => import('./icons/core/chat/sendFill.svg'), + 'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'), + 'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'), + 'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'), + 'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'), + 'core/dataset/commonDataset': () => import('./icons/core/dataset/commonDataset.svg'), + 'core/dataset/datasetFill': () => import('./icons/core/dataset/datasetFill.svg'), + 'core/dataset/datasetLight': () => import('./icons/core/dataset/datasetLight.svg'), + 'core/dataset/externalDataset': () => import('./icons/core/dataset/externalDataset.svg'), + 'core/dataset/fileCollection': () => import('./icons/core/dataset/fileCollection.svg'), + 'core/dataset/fullTextRecall': () => import('./icons/core/dataset/fullTextRecall.svg'), + 'core/dataset/manualCollection': () => import('./icons/core/dataset/manualCollection.svg'), + 'core/dataset/mixedRecall': () => import('./icons/core/dataset/mixedRecall.svg'), + 'core/dataset/modeEmbedding': () => import('./icons/core/dataset/modeEmbedding.svg'), + 'core/dataset/rerank': () => import('./icons/core/dataset/rerank.svg'), + 'core/dataset/splitLight': () => import('./icons/core/dataset/splitLight.svg'), + 'core/dataset/tableCollection': () => import('./icons/core/dataset/tableCollection.svg'), + 'core/dataset/websiteDataset': () => import('./icons/core/dataset/websiteDataset.svg'), + 'core/modules/basicNode': () => import('./icons/core/modules/basicNode.svg'), + 'core/modules/fixview': () => import('./icons/core/modules/fixview.svg'), + 'core/modules/flowLight': () => import('./icons/core/modules/flowLight.svg'), + 'core/modules/previewLight': () => import('./icons/core/modules/previewLight.svg'), + 'core/modules/systemPlugin': () => import('./icons/core/modules/systemPlugin.svg'), + 'core/modules/teamPlugin': () => import('./icons/core/modules/teamPlugin.svg'), + 'core/modules/variable': () => import('./icons/core/modules/variable.svg'), + 'core/modules/welcomeText': () => import('./icons/core/modules/welcomeText.svg'), + 'core/workflow/closeEdge': () => import('./icons/core/workflow/closeEdge.svg'), + 'core/workflow/debug': () => import('./icons/core/workflow/debug.svg'), + 'core/workflow/debugBlue': () => import('./icons/core/workflow/debugBlue.svg'), + 'core/workflow/debugNext': () => import('./icons/core/workflow/debugNext.svg'), + 'core/workflow/debugResult': () => import('./icons/core/workflow/debugResult.svg'), + 'core/workflow/edgeArrow': () => import('./icons/core/workflow/edgeArrow.svg'), + 'core/workflow/grout': () => import('./icons/core/workflow/grout.svg'), + 'core/workflow/inputType/dynamic': () => import('./icons/core/workflow/inputType/dynamic.svg'), + 'core/workflow/inputType/input': () => import('./icons/core/workflow/inputType/input.svg'), + 'core/workflow/inputType/jsonEditor': () => import('./icons/core/workflow/inputType/jsonEditor.svg'), + 'core/workflow/inputType/numberInput': () => import('./icons/core/workflow/inputType/numberInput.svg'), + 'core/workflow/inputType/reference': () => import('./icons/core/workflow/inputType/reference.svg'), + 'core/workflow/inputType/select': () => import('./icons/core/workflow/inputType/select.svg'), + 'core/workflow/inputType/selectApp': () => import('./icons/core/workflow/inputType/selectApp.svg'), + 'core/workflow/inputType/selectDataset': () => import('./icons/core/workflow/inputType/selectDataset.svg'), + 'core/workflow/inputType/selectLLM': () => import('./icons/core/workflow/inputType/selectLLM.svg'), + 'core/workflow/inputType/switch': () => import('./icons/core/workflow/inputType/switch.svg'), + 'core/workflow/inputType/textarea': () => import('./icons/core/workflow/inputType/textarea.svg'), + 'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'), + 'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'), + 'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'), + 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), + 'core/workflow/running': () => import('./icons/core/workflow/running.svg'), + 'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'), + 'date': () => import('./icons/date.svg'), + 'delete': () => import('./icons/delete.svg'), + 'edit': () => import('./icons/edit.svg'), + 'empty': () => import('./icons/empty.svg'), + 'export': () => import('./icons/export.svg'), + 'file/csv': () => import('./icons/file/csv.svg'), + 'file/fill/csv': () => import('./icons/file/fill/csv.svg'), + 'file/fill/doc': () => import('./icons/file/fill/doc.svg'), + 'file/fill/file': () => import('./icons/file/fill/file.svg'), + 'file/fill/folder': () => import('./icons/file/fill/folder.svg'), + 'file/fill/html': () => import('./icons/file/fill/html.svg'), + 'file/fill/manual': () => import('./icons/file/fill/manual.svg'), + 'file/fill/markdown': () => import('./icons/file/fill/markdown.svg'), + 'file/fill/pdf': () => import('./icons/file/fill/pdf.svg'), + 'file/fill/ppt': () => import('./icons/file/fill/ppt.svg'), + 'file/fill/txt': () => import('./icons/file/fill/txt.svg'), + 'file/fill/xlsx': () => import('./icons/file/fill/xlsx.svg'), + 'file/html': () => import('./icons/file/html.svg'), + 'file/indexImport': () => import('./icons/file/indexImport.svg'), + 'file/manualImport': () => import('./icons/file/manualImport.svg'), + 'file/markdown': () => import('./icons/file/markdown.svg'), + 'file/pdf': () => import('./icons/file/pdf.svg'), + 'file/qaImport': () => import('./icons/file/qaImport.svg'), + 'file/uploadFile': () => import('./icons/file/uploadFile.svg'), + 'history': () => import('./icons/history.svg'), + 'kbTest': () => import('./icons/kbTest.svg'), + 'menu': () => import('./icons/menu.svg'), + 'minus': () => import('./icons/minus.svg'), + 'modal/AddClb': () => import('./icons/modal/AddClb.svg'), + 'modal/concat': () => import('./icons/modal/concat.svg'), + 'modal/confirmPay': () => import('./icons/modal/confirmPay.svg'), + 'modal/edit': () => import('./icons/modal/edit.svg'), + 'modal/manualDataset': () => import('./icons/modal/manualDataset.svg'), + 'modal/selectSource': () => import('./icons/modal/selectSource.svg'), + 'modal/setting': () => import('./icons/modal/setting.svg'), + 'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'), + 'more': () => import('./icons/more.svg'), + 'moreLine': () => import('./icons/moreLine.svg'), + 'out': () => import('./icons/out.svg'), + 'phoneTabbar/me': () => import('./icons/phoneTabbar/me.svg'), + 'phoneTabbar/tool': () => import('./icons/phoneTabbar/tool.svg'), + 'phoneTabbar/toolFill': () => import('./icons/phoneTabbar/toolFill.svg'), + 'plugins/textEditor': () => import('./icons/plugins/textEditor.svg'), + 'price/bg': () => import('./icons/price/bg.svg'), + 'price/right': () => import('./icons/price/right.svg'), + 'save': () => import('./icons/save.svg'), + 'stop': () => import('./icons/stop.svg'), + 'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'), + 'support/account/passwordLogin': () => import('./icons/support/account/passwordLogin.svg'), + 'support/account/plans': () => import('./icons/support/account/plans.svg'), + 'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'), + 'support/bill/extraDatasetsize': () => import('./icons/support/bill/extraDatasetsize.svg'), + 'support/bill/extraPoints': () => import('./icons/support/bill/extraPoints.svg'), + 'support/bill/payRecordLight': () => import('./icons/support/bill/payRecordLight.svg'), + 'support/bill/priceLight': () => import('./icons/support/bill/priceLight.svg'), + 'support/bill/shoppingCart': () => import('./icons/support/bill/shoppingCart.svg'), + 'support/outlink/apikeyFill': () => import('./icons/support/outlink/apikeyFill.svg'), + 'support/outlink/apikeyLight': () => import('./icons/support/outlink/apikeyLight.svg'), + 'support/outlink/iframeLight': () => import('./icons/support/outlink/iframeLight.svg'), + 'support/outlink/share': () => import('./icons/support/outlink/share.svg'), + 'support/outlink/shareLight': () => import('./icons/support/outlink/shareLight.svg'), + 'support/permission/collaborator': () => import('./icons/support/permission/collaborator.svg'), + 'support/permission/privateLight': () => import('./icons/support/permission/privateLight.svg'), + 'support/permission/publicLight': () => import('./icons/support/permission/publicLight.svg'), + 'support/team/key': () => import('./icons/support/team/key.svg'), + 'support/team/memberLight': () => import('./icons/support/team/memberLight.svg'), + 'support/usage/usageRecordLight': () => import('./icons/support/usage/usageRecordLight.svg'), + 'support/user/individuation': () => import('./icons/support/user/individuation.svg'), + 'support/user/informLight': () => import('./icons/support/user/informLight.svg'), + 'support/user/userFill': () => import('./icons/support/user/userFill.svg'), + 'support/user/userLight': () => import('./icons/support/user/userLight.svg'), + 'text': () => import('./icons/text.svg'), + 'union': () => import('./icons/union.svg'), + 'user': () => import('./icons/user.svg'), + 'wx': () => import('./icons/wx.svg'), + + }; \ No newline at end of file diff --git a/packages/web/components/common/Icon/icons/plugins/textEditor.svg b/packages/web/components/common/Icon/icons/plugins/textEditor.svg new file mode 100644 index 00000000000..bee20bf70ef --- /dev/null +++ b/packages/web/components/common/Icon/icons/plugins/textEditor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/web/i18n/en/common.json b/packages/web/i18n/en/common.json index 3b14a9bd658..e0a988ef574 100644 --- a/packages/web/i18n/en/common.json +++ b/packages/web/i18n/en/common.json @@ -1046,9 +1046,11 @@ "plugin": { "Custom headers": "Custom headers", "Delete http plugin": "Confirm to delete this group of HTTP plugins? This will delete all plugins in the directory.", + "Free": "The plugin requires no points～", "Get Plugin Module Detail Failed": "Plugin loading failed", "Http plugin intro placeholder": "For display only, no actual effect", - "Intro placeholder": "If this plugin is used as a tool, this introduction will be used as a prompt." + "Intro placeholder": "If this plugin is used as a tool, this introduction will be used as a prompt.", + "cost": "Plugin cost: " }, "shareChat": { "Init Error": "Failed to initialize chat dialog", diff --git a/packages/web/i18n/zh/common.json b/packages/web/i18n/zh/common.json index c7d1e84ea26..2e9c2f67206 100644 --- a/packages/web/i18n/zh/common.json +++ b/packages/web/i18n/zh/common.json @@ -1055,9 +1055,11 @@ "plugin": { "Custom headers": "自定义请求头", "Delete http plugin": "确认删除该组 HTTP 插件？会删除该目录下所有插件。", + "Free": "该插件无需积分消耗～", "Get Plugin Module Detail Failed": "加载插件异常", "Http plugin intro placeholder": "仅做展示，无实际效果", - "Intro placeholder": "如果该插件作为工具被调用，则会使用该介绍作为提示词。" + "Intro placeholder": "如果该插件作为工具被调用，则会使用该介绍作为提示词。", + "cost": "积分消耗：" }, "shareChat": { "Init Error": "初始化对话框失败", diff --git a/projects/app/public/imgs/workflow/fetchUrl.png b/projects/app/public/imgs/workflow/fetchUrl.png new file mode 100644 index 0000000000000000000000000000000000000000..d2e42d4934389b741a3d6505810fe1d14f4c3ee2 GIT binary patch literal 1272 zcmVk#Tr=U!ctH8)-vOmXrecm72EWPVD4PHwF>kkXB<5A-TZHCHW_+{A z{D+jzKKq@Lc~b0?Y(Byb8#S9SJH=Lk!jy8iWSVRt*w|utMrb`a_#dc>`bv78w5s9q zIPobq!gd9ZW8>@G5Fu5FTwE?NldV#{dz-PBc2Stk;MqRH(o&WIv&zx&K_Y$+?V|0a z%+%_9cQsB!mQoQir{6lr-fi7Py*7>qO@@0r=&-}rmu_)xI!?Q2i_mpR&E2^rP9GfM z-oi2`4ool__F|KWX}Zoxr7t-kTlSuz9+rx#6<5|Gl&jW=_JoMnAuG{x zIPDbO9^y5SK8od14OMY)V^yWmFjy;9(4{`zN@iFoRxsuNYvqa+SJp&*ZZXGFzKqsr zpv$jQ`6AsC1w`D2VN%pI%7p?!pHCts(W)DyMQek8H-4`Nm!vHg3G(L7k@Z|z6tz6k zQ=vMqO^%YS8hr4>MLs*an{B;at?BP?r&vza`S{50mYvf~K0JGsPhTHrC>-E+zRvG+ z2}`alX{bx0F_SK~t~*>d8a6w*hx%y3kf+b?us^aZlE%8O;di@Q_H0h2Kj^jM${L}` zo&XE7ab+qx1<^v->tay|W(q2ql58I}ox0*AFZx;&GI3QWC}eDss*DK!dSZpK-iQ@f z)(hj6beStT(NWzbn@kZ3hwzE8>rK6+vofyZl+9Jss%W(ucBd0pO(i56dinV%hbN*| z+*mJ+FN9oNp1#MiScJgdA-=pk$H_fW`XZfNaOkLVtE12Lkd+91`_}>=y*Sc}(2qA3 z*&iFU>c;wB=98Phdte7==T^y=%1rc!xtGc^(dlNu>tH}MGAY-KnG(H0A8ygw&(jHx zPYw`rTW>1b?x{;vji06$$(2-crjw~ouzLe&!HAHS5;2`5+8e?t1?t#%KOtv(4aJ6= z{8bV2r9_^Zh`C%`!`az|y;3GDwP#;n2ZO$i^?uLZI@ZH8LhGSP=sa5lBIav0`M$u` z!5Jl}5y* literal 0 HcmV?d00001 diff --git a/projects/app/public/imgs/workflow/fetchUrl.svg b/projects/app/public/imgs/workflow/fetchUrl.svg deleted file mode 100644 index d034e6eba0a..00000000000 --- a/projects/app/public/imgs/workflow/fetchUrl.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/projects/app/public/imgs/workflow/getCurrentTime.png b/projects/app/public/imgs/workflow/getCurrentTime.png new file mode 100644 index 0000000000000000000000000000000000000000..69f9b9a90ea03613d32d20052669cf6a5f1c969e GIT binary patch literal 1407 zcmV-_1%UdAP)QBi?{j+x?GrwipXfLCt<+foil_YF`BmIB>M*X?hzaq!dQ?`YE1=_B?VcMH1TK_ zH0gBV{o*T3kpQ7kkf3a)@$*lSLlNYjs~F>PV&-R&Hdt|gdy04{fNyFRa&oYJcmzkq z7EL^wQWo=iaUK7fbWx9>UWd!=Mzy7)n{ZUfV*|mHCz-u|joGRS7KZxCo}0n0flE`$tW{N%zxOW6^bD1|_TV^n z3~Nada^GE&UQJI&5+7My8*biUV_h}XpL|Sib1UXxg!=bCU}J5)7AkFmvdhb;uB@W4 zvWCJ#?_d;ZOJ=6IiKHTn1u`@L?7VFofyG5`ba#_;;C1A<4ttuF4I-7RCMbbGZ!ba> z=JIkF9tOXkMOEZMeKZpTbYDJ)!C<1Uu8#ct{N#Vsu`yIpMT0?4EFK~3@nTvY z*8eLAlZom11@gqVQsO|;>61exwhI&$7m=53ClU>ln*NU*ZQh(ro)iq=_AgQ)Yn!Px z4Vl?yBVDCQ$YEFml{18UMkpwsCvoBp2kR55EOEE5+)=^q%xCul5LSz4&H3DSwm zY;34!rn8fXdkR(fMqOC=%h2kQV-o_CBEw;n^XCZ)KTTcfqM)TE`HWQ)lt7h;@WkK% z&dXN`H8r7RWS|ZXqKYb@E>$am{(cle9uo0)UAe;S&=BQqZCYux3(6D8D%-b@z7r>K z-MK@+?;|!hha!Y1Gqb33^U1Wu#5%Vqs^`9Ym!VUqsNKDr?4}m2G^}U~8w~{L_@N!= zFYT1QxQm>Z_hQ+Ug*-nkevF`G=i?J1r+;o|_}Vq>t|?yN60bRvO)KG8Nrf)nyiK0i z@05wCdmcQX=f|Iz67!8`VgjA4BXg5oEH9PRzO)xxNeTCch8dgpvbUvCD+R0a*0F48 zN#m~Yzp$bq`!}qHkYzl5>v$Xzf-bObp!UkbkQZ4eNSqZ(iGwQDAm3UK$1!q2p+lA& z4v(Z$c8YS1vUW%wSS2nV$!p@QNUYc5ct&dA$>2i5GIC5go+wPB;SZwd8uoYr0iOT> N002ovPDHLkV1nrah-Lr) literal 0 HcmV?d00001 diff --git a/projects/app/public/imgs/workflow/getCurrentTime.svg b/projects/app/public/imgs/workflow/getCurrentTime.svg deleted file mode 100644 index bce53c3fe72..00000000000 --- a/projects/app/public/imgs/workflow/getCurrentTime.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/projects/app/public/imgs/workflow/mathExprEval.png b/projects/app/public/imgs/workflow/mathExprEval.png new file mode 100644 index 0000000000000000000000000000000000000000..b08f161a48752a30b273b71d43c6ac24f9f7fc0b GIT binary patch literal 518 zcmV+h0{Q)kP)ugK~#7F?U=ty z!$1_rzwfL|e^IT}qM*$pE`>Tc+v4ix*5Fz3?U;D z@*@)RBL+>5>j!Wh#~UY8X_S{&po6wh{csPD5BJ`9GC!>?^#5KN5d&ktcVF6>+U~SO z$?z^DQa|F!G;~mULf7U69H*nQ1moEp=H`n(K3_?wezcFNwi71!tnG%M8jNh&d85bLdL0+Nt20mnWg>Iq*$N&HU07*qo IM6N<$f))MN4*&oF literal 0 HcmV?d00001 diff --git a/projects/app/public/imgs/workflow/mathExprEval.svg b/projects/app/public/imgs/workflow/mathExprEval.svg deleted file mode 100644 index 959ed176fd3..00000000000 --- a/projects/app/public/imgs/workflow/mathExprEval.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts index bcb5413e5a6..a20661a10be 100644 --- a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts +++ b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts @@ -23,7 +23,9 @@ async function handler( avatar: plugin.avatar, name: plugin.name, intro: plugin.intro, - isTool: plugin.isTool + isTool: plugin.isTool, + currentCost: plugin.currentCost, + author: plugin.author })) ); } diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx index c7f8f4d8cbe..500b21be7e7 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx @@ -5,6 +5,7 @@ import { useTranslation } from 'next-i18next'; import { Box, Button, + Divider, Flex, Input, InputGroup, @@ -41,6 +42,7 @@ import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import { getAppFolderPath } from '@/web/core/app/api/app'; import FolderPath from '@/components/common/folder/Path'; +import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; type Props = { selectedTools: FlowNodeTemplateType[]; @@ -145,6 +147,7 @@ const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) templates={templates} isLoadingData={isLoading} setParentId={setParentId} + showCost={templateType === TemplateTypeEnum.systemPlugin} {...props} /> @@ -160,11 +163,13 @@ const RenderList = React.memo(function RenderList({ isLoadingData, onAddTool, onRemoveTool, - setParentId + setParentId, + showCost }: Props & { templates: NodeTemplateListItemType[]; isLoadingData: boolean; setParentId: React.Dispatch>; + showCost?: boolean; }) { const { t } = useTranslation(); const [configTool, setConfigTool] = useState(); @@ -195,57 +200,93 @@ const RenderList = React.memo(function RenderList({ const selected = selectedTools.some((tool) => tool.pluginId === item.id); return ( - + + {item.avatar?.startsWith('/') ? ( + + ) : ( + + )} + + {t(item.name)} + + + + {t(item.intro) || t('core.workflow.Not intro')} + + {showCost && ( + <> + + + {t('core.plugin.cost')} + {item.currentCost || t('core.plugin.Free')} + + + )} + + } > - - - {t(item.name as any)} - {item.intro && ( - - {t(item.intro as any)} + + {item.avatar?.startsWith('/') ? ( + + ) : ( + + )} + + {t(item.name)} + + {showCost && ( + + {item.author ? `by ${item.author}` : `by 匿名大佬`} )} - - {selected ? ( - - ) : item.isFolder ? ( - - ) : ( - - )} - + {selected ? ( + + ) : item.isFolder ? ( + + ) : ( + + )} + + ); })} {!!configTool && ( diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx index 028467ef684..efb7168271d 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -1,5 +1,14 @@ import React, { useCallback, useMemo, useState } from 'react'; -import { Box, Flex, IconButton, Input, InputGroup, InputLeftElement, css } from '@chakra-ui/react'; +import { + Box, + Divider, + Flex, + IconButton, + Input, + InputGroup, + InputLeftElement, + css +} from '@chakra-ui/react'; import type { NodeTemplateListItemType, NodeTemplateListType @@ -43,6 +52,7 @@ type RenderListProps = { onClose: () => void; parentId: ParentIdType; setParentId: React.Dispatch>; + showCost?: boolean; }; enum TemplateTypeEnum { @@ -249,6 +259,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { onClose={onClose} parentId={parentId} setParentId={setParentId} + showCost={templateType === TemplateTypeEnum.systemPlugin} /> @@ -264,7 +275,8 @@ const RenderList = React.memo(function RenderList({ templates, onClose, parentId, - setParentId + setParentId, + showCost }: RenderListProps) { const { t } = useTranslation(); const { appT } = useI18n(); @@ -387,12 +399,16 @@ const RenderList = React.memo(function RenderList({ label={ - + {template.avatar?.startsWith('/') ? ( + + ) : ( + + )} {t(template.name as any)} @@ -400,6 +416,17 @@ const RenderList = React.memo(function RenderList({ {t(template.intro as any) || t('common:core.workflow.Not intro')} + {showCost && ( + <> + + + {t('core.plugin.cost')} + + {template.currentCost || t('core.plugin.Free')} + + + + )} } > @@ -434,15 +461,24 @@ const RenderList = React.memo(function RenderList({ onClose(); }} > - + {template.avatar?.startsWith('/') ? ( + + ) : ( + + )} {t(template.name as any)} + {showCost && ( + + {template.author ? `by ${template.author}` : `by 匿名大佬`} + + )} ))} From a138d7f0195cba0e4b976635ac4125a72688aa01 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Fri, 12 Jul 2024 17:56:20 +0800 Subject: [PATCH 03/11] feat: duckduckgo plugin --- packages/global/core/workflow/type/node.d.ts | 2 +- packages/plugins/package.json | 1 + packages/plugins/register.ts | 29 +- .../plugins/src/duckduckgo/search/index.ts | 32 +++ .../src/duckduckgo/search/template.json | 260 ++++++++++++++++++ packages/plugins/src/duckduckgo/template.json | 17 ++ .../core/workflow/dispatch/chat/oneapi.ts | 141 +++++----- pnpm-lock.yaml | 31 +++ .../app/plugin/getSystemPluginTemplates.ts | 17 +- .../app/src/pages/api/core/app/plugin/path.ts | 35 +++ .../SimpleApp/components/ToolSelectModal.tsx | 31 ++- projects/app/src/web/core/app/api/plugin.ts | 9 +- 12 files changed, 515 insertions(+), 90 deletions(-) create mode 100644 packages/plugins/src/duckduckgo/search/index.ts create mode 100644 packages/plugins/src/duckduckgo/search/template.json create mode 100644 packages/plugins/src/duckduckgo/template.json create mode 100644 projects/app/src/pages/api/core/app/plugin/path.ts diff --git a/packages/global/core/workflow/type/node.d.ts b/packages/global/core/workflow/type/node.d.ts index 4705541b6e9..e14255b280e 100644 --- a/packages/global/core/workflow/type/node.d.ts +++ b/packages/global/core/workflow/type/node.d.ts @@ -70,7 +70,7 @@ export type FlowNodeTemplateType = FlowNodeCommonType & { export type NodeTemplateListItemType = { id: string; // 系统节点-系统节点的 id， 系统插件-插件的 id，团队应用的 id flowNodeType: FlowNodeTypeEnum; // render node card - parentId?: string; + parentId?: ParentIdType; isFolder?: boolean; templateType: FlowNodeTemplateTypeEnum; avatar?: string; diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 03c90737b97..0c232b2e77a 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -2,6 +2,7 @@ "name": "@fastgpt/plugins", "version": "1.0.0", "dependencies": { + "duck-duck-scrape": "^2.2.5", "expr-eval": "^2.0.2" }, "devDependencies": { diff --git a/packages/plugins/register.ts b/packages/plugins/register.ts index 9a0befbd866..52be2bc17d3 100644 --- a/packages/plugins/register.ts +++ b/packages/plugins/register.ts @@ -1,27 +1,36 @@ import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants'; -import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants'; -import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { SystemPluginResponseType } from './type'; -import { NodeTemplateListItemType } from '@fastgpt/global/core/workflow/type/node'; import { FastGPTProUrl, isProduction } from '../service/common/system/constants'; import { GET, POST } from '@fastgpt/service/common/api/plusRequest'; import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; -let list = ['getTime', 'fetchUrl', 'mathExprVal']; +let list = ['getTime', 'fetchUrl', 'mathExprVal', 'duckduckgo', 'duckduckgo/search']; /* Get plugins */ export const getCommunityPlugins = () => { - return list.map((name) => ({ - ...require(`./src/${name}/template.json`), - id: `${PluginSourceEnum.community}-${name}`, - isActive: true - })); + return list.map((name) => { + const config = require(`./src/${name}/template.json`); + + const isFolder = list.find((item) => item.startsWith(`${name}/`)); + + const parentIdList = name.split('/').slice(0, -1); + const parentId = + parentIdList.length > 0 ? `${PluginSourceEnum.community}-${parentIdList.join('/')}` : null; + + return { + ...config, + id: `${PluginSourceEnum.community}-${name}`, + isFolder, + parentId, + isActive: true + }; + }); }; const getCommercialPlugins = () => { return GET('/core/app/plugin/getSystemPlugins'); }; export const getSystemPluginTemplates = async () => { - if (global.systemPlugins) return global.systemPlugins; + if (isProduction && global.systemPlugins) return global.systemPlugins; try { global.systemPlugins = []; diff --git a/packages/plugins/src/duckduckgo/search/index.ts b/packages/plugins/src/duckduckgo/search/index.ts new file mode 100644 index 00000000000..f88c3874ef3 --- /dev/null +++ b/packages/plugins/src/duckduckgo/search/index.ts @@ -0,0 +1,32 @@ +import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; +import { search, SafeSearchType } from 'duck-duck-scrape'; + +type Props = { + query: string; +}; + +// Response type same as HTTP outputs +type Response = Promise<{ + result: string; +}>; + +const main = async ({ query }: Props): Response => { + const searchResults = await search(query, { + safeSearch: SafeSearchType.STRICT, + time: 'y' + }); + + const result = searchResults.results + .map((item) => ({ + title: item.title, + link: item.url, + snippet: item.description + })) + .slice(0, 10); + // console.log(result); + return { + result: JSON.stringify(result) + }; +}; + +export default main; diff --git a/packages/plugins/src/duckduckgo/search/template.json b/packages/plugins/src/duckduckgo/search/template.json new file mode 100644 index 00000000000..a3584dd70d8 --- /dev/null +++ b/packages/plugins/src/duckduckgo/search/template.json @@ -0,0 +1,260 @@ +{ + "author": "FastGPT", + "version": "486", + "name": "DuckDuckGo 搜索", + "avatar": "/imgs/workflow/textEditor.svg", + "intro": "使用 DuckDuckGo 进行网络检索", + "showStatus": true, + "weight": 10, + + "isTool": true, + "templateType": "tools", + + "workflow": { + "nodes": [ + { + "nodeId": "pluginInput", + "name": "自定义插件输入", + "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件", + "avatar": "/imgs/workflow/input.png", + "flowNodeType": "pluginInput", + "showStatus": false, + "position": { + "x": 393.68844551739926, + "y": -58.80666875994541 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "selectedTypeIndex": 0, + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "description": "检索词", + "required": true, + "toolDescription": "检索词" + } + ], + "outputs": [ + { + "id": "query", + "valueType": "string", + "key": "query", + "label": "query", + "type": "hidden" + } + ] + }, + { + "nodeId": "pluginOutput", + "name": "自定义插件输出", + "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出", + "avatar": "/imgs/workflow/output.png", + "flowNodeType": "pluginOutput", + "showStatus": false, + "position": { + "x": 1795.6509902691012, + "y": -47.04550785550961 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "result", + "label": "result", + "description": " 检索结果", + "value": ["hjnVuJAOwyXV", "lEyy5QqyIBrK"] + } + ], + "outputs": [] + }, + { + "nodeId": "hjnVuJAOwyXV", + "name": "HTTP 请求", + "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）", + "avatar": "/imgs/workflow/http.png", + "flowNodeType": "httpRequest468", + "showStatus": true, + "position": { + "x": 1054.6774638324207, + "y": -403.06127656499825 + }, + "version": "481", + "inputs": [ + { + "key": "system_addInputParam", + "renderTypeList": ["addInputParam"], + "valueType": "dynamic", + "label": "", + "required": false, + "description": "core.module.input.description.HTTP Dynamic Input", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + } + }, + { + "key": "system_httpMethod", + "renderTypeList": ["custom"], + "valueType": "string", + "label": "", + "value": "POST", + "required": true + }, + { + "key": "system_httpReqUrl", + "renderTypeList": ["hidden"], + "valueType": "string", + "label": "", + "description": "core.module.input.description.Http Request Url", + "placeholder": "https://api.ai.com/getInventory", + "required": false, + "value": "duckduckSearch" + }, + { + "key": "system_httpHeader", + "renderTypeList": ["custom"], + "valueType": "any", + "value": [], + "label": "", + "description": "core.module.input.description.Http Request Header", + "placeholder": "core.module.input.description.Http Request Header", + "required": false + }, + { + "key": "system_httpParams", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": [], + "label": "", + "required": false + }, + { + "key": "system_httpJsonBody", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": "{\n \"query\": \"{{query}}\"\n}", + "label": "", + "required": false + }, + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + }, + "required": true, + "value": ["pluginInput", "query"] + } + ], + "outputs": [ + { + "id": "system_addOutputParam", + "key": "system_addOutputParam", + "type": "dynamic", + "valueType": "dynamic", + "label": "", + "customFieldConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": false + } + }, + { + "id": "error", + "key": "error", + "label": "请求错误", + "description": "HTTP请求错误信息，成功时返回空", + "valueType": "object", + "type": "static" + }, + { + "id": "httpRawResponse", + "key": "httpRawResponse", + "label": "原始响应", + "required": true, + "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。", + "valueType": "any", + "type": "static" + }, + { + "id": "lEyy5QqyIBrK", + "valueType": "string", + "type": "dynamic", + "key": "result", + "label": "result" + } + ] + } + ], + "edges": [ + { + "source": "pluginInput", + "target": "hjnVuJAOwyXV", + "sourceHandle": "pluginInput-source-right", + "targetHandle": "hjnVuJAOwyXV-target-left" + }, + { + "source": "hjnVuJAOwyXV", + "target": "pluginOutput", + "sourceHandle": "hjnVuJAOwyXV-source-right", + "targetHandle": "pluginOutput-target-left" + } + ] + } +} diff --git a/packages/plugins/src/duckduckgo/template.json b/packages/plugins/src/duckduckgo/template.json new file mode 100644 index 00000000000..5db2f601b4c --- /dev/null +++ b/packages/plugins/src/duckduckgo/template.json @@ -0,0 +1,17 @@ +{ + "author": "FastGPT", + "version": "486", + "name": "DuckDuckGo", + "avatar": "/imgs/workflow/textEditor.svg", + "intro": "DuckDuckGo 服务", + "showStatus": false, + "weight": 10, + + "isTool": true, + "templateType": "tools", + + "workflow": { + "nodes": [], + "edges": [] + } +} diff --git a/packages/service/core/workflow/dispatch/chat/oneapi.ts b/packages/service/core/workflow/dispatch/chat/oneapi.ts index 20737ecd1b2..299f7683a8f 100644 --- a/packages/service/core/workflow/dispatch/chat/oneapi.ts +++ b/packages/service/core/workflow/dispatch/chat/oneapi.ts @@ -161,70 +161,86 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise { - if (res && stream) { - // sse response - const { answer } = await streamResponse({ - res, - detail, - stream: response, - requestBody - }); - - return { - answerText: answer - }; - } else { - const unStreamResponse = response as ChatCompletion; - const answer = unStreamResponse.choices?.[0]?.message?.content || ''; - - return { - answerText: answer - }; - } - })(); + try { + const response = await ai.chat.completions.create(requestBody, { + headers: { + Accept: 'application/json, text/plain, */*' + } + }); - const completeMessages = filterMessages.concat({ - role: ChatCompletionRequestMessageRoleEnum.Assistant, - content: answerText - }); - const chatCompleteMessages = GPTMessages2Chats(completeMessages); + const { answerText } = await (async () => { + if (res && stream) { + // sse response + const { answer } = await streamResponse({ + res, + detail, + stream: response + }); + + if (!answer) { + throw new Error('LLM model response empty'); + } + + return { + answerText: answer + }; + } else { + const unStreamResponse = response as ChatCompletion; + const answer = unStreamResponse.choices?.[0]?.message?.content || ''; + + return { + answerText: answer + }; + } + })(); - const tokens = await countMessagesTokens(chatCompleteMessages); - const { totalPoints, modelName } = formatModelChars2Points({ - model, - tokens, - modelType: ModelTypeEnum.llm - }); + const completeMessages = filterMessages.concat({ + role: ChatCompletionRequestMessageRoleEnum.Assistant, + content: answerText + }); + const chatCompleteMessages = GPTMessages2Chats(completeMessages); - return { - answerText, - [DispatchNodeResponseKeyEnum.nodeResponse]: { - totalPoints: user.openaiAccount?.key ? 0 : totalPoints, - model: modelName, + const tokens = await countMessagesTokens(chatCompleteMessages); + const { totalPoints, modelName } = formatModelChars2Points({ + model, tokens, - query: `${userChatInput}`, - maxToken: max_tokens, - historyPreview: getHistoryPreview(chatCompleteMessages), - contextTotalLen: completeMessages.length - }, - [DispatchNodeResponseKeyEnum.nodeDispatchUsages]: [ - { - moduleName: name, + modelType: ModelTypeEnum.llm + }); + + return { + answerText, + [DispatchNodeResponseKeyEnum.nodeResponse]: { totalPoints: user.openaiAccount?.key ? 0 : totalPoints, model: modelName, - tokens - } - ], - [DispatchNodeResponseKeyEnum.toolResponses]: answerText, - history: chatCompleteMessages - }; + tokens, + query: `${userChatInput}`, + maxToken: max_tokens, + historyPreview: getHistoryPreview(chatCompleteMessages), + contextTotalLen: completeMessages.length + }, + [DispatchNodeResponseKeyEnum.nodeDispatchUsages]: [ + { + moduleName: name, + totalPoints: user.openaiAccount?.key ? 0 : totalPoints, + model: modelName, + tokens + } + ], + [DispatchNodeResponseKeyEnum.toolResponses]: answerText, + history: chatCompleteMessages + }; + } catch (error) { + addLog.warn(`LLM response error`, { + baseUrl: user.openaiAccount?.baseUrl, + requestBody + }); + + if (user.openaiAccount?.baseUrl) { + return Promise.reject(`您的 OpenAI key 出错了: ${JSON.stringify(requestBody)}`); + } + + return Promise.reject(error); + } }; async function filterQuote({ @@ -334,13 +350,11 @@ async function getMaxTokens({ async function streamResponse({ res, detail, - stream, - requestBody + stream }: { res: NextApiResponse; detail: boolean; stream: StreamChatType; - requestBody: Record; }) { const write = responseWriteController({ res, @@ -364,10 +378,5 @@ async function streamResponse({ }); } - if (!answer) { - addLog.info(`LLM model response empty`, requestBody); - return Promise.reject('core.chat.Chat API is error or undefined'); - } - return { answer }; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 817c589b76a..4104fb11a35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,6 +81,9 @@ importers: packages/plugins: dependencies: + duck-duck-scrape: + specifier: ^2.2.5 + version: 2.2.5 expr-eval: specifier: ^2.0.2 version: 2.0.2 @@ -4692,6 +4695,9 @@ packages: domutils@3.1.0: resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} + duck-duck-scrape@2.2.5: + resolution: {integrity: sha512-RTu/Ag5LhgD/j1l2zVGCwTINBoEYCffl58nMoBjtXWJG8tTex72h3gxpDjAr8jVqFaBvhgASNKTUsE31JeqYgw==} + duck@0.1.12: resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==} @@ -5425,6 +5431,9 @@ packages: hoist-non-react-statics@3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} + html-entities@2.5.2: + resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==} + html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} @@ -6642,6 +6651,11 @@ packages: natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + needle@3.3.1: + resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==} + engines: {node: '>= 4.4.x'} + hasBin: true + negotiator@0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} @@ -7579,6 +7593,9 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + sax@1.4.1: + resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} + scheduler@0.23.2: resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} @@ -13553,6 +13570,11 @@ snapshots: domelementtype: 2.3.0 domhandler: 5.0.3 + duck-duck-scrape@2.2.5: + dependencies: + html-entities: 2.5.2 + needle: 3.3.1 + duck@0.1.12: dependencies: underscore: 1.13.6 @@ -14603,6 +14625,8 @@ snapshots: dependencies: react-is: 16.13.1 + html-entities@2.5.2: {} + html-escaper@2.0.2: {} html-parse-stringify@3.0.1: @@ -16206,6 +16230,11 @@ snapshots: natural-compare@1.4.0: {} + needle@3.3.1: + dependencies: + iconv-lite: 0.6.3 + sax: 1.4.1 + negotiator@0.6.3: {} neo-async@2.6.2: {} @@ -17268,6 +17297,8 @@ snapshots: immutable: 4.3.6 source-map-js: 1.2.0 + sax@1.4.1: {} + scheduler@0.23.2: dependencies: loose-envify: 1.4.0 diff --git a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts index a20661a10be..60a05a1db46 100644 --- a/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts +++ b/projects/app/src/pages/api/core/app/plugin/getSystemPluginTemplates.ts @@ -1,23 +1,35 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiResponse } from 'next'; import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { NodeTemplateListItemType } from '@fastgpt/global/core/workflow/type/node.d'; import { NextAPI } from '@/service/middleware/entry'; import { getSystemPluginTemplates } from '@fastgpt/plugins/register'; import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; +import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; +import { ApiRequestProps } from '@fastgpt/service/type/next'; + +export type GetSystemPluginTemplatesQuery = { + parentId: ParentIdType; +}; async function handler( - req: NextApiRequest, + req: ApiRequestProps<{}, GetSystemPluginTemplatesQuery>, res: NextApiResponse ): Promise { await authCert({ req, authToken: true }); + const { parentId } = req.query; + + const formatParentId = parentId || null; + return getSystemPluginTemplates().then((res) => res // Just show the active plugins .filter((item) => item.isActive) .map((plugin) => ({ id: plugin.id, + isFolder: plugin.isFolder, + parentId: plugin.parentId, templateType: plugin.templateType ?? FlowNodeTemplateTypeEnum.other, flowNodeType: FlowNodeTypeEnum.pluginModule, avatar: plugin.avatar, @@ -27,6 +39,7 @@ async function handler( currentCost: plugin.currentCost, author: plugin.author })) + .filter((item) => item.parentId === formatParentId) ); } diff --git a/projects/app/src/pages/api/core/app/plugin/path.ts b/projects/app/src/pages/api/core/app/plugin/path.ts new file mode 100644 index 00000000000..77217d1ed27 --- /dev/null +++ b/projects/app/src/pages/api/core/app/plugin/path.ts @@ -0,0 +1,35 @@ +import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; +import { NextAPI } from '@/service/middleware/entry'; +import { ParentIdType, ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; +import { getSystemPluginTemplates } from '@fastgpt/plugins/register'; + +export type pathQuery = { + parentId: ParentIdType; +}; + +export type pathBody = {}; + +export type pathResponse = Promise; + +async function handler( + req: ApiRequestProps, + res: ApiResponseType +): Promise { + const { parentId } = req.query; + + if (!parentId) return []; + + const plugins = await getSystemPluginTemplates(); + const plugin = plugins.find((item) => item.id === parentId); + + if (!plugin) return []; + + return [ + { + parentId: plugin.id, + parentName: plugin.name + } + ]; +} + +export default NextAPI(handler); diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx index 500b21be7e7..7ec526ab8dd 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useMemo, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import MyModal from '@fastgpt/web/components/common/MyModal'; import { useTranslation } from 'next-i18next'; @@ -30,12 +30,15 @@ import { import Avatar from '@/components/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { AddIcon } from '@chakra-ui/icons'; -import { getPreviewPluginNode, getSystemPlugTemplates } from '@/web/core/app/api/plugin'; +import { + getPreviewPluginNode, + getSystemPlugTemplates, + getSystemPluginPaths +} from '@/web/core/app/api/plugin'; import MyBox from '@fastgpt/web/components/common/MyBox'; import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants'; import { useForm } from 'react-hook-form'; import JsonEditor from '@fastgpt/web/components/common/Textarea/JsonEditor'; -import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import { getTeamPlugTemplates } from '@/web/core/app/api/plugin'; import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; @@ -65,7 +68,7 @@ const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) const { data: templates = [], loading: isLoading } = useRequest2( async () => { if (templateType === TemplateTypeEnum.systemPlugin) { - return (await getSystemPlugTemplates()).filter( + return (await getSystemPlugTemplates(parentId)).filter( (item) => item.isTool && item.name.toLowerCase().includes(searchKey.toLowerCase()) ); } else if (templateType === TemplateTypeEnum.teamPlugin) { @@ -84,10 +87,20 @@ const ToolSelectModal = ({ onClose, ...props }: Props & { onClose: () => void }) } ); - const { data: paths = [] } = useRequest2(() => getAppFolderPath(parentId), { - manual: false, - refreshDeps: [parentId] - }); + const { data: paths = [] } = useRequest2( + () => { + if (templateType === TemplateTypeEnum.teamPlugin) return getAppFolderPath(parentId); + return getSystemPluginPaths(parentId); + }, + { + manual: false, + refreshDeps: [parentId] + } + ); + + useEffect(() => { + setParentId(''); + }, [templateType, searchKey]); return ( void }) {/* route components */} - {templateType === TemplateTypeEnum.teamPlugin && !searchKey && parentId && ( + {!searchKey && parentId && ( @@ -30,8 +31,12 @@ export const getTeamPlugTemplates = (data?: ListAppBody) => })) ); -export const getSystemPlugTemplates = () => - GET('/core/app/plugin/getSystemPluginTemplates'); +/* ============ system plugin ============== */ +export const getSystemPlugTemplates = (parentId: ParentIdType) => + GET('/core/app/plugin/getSystemPluginTemplates', { parentId }); + +export const getSystemPluginPaths = (parentId: ParentIdType) => + GET('/core/app/plugin/path', { parentId }); export const getPreviewPluginNode = (data: GetPreviewNodeQuery) => GET('/core/app/plugin/getPreviewNode', data); From 09d1eb9d691d1afcea3f9135197e6c57710a8812 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Fri, 12 Jul 2024 17:59:32 +0800 Subject: [PATCH 04/11] duckduck search --- packages/plugins/src/duckduckgo/search/template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/src/duckduckgo/search/template.json b/packages/plugins/src/duckduckgo/search/template.json index a3584dd70d8..5988b6ef098 100644 --- a/packages/plugins/src/duckduckgo/search/template.json +++ b/packages/plugins/src/duckduckgo/search/template.json @@ -129,7 +129,7 @@ "description": "core.module.input.description.Http Request Url", "placeholder": "https://api.ai.com/getInventory", "required": false, - "value": "duckduckSearch" + "value": "duckduckgo/search" }, { "key": "system_httpHeader", From 3d9bc596a6af9011fdbd50f4a496f1098d8f618a Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Mon, 15 Jul 2024 17:18:01 +0800 Subject: [PATCH 05/11] perf: templates select system plugin --- packages/plugins/src/fetchUrl/template.json | 2 +- packages/plugins/src/getTime/template.json | 2 +- .../plugins/src/mathExprVal/template.json | 2 +- .../web/components/common/Icon/constants.ts | 475 +++++++++--------- packages/web/i18n/en/app.json | 1 + packages/web/i18n/zh/app.json | 1 + .../app/public/imgs/workflow/fetchUrl.png | Bin 1272 -> 0 bytes .../app/public/imgs/workflow/fetchUrl.svg | 4 + .../public/imgs/workflow/getCurrentTime.png | Bin 1407 -> 0 bytes .../public/imgs/workflow/getCurrentTime.svg | 4 + .../app/public/imgs/workflow/mathExprEval.png | Bin 518 -> 0 bytes .../app/public/imgs/workflow/mathExprEval.svg | 4 + .../Flow/NodeTemplatesModal.tsx | 162 +++--- projects/app/src/web/core/app/api/app.ts | 7 +- projects/app/src/web/core/app/api/plugin.ts | 6 +- 15 files changed, 364 insertions(+), 306 deletions(-) delete mode 100644 projects/app/public/imgs/workflow/fetchUrl.png create mode 100644 projects/app/public/imgs/workflow/fetchUrl.svg delete mode 100644 projects/app/public/imgs/workflow/getCurrentTime.png create mode 100644 projects/app/public/imgs/workflow/getCurrentTime.svg delete mode 100644 projects/app/public/imgs/workflow/mathExprEval.png create mode 100644 projects/app/public/imgs/workflow/mathExprEval.svg diff --git a/packages/plugins/src/fetchUrl/template.json b/packages/plugins/src/fetchUrl/template.json index b0798c1c932..324bcc74542 100644 --- a/packages/plugins/src/fetchUrl/template.json +++ b/packages/plugins/src/fetchUrl/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "网页内容抓取", - "avatar": "/imgs/workflow/fetchUrl.png", + "avatar": "/imgs/workflow/fetchUrl.svg", "intro": "可获取一个网页链接内容，并以 Markdown 格式输出，仅支持获取静态网站。", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/getTime/template.json b/packages/plugins/src/getTime/template.json index f402d875939..ebcefca6578 100644 --- a/packages/plugins/src/getTime/template.json +++ b/packages/plugins/src/getTime/template.json @@ -3,7 +3,7 @@ "version": "481", "templateType": "tools", "name": "获取当前时间", - "avatar": "/imgs/workflow/getCurrentTime.png", + "avatar": "/imgs/workflow/getCurrentTime.svg", "intro": "获取用户当前时区的时间。", "showStatus": false, "isTool": true, diff --git a/packages/plugins/src/mathExprVal/template.json b/packages/plugins/src/mathExprVal/template.json index dbcc0bff8e5..846261ce84e 100644 --- a/packages/plugins/src/mathExprVal/template.json +++ b/packages/plugins/src/mathExprVal/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "数学公式执行", - "avatar": "/imgs/workflow/mathExprEval.png", + "avatar": "/imgs/workflow/mathExprEval.svg", "intro": "用于执行数学表达式的工具，通过 js 的 expr-eval 库运行表达式并返回结果。", "showStatus": false, "weight": 10, diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts index de6d21d18b3..9c9baab507d 100644 --- a/packages/web/components/common/Icon/constants.ts +++ b/packages/web/components/common/Icon/constants.ts @@ -1,237 +1,242 @@ // @ts-nocheck - export const iconPaths = { - 'book': () => import('./icons/book.svg'), - 'change': () => import('./icons/change.svg'), - 'chatSend': () => import('./icons/chatSend.svg'), - 'closeSolid': () => import('./icons/closeSolid.svg'), - 'collectionLight': () => import('./icons/collectionLight.svg'), - 'collectionSolid': () => import('./icons/collectionSolid.svg'), - 'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'), - 'common/addLight': () => import('./icons/common/addLight.svg'), - 'common/backFill': () => import('./icons/common/backFill.svg'), - 'common/backLight': () => import('./icons/common/backLight.svg'), - 'common/clearLight': () => import('./icons/common/clearLight.svg'), - 'common/closeLight': () => import('./icons/common/closeLight.svg'), - 'common/confirm/commonTip': () => import('./icons/common/confirm/commonTip.svg'), - 'common/confirm/deleteTip': () => import('./icons/common/confirm/deleteTip.svg'), - 'common/confirm/rightTip': () => import('./icons/common/confirm/rightTip.svg'), - 'common/courseLight': () => import('./icons/common/courseLight.svg'), - 'common/customTitleLight': () => import('./icons/common/customTitleLight.svg'), - 'common/data': () => import('./icons/common/data.svg'), - 'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'), - 'common/errorFill': () => import('./icons/common/errorFill.svg'), - 'common/file/move': () => import('./icons/common/file/move.svg'), - 'common/folderFill': () => import('./icons/common/folderFill.svg'), - 'common/fullScreenLight': () => import('./icons/common/fullScreenLight.svg'), - 'common/gitFill': () => import('./icons/common/gitFill.svg'), - 'common/gitInlight': () => import('./icons/common/gitInlight.svg'), - 'common/gitLight': () => import('./icons/common/gitLight.svg'), - 'common/googleFill': () => import('./icons/common/googleFill.svg'), - 'common/importLight': () => import('./icons/common/importLight.svg'), - 'common/inviteLight': () => import('./icons/common/inviteLight.svg'), - 'common/language/en': () => import('./icons/common/language/en.svg'), - 'common/language/zh': () => import('./icons/common/language/zh.svg'), - 'common/leftArrowLight': () => import('./icons/common/leftArrowLight.svg'), - 'common/linkBlue': () => import('./icons/common/linkBlue.svg'), - 'common/loading': () => import('./icons/common/loading.svg'), - 'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'), - 'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'), - 'common/openai': () => import('./icons/common/openai.svg'), - 'common/overviewLight': () => import('./icons/common/overviewLight.svg'), - 'common/paramsLight': () => import('./icons/common/paramsLight.svg'), - 'common/playFill': () => import('./icons/common/playFill.svg'), - 'common/playLight': () => import('./icons/common/playLight.svg'), - 'common/publishFill': () => import('./icons/common/publishFill.svg'), - 'common/questionLight': () => import('./icons/common/questionLight.svg'), - 'common/refreshLight': () => import('./icons/common/refreshLight.svg'), - 'common/resultLight': () => import('./icons/common/resultLight.svg'), - 'common/retryLight': () => import('./icons/common/retryLight.svg'), - 'common/rightArrowFill': () => import('./icons/common/rightArrowFill.svg'), - 'common/rightArrowLight': () => import('./icons/common/rightArrowLight.svg'), - 'common/routePushLight': () => import('./icons/common/routePushLight.svg'), - 'common/saveFill': () => import('./icons/common/saveFill.svg'), - 'common/searchLight': () => import('./icons/common/searchLight.svg'), - 'common/select': () => import('./icons/common/select.svg'), - 'common/selectLight': () => import('./icons/common/selectLight.svg'), - 'common/settingLight': () => import('./icons/common/settingLight.svg'), - 'common/text/t': () => import('./icons/common/text/t.svg'), - 'common/tickFill': () => import('./icons/common/tickFill.svg'), - 'common/trash': () => import('./icons/common/trash.svg'), - 'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'), - 'common/viewLight': () => import('./icons/common/viewLight.svg'), - 'common/voiceLight': () => import('./icons/common/voiceLight.svg'), - 'common/wechatFill': () => import('./icons/common/wechatFill.svg'), - 'copy': () => import('./icons/copy.svg'), - 'core/app/aiFill': () => import('./icons/core/app/aiFill.svg'), - 'core/app/aiLight': () => import('./icons/core/app/aiLight.svg'), - 'core/app/appApiLight': () => import('./icons/core/app/appApiLight.svg'), - 'core/app/customFeedback': () => import('./icons/core/app/customFeedback.svg'), - 'core/app/headphones': () => import('./icons/core/app/headphones.svg'), - 'core/app/inputGuides': () => import('./icons/core/app/inputGuides.svg'), - 'core/app/logsLight': () => import('./icons/core/app/logsLight.svg'), - 'core/app/markLight': () => import('./icons/core/app/markLight.svg'), - 'core/app/publish/lark': () => import('./icons/core/app/publish/lark.svg'), - 'core/app/questionGuide': () => import('./icons/core/app/questionGuide.svg'), - 'core/app/schedulePlan': () => import('./icons/core/app/schedulePlan.svg'), - 'core/app/simpleBot': () => import('./icons/core/app/simpleBot.svg'), - 'core/app/simpleMode/ai': () => import('./icons/core/app/simpleMode/ai.svg'), - 'core/app/simpleMode/chat': () => import('./icons/core/app/simpleMode/chat.svg'), - 'core/app/simpleMode/dataset': () => import('./icons/core/app/simpleMode/dataset.svg'), - 'core/app/simpleMode/template': () => import('./icons/core/app/simpleMode/template.svg'), - 'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'), - 'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'), - 'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'), - 'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'), - 'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'), - 'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'), - 'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'), - 'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'), - 'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'), - 'core/app/type/simple': () => import('./icons/core/app/type/simple.svg'), - 'core/app/type/workflow': () => import('./icons/core/app/type/workflow.svg'), - 'core/app/type/workflowFill': () => import('./icons/core/app/type/workflowFill.svg'), - 'core/app/variable/external': () => import('./icons/core/app/variable/external.svg'), - 'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'), - 'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'), - 'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'), - 'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'), - 'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'), - 'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'), - 'core/chat/chatLight': () => import('./icons/core/chat/chatLight.svg'), - 'core/chat/chatModelTag': () => import('./icons/core/chat/chatModelTag.svg'), - 'core/chat/export/pdf': () => import('./icons/core/chat/export/pdf.svg'), - 'core/chat/feedback/badLight': () => import('./icons/core/chat/feedback/badLight.svg'), - 'core/chat/feedback/goodLight': () => import('./icons/core/chat/feedback/goodLight.svg'), - 'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'), - 'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'), - 'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'), - 'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'), - 'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'), - 'core/chat/sendFill': () => import('./icons/core/chat/sendFill.svg'), - 'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'), - 'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'), - 'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'), - 'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'), - 'core/dataset/commonDataset': () => import('./icons/core/dataset/commonDataset.svg'), - 'core/dataset/datasetFill': () => import('./icons/core/dataset/datasetFill.svg'), - 'core/dataset/datasetLight': () => import('./icons/core/dataset/datasetLight.svg'), - 'core/dataset/externalDataset': () => import('./icons/core/dataset/externalDataset.svg'), - 'core/dataset/fileCollection': () => import('./icons/core/dataset/fileCollection.svg'), - 'core/dataset/fullTextRecall': () => import('./icons/core/dataset/fullTextRecall.svg'), - 'core/dataset/manualCollection': () => import('./icons/core/dataset/manualCollection.svg'), - 'core/dataset/mixedRecall': () => import('./icons/core/dataset/mixedRecall.svg'), - 'core/dataset/modeEmbedding': () => import('./icons/core/dataset/modeEmbedding.svg'), - 'core/dataset/rerank': () => import('./icons/core/dataset/rerank.svg'), - 'core/dataset/splitLight': () => import('./icons/core/dataset/splitLight.svg'), - 'core/dataset/tableCollection': () => import('./icons/core/dataset/tableCollection.svg'), - 'core/dataset/websiteDataset': () => import('./icons/core/dataset/websiteDataset.svg'), - 'core/modules/basicNode': () => import('./icons/core/modules/basicNode.svg'), - 'core/modules/fixview': () => import('./icons/core/modules/fixview.svg'), - 'core/modules/flowLight': () => import('./icons/core/modules/flowLight.svg'), - 'core/modules/previewLight': () => import('./icons/core/modules/previewLight.svg'), - 'core/modules/systemPlugin': () => import('./icons/core/modules/systemPlugin.svg'), - 'core/modules/teamPlugin': () => import('./icons/core/modules/teamPlugin.svg'), - 'core/modules/variable': () => import('./icons/core/modules/variable.svg'), - 'core/modules/welcomeText': () => import('./icons/core/modules/welcomeText.svg'), - 'core/workflow/closeEdge': () => import('./icons/core/workflow/closeEdge.svg'), - 'core/workflow/debug': () => import('./icons/core/workflow/debug.svg'), - 'core/workflow/debugBlue': () => import('./icons/core/workflow/debugBlue.svg'), - 'core/workflow/debugNext': () => import('./icons/core/workflow/debugNext.svg'), - 'core/workflow/debugResult': () => import('./icons/core/workflow/debugResult.svg'), - 'core/workflow/edgeArrow': () => import('./icons/core/workflow/edgeArrow.svg'), - 'core/workflow/grout': () => import('./icons/core/workflow/grout.svg'), - 'core/workflow/inputType/dynamic': () => import('./icons/core/workflow/inputType/dynamic.svg'), - 'core/workflow/inputType/input': () => import('./icons/core/workflow/inputType/input.svg'), - 'core/workflow/inputType/jsonEditor': () => import('./icons/core/workflow/inputType/jsonEditor.svg'), - 'core/workflow/inputType/numberInput': () => import('./icons/core/workflow/inputType/numberInput.svg'), - 'core/workflow/inputType/reference': () => import('./icons/core/workflow/inputType/reference.svg'), - 'core/workflow/inputType/select': () => import('./icons/core/workflow/inputType/select.svg'), - 'core/workflow/inputType/selectApp': () => import('./icons/core/workflow/inputType/selectApp.svg'), - 'core/workflow/inputType/selectDataset': () => import('./icons/core/workflow/inputType/selectDataset.svg'), - 'core/workflow/inputType/selectLLM': () => import('./icons/core/workflow/inputType/selectLLM.svg'), - 'core/workflow/inputType/switch': () => import('./icons/core/workflow/inputType/switch.svg'), - 'core/workflow/inputType/textarea': () => import('./icons/core/workflow/inputType/textarea.svg'), - 'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'), - 'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'), - 'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'), - 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), - 'core/workflow/running': () => import('./icons/core/workflow/running.svg'), - 'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'), - 'date': () => import('./icons/date.svg'), - 'delete': () => import('./icons/delete.svg'), - 'edit': () => import('./icons/edit.svg'), - 'empty': () => import('./icons/empty.svg'), - 'export': () => import('./icons/export.svg'), - 'file/csv': () => import('./icons/file/csv.svg'), - 'file/fill/csv': () => import('./icons/file/fill/csv.svg'), - 'file/fill/doc': () => import('./icons/file/fill/doc.svg'), - 'file/fill/file': () => import('./icons/file/fill/file.svg'), - 'file/fill/folder': () => import('./icons/file/fill/folder.svg'), - 'file/fill/html': () => import('./icons/file/fill/html.svg'), - 'file/fill/manual': () => import('./icons/file/fill/manual.svg'), - 'file/fill/markdown': () => import('./icons/file/fill/markdown.svg'), - 'file/fill/pdf': () => import('./icons/file/fill/pdf.svg'), - 'file/fill/ppt': () => import('./icons/file/fill/ppt.svg'), - 'file/fill/txt': () => import('./icons/file/fill/txt.svg'), - 'file/fill/xlsx': () => import('./icons/file/fill/xlsx.svg'), - 'file/html': () => import('./icons/file/html.svg'), - 'file/indexImport': () => import('./icons/file/indexImport.svg'), - 'file/manualImport': () => import('./icons/file/manualImport.svg'), - 'file/markdown': () => import('./icons/file/markdown.svg'), - 'file/pdf': () => import('./icons/file/pdf.svg'), - 'file/qaImport': () => import('./icons/file/qaImport.svg'), - 'file/uploadFile': () => import('./icons/file/uploadFile.svg'), - 'history': () => import('./icons/history.svg'), - 'kbTest': () => import('./icons/kbTest.svg'), - 'menu': () => import('./icons/menu.svg'), - 'minus': () => import('./icons/minus.svg'), - 'modal/AddClb': () => import('./icons/modal/AddClb.svg'), - 'modal/concat': () => import('./icons/modal/concat.svg'), - 'modal/confirmPay': () => import('./icons/modal/confirmPay.svg'), - 'modal/edit': () => import('./icons/modal/edit.svg'), - 'modal/manualDataset': () => import('./icons/modal/manualDataset.svg'), - 'modal/selectSource': () => import('./icons/modal/selectSource.svg'), - 'modal/setting': () => import('./icons/modal/setting.svg'), - 'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'), - 'more': () => import('./icons/more.svg'), - 'moreLine': () => import('./icons/moreLine.svg'), - 'out': () => import('./icons/out.svg'), - 'phoneTabbar/me': () => import('./icons/phoneTabbar/me.svg'), - 'phoneTabbar/tool': () => import('./icons/phoneTabbar/tool.svg'), - 'phoneTabbar/toolFill': () => import('./icons/phoneTabbar/toolFill.svg'), - 'plugins/textEditor': () => import('./icons/plugins/textEditor.svg'), - 'price/bg': () => import('./icons/price/bg.svg'), - 'price/right': () => import('./icons/price/right.svg'), - 'save': () => import('./icons/save.svg'), - 'stop': () => import('./icons/stop.svg'), - 'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'), - 'support/account/passwordLogin': () => import('./icons/support/account/passwordLogin.svg'), - 'support/account/plans': () => import('./icons/support/account/plans.svg'), - 'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'), - 'support/bill/extraDatasetsize': () => import('./icons/support/bill/extraDatasetsize.svg'), - 'support/bill/extraPoints': () => import('./icons/support/bill/extraPoints.svg'), - 'support/bill/payRecordLight': () => import('./icons/support/bill/payRecordLight.svg'), - 'support/bill/priceLight': () => import('./icons/support/bill/priceLight.svg'), - 'support/bill/shoppingCart': () => import('./icons/support/bill/shoppingCart.svg'), - 'support/outlink/apikeyFill': () => import('./icons/support/outlink/apikeyFill.svg'), - 'support/outlink/apikeyLight': () => import('./icons/support/outlink/apikeyLight.svg'), - 'support/outlink/iframeLight': () => import('./icons/support/outlink/iframeLight.svg'), - 'support/outlink/share': () => import('./icons/support/outlink/share.svg'), - 'support/outlink/shareLight': () => import('./icons/support/outlink/shareLight.svg'), - 'support/permission/collaborator': () => import('./icons/support/permission/collaborator.svg'), - 'support/permission/privateLight': () => import('./icons/support/permission/privateLight.svg'), - 'support/permission/publicLight': () => import('./icons/support/permission/publicLight.svg'), - 'support/team/key': () => import('./icons/support/team/key.svg'), - 'support/team/memberLight': () => import('./icons/support/team/memberLight.svg'), - 'support/usage/usageRecordLight': () => import('./icons/support/usage/usageRecordLight.svg'), - 'support/user/individuation': () => import('./icons/support/user/individuation.svg'), - 'support/user/informLight': () => import('./icons/support/user/informLight.svg'), - 'support/user/userFill': () => import('./icons/support/user/userFill.svg'), - 'support/user/userLight': () => import('./icons/support/user/userLight.svg'), - 'text': () => import('./icons/text.svg'), - 'union': () => import('./icons/union.svg'), - 'user': () => import('./icons/user.svg'), - 'wx': () => import('./icons/wx.svg'), - - }; \ No newline at end of file +export const iconPaths = { + book: () => import('./icons/book.svg'), + change: () => import('./icons/change.svg'), + chatSend: () => import('./icons/chatSend.svg'), + closeSolid: () => import('./icons/closeSolid.svg'), + collectionLight: () => import('./icons/collectionLight.svg'), + collectionSolid: () => import('./icons/collectionSolid.svg'), + 'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'), + 'common/addLight': () => import('./icons/common/addLight.svg'), + 'common/backFill': () => import('./icons/common/backFill.svg'), + 'common/backLight': () => import('./icons/common/backLight.svg'), + 'common/clearLight': () => import('./icons/common/clearLight.svg'), + 'common/closeLight': () => import('./icons/common/closeLight.svg'), + 'common/confirm/commonTip': () => import('./icons/common/confirm/commonTip.svg'), + 'common/confirm/deleteTip': () => import('./icons/common/confirm/deleteTip.svg'), + 'common/confirm/rightTip': () => import('./icons/common/confirm/rightTip.svg'), + 'common/courseLight': () => import('./icons/common/courseLight.svg'), + 'common/customTitleLight': () => import('./icons/common/customTitleLight.svg'), + 'common/data': () => import('./icons/common/data.svg'), + 'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'), + 'common/errorFill': () => import('./icons/common/errorFill.svg'), + 'common/file/move': () => import('./icons/common/file/move.svg'), + 'common/folderFill': () => import('./icons/common/folderFill.svg'), + 'common/fullScreenLight': () => import('./icons/common/fullScreenLight.svg'), + 'common/gitFill': () => import('./icons/common/gitFill.svg'), + 'common/gitInlight': () => import('./icons/common/gitInlight.svg'), + 'common/gitLight': () => import('./icons/common/gitLight.svg'), + 'common/googleFill': () => import('./icons/common/googleFill.svg'), + 'common/importLight': () => import('./icons/common/importLight.svg'), + 'common/inviteLight': () => import('./icons/common/inviteLight.svg'), + 'common/language/en': () => import('./icons/common/language/en.svg'), + 'common/language/zh': () => import('./icons/common/language/zh.svg'), + 'common/leftArrowLight': () => import('./icons/common/leftArrowLight.svg'), + 'common/linkBlue': () => import('./icons/common/linkBlue.svg'), + 'common/loading': () => import('./icons/common/loading.svg'), + 'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'), + 'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'), + 'common/openai': () => import('./icons/common/openai.svg'), + 'common/overviewLight': () => import('./icons/common/overviewLight.svg'), + 'common/paramsLight': () => import('./icons/common/paramsLight.svg'), + 'common/playFill': () => import('./icons/common/playFill.svg'), + 'common/playLight': () => import('./icons/common/playLight.svg'), + 'common/publishFill': () => import('./icons/common/publishFill.svg'), + 'common/questionLight': () => import('./icons/common/questionLight.svg'), + 'common/refreshLight': () => import('./icons/common/refreshLight.svg'), + 'common/resultLight': () => import('./icons/common/resultLight.svg'), + 'common/retryLight': () => import('./icons/common/retryLight.svg'), + 'common/rightArrowFill': () => import('./icons/common/rightArrowFill.svg'), + 'common/rightArrowLight': () => import('./icons/common/rightArrowLight.svg'), + 'common/routePushLight': () => import('./icons/common/routePushLight.svg'), + 'common/saveFill': () => import('./icons/common/saveFill.svg'), + 'common/searchLight': () => import('./icons/common/searchLight.svg'), + 'common/select': () => import('./icons/common/select.svg'), + 'common/selectLight': () => import('./icons/common/selectLight.svg'), + 'common/settingLight': () => import('./icons/common/settingLight.svg'), + 'common/text/t': () => import('./icons/common/text/t.svg'), + 'common/tickFill': () => import('./icons/common/tickFill.svg'), + 'common/trash': () => import('./icons/common/trash.svg'), + 'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'), + 'common/viewLight': () => import('./icons/common/viewLight.svg'), + 'common/voiceLight': () => import('./icons/common/voiceLight.svg'), + 'common/wechatFill': () => import('./icons/common/wechatFill.svg'), + copy: () => import('./icons/copy.svg'), + 'core/app/aiFill': () => import('./icons/core/app/aiFill.svg'), + 'core/app/aiLight': () => import('./icons/core/app/aiLight.svg'), + 'core/app/appApiLight': () => import('./icons/core/app/appApiLight.svg'), + 'core/app/customFeedback': () => import('./icons/core/app/customFeedback.svg'), + 'core/app/headphones': () => import('./icons/core/app/headphones.svg'), + 'core/app/inputGuides': () => import('./icons/core/app/inputGuides.svg'), + 'core/app/logsLight': () => import('./icons/core/app/logsLight.svg'), + 'core/app/markLight': () => import('./icons/core/app/markLight.svg'), + 'core/app/publish/lark': () => import('./icons/core/app/publish/lark.svg'), + 'core/app/questionGuide': () => import('./icons/core/app/questionGuide.svg'), + 'core/app/schedulePlan': () => import('./icons/core/app/schedulePlan.svg'), + 'core/app/simpleBot': () => import('./icons/core/app/simpleBot.svg'), + 'core/app/simpleMode/ai': () => import('./icons/core/app/simpleMode/ai.svg'), + 'core/app/simpleMode/chat': () => import('./icons/core/app/simpleMode/chat.svg'), + 'core/app/simpleMode/dataset': () => import('./icons/core/app/simpleMode/dataset.svg'), + 'core/app/simpleMode/template': () => import('./icons/core/app/simpleMode/template.svg'), + 'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'), + 'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'), + 'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'), + 'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'), + 'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'), + 'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'), + 'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'), + 'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'), + 'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'), + 'core/app/type/simple': () => import('./icons/core/app/type/simple.svg'), + 'core/app/type/workflow': () => import('./icons/core/app/type/workflow.svg'), + 'core/app/type/workflowFill': () => import('./icons/core/app/type/workflowFill.svg'), + 'core/app/variable/external': () => import('./icons/core/app/variable/external.svg'), + 'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'), + 'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'), + 'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'), + 'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'), + 'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'), + 'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'), + 'core/chat/chatLight': () => import('./icons/core/chat/chatLight.svg'), + 'core/chat/chatModelTag': () => import('./icons/core/chat/chatModelTag.svg'), + 'core/chat/export/pdf': () => import('./icons/core/chat/export/pdf.svg'), + 'core/chat/feedback/badLight': () => import('./icons/core/chat/feedback/badLight.svg'), + 'core/chat/feedback/goodLight': () => import('./icons/core/chat/feedback/goodLight.svg'), + 'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'), + 'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'), + 'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'), + 'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'), + 'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'), + 'core/chat/sendFill': () => import('./icons/core/chat/sendFill.svg'), + 'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'), + 'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'), + 'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'), + 'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'), + 'core/dataset/commonDataset': () => import('./icons/core/dataset/commonDataset.svg'), + 'core/dataset/datasetFill': () => import('./icons/core/dataset/datasetFill.svg'), + 'core/dataset/datasetLight': () => import('./icons/core/dataset/datasetLight.svg'), + 'core/dataset/externalDataset': () => import('./icons/core/dataset/externalDataset.svg'), + 'core/dataset/fileCollection': () => import('./icons/core/dataset/fileCollection.svg'), + 'core/dataset/fullTextRecall': () => import('./icons/core/dataset/fullTextRecall.svg'), + 'core/dataset/manualCollection': () => import('./icons/core/dataset/manualCollection.svg'), + 'core/dataset/mixedRecall': () => import('./icons/core/dataset/mixedRecall.svg'), + 'core/dataset/modeEmbedding': () => import('./icons/core/dataset/modeEmbedding.svg'), + 'core/dataset/rerank': () => import('./icons/core/dataset/rerank.svg'), + 'core/dataset/splitLight': () => import('./icons/core/dataset/splitLight.svg'), + 'core/dataset/tableCollection': () => import('./icons/core/dataset/tableCollection.svg'), + 'core/dataset/websiteDataset': () => import('./icons/core/dataset/websiteDataset.svg'), + 'core/modules/basicNode': () => import('./icons/core/modules/basicNode.svg'), + 'core/modules/fixview': () => import('./icons/core/modules/fixview.svg'), + 'core/modules/flowLight': () => import('./icons/core/modules/flowLight.svg'), + 'core/modules/previewLight': () => import('./icons/core/modules/previewLight.svg'), + 'core/modules/systemPlugin': () => import('./icons/core/modules/systemPlugin.svg'), + 'core/modules/teamPlugin': () => import('./icons/core/modules/teamPlugin.svg'), + 'core/modules/variable': () => import('./icons/core/modules/variable.svg'), + 'core/modules/welcomeText': () => import('./icons/core/modules/welcomeText.svg'), + 'core/workflow/closeEdge': () => import('./icons/core/workflow/closeEdge.svg'), + 'core/workflow/debug': () => import('./icons/core/workflow/debug.svg'), + 'core/workflow/debugBlue': () => import('./icons/core/workflow/debugBlue.svg'), + 'core/workflow/debugNext': () => import('./icons/core/workflow/debugNext.svg'), + 'core/workflow/debugResult': () => import('./icons/core/workflow/debugResult.svg'), + 'core/workflow/edgeArrow': () => import('./icons/core/workflow/edgeArrow.svg'), + 'core/workflow/grout': () => import('./icons/core/workflow/grout.svg'), + 'core/workflow/inputType/dynamic': () => import('./icons/core/workflow/inputType/dynamic.svg'), + 'core/workflow/inputType/input': () => import('./icons/core/workflow/inputType/input.svg'), + 'core/workflow/inputType/jsonEditor': () => + import('./icons/core/workflow/inputType/jsonEditor.svg'), + 'core/workflow/inputType/numberInput': () => + import('./icons/core/workflow/inputType/numberInput.svg'), + 'core/workflow/inputType/reference': () => + import('./icons/core/workflow/inputType/reference.svg'), + 'core/workflow/inputType/select': () => import('./icons/core/workflow/inputType/select.svg'), + 'core/workflow/inputType/selectApp': () => + import('./icons/core/workflow/inputType/selectApp.svg'), + 'core/workflow/inputType/selectDataset': () => + import('./icons/core/workflow/inputType/selectDataset.svg'), + 'core/workflow/inputType/selectLLM': () => + import('./icons/core/workflow/inputType/selectLLM.svg'), + 'core/workflow/inputType/switch': () => import('./icons/core/workflow/inputType/switch.svg'), + 'core/workflow/inputType/textarea': () => import('./icons/core/workflow/inputType/textarea.svg'), + 'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'), + 'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'), + 'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'), + 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), + 'core/workflow/running': () => import('./icons/core/workflow/running.svg'), + 'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'), + date: () => import('./icons/date.svg'), + delete: () => import('./icons/delete.svg'), + edit: () => import('./icons/edit.svg'), + empty: () => import('./icons/empty.svg'), + export: () => import('./icons/export.svg'), + 'file/csv': () => import('./icons/file/csv.svg'), + 'file/fill/csv': () => import('./icons/file/fill/csv.svg'), + 'file/fill/doc': () => import('./icons/file/fill/doc.svg'), + 'file/fill/file': () => import('./icons/file/fill/file.svg'), + 'file/fill/folder': () => import('./icons/file/fill/folder.svg'), + 'file/fill/html': () => import('./icons/file/fill/html.svg'), + 'file/fill/manual': () => import('./icons/file/fill/manual.svg'), + 'file/fill/markdown': () => import('./icons/file/fill/markdown.svg'), + 'file/fill/pdf': () => import('./icons/file/fill/pdf.svg'), + 'file/fill/ppt': () => import('./icons/file/fill/ppt.svg'), + 'file/fill/txt': () => import('./icons/file/fill/txt.svg'), + 'file/fill/xlsx': () => import('./icons/file/fill/xlsx.svg'), + 'file/html': () => import('./icons/file/html.svg'), + 'file/indexImport': () => import('./icons/file/indexImport.svg'), + 'file/manualImport': () => import('./icons/file/manualImport.svg'), + 'file/markdown': () => import('./icons/file/markdown.svg'), + 'file/pdf': () => import('./icons/file/pdf.svg'), + 'file/qaImport': () => import('./icons/file/qaImport.svg'), + 'file/uploadFile': () => import('./icons/file/uploadFile.svg'), + history: () => import('./icons/history.svg'), + kbTest: () => import('./icons/kbTest.svg'), + menu: () => import('./icons/menu.svg'), + minus: () => import('./icons/minus.svg'), + 'modal/AddClb': () => import('./icons/modal/AddClb.svg'), + 'modal/concat': () => import('./icons/modal/concat.svg'), + 'modal/confirmPay': () => import('./icons/modal/confirmPay.svg'), + 'modal/edit': () => import('./icons/modal/edit.svg'), + 'modal/manualDataset': () => import('./icons/modal/manualDataset.svg'), + 'modal/selectSource': () => import('./icons/modal/selectSource.svg'), + 'modal/setting': () => import('./icons/modal/setting.svg'), + 'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'), + more: () => import('./icons/more.svg'), + moreLine: () => import('./icons/moreLine.svg'), + out: () => import('./icons/out.svg'), + 'phoneTabbar/me': () => import('./icons/phoneTabbar/me.svg'), + 'phoneTabbar/tool': () => import('./icons/phoneTabbar/tool.svg'), + 'phoneTabbar/toolFill': () => import('./icons/phoneTabbar/toolFill.svg'), + 'plugins/textEditor': () => import('./icons/plugins/textEditor.svg'), + 'price/bg': () => import('./icons/price/bg.svg'), + 'price/right': () => import('./icons/price/right.svg'), + save: () => import('./icons/save.svg'), + stop: () => import('./icons/stop.svg'), + 'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'), + 'support/account/passwordLogin': () => import('./icons/support/account/passwordLogin.svg'), + 'support/account/plans': () => import('./icons/support/account/plans.svg'), + 'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'), + 'support/bill/extraDatasetsize': () => import('./icons/support/bill/extraDatasetsize.svg'), + 'support/bill/extraPoints': () => import('./icons/support/bill/extraPoints.svg'), + 'support/bill/payRecordLight': () => import('./icons/support/bill/payRecordLight.svg'), + 'support/bill/priceLight': () => import('./icons/support/bill/priceLight.svg'), + 'support/bill/shoppingCart': () => import('./icons/support/bill/shoppingCart.svg'), + 'support/outlink/apikeyFill': () => import('./icons/support/outlink/apikeyFill.svg'), + 'support/outlink/apikeyLight': () => import('./icons/support/outlink/apikeyLight.svg'), + 'support/outlink/iframeLight': () => import('./icons/support/outlink/iframeLight.svg'), + 'support/outlink/share': () => import('./icons/support/outlink/share.svg'), + 'support/outlink/shareLight': () => import('./icons/support/outlink/shareLight.svg'), + 'support/permission/collaborator': () => import('./icons/support/permission/collaborator.svg'), + 'support/permission/privateLight': () => import('./icons/support/permission/privateLight.svg'), + 'support/permission/publicLight': () => import('./icons/support/permission/publicLight.svg'), + 'support/team/key': () => import('./icons/support/team/key.svg'), + 'support/team/memberLight': () => import('./icons/support/team/memberLight.svg'), + 'support/usage/usageRecordLight': () => import('./icons/support/usage/usageRecordLight.svg'), + 'support/user/individuation': () => import('./icons/support/user/individuation.svg'), + 'support/user/informLight': () => import('./icons/support/user/informLight.svg'), + 'support/user/userFill': () => import('./icons/support/user/userFill.svg'), + 'support/user/userLight': () => import('./icons/support/user/userLight.svg'), + text: () => import('./icons/text.svg'), + union: () => import('./icons/union.svg'), + user: () => import('./icons/user.svg'), + wx: () => import('./icons/wx.svg') +}; diff --git a/packages/web/i18n/en/app.json b/packages/web/i18n/en/app.json index e8993ccbdb7..7e6b0dfac82 100644 --- a/packages/web/i18n/en/app.json +++ b/packages/web/i18n/en/app.json @@ -42,6 +42,7 @@ "Paste Config": "Paste Config", "Plugin dispatch": "Plugins", "Plugin dispatch tip": "It is up to the model to decide which plug-ins to add additional capabilities to. If the plug-in is selected, the knowledge base call is also treated as a special plug-in.", + "Plugin cost per times": "{{cost}}/per time", "Publish channel": "Publish channel", "Publish success": "Publish success", "Run": "Run", diff --git a/packages/web/i18n/zh/app.json b/packages/web/i18n/zh/app.json index d4832be8559..1684701d14b 100644 --- a/packages/web/i18n/zh/app.json +++ b/packages/web/i18n/zh/app.json @@ -41,6 +41,7 @@ "Paste Config": "粘贴配置", "Plugin dispatch": "插件调用", "Plugin dispatch tip": "给模型附加额外的能力，具体调用哪些插件，将由模型自主决定。\n若选择了插件，知识库调用将自动作为一个特殊的插件。", + "Plugin cost per times": "{{cost}}/次", "Publish channel": "发布渠道", "Publish success": "发布成功", "Run": "运行", diff --git a/projects/app/public/imgs/workflow/fetchUrl.png b/projects/app/public/imgs/workflow/fetchUrl.png deleted file mode 100644 index d2e42d4934389b741a3d6505810fe1d14f4c3ee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1272 zcmVk#Tr=U!ctH8)-vOmXrecm72EWPVD4PHwF>kkXB<5A-TZHCHW_+{A z{D+jzKKq@Lc~b0?Y(Byb8#S9SJH=Lk!jy8iWSVRt*w|utMrb`a_#dc>`bv78w5s9q zIPobq!gd9ZW8>@G5Fu5FTwE?NldV#{dz-PBc2Stk;MqRH(o&WIv&zx&K_Y$+?V|0a z%+%_9cQsB!mQoQir{6lr-fi7Py*7>qO@@0r=&-}rmu_)xI!?Q2i_mpR&E2^rP9GfM z-oi2`4ool__F|KWX}Zoxr7t-kTlSuz9+rx#6<5|Gl&jW=_JoMnAuG{x zIPDbO9^y5SK8od14OMY)V^yWmFjy;9(4{`zN@iFoRxsuNYvqa+SJp&*ZZXGFzKqsr zpv$jQ`6AsC1w`D2VN%pI%7p?!pHCts(W)DyMQek8H-4`Nm!vHg3G(L7k@Z|z6tz6k zQ=vMqO^%YS8hr4>MLs*an{B;at?BP?r&vza`S{50mYvf~K0JGsPhTHrC>-E+zRvG+ z2}`alX{bx0F_SK~t~*>d8a6w*hx%y3kf+b?us^aZlE%8O;di@Q_H0h2Kj^jM${L}` zo&XE7ab+qx1<^v->tay|W(q2ql58I}ox0*AFZx;&GI3QWC}eDss*DK!dSZpK-iQ@f z)(hj6beStT(NWzbn@kZ3hwzE8>rK6+vofyZl+9Jss%W(ucBd0pO(i56dinV%hbN*| z+*mJ+FN9oNp1#MiScJgdA-=pk$H_fW`XZfNaOkLVtE12Lkd+91`_}>=y*Sc}(2qA3 z*&iFU>c;wB=98Phdte7==T^y=%1rc!xtGc^(dlNu>tH}MGAY-KnG(H0A8ygw&(jHx zPYw`rTW>1b?x{;vji06$$(2-crjw~ouzLe&!HAHS5;2`5+8e?t1?t#%KOtv(4aJ6= z{8bV2r9_^Zh`C%`!`az|y;3GDwP#;n2ZO$i^?uLZI@ZH8LhGSP=sa5lBIav0`M$u` z!5Jl}5y* diff --git a/projects/app/public/imgs/workflow/fetchUrl.svg b/projects/app/public/imgs/workflow/fetchUrl.svg new file mode 100644 index 00000000000..d75de420f5a --- /dev/null +++ b/projects/app/public/imgs/workflow/fetchUrl.svg @@ -0,0 +1,4 @@ + + +🌐 + diff --git a/projects/app/public/imgs/workflow/getCurrentTime.png b/projects/app/public/imgs/workflow/getCurrentTime.png deleted file mode 100644 index 69f9b9a90ea03613d32d20052669cf6a5f1c969e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1407 zcmV-_1%UdAP)QBi?{j+x?GrwipXfLCt<+foil_YF`BmIB>M*X?hzaq!dQ?`YE1=_B?VcMH1TK_ zH0gBV{o*T3kpQ7kkf3a)@$*lSLlNYjs~F>PV&-R&Hdt|gdy04{fNyFRa&oYJcmzkq z7EL^wQWo=iaUK7fbWx9>UWd!=Mzy7)n{ZUfV*|mHCz-u|joGRS7KZxCo}0n0flE`$tW{N%zxOW6^bD1|_TV^n z3~Nada^GE&UQJI&5+7My8*biUV_h}XpL|Sib1UXxg!=bCU}J5)7AkFmvdhb;uB@W4 zvWCJ#?_d;ZOJ=6IiKHTn1u`@L?7VFofyG5`ba#_;;C1A<4ttuF4I-7RCMbbGZ!ba> z=JIkF9tOXkMOEZMeKZpTbYDJ)!C<1Uu8#ct{N#Vsu`yIpMT0?4EFK~3@nTvY z*8eLAlZom11@gqVQsO|;>61exwhI&$7m=53ClU>ln*NU*ZQh(ro)iq=_AgQ)Yn!Px z4Vl?yBVDCQ$YEFml{18UMkpwsCvoBp2kR55EOEE5+)=^q%xCul5LSz4&H3DSwm zY;34!rn8fXdkR(fMqOC=%h2kQV-o_CBEw;n^XCZ)KTTcfqM)TE`HWQ)lt7h;@WkK% z&dXN`H8r7RWS|ZXqKYb@E>$am{(cle9uo0)UAe;S&=BQqZCYux3(6D8D%-b@z7r>K z-MK@+?;|!hha!Y1Gqb33^U1Wu#5%Vqs^`9Ym!VUqsNKDr?4}m2G^}U~8w~{L_@N!= zFYT1QxQm>Z_hQ+Ug*-nkevF`G=i?J1r+;o|_}Vq>t|?yN60bRvO)KG8Nrf)nyiK0i z@05wCdmcQX=f|Iz67!8`VgjA4BXg5oEH9PRzO)xxNeTCch8dgpvbUvCD+R0a*0F48 zN#m~Yzp$bq`!}qHkYzl5>v$Xzf-bObp!UkbkQZ4eNSqZ(iGwQDAm3UK$1!q2p+lA& z4v(Z$c8YS1vUW%wSS2nV$!p@QNUYc5ct&dA$>2i5GIC5go+wPB;SZwd8uoYr0iOT> N002ovPDHLkV1nrah-Lr) diff --git a/projects/app/public/imgs/workflow/getCurrentTime.svg b/projects/app/public/imgs/workflow/getCurrentTime.svg new file mode 100644 index 00000000000..85fefdb688e --- /dev/null +++ b/projects/app/public/imgs/workflow/getCurrentTime.svg @@ -0,0 +1,4 @@ + + +⏰ + diff --git a/projects/app/public/imgs/workflow/mathExprEval.png b/projects/app/public/imgs/workflow/mathExprEval.png deleted file mode 100644 index b08f161a48752a30b273b71d43c6ac24f9f7fc0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)kP)ugK~#7F?U=ty z!$1_rzwfL|e^IT}qM*$pE`>Tc+v4ix*5Fz3?U;D z@*@)RBL+>5>j!Wh#~UY8X_S{&po6wh{csPD5BJ`9GC!>?^#5KN5d&ktcVF6>+U~SO z$?z^DQa|F!G;~mULf7U69H*nQ1moEp=H`n(K3_?wezcFNwi71!tnG%M8jNh&d85bLdL0+Nt20mnWg>Iq*$N&HU07*qo IM6N<$f))MN4*&oF diff --git a/projects/app/public/imgs/workflow/mathExprEval.svg b/projects/app/public/imgs/workflow/mathExprEval.svg new file mode 100644 index 00000000000..269ee1a8a2c --- /dev/null +++ b/projects/app/public/imgs/workflow/mathExprEval.svg @@ -0,0 +1,4 @@ + + +➗ + diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx index efb7168271d..e747c461b31 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useMemo, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Box, Divider, @@ -20,7 +20,11 @@ import { nodeTemplate2FlowNode } from '@/web/core/workflow/utils'; import { useTranslation } from 'next-i18next'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; -import { getPreviewPluginNode, getSystemPlugTemplates } from '@/web/core/app/api/plugin'; +import { + getPreviewPluginNode, + getSystemPlugTemplates, + getSystemPluginPaths +} from '@/web/core/app/api/plugin'; import { useToast } from '@fastgpt/web/hooks/useToast'; import { getErrText } from '@fastgpt/global/common/error/utils'; import { workflowNodeTemplateList } from '@fastgpt/web/core/workflow/constants'; @@ -49,10 +53,10 @@ type ModuleTemplateListProps = { }; type RenderListProps = { templates: NodeTemplateListItemType[]; + type: TemplateTypeEnum; onClose: () => void; parentId: ParentIdType; setParentId: React.Dispatch>; - showCost?: boolean; }; enum TemplateTypeEnum { @@ -61,7 +65,7 @@ enum TemplateTypeEnum { 'teamPlugin' = 'teamPlugin' } -const sliderWidth = 390; +const sliderWidth = 420; const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { const { t } = useTranslation(); @@ -114,7 +118,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { refreshDeps: [basicNodeTemplates, nodeList, hasToolNode, templateType, searchKey, parentId] } ); - const { data: teamApps, loading: isLoadingTeamApp } = useRequest2( + const { data: teamAndSystemApps, loading: isLoadingTeamApp } = useRequest2( async () => { if (templateType === TemplateTypeEnum.teamPlugin) { return getTeamPlugTemplates({ @@ -123,6 +127,9 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { type: [AppTypeEnum.folder, AppTypeEnum.httpPlugin, AppTypeEnum.plugin] }).then((res) => res.filter((app) => app.id !== appId)); } + if (templateType === TemplateTypeEnum.systemPlugin) { + return getSystemPlugTemplates(parentId); + } }, { manual: false, @@ -130,29 +137,28 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { refreshDeps: [templateType, searchKey, parentId] } ); - const { data: systemPlugins, loading: isLoadingSystemPlugins } = useRequest2( - async () => { - if (templateType === TemplateTypeEnum.systemPlugin) { - return getSystemPlugTemplates(); - } + + const isLoading = isLoadingTeamApp; + const templates = useMemo( + () => basicNodes || teamAndSystemApps || [], + [basicNodes, teamAndSystemApps] + ); + + useEffect(() => { + setParentId(''); + }, [templateType, searchKey]); + + const { data: paths = [] } = useRequest2( + () => { + if (templateType === TemplateTypeEnum.teamPlugin) return getAppFolderPath(parentId); + return getSystemPluginPaths(parentId); }, { manual: false, - refreshDeps: [templateType] + refreshDeps: [parentId] } ); - const isLoading = isLoadingTeamApp || isLoadingSystemPlugins; - const templates = useMemo( - () => basicNodes || teamApps || systemPlugins || [], - [basicNodes, systemPlugins, teamApps] - ); - - const { data: paths = [] } = useRequest2(() => getAppFolderPath(parentId), { - manual: false, - refreshDeps: [parentId] - }); - const Render = useMemo(() => { return ( <> @@ -164,6 +170,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { left={0} bottom={0} w={`${sliderWidth}px`} + maxW={'100%'} onClick={onClose} fontSize={'sm'} /> @@ -186,30 +193,35 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { userSelect={'none'} overflow={isOpen ? 'none' : 'hidden'} > + {/* Header */} + {/* Tabs */} - setTemplateType(e as TemplateTypeEnum)} - /> + + setTemplateType(e as TemplateTypeEnum)} + /> + {/* close icon */} { onClick={onClose} /> + {/* Search */} {templateType === TemplateTypeEnum.teamPlugin && ( @@ -248,18 +261,22 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => { )} - {templateType === TemplateTypeEnum.teamPlugin && !searchKey && parentId && ( - - - - )} + {/* paths */} + {(templateType === TemplateTypeEnum.teamPlugin || + templateType === TemplateTypeEnum.systemPlugin) && + !searchKey && + parentId && ( + + + + )} @@ -273,15 +290,18 @@ export default React.memo(NodeTemplatesModal); const RenderList = React.memo(function RenderList({ templates, + type, onClose, parentId, - setParentId, - showCost + setParentId }: RenderListProps) { const { t } = useTranslation(); const { appT } = useI18n(); const { isPc } = useSystem(); + const isSystemPlugin = type === TemplateTypeEnum.systemPlugin; + const avatarSize = type === TemplateTypeEnum.teamPlugin ? '1.75rem' : '2.25rem'; + const { x, y, zoom } = useViewport(); const { setLoading } = useSystemStore(); const { toast } = useToast(); @@ -397,7 +417,7 @@ const RenderList = React.memo(function RenderList({ key={template.id} placement={'right'} label={ - + {template.avatar?.startsWith('/') ? ( {t(template.intro as any) || t('common:core.workflow.Not intro')} - {showCost && ( + {isSystemPlugin && ( <> {t('core.plugin.cost')} - {template.currentCost || t('core.plugin.Free')} + {template.currentCost && template.currentCost > 0 + ? appT('Plugin cost per times', { cost: template.currentCost }) + : t('core.plugin.Free')} @@ -432,7 +454,8 @@ const RenderList = React.memo(function RenderList({ > ) : ( - + )} - - {t(template.name as any)} + + {t(template.name)} - {showCost && ( - - {template.author ? `by ${template.author}` : `by 匿名大佬`} + {template.author && ( + + {`by ${template.author}`} )} @@ -488,7 +511,18 @@ const RenderList = React.memo(function RenderList({ ); - }, [appT, formatTemplates, isPc, onAddNode, onClose, setParentId, t, templates.length]); + }, [ + appT, + avatarSize, + formatTemplates, + isPc, + isSystemPlugin, + onAddNode, + onClose, + setParentId, + t, + templates.length + ]); return Render; }); diff --git a/projects/app/src/web/core/app/api/app.ts b/projects/app/src/web/core/app/api/app.ts index 90d6eb02531..6ce023aa2e6 100644 --- a/projects/app/src/web/core/app/api/app.ts +++ b/projects/app/src/web/core/app/api/app.ts @@ -12,8 +12,11 @@ import type { copyAppQuery, copyAppResponse } from '@/pages/api/core/app/copy'; export const postCreateAppFolder = (data: CreateAppFolderBody) => POST('/core/app/folder/create', data); -export const getAppFolderPath = (parentId: ParentIdType) => - GET(`/core/app/folder/path`, { parentId }); +export const getAppFolderPath = (parentId: ParentIdType) => { + if (!parentId) return Promise.resolve([]); + + return GET(`/core/app/folder/path`, { parentId }); +}; /* detail */ export const postTransition2Workflow = (data: transitionWorkflowBody) => diff --git a/projects/app/src/web/core/app/api/plugin.ts b/projects/app/src/web/core/app/api/plugin.ts index 3000f5c2622..dd94701f3bd 100644 --- a/projects/app/src/web/core/app/api/plugin.ts +++ b/projects/app/src/web/core/app/api/plugin.ts @@ -35,8 +35,10 @@ export const getTeamPlugTemplates = (data?: ListAppBody) => export const getSystemPlugTemplates = (parentId: ParentIdType) => GET('/core/app/plugin/getSystemPluginTemplates', { parentId }); -export const getSystemPluginPaths = (parentId: ParentIdType) => - GET('/core/app/plugin/path', { parentId }); +export const getSystemPluginPaths = (parentId: ParentIdType) => { + if (!parentId) return Promise.resolve([]); + return GET('/core/app/plugin/path', { parentId }); +}; export const getPreviewPluginNode = (data: GetPreviewNodeQuery) => GET('/core/app/plugin/getPreviewNode', data); From c6f305b42afd4f8421feb19971a089d75a8792f0 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Mon, 15 Jul 2024 17:48:41 +0800 Subject: [PATCH 06/11] perf: system plugin avatar --- packages/plugins/src/fetchUrl/template.json | 2 +- packages/plugins/src/getTime/template.json | 2 +- packages/plugins/src/mathExprVal/template.json | 2 +- projects/app/public/imgs/workflow/fetchUrl.png | Bin 0 -> 9352 bytes projects/app/public/imgs/workflow/fetchUrl.svg | 4 ++-- .../app/public/imgs/workflow/getCurrentTime.png | Bin 0 -> 9634 bytes .../app/public/imgs/workflow/getCurrentTime.svg | 2 +- .../app/public/imgs/workflow/mathExprEval.png | Bin 0 -> 1227 bytes .../app/detail/components/SimpleApp/EditForm.tsx | 2 +- .../SimpleApp/components/ToolSelectModal.tsx | 10 ++++++++-- 10 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 projects/app/public/imgs/workflow/fetchUrl.png create mode 100644 projects/app/public/imgs/workflow/getCurrentTime.png create mode 100644 projects/app/public/imgs/workflow/mathExprEval.png diff --git a/packages/plugins/src/fetchUrl/template.json b/packages/plugins/src/fetchUrl/template.json index 324bcc74542..b0798c1c932 100644 --- a/packages/plugins/src/fetchUrl/template.json +++ b/packages/plugins/src/fetchUrl/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "网页内容抓取", - "avatar": "/imgs/workflow/fetchUrl.svg", + "avatar": "/imgs/workflow/fetchUrl.png", "intro": "可获取一个网页链接内容，并以 Markdown 格式输出，仅支持获取静态网站。", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/getTime/template.json b/packages/plugins/src/getTime/template.json index ebcefca6578..f402d875939 100644 --- a/packages/plugins/src/getTime/template.json +++ b/packages/plugins/src/getTime/template.json @@ -3,7 +3,7 @@ "version": "481", "templateType": "tools", "name": "获取当前时间", - "avatar": "/imgs/workflow/getCurrentTime.svg", + "avatar": "/imgs/workflow/getCurrentTime.png", "intro": "获取用户当前时区的时间。", "showStatus": false, "isTool": true, diff --git a/packages/plugins/src/mathExprVal/template.json b/packages/plugins/src/mathExprVal/template.json index 846261ce84e..dbcc0bff8e5 100644 --- a/packages/plugins/src/mathExprVal/template.json +++ b/packages/plugins/src/mathExprVal/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "数学公式执行", - "avatar": "/imgs/workflow/mathExprEval.svg", + "avatar": "/imgs/workflow/mathExprEval.png", "intro": "用于执行数学表达式的工具，通过 js 的 expr-eval 库运行表达式并返回结果。", "showStatus": false, "weight": 10, diff --git a/projects/app/public/imgs/workflow/fetchUrl.png b/projects/app/public/imgs/workflow/fetchUrl.png new file mode 100644 index 0000000000000000000000000000000000000000..43a6c3519e51a86f99c0cbebf56f22b9f8da096e GIT binary patch literal 9352 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 + -🌐 +🌐 diff --git a/projects/app/public/imgs/workflow/getCurrentTime.png b/projects/app/public/imgs/workflow/getCurrentTime.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd2970cda0ef97922250a0f708a8cb0916f6902 GIT binary patch literal 9634 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 -⏰ +⏰ diff --git a/projects/app/public/imgs/workflow/mathExprEval.png b/projects/app/public/imgs/workflow/mathExprEval.png new file mode 100644 index 0000000000000000000000000000000000000000..bde2b1b477b2f5d8f976cddcfc17fd3595a1d9a6 GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p{OJ&H|6fVg?393lL^>oo1K-6l5$8 za(7}_cTVOdki(Mh=z!>pDN z(Ed5!XolnM`gKA7cY4RRR7yW~D>}2}=)X?eEZyDOrVon5Jm)Q6)^AXpb?3~xrze@4 z|L%UIw&t+u{+kUlORgNBAt#b|Jz?$t*uB>dPAUGu6eN}WA=mua7W+zJge44h#7A{Ii5$Wk^niyzc#O3C8@PvlMOo^5?Zyz1M`ToQ2wLf!WBNWd) z+}p|j@#OOP%3VM9#c4LP&OOH_XA|KXsK))~fLFTL@?td8E}TSpKzR}#nKqo*<@{+yw zzx27;uDg1DlXi$bUc3GD?!?{D3R zI36e%$1gSIca-0AxQ9^Pwe(y`&kyfkTQfw?+<&(@cE=ZMBcmpxsZ~dRzHe1~w4*Gf zD)o?2^OG~y8r{=4CS0_H2Tohj)BGI;73B~8*R1&y{^L`kL{jhmDyH;v^FAxv-2Jvt zfGWwrrP^w&3BuY=A%hZ_`7^Lx-BmQ)BcJ!u_d2!#673%NeikE&EN|vJ$pe*`dWG8 z>j_?;t*`q0E1bN4f+SxzuZQT;<;Q)6%&PR~tUZ`M!Ru4?)i2k|^dpSYo=tdP79@Ku z>DiSXGw=TT+qY8Fx<&slJMZV!%15KFElGFZ@MK2j?}d+#-xPkjVd=i3OH~Z5(-zH} z`G?o}_y-q_TZvg|8*93k%fGOWp6@DsX!ixnwIvVdq=x@K&c(KFNe(dM?RzC+^29zP zQ)1=w=KZm6D_>^Iy<2r(=RJGx9)?em%U<7hZ(^Po?_>5|BKgw)quu9z?mhRzyxl6r t;IV$H - + {item.name} diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx index 7ec526ab8dd..2841042eae4 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx @@ -46,6 +46,7 @@ import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import { getAppFolderPath } from '@/web/core/app/api/app'; import FolderPath from '@/components/common/folder/Path'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; +import { useI18n } from '@/web/context/I18n'; type Props = { selectedTools: FlowNodeTemplateType[]; @@ -185,6 +186,7 @@ const RenderList = React.memo(function RenderList({ showCost?: boolean; }) { const { t } = useTranslation(); + const { appT } = useI18n(); const [configTool, setConfigTool] = useState(); const onCloseConfigTool = useCallback(() => setConfigTool(undefined), []); @@ -215,7 +217,7 @@ const RenderList = React.memo(function RenderList({ return ( @@ -237,7 +239,11 @@ const RenderList = React.memo(function RenderList({ {t('core.plugin.cost')} - {item.currentCost || t('core.plugin.Free')} + + {item.currentCost && item.currentCost > 0 + ? appT('Plugin cost per times', { cost: item.currentCost }) + : t('core.plugin.Free')} + )} From 4618c25167fa38f729980bb0cb864aed96267abe Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Mon, 15 Jul 2024 18:48:38 +0800 Subject: [PATCH 07/11] feat: duckduck plugins --- packages/plugins/register.ts | 32 ++- .../plugins/src/duckduckgo/search/index.ts | 51 ++-- .../src/duckduckgo/search/template.json | 2 +- .../plugins/src/duckduckgo/searchImg/index.ts | 46 ++++ .../src/duckduckgo/searchImg/template.json | 260 ++++++++++++++++++ .../src/duckduckgo/searchNews/index.ts | 47 ++++ .../src/duckduckgo/searchNews/template.json | 260 ++++++++++++++++++ .../src/duckduckgo/searchVideo/index.ts | 47 ++++ .../src/duckduckgo/searchVideo/template.json | 260 ++++++++++++++++++ 9 files changed, 979 insertions(+), 26 deletions(-) create mode 100644 packages/plugins/src/duckduckgo/searchImg/index.ts create mode 100644 packages/plugins/src/duckduckgo/searchImg/template.json create mode 100644 packages/plugins/src/duckduckgo/searchNews/index.ts create mode 100644 packages/plugins/src/duckduckgo/searchNews/template.json create mode 100644 packages/plugins/src/duckduckgo/searchVideo/index.ts create mode 100644 packages/plugins/src/duckduckgo/searchVideo/template.json diff --git a/packages/plugins/register.ts b/packages/plugins/register.ts index 52be2bc17d3..c9d4e1c4877 100644 --- a/packages/plugins/register.ts +++ b/packages/plugins/register.ts @@ -4,7 +4,16 @@ import { FastGPTProUrl, isProduction } from '../service/common/system/constants' import { GET, POST } from '@fastgpt/service/common/api/plusRequest'; import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; -let list = ['getTime', 'fetchUrl', 'mathExprVal', 'duckduckgo', 'duckduckgo/search']; +let list = [ + 'getTime', + 'fetchUrl', + 'mathExprVal', + 'duckduckgo', + 'duckduckgo/search', + 'duckduckgo/searchImg', + 'duckduckgo/searchNews', + 'duckduckgo/searchVideo' +]; /* Get plugins */ export const getCommunityPlugins = () => { @@ -51,12 +60,21 @@ export const getCommunityCb = async () => { return module.default; }; - const result = await Promise.all( - list.map(async (name) => ({ - name, - cb: await loadModule(name) - })) - ); + const result = ( + await Promise.all( + list.map(async (name) => { + try { + return { + name, + cb: await loadModule(name) + }; + } catch (error) {} + }) + ) + ).filter(Boolean) as { + name: string; + cb: any; + }[]; return result.reduce SystemPluginResponseType>>( (acc, { name, cb }) => { diff --git a/packages/plugins/src/duckduckgo/search/index.ts b/packages/plugins/src/duckduckgo/search/index.ts index f88c3874ef3..0d93404a1bb 100644 --- a/packages/plugins/src/duckduckgo/search/index.ts +++ b/packages/plugins/src/duckduckgo/search/index.ts @@ -1,5 +1,6 @@ -import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { search, SafeSearchType } from 'duck-duck-scrape'; +import { delay } from '@fastgpt/global/common/system/utils'; +import { addLog } from '@fastgpt/service/common/system/log'; type Props = { query: string; @@ -10,23 +11,37 @@ type Response = Promise<{ result: string; }>; -const main = async ({ query }: Props): Response => { - const searchResults = await search(query, { - safeSearch: SafeSearchType.STRICT, - time: 'y' - }); - - const result = searchResults.results - .map((item) => ({ - title: item.title, - link: item.url, - snippet: item.description - })) - .slice(0, 10); - // console.log(result); - return { - result: JSON.stringify(result) - }; +const main = async (props: Props, retry = 3): Response => { + const { query } = props; + try { + const searchResults = await search(query, { + safeSearch: SafeSearchType.STRICT, + time: 'y' + }); + + const result = searchResults.results + .map((item) => ({ + title: item.title, + link: item.url, + snippet: item.description + })) + .slice(0, 10); + + return { + result: JSON.stringify(result) + }; + } catch (error) { + if (retry <= 0) { + return { + result: 'Failed to fetch data' + }; + } + + addLog.warn('DuckDuckGo error', { error }); + + await delay(Math.random() * 2000); + return main(props, retry - 1); + } }; export default main; diff --git a/packages/plugins/src/duckduckgo/search/template.json b/packages/plugins/src/duckduckgo/search/template.json index 5988b6ef098..6964da4aa85 100644 --- a/packages/plugins/src/duckduckgo/search/template.json +++ b/packages/plugins/src/duckduckgo/search/template.json @@ -3,7 +3,7 @@ "version": "486", "name": "DuckDuckGo 搜索", "avatar": "/imgs/workflow/textEditor.svg", - "intro": "使用 DuckDuckGo 进行网络检索", + "intro": "使用 DuckDuckGo 进行网络搜索", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/duckduckgo/searchImg/index.ts b/packages/plugins/src/duckduckgo/searchImg/index.ts new file mode 100644 index 00000000000..a49bd3136d5 --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchImg/index.ts @@ -0,0 +1,46 @@ +import { searchImages, SafeSearchType } from 'duck-duck-scrape'; +import { delay } from '@fastgpt/global/common/system/utils'; +import { addLog } from '@fastgpt/service/common/system/log'; + +type Props = { + query: string; +}; + +// Response type same as HTTP outputs +type Response = Promise<{ + result: string; +}>; + +const main = async (props: Props, retry = 3): Response => { + const { query } = props; + + try { + const searchResults = await searchImages(query, { + safeSearch: SafeSearchType.STRICT + }); + + const result = searchResults.results + .map((item) => ({ + title: item.title, + image: item.image + })) + .slice(0, 10); + + return { + result: JSON.stringify(result) + }; + } catch (error) { + if (retry <= 0) { + return { + result: 'Failed to fetch data' + }; + } + + addLog.warn('DuckDuckGo error', { error }); + + await delay(Math.random() * 2000); + return main(props, retry - 1); + } +}; + +export default main; diff --git a/packages/plugins/src/duckduckgo/searchImg/template.json b/packages/plugins/src/duckduckgo/searchImg/template.json new file mode 100644 index 00000000000..7596c5a6fb9 --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchImg/template.json @@ -0,0 +1,260 @@ +{ + "author": "FastGPT", + "version": "486", + "name": "DuckDuckGo 图片搜索", + "avatar": "/imgs/workflow/textEditor.svg", + "intro": "使用 DuckDuckGo 进行图片搜索", + "showStatus": true, + "weight": 10, + + "isTool": true, + "templateType": "tools", + + "workflow": { + "nodes": [ + { + "nodeId": "pluginInput", + "name": "自定义插件输入", + "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件", + "avatar": "/imgs/workflow/input.png", + "flowNodeType": "pluginInput", + "showStatus": false, + "position": { + "x": 393.68844551739926, + "y": -58.80666875994541 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "selectedTypeIndex": 0, + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "description": "检索词", + "required": true, + "toolDescription": "检索词" + } + ], + "outputs": [ + { + "id": "query", + "valueType": "string", + "key": "query", + "label": "query", + "type": "hidden" + } + ] + }, + { + "nodeId": "pluginOutput", + "name": "自定义插件输出", + "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出", + "avatar": "/imgs/workflow/output.png", + "flowNodeType": "pluginOutput", + "showStatus": false, + "position": { + "x": 1795.6509902691012, + "y": -47.04550785550961 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "result", + "label": "result", + "description": " 检索结果", + "value": ["hjnVuJAOwyXV", "lEyy5QqyIBrK"] + } + ], + "outputs": [] + }, + { + "nodeId": "hjnVuJAOwyXV", + "name": "HTTP 请求", + "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）", + "avatar": "/imgs/workflow/http.png", + "flowNodeType": "httpRequest468", + "showStatus": true, + "position": { + "x": 1054.6774638324207, + "y": -403.06127656499825 + }, + "version": "481", + "inputs": [ + { + "key": "system_addInputParam", + "renderTypeList": ["addInputParam"], + "valueType": "dynamic", + "label": "", + "required": false, + "description": "core.module.input.description.HTTP Dynamic Input", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + } + }, + { + "key": "system_httpMethod", + "renderTypeList": ["custom"], + "valueType": "string", + "label": "", + "value": "POST", + "required": true + }, + { + "key": "system_httpReqUrl", + "renderTypeList": ["hidden"], + "valueType": "string", + "label": "", + "description": "core.module.input.description.Http Request Url", + "placeholder": "https://api.ai.com/getInventory", + "required": false, + "value": "duckduckgo/searchImg" + }, + { + "key": "system_httpHeader", + "renderTypeList": ["custom"], + "valueType": "any", + "value": [], + "label": "", + "description": "core.module.input.description.Http Request Header", + "placeholder": "core.module.input.description.Http Request Header", + "required": false + }, + { + "key": "system_httpParams", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": [], + "label": "", + "required": false + }, + { + "key": "system_httpJsonBody", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": "{\n \"query\": \"{{query}}\"\n}", + "label": "", + "required": false + }, + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + }, + "required": true, + "value": ["pluginInput", "query"] + } + ], + "outputs": [ + { + "id": "system_addOutputParam", + "key": "system_addOutputParam", + "type": "dynamic", + "valueType": "dynamic", + "label": "", + "customFieldConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": false + } + }, + { + "id": "error", + "key": "error", + "label": "请求错误", + "description": "HTTP请求错误信息，成功时返回空", + "valueType": "object", + "type": "static" + }, + { + "id": "httpRawResponse", + "key": "httpRawResponse", + "label": "原始响应", + "required": true, + "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。", + "valueType": "any", + "type": "static" + }, + { + "id": "lEyy5QqyIBrK", + "valueType": "string", + "type": "dynamic", + "key": "result", + "label": "result" + } + ] + } + ], + "edges": [ + { + "source": "pluginInput", + "target": "hjnVuJAOwyXV", + "sourceHandle": "pluginInput-source-right", + "targetHandle": "hjnVuJAOwyXV-target-left" + }, + { + "source": "hjnVuJAOwyXV", + "target": "pluginOutput", + "sourceHandle": "hjnVuJAOwyXV-source-right", + "targetHandle": "pluginOutput-target-left" + } + ] + } +} diff --git a/packages/plugins/src/duckduckgo/searchNews/index.ts b/packages/plugins/src/duckduckgo/searchNews/index.ts new file mode 100644 index 00000000000..99a2af03007 --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchNews/index.ts @@ -0,0 +1,47 @@ +import { searchNews, SafeSearchType } from 'duck-duck-scrape'; +import { delay } from '@fastgpt/global/common/system/utils'; +import { addLog } from '@fastgpt/service/common/system/log'; + +type Props = { + query: string; +}; + +// Response type same as HTTP outputs +type Response = Promise<{ + result: string; +}>; + +const main = async (props: Props, retry = 3): Response => { + const { query } = props; + + try { + const searchResults = await searchNews(query, { + safeSearch: SafeSearchType.STRICT + }); + + const result = searchResults.results + .map((item) => ({ + title: item.title, + excerpt: item.excerpt, + url: item.url + })) + .slice(0, 10); + + return { + result: JSON.stringify(result) + }; + } catch (error) { + if (retry <= 0) { + return { + result: 'Failed to fetch data' + }; + } + + addLog.warn('DuckDuckGo error', { error }); + + await delay(Math.random() * 2000); + return main(props, retry - 1); + } +}; + +export default main; diff --git a/packages/plugins/src/duckduckgo/searchNews/template.json b/packages/plugins/src/duckduckgo/searchNews/template.json new file mode 100644 index 00000000000..3b4a172d6c1 --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchNews/template.json @@ -0,0 +1,260 @@ +{ + "author": "FastGPT", + "version": "486", + "name": "DuckDuckGo 新闻检索", + "avatar": "/imgs/workflow/textEditor.svg", + "intro": "使用 DuckDuckGo 进行新闻检索", + "showStatus": true, + "weight": 10, + + "isTool": true, + "templateType": "tools", + + "workflow": { + "nodes": [ + { + "nodeId": "pluginInput", + "name": "自定义插件输入", + "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件", + "avatar": "/imgs/workflow/input.png", + "flowNodeType": "pluginInput", + "showStatus": false, + "position": { + "x": 393.68844551739926, + "y": -58.80666875994541 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "selectedTypeIndex": 0, + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "description": "检索词", + "required": true, + "toolDescription": "检索词" + } + ], + "outputs": [ + { + "id": "query", + "valueType": "string", + "key": "query", + "label": "query", + "type": "hidden" + } + ] + }, + { + "nodeId": "pluginOutput", + "name": "自定义插件输出", + "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出", + "avatar": "/imgs/workflow/output.png", + "flowNodeType": "pluginOutput", + "showStatus": false, + "position": { + "x": 1795.6509902691012, + "y": -47.04550785550961 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "result", + "label": "result", + "description": " 检索结果", + "value": ["hjnVuJAOwyXV", "lEyy5QqyIBrK"] + } + ], + "outputs": [] + }, + { + "nodeId": "hjnVuJAOwyXV", + "name": "HTTP 请求", + "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）", + "avatar": "/imgs/workflow/http.png", + "flowNodeType": "httpRequest468", + "showStatus": true, + "position": { + "x": 1054.6774638324207, + "y": -403.06127656499825 + }, + "version": "481", + "inputs": [ + { + "key": "system_addInputParam", + "renderTypeList": ["addInputParam"], + "valueType": "dynamic", + "label": "", + "required": false, + "description": "core.module.input.description.HTTP Dynamic Input", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + } + }, + { + "key": "system_httpMethod", + "renderTypeList": ["custom"], + "valueType": "string", + "label": "", + "value": "POST", + "required": true + }, + { + "key": "system_httpReqUrl", + "renderTypeList": ["hidden"], + "valueType": "string", + "label": "", + "description": "core.module.input.description.Http Request Url", + "placeholder": "https://api.ai.com/getInventory", + "required": false, + "value": "duckduckgo/searchNews" + }, + { + "key": "system_httpHeader", + "renderTypeList": ["custom"], + "valueType": "any", + "value": [], + "label": "", + "description": "core.module.input.description.Http Request Header", + "placeholder": "core.module.input.description.Http Request Header", + "required": false + }, + { + "key": "system_httpParams", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": [], + "label": "", + "required": false + }, + { + "key": "system_httpJsonBody", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": "{\n \"query\": \"{{query}}\"\n}", + "label": "", + "required": false + }, + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + }, + "required": true, + "value": ["pluginInput", "query"] + } + ], + "outputs": [ + { + "id": "system_addOutputParam", + "key": "system_addOutputParam", + "type": "dynamic", + "valueType": "dynamic", + "label": "", + "customFieldConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": false + } + }, + { + "id": "error", + "key": "error", + "label": "请求错误", + "description": "HTTP请求错误信息，成功时返回空", + "valueType": "object", + "type": "static" + }, + { + "id": "httpRawResponse", + "key": "httpRawResponse", + "label": "原始响应", + "required": true, + "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。", + "valueType": "any", + "type": "static" + }, + { + "id": "lEyy5QqyIBrK", + "valueType": "string", + "type": "dynamic", + "key": "result", + "label": "result" + } + ] + } + ], + "edges": [ + { + "source": "pluginInput", + "target": "hjnVuJAOwyXV", + "sourceHandle": "pluginInput-source-right", + "targetHandle": "hjnVuJAOwyXV-target-left" + }, + { + "source": "hjnVuJAOwyXV", + "target": "pluginOutput", + "sourceHandle": "hjnVuJAOwyXV-source-right", + "targetHandle": "pluginOutput-target-left" + } + ] + } +} diff --git a/packages/plugins/src/duckduckgo/searchVideo/index.ts b/packages/plugins/src/duckduckgo/searchVideo/index.ts new file mode 100644 index 00000000000..ba0fe5b9e46 --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchVideo/index.ts @@ -0,0 +1,47 @@ +import { searchVideos, SafeSearchType } from 'duck-duck-scrape'; +import { delay } from '@fastgpt/global/common/system/utils'; +import { addLog } from '@fastgpt/service/common/system/log'; + +type Props = { + query: string; +}; + +// Response type same as HTTP outputs +type Response = Promise<{ + result: string; +}>; + +const main = async (props: Props, retry = 3): Response => { + const { query } = props; + + try { + const searchResults = await searchVideos(query, { + safeSearch: SafeSearchType.STRICT + }); + + const result = searchResults.results + .map((item) => ({ + title: item.title, + description: item.description, + url: item.url + })) + .slice(0, 10); + + return { + result: JSON.stringify(result) + }; + } catch (error) { + if (retry <= 0) { + return { + result: 'Failed to fetch data' + }; + } + + addLog.warn('DuckDuckGo error', { error }); + + await delay(Math.random() * 2000); + return main(props, retry - 1); + } +}; + +export default main; diff --git a/packages/plugins/src/duckduckgo/searchVideo/template.json b/packages/plugins/src/duckduckgo/searchVideo/template.json new file mode 100644 index 00000000000..a4295d97e0e --- /dev/null +++ b/packages/plugins/src/duckduckgo/searchVideo/template.json @@ -0,0 +1,260 @@ +{ + "author": "FastGPT", + "version": "486", + "name": "DuckDuckGo 视频搜索", + "avatar": "/imgs/workflow/textEditor.svg", + "intro": "使用 DuckDuckGo 进行视频搜索", + "showStatus": true, + "weight": 10, + + "isTool": true, + "templateType": "tools", + + "workflow": { + "nodes": [ + { + "nodeId": "pluginInput", + "name": "自定义插件输入", + "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件", + "avatar": "/imgs/workflow/input.png", + "flowNodeType": "pluginInput", + "showStatus": false, + "position": { + "x": 393.68844551739926, + "y": -58.80666875994541 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "selectedTypeIndex": 0, + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "description": "检索词", + "required": true, + "toolDescription": "检索词" + } + ], + "outputs": [ + { + "id": "query", + "valueType": "string", + "key": "query", + "label": "query", + "type": "hidden" + } + ] + }, + { + "nodeId": "pluginOutput", + "name": "自定义插件输出", + "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出", + "avatar": "/imgs/workflow/output.png", + "flowNodeType": "pluginOutput", + "showStatus": false, + "position": { + "x": 1795.6509902691012, + "y": -47.04550785550961 + }, + "version": "481", + "inputs": [ + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "result", + "label": "result", + "description": " 检索结果", + "value": ["hjnVuJAOwyXV", "lEyy5QqyIBrK"] + } + ], + "outputs": [] + }, + { + "nodeId": "hjnVuJAOwyXV", + "name": "HTTP 请求", + "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）", + "avatar": "/imgs/workflow/http.png", + "flowNodeType": "httpRequest468", + "showStatus": true, + "position": { + "x": 1054.6774638324207, + "y": -403.06127656499825 + }, + "version": "481", + "inputs": [ + { + "key": "system_addInputParam", + "renderTypeList": ["addInputParam"], + "valueType": "dynamic", + "label": "", + "required": false, + "description": "core.module.input.description.HTTP Dynamic Input", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + } + }, + { + "key": "system_httpMethod", + "renderTypeList": ["custom"], + "valueType": "string", + "label": "", + "value": "POST", + "required": true + }, + { + "key": "system_httpReqUrl", + "renderTypeList": ["hidden"], + "valueType": "string", + "label": "", + "description": "core.module.input.description.Http Request Url", + "placeholder": "https://api.ai.com/getInventory", + "required": false, + "value": "duckduckgo/searchVideo" + }, + { + "key": "system_httpHeader", + "renderTypeList": ["custom"], + "valueType": "any", + "value": [], + "label": "", + "description": "core.module.input.description.Http Request Header", + "placeholder": "core.module.input.description.Http Request Header", + "required": false + }, + { + "key": "system_httpParams", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": [], + "label": "", + "required": false + }, + { + "key": "system_httpJsonBody", + "renderTypeList": ["hidden"], + "valueType": "any", + "value": "{\n \"query\": \"{{query}}\"\n}", + "label": "", + "required": false + }, + { + "renderTypeList": ["reference"], + "valueType": "string", + "canEdit": true, + "key": "query", + "label": "query", + "customInputConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": true + }, + "required": true, + "value": ["pluginInput", "query"] + } + ], + "outputs": [ + { + "id": "system_addOutputParam", + "key": "system_addOutputParam", + "type": "dynamic", + "valueType": "dynamic", + "label": "", + "customFieldConfig": { + "selectValueTypeList": [ + "string", + "number", + "boolean", + "object", + "arrayString", + "arrayNumber", + "arrayBoolean", + "arrayObject", + "any", + "chatHistory", + "datasetQuote", + "dynamic", + "selectApp", + "selectDataset" + ], + "showDescription": false, + "showDefaultValue": false + } + }, + { + "id": "error", + "key": "error", + "label": "请求错误", + "description": "HTTP请求错误信息，成功时返回空", + "valueType": "object", + "type": "static" + }, + { + "id": "httpRawResponse", + "key": "httpRawResponse", + "label": "原始响应", + "required": true, + "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。", + "valueType": "any", + "type": "static" + }, + { + "id": "lEyy5QqyIBrK", + "valueType": "string", + "type": "dynamic", + "key": "result", + "label": "result" + } + ] + } + ], + "edges": [ + { + "source": "pluginInput", + "target": "hjnVuJAOwyXV", + "sourceHandle": "pluginInput-source-right", + "targetHandle": "hjnVuJAOwyXV-target-left" + }, + { + "source": "hjnVuJAOwyXV", + "target": "pluginOutput", + "sourceHandle": "hjnVuJAOwyXV-source-right", + "targetHandle": "pluginOutput-target-left" + } + ] + } +} From 82fd9710fd777225780ae634fea5714fee01d888 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Mon, 15 Jul 2024 19:16:17 +0800 Subject: [PATCH 08/11] doc --- docSite/content/zh-cn/docs/development/upgrading/468.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docSite/content/zh-cn/docs/development/upgrading/468.md b/docSite/content/zh-cn/docs/development/upgrading/468.md index 1b579ab0b91..6df28919be7 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/468.md +++ b/docSite/content/zh-cn/docs/development/upgrading/468.md @@ -77,7 +77,7 @@ docker-compose up -d 商业版用户需要执行一个初始化，格式化团队信息。 -发起 1 个 HTTP 请求 ({{rootkey}} 替换成环境变量里的 `rootkey`，{{host}} 替换成自己域名) +发起 1 个 HTTP 请求 ({{rootkey}} 替换成环境变量里的 `rootkey`，{{host}} 替换成商业版域名) ```bash curl --location --request POST 'https://{{host}}/api/init/v468' \ From 469122feb54970c48eec91196459a0f1b83c82a3 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Tue, 16 Jul 2024 13:06:57 +0800 Subject: [PATCH 09/11] perf: plugin classify --- packages/global/core/workflow/constants.ts | 3 +++ packages/plugins/src/duckduckgo/search/template.json | 4 ++-- .../plugins/src/duckduckgo/searchImg/template.json | 2 +- .../plugins/src/duckduckgo/searchNews/template.json | 2 +- .../plugins/src/duckduckgo/searchVideo/template.json | 2 +- packages/plugins/src/duckduckgo/template.json | 2 +- packages/web/core/workflow/constants.ts | 10 ++++++++++ packages/web/i18n/en/common.json | 4 ++++ packages/web/i18n/zh/common.json | 4 ++++ .../WorkflowComponents/Flow/NodeTemplatesModal.tsx | 2 +- 10 files changed, 28 insertions(+), 7 deletions(-) diff --git a/packages/global/core/workflow/constants.ts b/packages/global/core/workflow/constants.ts index 7df5f06a751..62e11b5ffea 100644 --- a/packages/global/core/workflow/constants.ts +++ b/packages/global/core/workflow/constants.ts @@ -4,6 +4,9 @@ export enum FlowNodeTemplateTypeEnum { function = 'function', tools = 'tools', + search = 'search', + multimodal = 'multimodal', + other = 'other', teamApp = 'teamApp' } diff --git a/packages/plugins/src/duckduckgo/search/template.json b/packages/plugins/src/duckduckgo/search/template.json index 6964da4aa85..e4321529aa8 100644 --- a/packages/plugins/src/duckduckgo/search/template.json +++ b/packages/plugins/src/duckduckgo/search/template.json @@ -1,14 +1,14 @@ { "author": "FastGPT", "version": "486", - "name": "DuckDuckGo 搜索", + "name": "DuckDuckGo 网络搜索", "avatar": "/imgs/workflow/textEditor.svg", "intro": "使用 DuckDuckGo 进行网络搜索", "showStatus": true, "weight": 10, "isTool": true, - "templateType": "tools", + "templateType": "search", "workflow": { "nodes": [ diff --git a/packages/plugins/src/duckduckgo/searchImg/template.json b/packages/plugins/src/duckduckgo/searchImg/template.json index 7596c5a6fb9..58beae5ab7b 100644 --- a/packages/plugins/src/duckduckgo/searchImg/template.json +++ b/packages/plugins/src/duckduckgo/searchImg/template.json @@ -8,7 +8,7 @@ "weight": 10, "isTool": true, - "templateType": "tools", + "templateType": "search", "workflow": { "nodes": [ diff --git a/packages/plugins/src/duckduckgo/searchNews/template.json b/packages/plugins/src/duckduckgo/searchNews/template.json index 3b4a172d6c1..5e1184d8ff6 100644 --- a/packages/plugins/src/duckduckgo/searchNews/template.json +++ b/packages/plugins/src/duckduckgo/searchNews/template.json @@ -8,7 +8,7 @@ "weight": 10, "isTool": true, - "templateType": "tools", + "templateType": "search", "workflow": { "nodes": [ diff --git a/packages/plugins/src/duckduckgo/searchVideo/template.json b/packages/plugins/src/duckduckgo/searchVideo/template.json index a4295d97e0e..cc39c111f0f 100644 --- a/packages/plugins/src/duckduckgo/searchVideo/template.json +++ b/packages/plugins/src/duckduckgo/searchVideo/template.json @@ -8,7 +8,7 @@ "weight": 10, "isTool": true, - "templateType": "tools", + "templateType": "search", "workflow": { "nodes": [ diff --git a/packages/plugins/src/duckduckgo/template.json b/packages/plugins/src/duckduckgo/template.json index 5db2f601b4c..e613168a0e3 100644 --- a/packages/plugins/src/duckduckgo/template.json +++ b/packages/plugins/src/duckduckgo/template.json @@ -8,7 +8,7 @@ "weight": 10, "isTool": true, - "templateType": "tools", + "templateType": "search", "workflow": { "nodes": [], diff --git a/packages/web/core/workflow/constants.ts b/packages/web/core/workflow/constants.ts index bfebc1c9bfd..6124f1e2742 100644 --- a/packages/web/core/workflow/constants.ts +++ b/packages/web/core/workflow/constants.ts @@ -18,6 +18,16 @@ export const workflowNodeTemplateList = (t: TFunction): NodeTemplateListType => label: t('common:core.module.template.Tool module'), list: [] }, + { + type: FlowNodeTemplateTypeEnum.search, + label: t('core.workflow.template.Search'), + list: [] + }, + { + type: FlowNodeTemplateTypeEnum.multimodal, + label: t('core.workflow.template.Multimodal'), + list: [] + }, { type: FlowNodeTemplateTypeEnum.other, label: t('common:common.Other'), diff --git a/packages/web/i18n/en/common.json b/packages/web/i18n/en/common.json index e0a988ef574..29d02e54044 100644 --- a/packages/web/i18n/en/common.json +++ b/packages/web/i18n/en/common.json @@ -1119,6 +1119,10 @@ "OnRevert version confirm": "Confirm to revert to this version? It will save the configuration of the version being edited and create a new published version for the reverted version.", "histories": "Publishing records" }, + "template": { + "Multimodal": "Multimodal", + "Search": "Search" + }, "tool": { "Handle": "Tool connector", "Select Tool": "Select tool" diff --git a/packages/web/i18n/zh/common.json b/packages/web/i18n/zh/common.json index 2e9c2f67206..7e0cf82a8a5 100644 --- a/packages/web/i18n/zh/common.json +++ b/packages/web/i18n/zh/common.json @@ -1128,6 +1128,10 @@ "OnRevert version confirm": "确认回退至该版本？会为您保存编辑中版本的配置，并为回退版本创建一个新的发布版本。", "histories": "发布记录" }, + "template": { + "Multimodal": "多模态", + "Search": "搜索" + }, "tool": { "Handle": "工具连接器", "Select Tool": "选择工具" diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx index e747c461b31..89aab3e89c2 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -403,7 +403,7 @@ const RenderList = React.memo(function RenderList({ } })} > - {item.label && ( + {item.label && formatTemplates.length > 1 && ( {t(item.label as any)} From f7f11c4cc8316468a8f51d29c1c936daac5fd98c Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Thu, 18 Jul 2024 11:01:08 +0800 Subject: [PATCH 10/11] perf: icon avatar component --- .../web/components/common/Avatar/index.tsx | 9 +++++++- projects/app/src/components/Avatar/index.tsx | 22 ------------------- projects/app/src/components/Layout/navbar.tsx | 2 +- .../src/components/Select/AIModelSelector.tsx | 2 +- .../common/Modal/EditResourceModal.tsx | 2 +- .../common/folder/SelectOneResource.tsx | 2 +- .../core/ai/SettingLLMModel/index.tsx | 2 +- .../core/app/DatasetSelectModal.tsx | 2 +- .../ChatBox/components/ChatAvatar.tsx | 2 +- .../components/SelectMarkCollection.tsx | 2 +- .../core/chat/components/AIResponseBox.tsx | 2 +- .../permission/ConfigPerModal/index.tsx | 2 +- .../MemberManager/AddMemberModal.tsx | 4 ++-- .../permission/MemberManager/ManageModal.tsx | 2 +- .../MemberManager/MemberListCard.tsx | 2 +- .../user/team/TeamManageModal/TeamList.tsx | 2 +- .../components/EditInfoModal.tsx | 2 +- .../components/MemberTable.tsx | 2 +- .../PermissionManage/AddManager.tsx | 2 +- .../components/PermissionManage/index.tsx | 2 +- .../support/user/team/TeamMenu/index.tsx | 2 +- .../user/team/UpdateInviteModal/index.tsx | 2 +- .../app/src/pages/account/components/Info.tsx | 2 +- .../pages/account/components/UsageTable.tsx | 2 +- .../pages/app/detail/components/InfoModal.tsx | 2 +- .../detail/components/SimpleApp/AppCard.tsx | 2 +- .../detail/components/SimpleApp/EditForm.tsx | 2 +- .../SimpleApp/components/ToolSelectModal.tsx | 8 +++---- .../components/WorkflowComponents/AppCard.tsx | 2 +- .../Flow/NodeTemplatesModal.tsx | 6 ++--- .../Flow/nodes/render/NodeCard.tsx | 2 +- .../RenderInput/templates/Reference.tsx | 2 +- .../RenderInput/templates/SelectApp.tsx | 2 +- .../RenderInput/templates/SelectDataset.tsx | 2 +- .../pages/app/list/components/CreateModal.tsx | 2 +- .../list/components/HttpPluginEditModal.tsx | 2 +- .../src/pages/app/list/components/List.tsx | 2 +- .../src/pages/chat/components/ChatHeader.tsx | 2 +- .../chat/components/ChatHistorySlider.tsx | 2 +- .../app/src/pages/chat/components/Empty.tsx | 2 +- .../src/pages/chat/components/SliderApps.tsx | 2 +- .../pages/dataset/detail/components/Info.tsx | 2 +- .../dataset/detail/components/Slider.tsx | 2 +- .../dataset/list/component/CreateModal.tsx | 2 +- .../src/pages/dataset/list/component/List.tsx | 2 +- .../dataset/list/component/MoveModal.tsx | 2 +- 46 files changed, 58 insertions(+), 73 deletions(-) delete mode 100644 projects/app/src/components/Avatar/index.tsx diff --git a/packages/web/components/common/Avatar/index.tsx b/packages/web/components/common/Avatar/index.tsx index a5d96e26f2b..3c802866b1c 100644 --- a/packages/web/components/common/Avatar/index.tsx +++ b/packages/web/components/common/Avatar/index.tsx @@ -2,9 +2,16 @@ import React from 'react'; import { Image } from '@chakra-ui/react'; import type { ImageProps } from '@chakra-ui/react'; import { LOGO_ICON } from '@fastgpt/global/common/system/constants'; +import MyIcon from '../Icon'; +import { iconPaths } from '../Icon/constants'; const Avatar = ({ w = '30px', src, ...props }: ImageProps) => { - return ( + // @ts-ignore + const isIcon = !!iconPaths[src as any]; + + return isIcon ? ( + + ) : ( { - return ( - - ); -}; - -export default Avatar; diff --git a/projects/app/src/components/Layout/navbar.tsx b/projects/app/src/components/Layout/navbar.tsx index c1d42cb3bf3..f2785673fd6 100644 --- a/projects/app/src/components/Layout/navbar.tsx +++ b/projects/app/src/components/Layout/navbar.tsx @@ -6,7 +6,7 @@ import { useChatStore } from '@/web/core/chat/context/storeChat'; import { HUMAN_ICON } from '@fastgpt/global/common/system/constants'; import NextLink from 'next/link'; import Badge from '../Badge'; -import Avatar from '../Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useTranslation } from 'next-i18next'; import { useSystemStore } from '@/web/common/system/useSystemStore'; diff --git a/projects/app/src/components/Select/AIModelSelector.tsx b/projects/app/src/components/Select/AIModelSelector.tsx index 5792763f942..0c93ff4e253 100644 --- a/projects/app/src/components/Select/AIModelSelector.tsx +++ b/projects/app/src/components/Select/AIModelSelector.tsx @@ -7,7 +7,7 @@ import { AI_POINT_USAGE_CARD_ROUTE } from '@/web/support/wallet/sub/constants'; import MySelect, { SelectProps } from '@fastgpt/web/components/common/MySelect'; import { HUGGING_FACE_ICON, LOGO_ICON } from '@fastgpt/global/common/system/constants'; import { Box, Flex } from '@chakra-ui/react'; -import Avatar from '../Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; type Props = SelectProps & { diff --git a/projects/app/src/components/common/Modal/EditResourceModal.tsx b/projects/app/src/components/common/Modal/EditResourceModal.tsx index 5a1362e4e9b..ce88d869745 100644 --- a/projects/app/src/components/common/Modal/EditResourceModal.tsx +++ b/projects/app/src/components/common/Modal/EditResourceModal.tsx @@ -10,7 +10,7 @@ import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants' import { useSelectFile } from '@/web/common/file/hooks/useSelectFile'; import { getErrText } from '@fastgpt/global/common/error/utils'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useToast } from '@fastgpt/web/hooks/useToast'; export type EditResourceInfoFormType = { diff --git a/projects/app/src/components/common/folder/SelectOneResource.tsx b/projects/app/src/components/common/folder/SelectOneResource.tsx index d231e37e440..2448088795c 100644 --- a/projects/app/src/components/common/folder/SelectOneResource.tsx +++ b/projects/app/src/components/common/folder/SelectOneResource.tsx @@ -7,7 +7,7 @@ import { } from '@fastgpt/global/common/parentFolder/type'; import MyIcon from '@fastgpt/web/components/common/Icon'; import Loading from '@fastgpt/web/components/common/MyLoading'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { useMemoizedFn } from 'ahooks'; import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; diff --git a/projects/app/src/components/core/ai/SettingLLMModel/index.tsx b/projects/app/src/components/core/ai/SettingLLMModel/index.tsx index dc13393dd54..e73e6f60caf 100644 --- a/projects/app/src/components/core/ai/SettingLLMModel/index.tsx +++ b/projects/app/src/components/core/ai/SettingLLMModel/index.tsx @@ -4,7 +4,7 @@ import { LLMModelTypeEnum, llmModelTypeFilterMap } from '@fastgpt/global/core/ai import { Box, Button, Flex, css, useDisclosure } from '@chakra-ui/react'; import type { SettingAIDataType } from '@fastgpt/global/core/app/type.d'; import AISettingModal from '@/components/core/ai/AISettingModal'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { HUGGING_FACE_ICON } from '@fastgpt/global/common/system/constants'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/components/core/app/DatasetSelectModal.tsx b/projects/app/src/components/core/app/DatasetSelectModal.tsx index 5129ec88ec9..418d19fe224 100644 --- a/projects/app/src/components/core/app/DatasetSelectModal.tsx +++ b/projects/app/src/components/core/app/DatasetSelectModal.tsx @@ -10,7 +10,7 @@ import { Grid, Divider } from '@chakra-ui/react'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import type { SelectedDatasetType } from '@fastgpt/global/core/workflow/api.d'; import { useToast } from '@fastgpt/web/hooks/useToast'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatAvatar.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatAvatar.tsx index a0faa371185..56ba48acf46 100644 --- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatAvatar.tsx +++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ChatAvatar.tsx @@ -1,4 +1,4 @@ -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { Box } from '@chakra-ui/react'; import { useTheme } from '@chakra-ui/system'; import React from 'react'; diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/SelectMarkCollection.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/SelectMarkCollection.tsx index 1ae5dc90061..925db604eb4 100644 --- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/SelectMarkCollection.tsx +++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/SelectMarkCollection.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { ModalBody, useTheme, ModalFooter, Button, Box, Card, Flex, Grid } from '@chakra-ui/react'; import { useTranslation } from 'next-i18next'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; import DatasetSelectModal, { useDatasetSelect } from '@/components/core/dataset/SelectModal'; diff --git a/projects/app/src/components/core/chat/components/AIResponseBox.tsx b/projects/app/src/components/core/chat/components/AIResponseBox.tsx index e01251331b2..cc5bbb9ec60 100644 --- a/projects/app/src/components/core/chat/components/AIResponseBox.tsx +++ b/projects/app/src/components/core/chat/components/AIResponseBox.tsx @@ -15,7 +15,7 @@ import { } from '@fastgpt/global/core/chat/type'; import React from 'react'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; type props = { value: UserChatItemValueItemType | AIChatItemValueItemType; diff --git a/projects/app/src/components/support/permission/ConfigPerModal/index.tsx b/projects/app/src/components/support/permission/ConfigPerModal/index.tsx index b4cf7066905..2cab7ee6097 100644 --- a/projects/app/src/components/support/permission/ConfigPerModal/index.tsx +++ b/projects/app/src/components/support/permission/ConfigPerModal/index.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'next-i18next'; import { PermissionValueType } from '@fastgpt/global/support/permission/type'; import CollaboratorContextProvider, { MemberManagerInputPropsType } from '../MemberManager/context'; import { Box, Button, Flex, HStack, ModalBody } from '@chakra-ui/react'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import DefaultPermissionList from '../DefaultPerList'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; diff --git a/projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx b/projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx index 1f93951ed05..c1ef73f36d8 100644 --- a/projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx +++ b/projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx @@ -14,7 +14,7 @@ import { import MyModal from '@fastgpt/web/components/common/MyModal'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useContextSelector } from 'use-context-selector'; -import MyAvatar from '@/components/Avatar'; +import MyAvatar from '@fastgpt/web/components/common/Avatar'; import { useMemo, useState } from 'react'; import PermissionSelect from './PermissionSelect'; import PermissionTags from './PermissionTags'; @@ -23,7 +23,7 @@ import { useUserStore } from '@/web/support/user/useUserStore'; import { getTeamMembers } from '@/web/support/user/team/api'; import MyBox from '@fastgpt/web/components/common/MyBox'; import { ChevronDownIcon } from '@chakra-ui/icons'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/components/support/permission/MemberManager/ManageModal.tsx b/projects/app/src/components/support/permission/MemberManager/ManageModal.tsx index 609553a5093..ff8af158a04 100644 --- a/projects/app/src/components/support/permission/MemberManager/ManageModal.tsx +++ b/projects/app/src/components/support/permission/MemberManager/ManageModal.tsx @@ -15,7 +15,7 @@ import React from 'react'; import { useContextSelector } from 'use-context-selector'; import PermissionSelect from './PermissionSelect'; import PermissionTags from './PermissionTags'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { CollaboratorContext } from './context'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest'; diff --git a/projects/app/src/components/support/permission/MemberManager/MemberListCard.tsx b/projects/app/src/components/support/permission/MemberManager/MemberListCard.tsx index 09aa927090c..c9de309dfb2 100644 --- a/projects/app/src/components/support/permission/MemberManager/MemberListCard.tsx +++ b/projects/app/src/components/support/permission/MemberManager/MemberListCard.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { useContextSelector } from 'use-context-selector'; import { CollaboratorContext } from './context'; import Tag, { TagProps } from '@fastgpt/web/components/common/Tag'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useTranslation } from 'next-i18next'; export type MemberListCardProps = BoxProps & { tagStyle?: Omit }; diff --git a/projects/app/src/components/support/user/team/TeamManageModal/TeamList.tsx b/projects/app/src/components/support/user/team/TeamManageModal/TeamList.tsx index a6eedc7052a..c9b020af892 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/TeamList.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/TeamList.tsx @@ -1,5 +1,5 @@ import { Box, Button, Flex, IconButton, Text } from '@chakra-ui/react'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useTranslation } from 'next-i18next'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant'; diff --git a/projects/app/src/components/support/user/team/TeamManageModal/components/EditInfoModal.tsx b/projects/app/src/components/support/user/team/TeamManageModal/components/EditInfoModal.tsx index 0b5ba657c25..416c120cb38 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/components/EditInfoModal.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/components/EditInfoModal.tsx @@ -9,7 +9,7 @@ import { useRequest } from '@fastgpt/web/hooks/useRequest'; import MyModal from '@fastgpt/web/components/common/MyModal'; import { Box, Button, Flex, Input, ModalBody, ModalFooter } from '@chakra-ui/react'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { postCreateTeam, putUpdateTeam } from '@/web/support/user/team/api'; import { CreateTeamProps } from '@fastgpt/global/support/user/team/controller.d'; import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'; diff --git a/projects/app/src/components/support/user/team/TeamManageModal/components/MemberTable.tsx b/projects/app/src/components/support/user/team/TeamManageModal/components/MemberTable.tsx index b5879d08cc3..ded51b07e9a 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/components/MemberTable.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/components/MemberTable.tsx @@ -1,4 +1,4 @@ -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { Box, diff --git a/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/AddManager.tsx b/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/AddManager.tsx index 48405a25b64..561befec510 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/AddManager.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/AddManager.tsx @@ -12,7 +12,7 @@ import { InputGroup, InputLeftElement } from '@chakra-ui/react'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyModal from '@fastgpt/web/components/common/MyModal'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx b/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx index 9acfb911faa..e8d0438e259 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx @@ -3,7 +3,7 @@ import { Box, Button, Flex, Tag, TagLabel, useDisclosure } from '@chakra-ui/reac import { useTranslation } from 'next-i18next'; import { useContextSelector } from 'use-context-selector'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; import { delMemberPermission } from '@/web/support/user/team/api'; import { useUserStore } from '@/web/support/user/useUserStore'; diff --git a/projects/app/src/components/support/user/team/TeamMenu/index.tsx b/projects/app/src/components/support/user/team/TeamMenu/index.tsx index 2bfee82e0d9..61ab1440f50 100644 --- a/projects/app/src/components/support/user/team/TeamMenu/index.tsx +++ b/projects/app/src/components/support/user/team/TeamMenu/index.tsx @@ -6,7 +6,7 @@ import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import dynamic from 'next/dynamic'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useToast } from '@fastgpt/web/hooks/useToast'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; const TeamManageModal = dynamic(() => import('../TeamManageModal')); diff --git a/projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx b/projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx index 49e75f4faea..455fc53ac4a 100644 --- a/projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx +++ b/projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx @@ -13,7 +13,7 @@ import { import { useQuery } from '@tanstack/react-query'; import { getTeamList, updateInviteResult } from '@/web/support/user/team/api'; import { TeamMemberStatusEnum } from '@fastgpt/global/support/user/team/constant'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; import { useToast } from '@fastgpt/web/hooks/useToast'; import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; diff --git a/projects/app/src/pages/account/components/Info.tsx b/projects/app/src/pages/account/components/Info.tsx index db78f0576db..de76fcc927d 100644 --- a/projects/app/src/pages/account/components/Info.tsx +++ b/projects/app/src/pages/account/components/Info.tsx @@ -23,7 +23,7 @@ import { useSelectFile } from '@/web/common/file/hooks/useSelectFile'; import { compressImgFileAndUpload } from '@/web/common/file/controller'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useTranslation } from 'next-i18next'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useRouter } from 'next/router'; diff --git a/projects/app/src/pages/account/components/UsageTable.tsx b/projects/app/src/pages/account/components/UsageTable.tsx index 39850c845b6..2af918dad47 100644 --- a/projects/app/src/pages/account/components/UsageTable.tsx +++ b/projects/app/src/pages/account/components/UsageTable.tsx @@ -27,7 +27,7 @@ import { useTranslation } from 'next-i18next'; import { useQuery } from '@tanstack/react-query'; import { useUserStore } from '@/web/support/user/useUserStore'; import { getTeamMembers } from '@/web/support/user/team/api'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MySelect from '@fastgpt/web/components/common/MySelect'; import { formatNumber } from '@fastgpt/global/common/math/tools'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; diff --git a/projects/app/src/pages/app/detail/components/InfoModal.tsx b/projects/app/src/pages/app/detail/components/InfoModal.tsx index 2bdc37a2048..bfbae9ad873 100644 --- a/projects/app/src/pages/app/detail/components/InfoModal.tsx +++ b/projects/app/src/pages/app/detail/components/InfoModal.tsx @@ -16,7 +16,7 @@ import { useSelectFile } from '@/web/common/file/hooks/useSelectFile'; import { compressImgFileAndUpload } from '@/web/common/file/controller'; import { getErrText } from '@fastgpt/global/common/error/utils'; import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyModal from '@fastgpt/web/components/common/MyModal'; import { useTranslation } from 'next-i18next'; import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'; diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx index 74c94224139..06e756d9351 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx @@ -13,7 +13,7 @@ import { import { useRouter } from 'next/router'; import { AppSchema } from '@fastgpt/global/core/app/type.d'; import { useTranslation } from 'next-i18next'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import TagsEditModal from '../TagsEditModal'; import { useSystemStore } from '@/web/common/system/useSystemStore'; diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx index 7261c028326..6dc1905ce26 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx @@ -18,7 +18,7 @@ import { useDatasetStore } from '@/web/core/dataset/store/dataset'; import dynamic from 'next/dynamic'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import VariableEdit from '@/components/core/app/VariableEdit'; import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor'; diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx index 2841042eae4..2ea8e93cf22 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx @@ -27,7 +27,7 @@ import { FlowNodeTemplateType, NodeTemplateListItemType } from '@fastgpt/global/core/workflow/type/node.d'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { AddIcon } from '@chakra-ui/icons'; import { @@ -228,11 +228,11 @@ const RenderList = React.memo(function RenderList({ )} - {t(item.name)} + {t(item.name as any)} - {t(item.intro) || t('core.workflow.Not intro')} + {t(item.intro as any) || t('core.workflow.Not intro')} {showCost && ( <> @@ -273,7 +273,7 @@ const RenderList = React.memo(function RenderList({ )} - {t(item.name)} + {t(item.name as any)} {showCost && ( diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx index cf44628c9a8..9e05cc21d3a 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx @@ -4,7 +4,7 @@ import { useContextSelector } from 'use-context-selector'; import { AppContext, TabEnum } from '../context'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useTranslation } from 'next-i18next'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyMenu from '@fastgpt/web/components/common/MyMenu'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useI18n } from '@/web/context/I18n'; diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx index 89aab3e89c2..7761eb4ed66 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -15,7 +15,7 @@ import type { } from '@fastgpt/global/core/workflow/type/node.d'; import { useViewport, XYPosition } from 'reactflow'; import { useSystemStore } from '@/web/common/system/useSystemStore'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { nodeTemplate2FlowNode } from '@/web/core/workflow/utils'; import { useTranslation } from 'next-i18next'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; @@ -369,7 +369,7 @@ const RenderList = React.memo(function RenderList({ flowNodeType: templateNode.flowNodeType, pluginId: templateNode.pluginId }), - intro: t(templateNode.intro || ('' as any)) + intro: t(templateNode.intro as any) }, position: { x: mouseX, y: mouseY - 20 }, selected: true @@ -495,7 +495,7 @@ const RenderList = React.memo(function RenderList({ )} - {t(template.name)} + {t(template.name as any)} {template.author && ( diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx index dc6f0332e9a..55f15029ea0 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Box, Button, Card, Flex } from '@chakra-ui/react'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import type { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/node.d'; import { useTranslation } from 'next-i18next'; import { useEditTitle } from '@/web/common/hooks/useEditTitle'; diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx index af5a17a5b45..7d06d938f00 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx @@ -19,7 +19,7 @@ import { AppContext } from '@/pages/app/detail/components/context'; const MultipleRowSelect = dynamic( () => import('@fastgpt/web/components/common/MySelect/MultipleRowSelect') ); -const Avatar = dynamic(() => import('@/components/Avatar')); +const Avatar = dynamic(() => import('@fastgpt/web/components/common/Avatar')); type SelectProps = { value?: ReferenceValueProps; diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectApp.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectApp.tsx index c350f88f0a7..e7516be9ab8 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectApp.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectApp.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import type { RenderInputProps } from '../type'; import { Box, Button, useDisclosure } from '@chakra-ui/react'; import { SelectAppItemType } from '@fastgpt/global/core/workflow/template/system/runApp/type'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import SelectAppModal from '../../../../SelectAppModal'; import { useTranslation } from 'next-i18next'; import { useContextSelector } from 'use-context-selector'; diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx index 9c4dec1ab01..9b9b6f2d15c 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx @@ -3,7 +3,7 @@ import type { RenderInputProps } from '../type'; import { Box, Button, Flex, Grid, useDisclosure, useTheme } from '@chakra-ui/react'; import { useDatasetStore } from '@/web/core/dataset/store/dataset'; import { SelectedDatasetType } from '@fastgpt/global/core/workflow/api'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'next-i18next'; import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants'; diff --git a/projects/app/src/pages/app/list/components/CreateModal.tsx b/projects/app/src/pages/app/list/components/CreateModal.tsx index 28842f51b6c..ee18e0db65c 100644 --- a/projects/app/src/pages/app/list/components/CreateModal.tsx +++ b/projects/app/src/pages/app/list/components/CreateModal.tsx @@ -20,7 +20,7 @@ import { useRouter } from 'next/router'; import { simpleBotTemplates, workflowTemplates, pluginTemplates } from '@/web/core/app/templates'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import MyModal from '@fastgpt/web/components/common/MyModal'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/pages/app/list/components/HttpPluginEditModal.tsx b/projects/app/src/pages/app/list/components/HttpPluginEditModal.tsx index 87b3a4e12ae..e1e68b93192 100644 --- a/projects/app/src/pages/app/list/components/HttpPluginEditModal.tsx +++ b/projects/app/src/pages/app/list/components/HttpPluginEditModal.tsx @@ -21,7 +21,7 @@ import { compressImgFileAndUpload } from '@/web/common/file/controller'; import { getErrText } from '@fastgpt/global/common/error/utils'; import { useToast } from '@fastgpt/web/hooks/useToast'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useTranslation } from 'next-i18next'; import { HttpPluginImgUrl, MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'; diff --git a/projects/app/src/pages/app/list/components/List.tsx b/projects/app/src/pages/app/list/components/List.tsx index 294d362a343..70a9f29a03c 100644 --- a/projects/app/src/pages/app/list/components/List.tsx +++ b/projects/app/src/pages/app/list/components/List.tsx @@ -4,7 +4,7 @@ import { useRouter } from 'next/router'; import { delAppById, putAppById, resumeInheritPer } from '@/web/core/app/api'; import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import PermissionIconText from '@/components/support/permission/IconText'; import { useI18n } from '@/web/context/I18n'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; diff --git a/projects/app/src/pages/chat/components/ChatHeader.tsx b/projects/app/src/pages/chat/components/ChatHeader.tsx index 838cd9cde4c..8804d1e3cbc 100644 --- a/projects/app/src/pages/chat/components/ChatHeader.tsx +++ b/projects/app/src/pages/chat/components/ChatHeader.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Flex, useTheme, Box } from '@chakra-ui/react'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import ToolMenu from './ToolMenu'; import type { ChatItemType } from '@fastgpt/global/core/chat/type'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/pages/chat/components/ChatHistorySlider.tsx b/projects/app/src/pages/chat/components/ChatHistorySlider.tsx index 5591f1b416b..578c7fc3fb9 100644 --- a/projects/app/src/pages/chat/components/ChatHistorySlider.tsx +++ b/projects/app/src/pages/chat/components/ChatHistorySlider.tsx @@ -3,7 +3,7 @@ import { Box, Button, Flex, useTheme, IconButton } from '@chakra-ui/react'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useEditTitle } from '@/web/common/hooks/useEditTitle'; import { useRouter } from 'next/router'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useTranslation } from 'next-i18next'; diff --git a/projects/app/src/pages/chat/components/Empty.tsx b/projects/app/src/pages/chat/components/Empty.tsx index b0e67b2fc7a..31746b08f4f 100644 --- a/projects/app/src/pages/chat/components/Empty.tsx +++ b/projects/app/src/pages/chat/components/Empty.tsx @@ -4,7 +4,7 @@ import { useMarkdown } from '@/web/common/hooks/useMarkdown'; import dynamic from 'next/dynamic'; const Markdown = dynamic(() => import('@/components/Markdown')); -const Avatar = dynamic(() => import('@/components/Avatar')); +const Avatar = dynamic(() => import('@fastgpt/web/components/common/Avatar')); const Empty = ({ showChatProblem, diff --git a/projects/app/src/pages/chat/components/SliderApps.tsx b/projects/app/src/pages/chat/components/SliderApps.tsx index 051b6c44a87..1c1e3474c08 100644 --- a/projects/app/src/pages/chat/components/SliderApps.tsx +++ b/projects/app/src/pages/chat/components/SliderApps.tsx @@ -3,7 +3,7 @@ import { Flex, Box, IconButton, HStack } from '@chakra-ui/react'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; import MyIcon from '@fastgpt/web/components/common/Icon'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { AppListItemType } from '@fastgpt/global/core/app/type'; import MyDivider from '@fastgpt/web/components/common/MyDivider'; import MyPopover from '@fastgpt/web/components/common/MyPopover/index'; diff --git a/projects/app/src/pages/dataset/detail/components/Info.tsx b/projects/app/src/pages/dataset/detail/components/Info.tsx index ae39fb938d6..b5098350dae 100644 --- a/projects/app/src/pages/dataset/detail/components/Info.tsx +++ b/projects/app/src/pages/dataset/detail/components/Info.tsx @@ -8,7 +8,7 @@ import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; import { useForm } from 'react-hook-form'; import { compressImgFileAndUpload } from '@/web/common/file/controller'; import type { DatasetItemType } from '@fastgpt/global/core/dataset/type.d'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useTranslation } from 'next-i18next'; import { useSystemStore } from '@/web/common/system/useSystemStore'; diff --git a/projects/app/src/pages/dataset/detail/components/Slider.tsx b/projects/app/src/pages/dataset/detail/components/Slider.tsx index 0862bb7956a..3014d971c7e 100644 --- a/projects/app/src/pages/dataset/detail/components/Slider.tsx +++ b/projects/app/src/pages/dataset/detail/components/Slider.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'next-i18next'; import { Box, Flex, IconButton, useTheme, Progress } from '@chakra-ui/react'; import { useSystemStore } from '@/web/common/system/useSystemStore'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { DatasetTypeMap } from '@fastgpt/global/core/dataset/constants'; import DatasetTypeTag from '@/components/core/dataset/DatasetTypeTag'; import MyIcon from '@fastgpt/web/components/common/Icon'; diff --git a/projects/app/src/pages/dataset/list/component/CreateModal.tsx b/projects/app/src/pages/dataset/list/component/CreateModal.tsx index c580767f8d0..ddc10523bcf 100644 --- a/projects/app/src/pages/dataset/list/component/CreateModal.tsx +++ b/projects/app/src/pages/dataset/list/component/CreateModal.tsx @@ -8,7 +8,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast'; import { useRouter } from 'next/router'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import MyModal from '@fastgpt/web/components/common/MyModal'; import { postCreateDataset } from '@/web/core/dataset/api'; diff --git a/projects/app/src/pages/dataset/list/component/List.tsx b/projects/app/src/pages/dataset/list/component/List.tsx index 465ecbd981d..bf93ef2c2d3 100644 --- a/projects/app/src/pages/dataset/list/component/List.tsx +++ b/projects/app/src/pages/dataset/list/component/List.tsx @@ -8,7 +8,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon'; import { useRouter } from 'next/router'; import PermissionIconText from '@/components/support/permission/IconText'; import DatasetTypeTag from '@/components/core/dataset/DatasetTypeTag'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; import { useRequest } from '@fastgpt/web/hooks/useRequest'; import { DatasetItemType } from '@fastgpt/global/core/dataset/type'; diff --git a/projects/app/src/pages/dataset/list/component/MoveModal.tsx b/projects/app/src/pages/dataset/list/component/MoveModal.tsx index fd4a3872543..d2f748fa4bf 100644 --- a/projects/app/src/pages/dataset/list/component/MoveModal.tsx +++ b/projects/app/src/pages/dataset/list/component/MoveModal.tsx @@ -10,7 +10,7 @@ import { useTheme, Grid } from '@chakra-ui/react'; -import Avatar from '@/components/Avatar'; +import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import MyModal from '@fastgpt/web/components/common/MyModal'; import MyIcon from '@fastgpt/web/components/common/Icon'; From e96f5dfe180b53b5f1c36cf45a14c706fd2e86dc Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Thu, 18 Jul 2024 14:05:52 +0800 Subject: [PATCH 11/11] perf: system template avatar --- .../core/workflow/template/system/aiChat.ts | 2 +- .../template/system/assignedAnswer.ts | 2 +- .../template/system/classifyQuestion/index.ts | 2 +- .../template/system/contextExtract/index.ts | 2 +- .../template/system/customFeedback.ts | 2 +- .../workflow/template/system/datasetConcat.ts | 2 +- .../workflow/template/system/datasetSearch.ts | 2 +- .../core/workflow/template/system/http468.ts | 2 +- .../workflow/template/system/ifElse/index.ts | 2 +- .../core/workflow/template/system/laf.ts | 2 +- .../workflow/template/system/pluginInput.ts | 2 +- .../workflow/template/system/pluginOutput.ts | 2 +- .../template/system/queryExtension.ts | 2 +- .../workflow/template/system/runApp/index.ts | 2 +- .../workflow/template/system/sandbox/index.ts | 2 +- .../core/workflow/template/system/stopTool.ts | 2 +- .../workflow/template/system/systemConfig.ts | 2 +- .../workflow/template/system/textEditor.ts | 2 +- .../core/workflow/template/system/tools.ts | 2 +- .../template/system/variableUpdate/index.tsx | 2 +- .../workflow/template/system/workflowStart.ts | 2 +- .../src/duckduckgo/search/template.json | 2 +- .../src/duckduckgo/searchImg/template.json | 2 +- .../src/duckduckgo/searchNews/template.json | 2 +- .../src/duckduckgo/searchVideo/template.json | 2 +- packages/plugins/src/duckduckgo/template.json | 6 +- packages/plugins/src/fetchUrl/template.json | 2 +- packages/plugins/src/getTime/template.json | 2 +- .../plugins/src/mathExprVal/template.json | 2 +- .../web/components/common/Avatar/index.tsx | 2 +- .../web/components/common/Icon/constants.ts | 39 ++++++++ .../icons/core/workflow/template/FileRead.svg | 10 ++ .../icons/core/workflow/template/aiChat.svg | 10 ++ .../icons/core/workflow/template/codeRun.svg | 10 ++ .../core/workflow/template/customFeedback.svg | 10 ++ .../core/workflow/template/datasetConcat.svg | 10 ++ .../core/workflow/template/datasetSearch.svg | 13 +++ .../core/workflow/template/duckduckgo.svg | 1 + .../core/workflow/template/extractJson.svg | 11 +++ .../icons/core/workflow/template/fetchUrl.svg | 10 ++ .../icons/core/workflow/template/getTime.svg | 12 +++ .../core/workflow/template/httpRequest.svg | 10 ++ .../icons/core/workflow/template/ifelse.svg | 10 ++ .../core/workflow/template/lafDispatch.svg | 10 ++ .../icons/core/workflow/template/mathCall.svg | 10 ++ .../core/workflow/template/pluginOutput.svg | 13 +++ .../core/workflow/template/queryExtension.svg | 10 ++ .../workflow/template/questionClassify.svg | 12 +++ .../icons/core/workflow/template/reply.svg | 10 ++ .../icons/core/workflow/template/runApp.svg | 13 +++ .../icons/core/workflow/template/stopTool.svg | 10 ++ .../core/workflow/template/systemConfig.svg | 10 ++ .../core/workflow/template/textConcat.svg | 11 +++ .../icons/core/workflow/template/toolCall.svg | 13 +++ .../core/workflow/template/variableUpdate.svg | 12 +++ .../core/workflow/template/workflowStart.svg | 10 ++ .../web/components/common/MyModal/index.tsx | 17 ++-- .../components/common/Tabs/LightRowTabs.tsx | 10 +- packages/web/i18n/en/app.json | 5 +- packages/web/i18n/zh/app.json | 5 +- .../app/public/imgs/app/inputGuide-icon.svg | 2 +- .../app/public/imgs/app/nextQuestion-icon.svg | 2 +- projects/app/public/imgs/app/welcome-icon.svg | 2 +- .../app/public/imgs/workflow/fetchUrl.png | Bin 9352 -> 0 bytes .../app/public/imgs/workflow/fetchUrl.svg | 2 +- .../public/imgs/workflow/getCurrentTime.png | Bin 9634 -> 0 bytes .../public/imgs/workflow/getCurrentTime.svg | 2 +- .../app/public/imgs/workflow/mathExprEval.png | Bin 1227 -> 0 bytes .../app/public/imgs/workflow/mathExprEval.svg | 2 +- .../core/chat/components/AIResponseBox.tsx | 6 +- .../chat/components/WholeResponseModal.tsx | 21 ++-- .../detail/components/SimpleApp/EditForm.tsx | 22 ++++- .../SimpleApp/components/ToolSelectModal.tsx | 41 ++++---- .../app/detail/components/Workflow/Header.tsx | 1 - .../Flow/NodeTemplatesModal.tsx | 54 +++++----- .../Flow/nodes/render/NodeCard.tsx | 2 +- .../RenderInput/templates/Reference.tsx | 4 +- .../pages/app/list/components/CreateModal.tsx | 2 +- projects/app/src/web/core/app/templates.ts | 92 +++++++++--------- projects/app/src/web/core/workflow/utils.ts | 1 + 80 files changed, 490 insertions(+), 169 deletions(-) create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/FileRead.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/aiChat.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/codeRun.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/customFeedback.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/datasetConcat.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/datasetSearch.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/duckduckgo.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/extractJson.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/fetchUrl.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/getTime.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/httpRequest.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/ifelse.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/lafDispatch.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/mathCall.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/pluginOutput.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/queryExtension.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/questionClassify.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/reply.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/runApp.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/stopTool.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/systemConfig.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/textConcat.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/toolCall.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/variableUpdate.svg create mode 100644 packages/web/components/common/Icon/icons/core/workflow/template/workflowStart.svg delete mode 100644 projects/app/public/imgs/workflow/fetchUrl.png delete mode 100644 projects/app/public/imgs/workflow/getCurrentTime.png delete mode 100644 projects/app/public/imgs/workflow/mathExprEval.png diff --git a/packages/global/core/workflow/template/system/aiChat.ts b/packages/global/core/workflow/template/system/aiChat.ts index 45e8f3120d6..e100e39fd06 100644 --- a/packages/global/core/workflow/template/system/aiChat.ts +++ b/packages/global/core/workflow/template/system/aiChat.ts @@ -26,7 +26,7 @@ export const AiChatModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.chatNode, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', name: 'AI 对话', intro: 'AI 大模型对话', showStatus: true, diff --git a/packages/global/core/workflow/template/system/assignedAnswer.ts b/packages/global/core/workflow/template/system/assignedAnswer.ts index 5a8998eecdb..6850eb58496 100644 --- a/packages/global/core/workflow/template/system/assignedAnswer.ts +++ b/packages/global/core/workflow/template/system/assignedAnswer.ts @@ -13,7 +13,7 @@ export const AssignedAnswerModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.answerNode, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/reply.png', + avatar: 'core/workflow/template/reply', name: '指定回复', intro: '该模块可以直接回复一段指定的内容。常用于引导、提示。非字符串内容传入时，会转成字符串进行输出。', diff --git a/packages/global/core/workflow/template/system/classifyQuestion/index.ts b/packages/global/core/workflow/template/system/classifyQuestion/index.ts index 8a587fa10b5..7d378fbab51 100644 --- a/packages/global/core/workflow/template/system/classifyQuestion/index.ts +++ b/packages/global/core/workflow/template/system/classifyQuestion/index.ts @@ -25,7 +25,7 @@ export const ClassifyQuestionModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.classifyQuestion, sourceHandle: getHandleConfig(false, false, false, false), targetHandle: getHandleConfig(true, false, true, true), - avatar: '/imgs/workflow/cq.png', + avatar: 'core/workflow/template/questionClassify', name: '问题分类', intro: `根据用户的历史记录和当前问题判断该次提问的类型。可以添加多组问题类型，下面是一个模板例子：\n类型1: 打招呼\n类型2: 关于商品“使用”问题\n类型3: 关于商品“购买”问题\n类型4: 其他问题`, showStatus: true, diff --git a/packages/global/core/workflow/template/system/contextExtract/index.ts b/packages/global/core/workflow/template/system/contextExtract/index.ts index 146fd6740a5..4b6eb42d646 100644 --- a/packages/global/core/workflow/template/system/contextExtract/index.ts +++ b/packages/global/core/workflow/template/system/contextExtract/index.ts @@ -20,7 +20,7 @@ export const ContextExtractModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.contentExtract, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/extract.png', + avatar: 'core/workflow/template/extractJson', name: '文本内容提取', intro: '可从文本中提取指定的数据，例如：sql语句、搜索关键词、代码等', showStatus: true, diff --git a/packages/global/core/workflow/template/system/customFeedback.ts b/packages/global/core/workflow/template/system/customFeedback.ts index cd7374ef649..fb8740c2806 100644 --- a/packages/global/core/workflow/template/system/customFeedback.ts +++ b/packages/global/core/workflow/template/system/customFeedback.ts @@ -13,7 +13,7 @@ export const CustomFeedbackNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.customFeedback, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/customFeedback.svg', + avatar: 'core/workflow/template/customFeedback', name: '自定义反馈', intro: '该模块被触发时，会给当前的对话记录增加一条反馈。可用于自动记录对话效果等。', version: '486', diff --git a/packages/global/core/workflow/template/system/datasetConcat.ts b/packages/global/core/workflow/template/system/datasetConcat.ts index 7355eb48c89..2b608cad3e4 100644 --- a/packages/global/core/workflow/template/system/datasetConcat.ts +++ b/packages/global/core/workflow/template/system/datasetConcat.ts @@ -37,7 +37,7 @@ export const DatasetConcatModule: FlowNodeTemplateType = { templateType: FlowNodeTemplateTypeEnum.other, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/concat.svg', + avatar: 'core/workflow/template/datasetConcat', name: '知识库搜索引用合并', intro: '可以将多个知识库搜索结果进行合并输出。使用 RRF 的合并方式进行最终排序输出。', showStatus: false, diff --git a/packages/global/core/workflow/template/system/datasetSearch.ts b/packages/global/core/workflow/template/system/datasetSearch.ts index caacb90523f..1e4f18a60da 100644 --- a/packages/global/core/workflow/template/system/datasetSearch.ts +++ b/packages/global/core/workflow/template/system/datasetSearch.ts @@ -23,7 +23,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.datasetSearchNode, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/db.png', + avatar: 'core/workflow/template/datasetSearch', name: '知识库搜索', intro: Dataset_SEARCH_DESC, showStatus: true, diff --git a/packages/global/core/workflow/template/system/http468.ts b/packages/global/core/workflow/template/system/http468.ts index 5a980fd8a1b..c7846f7868f 100644 --- a/packages/global/core/workflow/template/system/http468.ts +++ b/packages/global/core/workflow/template/system/http468.ts @@ -20,7 +20,7 @@ export const HttpNode468: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.httpRequest468, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/http.png', + avatar: 'core/workflow/template/httpRequest', name: 'HTTP 请求', intro: '可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）', showStatus: true, diff --git a/packages/global/core/workflow/template/system/ifElse/index.ts b/packages/global/core/workflow/template/system/ifElse/index.ts index 39b7b41202b..1da8dcb3268 100644 --- a/packages/global/core/workflow/template/system/ifElse/index.ts +++ b/packages/global/core/workflow/template/system/ifElse/index.ts @@ -18,7 +18,7 @@ export const IfElseNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.ifElseNode, sourceHandle: getHandleConfig(false, false, false, false), targetHandle: getHandleConfig(true, false, true, true), - avatar: '/imgs/workflow/ifElse.svg', + avatar: 'core/workflow/template/ifelse', name: '判断器', intro: '根据一定的条件，执行不同的分支。', showStatus: true, diff --git a/packages/global/core/workflow/template/system/laf.ts b/packages/global/core/workflow/template/system/laf.ts index 4e05c54bfcb..e5466bc6d2d 100644 --- a/packages/global/core/workflow/template/system/laf.ts +++ b/packages/global/core/workflow/template/system/laf.ts @@ -26,7 +26,7 @@ export const LafModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.lafModule, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/laf.png', + avatar: 'core/workflow/template/lafDispatch', name: 'Laf 函数调用（测试）', intro: '可以调用Laf账号下的云函数。', showStatus: true, diff --git a/packages/global/core/workflow/template/system/pluginInput.ts b/packages/global/core/workflow/template/system/pluginInput.ts index 2a0478ff0d1..27fce9013ea 100644 --- a/packages/global/core/workflow/template/system/pluginInput.ts +++ b/packages/global/core/workflow/template/system/pluginInput.ts @@ -11,7 +11,7 @@ export const PluginInputModule: FlowNodeTemplateType = { targetHandle: getHandleConfig(false, false, false, false), unique: true, forbidDelete: true, - avatar: '/imgs/workflow/input.png', + avatar: 'core/workflow/template/workflowStart', name: '插件输入', intro: '可以配置插件需要哪些输入，利用这些输入来运行插件', showStatus: false, diff --git a/packages/global/core/workflow/template/system/pluginOutput.ts b/packages/global/core/workflow/template/system/pluginOutput.ts index 023a0972a6e..1d2e98bc990 100644 --- a/packages/global/core/workflow/template/system/pluginOutput.ts +++ b/packages/global/core/workflow/template/system/pluginOutput.ts @@ -11,7 +11,7 @@ export const PluginOutputModule: FlowNodeTemplateType = { targetHandle: getHandleConfig(false, false, false, true), unique: true, forbidDelete: true, - avatar: '/imgs/workflow/output.png', + avatar: 'core/workflow/template/pluginOutput', name: '自定义插件输出', intro: '自定义配置外部输出，使用插件时，仅暴露自定义配置的输出', showStatus: false, diff --git a/packages/global/core/workflow/template/system/queryExtension.ts b/packages/global/core/workflow/template/system/queryExtension.ts index 356b1737f4e..6f4358fef4f 100644 --- a/packages/global/core/workflow/template/system/queryExtension.ts +++ b/packages/global/core/workflow/template/system/queryExtension.ts @@ -24,7 +24,7 @@ export const AiQueryExtension: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.queryExtension, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/cfr.svg', + avatar: 'core/workflow/template/queryExtension', name: '问题优化', intro: '使用问题优化功能，可以提高知识库连续对话时搜索的精度。使用该功能后，会先利用 AI 根据上下文构建一个或多个新的检索词，这些检索词更利于进行知识库搜索。该模块已内置在知识库搜索模块中，如果您仅进行一次知识库搜索，可直接使用知识库内置的补全功能。', diff --git a/packages/global/core/workflow/template/system/runApp/index.ts b/packages/global/core/workflow/template/system/runApp/index.ts index ccbfc5c827b..2d30a28ecb5 100644 --- a/packages/global/core/workflow/template/system/runApp/index.ts +++ b/packages/global/core/workflow/template/system/runApp/index.ts @@ -19,7 +19,7 @@ export const RunAppModule: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.runApp, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/app.png', + avatar: 'core/workflow/template/runApp', name: '应用调用', intro: '可以选择一个其他应用进行调用', showStatus: true, diff --git a/packages/global/core/workflow/template/system/sandbox/index.ts b/packages/global/core/workflow/template/system/sandbox/index.ts index 36e2f2867ea..cd8bb00fb4b 100644 --- a/packages/global/core/workflow/template/system/sandbox/index.ts +++ b/packages/global/core/workflow/template/system/sandbox/index.ts @@ -21,7 +21,7 @@ export const CodeNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.code, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/code.svg', + avatar: 'core/workflow/template/codeRun', name: '代码运行', intro: '执行一段简单的脚本代码，通常用于进行复杂的数据处理。', showStatus: true, diff --git a/packages/global/core/workflow/template/system/stopTool.ts b/packages/global/core/workflow/template/system/stopTool.ts index 8499db6bdd9..c930c1419bd 100644 --- a/packages/global/core/workflow/template/system/stopTool.ts +++ b/packages/global/core/workflow/template/system/stopTool.ts @@ -9,7 +9,7 @@ export const StopToolNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.stopTool, sourceHandle: getHandleConfig(false, false, false, false), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/toolStop.svg', + avatar: 'core/workflow/template/stopTool', name: '工具调用终止', intro: '该模块需配置工具调用使用。当该模块被执行时，本次工具调用将会强制结束，并且不再调用AI针对工具调用结果回答问题。', diff --git a/packages/global/core/workflow/template/system/systemConfig.ts b/packages/global/core/workflow/template/system/systemConfig.ts index 31836f3a5f3..b037b8f8b1a 100644 --- a/packages/global/core/workflow/template/system/systemConfig.ts +++ b/packages/global/core/workflow/template/system/systemConfig.ts @@ -9,7 +9,7 @@ export const SystemConfigNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.systemConfig, sourceHandle: getHandleConfig(false, false, false, false), targetHandle: getHandleConfig(false, false, false, false), - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', name: '系统配置', intro: '可以配置应用的系统参数。', unique: true, diff --git a/packages/global/core/workflow/template/system/textEditor.ts b/packages/global/core/workflow/template/system/textEditor.ts index b9f630a7a69..fa157e439b9 100644 --- a/packages/global/core/workflow/template/system/textEditor.ts +++ b/packages/global/core/workflow/template/system/textEditor.ts @@ -19,7 +19,7 @@ export const TextEditorNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.textEditor, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/textEditor.svg', + avatar: 'core/workflow/template/textConcat', name: '文本拼接', intro: '可对固定或传入的文本进行加工后输出，非字符串类型数据最终会转成字符串类型。', version: '486', diff --git a/packages/global/core/workflow/template/system/tools.ts b/packages/global/core/workflow/template/system/tools.ts index c3a043983b9..5ff9f6a4e76 100644 --- a/packages/global/core/workflow/template/system/tools.ts +++ b/packages/global/core/workflow/template/system/tools.ts @@ -26,7 +26,7 @@ export const ToolModule: FlowNodeTemplateType = { templateType: FlowNodeTemplateTypeEnum.ai, sourceHandle: getHandleConfig(true, true, false, true), targetHandle: getHandleConfig(true, true, false, true), - avatar: '/imgs/workflow/tool.svg', + avatar: 'core/workflow/template/toolCall', name: '工具调用', intro: '通过AI模型自动选择一个或多个功能块进行调用，也可以对插件进行调用。', showStatus: true, diff --git a/packages/global/core/workflow/template/system/variableUpdate/index.tsx b/packages/global/core/workflow/template/system/variableUpdate/index.tsx index 1d7e4936090..1ef323cb264 100644 --- a/packages/global/core/workflow/template/system/variableUpdate/index.tsx +++ b/packages/global/core/workflow/template/system/variableUpdate/index.tsx @@ -13,7 +13,7 @@ export const VariableUpdateNode: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.variableUpdate, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: '/imgs/workflow/variable.png', + avatar: 'core/workflow/template/variableUpdate', name: '变量更新', intro: '可以更新指定节点的输出值或更新全局变量', showStatus: false, diff --git a/packages/global/core/workflow/template/system/workflowStart.ts b/packages/global/core/workflow/template/system/workflowStart.ts index 4eaae7f01f8..d07870a734f 100644 --- a/packages/global/core/workflow/template/system/workflowStart.ts +++ b/packages/global/core/workflow/template/system/workflowStart.ts @@ -14,7 +14,7 @@ export const WorkflowStart: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.workflowStart, sourceHandle: getHandleConfig(false, true, false, false), targetHandle: getHandleConfig(false, false, false, false), - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', name: '流程开始', intro: '', forbidDelete: true, diff --git a/packages/plugins/src/duckduckgo/search/template.json b/packages/plugins/src/duckduckgo/search/template.json index e4321529aa8..35b283cd7d1 100644 --- a/packages/plugins/src/duckduckgo/search/template.json +++ b/packages/plugins/src/duckduckgo/search/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "DuckDuckGo 网络搜索", - "avatar": "/imgs/workflow/textEditor.svg", + "avatar": "core/workflow/template/duckduckgo", "intro": "使用 DuckDuckGo 进行网络搜索", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/duckduckgo/searchImg/template.json b/packages/plugins/src/duckduckgo/searchImg/template.json index 58beae5ab7b..28b3e0cc166 100644 --- a/packages/plugins/src/duckduckgo/searchImg/template.json +++ b/packages/plugins/src/duckduckgo/searchImg/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "DuckDuckGo 图片搜索", - "avatar": "/imgs/workflow/textEditor.svg", + "avatar": "core/workflow/template/duckduckgo", "intro": "使用 DuckDuckGo 进行图片搜索", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/duckduckgo/searchNews/template.json b/packages/plugins/src/duckduckgo/searchNews/template.json index 5e1184d8ff6..a1b85975905 100644 --- a/packages/plugins/src/duckduckgo/searchNews/template.json +++ b/packages/plugins/src/duckduckgo/searchNews/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "DuckDuckGo 新闻检索", - "avatar": "/imgs/workflow/textEditor.svg", + "avatar": "core/workflow/template/duckduckgo", "intro": "使用 DuckDuckGo 进行新闻检索", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/duckduckgo/searchVideo/template.json b/packages/plugins/src/duckduckgo/searchVideo/template.json index cc39c111f0f..9ab2181e36a 100644 --- a/packages/plugins/src/duckduckgo/searchVideo/template.json +++ b/packages/plugins/src/duckduckgo/searchVideo/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "DuckDuckGo 视频搜索", - "avatar": "/imgs/workflow/textEditor.svg", + "avatar": "core/workflow/template/duckduckgo", "intro": "使用 DuckDuckGo 进行视频搜索", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/duckduckgo/template.json b/packages/plugins/src/duckduckgo/template.json index e613168a0e3..0e70509a0d9 100644 --- a/packages/plugins/src/duckduckgo/template.json +++ b/packages/plugins/src/duckduckgo/template.json @@ -1,14 +1,14 @@ { "author": "FastGPT", "version": "486", - "name": "DuckDuckGo", - "avatar": "/imgs/workflow/textEditor.svg", + "name": "DuckDuckGo服务", + "avatar": "core/workflow/template/duckduckgo", "intro": "DuckDuckGo 服务", "showStatus": false, "weight": 10, "isTool": true, - "templateType": "search", + "templateType": "tools", "workflow": { "nodes": [], diff --git a/packages/plugins/src/fetchUrl/template.json b/packages/plugins/src/fetchUrl/template.json index b0798c1c932..5f8b359c1bf 100644 --- a/packages/plugins/src/fetchUrl/template.json +++ b/packages/plugins/src/fetchUrl/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "网页内容抓取", - "avatar": "/imgs/workflow/fetchUrl.png", + "avatar": "core/workflow/template/fetchUrl", "intro": "可获取一个网页链接内容，并以 Markdown 格式输出，仅支持获取静态网站。", "showStatus": true, "weight": 10, diff --git a/packages/plugins/src/getTime/template.json b/packages/plugins/src/getTime/template.json index f402d875939..6f87f66f9cf 100644 --- a/packages/plugins/src/getTime/template.json +++ b/packages/plugins/src/getTime/template.json @@ -3,7 +3,7 @@ "version": "481", "templateType": "tools", "name": "获取当前时间", - "avatar": "/imgs/workflow/getCurrentTime.png", + "avatar": "core/workflow/template/getTime", "intro": "获取用户当前时区的时间。", "showStatus": false, "isTool": true, diff --git a/packages/plugins/src/mathExprVal/template.json b/packages/plugins/src/mathExprVal/template.json index dbcc0bff8e5..5cc829301a4 100644 --- a/packages/plugins/src/mathExprVal/template.json +++ b/packages/plugins/src/mathExprVal/template.json @@ -2,7 +2,7 @@ "author": "FastGPT", "version": "486", "name": "数学公式执行", - "avatar": "/imgs/workflow/mathExprEval.png", + "avatar": "core/workflow/template/mathCall", "intro": "用于执行数学表达式的工具，通过 js 的 expr-eval 库运行表达式并返回结果。", "showStatus": false, "weight": 10, diff --git a/packages/web/components/common/Avatar/index.tsx b/packages/web/components/common/Avatar/index.tsx index 3c802866b1c..4546d6d6a89 100644 --- a/packages/web/components/common/Avatar/index.tsx +++ b/packages/web/components/common/Avatar/index.tsx @@ -10,7 +10,7 @@ const Avatar = ({ w = '30px', src, ...props }: ImageProps) => { const isIcon = !!iconPaths[src as any]; return isIcon ? ( - + ) : ( import('./icons/core/workflow/runSkip.svg'), 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), 'core/workflow/running': () => import('./icons/core/workflow/running.svg'), + 'core/workflow/template/FileRead': () => import('./icons/core/workflow/template/FileRead.svg'), + 'core/workflow/template/aiChat': () => import('./icons/core/workflow/template/aiChat.svg'), + 'core/workflow/template/codeRun': () => import('./icons/core/workflow/template/codeRun.svg'), + 'core/workflow/template/customFeedback': () => + import('./icons/core/workflow/template/customFeedback.svg'), + 'core/workflow/template/datasetConcat': () => + import('./icons/core/workflow/template/datasetConcat.svg'), + 'core/workflow/template/datasetSearch': () => + import('./icons/core/workflow/template/datasetSearch.svg'), + 'core/workflow/template/duckduckgo': () => + import('./icons/core/workflow/template/duckduckgo.svg'), + 'core/workflow/template/extractJson': () => + import('./icons/core/workflow/template/extractJson.svg'), + 'core/workflow/template/fetchUrl': () => import('./icons/core/workflow/template/fetchUrl.svg'), + 'core/workflow/template/getTime': () => import('./icons/core/workflow/template/getTime.svg'), + 'core/workflow/template/httpRequest': () => + import('./icons/core/workflow/template/httpRequest.svg'), + 'core/workflow/template/ifelse': () => import('./icons/core/workflow/template/ifelse.svg'), + 'core/workflow/template/lafDispatch': () => + import('./icons/core/workflow/template/lafDispatch.svg'), + 'core/workflow/template/mathCall': () => import('./icons/core/workflow/template/mathCall.svg'), + 'core/workflow/template/pluginOutput': () => + import('./icons/core/workflow/template/pluginOutput.svg'), + 'core/workflow/template/queryExtension': () => + import('./icons/core/workflow/template/queryExtension.svg'), + 'core/workflow/template/questionClassify': () => + import('./icons/core/workflow/template/questionClassify.svg'), + 'core/workflow/template/reply': () => import('./icons/core/workflow/template/reply.svg'), + 'core/workflow/template/runApp': () => import('./icons/core/workflow/template/runApp.svg'), + 'core/workflow/template/stopTool': () => import('./icons/core/workflow/template/stopTool.svg'), + 'core/workflow/template/systemConfig': () => + import('./icons/core/workflow/template/systemConfig.svg'), + 'core/workflow/template/textConcat': () => + import('./icons/core/workflow/template/textConcat.svg'), + 'core/workflow/template/toolCall': () => import('./icons/core/workflow/template/toolCall.svg'), + 'core/workflow/template/variableUpdate': () => + import('./icons/core/workflow/template/variableUpdate.svg'), + 'core/workflow/template/workflowStart': () => + import('./icons/core/workflow/template/workflowStart.svg'), 'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'), date: () => import('./icons/date.svg'), delete: () => import('./icons/delete.svg'), diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/FileRead.svg b/packages/web/components/common/Icon/icons/core/workflow/template/FileRead.svg new file mode 100644 index 00000000000..966b1aa54cb --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/FileRead.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/aiChat.svg b/packages/web/components/common/Icon/icons/core/workflow/template/aiChat.svg new file mode 100644 index 00000000000..c852f45d7fc --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/aiChat.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/codeRun.svg b/packages/web/components/common/Icon/icons/core/workflow/template/codeRun.svg new file mode 100644 index 00000000000..b6e9779bc6d --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/codeRun.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/customFeedback.svg b/packages/web/components/common/Icon/icons/core/workflow/template/customFeedback.svg new file mode 100644 index 00000000000..517b88e19f9 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/customFeedback.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/datasetConcat.svg b/packages/web/components/common/Icon/icons/core/workflow/template/datasetConcat.svg new file mode 100644 index 00000000000..680d1e2cb3e --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/datasetConcat.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/datasetSearch.svg b/packages/web/components/common/Icon/icons/core/workflow/template/datasetSearch.svg new file mode 100644 index 00000000000..7127308b473 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/datasetSearch.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/duckduckgo.svg b/packages/web/components/common/Icon/icons/core/workflow/template/duckduckgo.svg new file mode 100644 index 00000000000..3ab30101c21 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/duckduckgo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/extractJson.svg b/packages/web/components/common/Icon/icons/core/workflow/template/extractJson.svg new file mode 100644 index 00000000000..63426bbe8e8 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/extractJson.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/fetchUrl.svg b/packages/web/components/common/Icon/icons/core/workflow/template/fetchUrl.svg new file mode 100644 index 00000000000..d91c05df081 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/fetchUrl.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/getTime.svg b/packages/web/components/common/Icon/icons/core/workflow/template/getTime.svg new file mode 100644 index 00000000000..3a70e9f49a8 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/getTime.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/httpRequest.svg b/packages/web/components/common/Icon/icons/core/workflow/template/httpRequest.svg new file mode 100644 index 00000000000..ac7b79fd872 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/httpRequest.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/ifelse.svg b/packages/web/components/common/Icon/icons/core/workflow/template/ifelse.svg new file mode 100644 index 00000000000..f6a8dae00ca --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/ifelse.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/lafDispatch.svg b/packages/web/components/common/Icon/icons/core/workflow/template/lafDispatch.svg new file mode 100644 index 00000000000..89a94778e05 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/lafDispatch.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/mathCall.svg b/packages/web/components/common/Icon/icons/core/workflow/template/mathCall.svg new file mode 100644 index 00000000000..e389218b4c1 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/mathCall.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/pluginOutput.svg b/packages/web/components/common/Icon/icons/core/workflow/template/pluginOutput.svg new file mode 100644 index 00000000000..a5b9ca0b7b5 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/pluginOutput.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/queryExtension.svg b/packages/web/components/common/Icon/icons/core/workflow/template/queryExtension.svg new file mode 100644 index 00000000000..691161c3b12 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/queryExtension.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/questionClassify.svg b/packages/web/components/common/Icon/icons/core/workflow/template/questionClassify.svg new file mode 100644 index 00000000000..7e817735b19 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/questionClassify.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/reply.svg b/packages/web/components/common/Icon/icons/core/workflow/template/reply.svg new file mode 100644 index 00000000000..142bc9f5108 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/reply.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/runApp.svg b/packages/web/components/common/Icon/icons/core/workflow/template/runApp.svg new file mode 100644 index 00000000000..1f3b1ad5e41 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/runApp.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/stopTool.svg b/packages/web/components/common/Icon/icons/core/workflow/template/stopTool.svg new file mode 100644 index 00000000000..216381e4350 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/stopTool.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/systemConfig.svg b/packages/web/components/common/Icon/icons/core/workflow/template/systemConfig.svg new file mode 100644 index 00000000000..b1f010d9f59 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/systemConfig.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/textConcat.svg b/packages/web/components/common/Icon/icons/core/workflow/template/textConcat.svg new file mode 100644 index 00000000000..3b44b470d78 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/textConcat.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/toolCall.svg b/packages/web/components/common/Icon/icons/core/workflow/template/toolCall.svg new file mode 100644 index 00000000000..575bb2b5de9 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/toolCall.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/variableUpdate.svg b/packages/web/components/common/Icon/icons/core/workflow/template/variableUpdate.svg new file mode 100644 index 00000000000..9fed569cfe7 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/variableUpdate.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/workflowStart.svg b/packages/web/components/common/Icon/icons/core/workflow/template/workflowStart.svg new file mode 100644 index 00000000000..4cd6718fe84 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/workflowStart.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/components/common/MyModal/index.tsx b/packages/web/components/common/MyModal/index.tsx index 3f707575ba7..b38b440148e 100644 --- a/packages/web/components/common/MyModal/index.tsx +++ b/packages/web/components/common/MyModal/index.tsx @@ -12,6 +12,7 @@ import { import MyIcon from '../Icon'; import MyBox from '../MyBox'; import { useSystem } from '../../../hooks/useSystem'; +import Avatar from '../Avatar'; export interface MyModalProps extends ModalContentProps { iconSrc?: string; @@ -68,14 +69,18 @@ const MyModal = ({ > {iconSrc && ( <> - {iconSrc.startsWith('/') ? ( - - ) : ( - - )} + )} - {title} + + {title} + {onClose && ( diff --git a/packages/web/components/common/Tabs/LightRowTabs.tsx b/packages/web/components/common/Tabs/LightRowTabs.tsx index 110dc128e7a..069d290dc67 100644 --- a/packages/web/components/common/Tabs/LightRowTabs.tsx +++ b/packages/web/components/common/Tabs/LightRowTabs.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import { Box, Flex, Grid, Image } from '@chakra-ui/react'; import type { FlexProps, GridProps } from '@chakra-ui/react'; import { useTranslation } from 'next-i18next'; -import MyIcon from '../Icon'; +import Avatar from '../Avatar'; type Props = Omit & { list: { icon?: string; label: string | React.ReactNode; value: ValueType }[]; @@ -81,14 +81,10 @@ const LightRowTabs = ({ > {item.icon && ( <> - {item.icon.startsWith('/') ? ( - {''} - ) : ( - - )} + )} - {typeof item.label === 'string' ? t(item.label as any) : item.label} + {typeof item.label === 'string' ? t(item.label as any) : item.label} ))} diff --git a/packages/web/i18n/en/app.json b/packages/web/i18n/en/app.json index 7e6b0dfac82..b17c41ec84f 100644 --- a/packages/web/i18n/en/app.json +++ b/packages/web/i18n/en/app.json @@ -40,9 +40,9 @@ "My Apps": "My Apps", "Output Field Settings": "Output Field Settings", "Paste Config": "Paste Config", + "Plugin cost per times": "{{cost}}/per time", "Plugin dispatch": "Plugins", "Plugin dispatch tip": "It is up to the model to decide which plug-ins to add additional capabilities to. If the plug-in is selected, the knowledge base call is also treated as a special plug-in.", - "Plugin cost per times": "{{cost}}/per time", "Publish channel": "Publish channel", "Publish success": "Publish success", "Run": "Run", @@ -61,6 +61,9 @@ "has new version": "has new version" } }, + "common": { + "Plugin cost per times": "{{cost}} points/times" + }, "module": { "Combine Modules": "Combine Modules", "Confirm Sync": "The template will be updated to the latest template configuration. Fields that do not exist in the template will be deleted (including all custom fields). You are advised to make a copy of the node and then update the original node version.", diff --git a/packages/web/i18n/zh/app.json b/packages/web/i18n/zh/app.json index 1684701d14b..09f00921990 100644 --- a/packages/web/i18n/zh/app.json +++ b/packages/web/i18n/zh/app.json @@ -39,9 +39,9 @@ "My Apps": "我的应用", "Output Field Settings": "输出字段编辑", "Paste Config": "粘贴配置", + "Plugin cost per times": "{{cost}}/次", "Plugin dispatch": "插件调用", "Plugin dispatch tip": "给模型附加额外的能力，具体调用哪些插件，将由模型自主决定。\n若选择了插件，知识库调用将自动作为一个特殊的插件。", - "Plugin cost per times": "{{cost}}/次", "Publish channel": "发布渠道", "Publish success": "发布成功", "Run": "运行", @@ -60,6 +60,9 @@ "has new version": "有新版本" } }, + "common": { + "Plugin cost per times": "{{cost}}积分/次" + }, "module": { "Combine Modules": "组合模块", "Confirm Sync": "将会更新至最新的模板配置，不存在模板中的字段将会被删除（包括所有自定义字段），建议您先复制一份节点，再更新原来节点的版本。", diff --git a/projects/app/public/imgs/app/inputGuide-icon.svg b/projects/app/public/imgs/app/inputGuide-icon.svg index beeb3727699..d9929dcac94 100644 --- a/projects/app/public/imgs/app/inputGuide-icon.svg +++ b/projects/app/public/imgs/app/inputGuide-icon.svg @@ -1,4 +1,4 @@ - + diff --git a/projects/app/public/imgs/app/nextQuestion-icon.svg b/projects/app/public/imgs/app/nextQuestion-icon.svg index 846196f9fe7..8a921eafe14 100644 --- a/projects/app/public/imgs/app/nextQuestion-icon.svg +++ b/projects/app/public/imgs/app/nextQuestion-icon.svg @@ -1,4 +1,4 @@ - + diff --git a/projects/app/public/imgs/app/welcome-icon.svg b/projects/app/public/imgs/app/welcome-icon.svg index b8fbf3f031d..cfc1a0838b3 100644 --- a/projects/app/public/imgs/app/welcome-icon.svg +++ b/projects/app/public/imgs/app/welcome-icon.svg @@ -1,4 +1,4 @@ - + diff --git a/projects/app/public/imgs/workflow/fetchUrl.png b/projects/app/public/imgs/workflow/fetchUrl.png deleted file mode 100644 index 43a6c3519e51a86f99c0cbebf56f22b9f8da096e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9352 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 + 🌐 diff --git a/projects/app/public/imgs/workflow/getCurrentTime.png b/projects/app/public/imgs/workflow/getCurrentTime.png deleted file mode 100644 index 5bd2970cda0ef97922250a0f708a8cb0916f6902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9634 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 + ⏰ diff --git a/projects/app/public/imgs/workflow/mathExprEval.png b/projects/app/public/imgs/workflow/mathExprEval.png deleted file mode 100644 index bde2b1b477b2f5d8f976cddcfc17fd3595a1d9a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p{OJ&H|6fVg?393lL^>oo1K-6l5$8 za(7}_cTVOdki(Mh=z!>pDN z(Ed5!XolnM`gKA7cY4RRR7yW~D>}2}=)X?eEZyDOrVon5Jm)Q6)^AXpb?3~xrze@4 z|L%UIw&t+u{+kUlORgNBAt#b|Jz?$t*uB>dPAUGu6eN}WA=mua7W+zJge44h#7A{Ii5$Wk^niyzc#O3C8@PvlMOo^5?Zyz1M`ToQ2wLf!WBNWd) z+}p|j@#OOP%3VM9#c4LP&OOH_XA|KXsK))~fLFTL@?td8E}TSpKzR}#nKqo*<@{+yw zzx27;uDg1DlXi$bUc3GD?!?{D3R zI36e%$1gSIca-0AxQ9^Pwe(y`&kyfkTQfw?+<&(@cE=ZMBcmpxsZ~dRzHe1~w4*Gf zD)o?2^OG~y8r{=4CS0_H2Tohj)BGI;73B~8*R1&y{^L`kL{jhmDyH;v^FAxv-2Jvt zfGWwrrP^w&3BuY=A%hZ_`7^Lx-BmQ)BcJ!u_d2!#673%NeikE&EN|vJ$pe*`dWG8 z>j_?;t*`q0E1bN4f+SxzuZQT;<;Q)6%&PR~tUZ`M!Ru4?)i2k|^dpSYo=tdP79@Ku z>DiSXGw=TT+qY8Fx<&slJMZV!%15KFElGFZ@MK2j?}d+#-xPkjVd=i3OH~Z5(-zH} z`G?o}_y-q_TZvg|8*93k%fGOWp6@DsX!ixnwIvVdq=x@K&c(KFNe(dM?RzC+^29zP zQ)1=w=KZm6D_>^Iy<2r(=RJGx9)?em%U<7hZ(^Po?_>5|BKgw)quu9z?mhRzyxl6r t;IV$H + ➗ diff --git a/projects/app/src/components/core/chat/components/AIResponseBox.tsx b/projects/app/src/components/core/chat/components/AIResponseBox.tsx index cc5bbb9ec60..770f202545d 100644 --- a/projects/app/src/components/core/chat/components/AIResponseBox.tsx +++ b/projects/app/src/components/core/chat/components/AIResponseBox.tsx @@ -81,12 +81,14 @@ ${JSON.stringify(questionGuides)}`; borderWidth={'1px'} borderColor={'myGray.200'} boxShadow={'1'} + pl={3} + pr={2.5} _hover={{ bg: 'auto' }} > - - + + {tool.toolName} {isChatting && !tool.response && } diff --git a/projects/app/src/components/core/chat/components/WholeResponseModal.tsx b/projects/app/src/components/core/chat/components/WholeResponseModal.tsx index dfdac7e665e..62e8ba00a53 100644 --- a/projects/app/src/components/core/chat/components/WholeResponseModal.tsx +++ b/projects/app/src/components/core/chat/components/WholeResponseModal.tsx @@ -12,6 +12,7 @@ import { DatasetSearchModeMap } from '@fastgpt/global/core/dataset/constants'; import { formatNumber } from '@fastgpt/global/common/math/tools'; import { useI18n } from '@/web/context/I18n'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; +import Avatar from '@fastgpt/web/components/common/Avatar'; function RowRender({ children, @@ -125,18 +126,18 @@ export const ResponseBox = React.memo(function ResponseBox({ () => response.map((item, i) => ({ label: ( - - + item.moduleType === template.flowNodeType) ?.avatar } alt={''} - w={['14px', '16px']} + w={'1.25rem'} + borderRadius={'sm'} /> - {t(item.moduleName as any)} + {t(item.moduleName as any)} ), value: `${i}` @@ -334,7 +335,9 @@ export const ResponseBox = React.memo(function ResponseBox({ + + + } /> )} @@ -350,7 +353,11 @@ export const ResponseBox = React.memo(function ResponseBox({ {activeModule?.toolDetail && activeModule?.toolDetail.length > 0 && ( } + rawDom={ + + + + } /> )} diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx index 6dc1905ce26..fd2205e64b3 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx @@ -242,8 +242,15 @@ const EditForm = ({ }) } > - - + + {item.name} @@ -292,8 +299,15 @@ const EditForm = ({ borderColor: 'primary.300' }} > - - + + {item.name} - {item.avatar?.startsWith('/') ? ( - - ) : ( - - )} - + + {t(item.name as any)} - {t(item.intro as any) || t('core.workflow.Not intro')} + {t(item.intro as any) || t('common:core.workflow.Not intro')} {showCost && ( <> - {t('core.plugin.cost')} + {t('common:core.plugin.cost')} {item.currentCost && item.currentCost > 0 - ? appT('Plugin cost per times', { cost: item.currentCost }) - : t('core.plugin.Free')} + ? t('app:Plugin cost per times', { cost: item.currentCost }) + : t('common:core.plugin.Free')} @@ -262,17 +263,9 @@ const RenderList = React.memo(function RenderList({ bg: 'myGray.50' }} > - {item.avatar?.startsWith('/') ? ( - - ) : ( - - )} - + + + {t(item.name as any)} {showCost && ( @@ -287,11 +280,11 @@ const RenderList = React.memo(function RenderList({ leftIcon={} onClick={() => onRemoveTool(item)} > - {t('common.Remove')} + {t('common:common.Remove')} ) : item.isFolder ? ( ) : ( )} diff --git a/projects/app/src/pages/app/detail/components/Workflow/Header.tsx b/projects/app/src/pages/app/detail/components/Workflow/Header.tsx index e1d9b6ff989..af3e1db6381 100644 --- a/projects/app/src/pages/app/detail/components/Workflow/Header.tsx +++ b/projects/app/src/pages/app/detail/components/Workflow/Header.tsx @@ -10,7 +10,6 @@ import { WorkflowContext, getWorkflowStore } from '../WorkflowComponents/context import { useInterval } from 'ahooks'; import { AppContext, TabEnum } from '../context'; import RouteTab from '../RouteTab'; -import { useSystemStore } from '@/web/common/system/useSystemStore'; import PopoverConfirm from '@fastgpt/web/components/common/MyPopover/PopoverConfirm'; import { useRouter } from 'next/router'; diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx index 7761eb4ed66..3e08934d1d3 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx @@ -300,7 +300,6 @@ const RenderList = React.memo(function RenderList({ const { isPc } = useSystem(); const isSystemPlugin = type === TemplateTypeEnum.systemPlugin; - const avatarSize = type === TemplateTypeEnum.teamPlugin ? '1.75rem' : '2.25rem'; const { x, y, zoom } = useViewport(); const { setLoading } = useSystemStore(); @@ -405,7 +404,7 @@ const RenderList = React.memo(function RenderList({ > {item.label && formatTemplates.length > 1 && ( - + {t(item.label as any)} @@ -419,17 +418,13 @@ const RenderList = React.memo(function RenderList({ label={ - {template.avatar?.startsWith('/') ? ( - - ) : ( - - )} - + + {t(template.name as any)} @@ -440,11 +435,13 @@ const RenderList = React.memo(function RenderList({ <> - {t('core.plugin.cost')} + {t('common:core.plugin.cost')} {template.currentCost && template.currentCost > 0 - ? appT('Plugin cost per times', { cost: template.currentCost }) - : t('core.plugin.Free')} + ? t('app:Plugin cost per times', { + cost: template.currentCost + }) + : t('common:core.plugin.Free')} @@ -484,17 +481,19 @@ const RenderList = React.memo(function RenderList({ onClose(); }} > - {template.avatar?.startsWith('/') ? ( - - ) : ( - - )} - + + {t(template.name as any)} {template.author && ( @@ -513,7 +512,6 @@ const RenderList = React.memo(function RenderList({ ); }, [ appT, - avatarSize, formatTemplates, isPc, isSystemPlugin, diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx index 55f15029ea0..4ab4853db0e 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx @@ -137,7 +137,7 @@ const NodeCard = (props: Props) => { {/* avatar and name */} - + {t(name as any)} diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx index 7d06d938f00..5ae2f304454 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Reference.tsx @@ -120,8 +120,8 @@ export const useReference = ({ return { label: ( - - {t(node.name as any)} + + {t(node.name as any)} ), value: node.nodeId, diff --git a/projects/app/src/pages/app/list/components/CreateModal.tsx b/projects/app/src/pages/app/list/components/CreateModal.tsx index ee18e0db65c..eb74fb5a587 100644 --- a/projects/app/src/pages/app/list/components/CreateModal.tsx +++ b/projects/app/src/pages/app/list/components/CreateModal.tsx @@ -195,7 +195,7 @@ const CreateModal = ({ onClose, type }: { type: CreateAppType; onClose: () => vo }} > - + {t(item.name as any)} diff --git a/projects/app/src/web/core/app/templates.ts b/projects/app/src/web/core/app/templates.ts index a8d58af78d5..cfec8b621d3 100644 --- a/projects/app/src/web/core/app/templates.ts +++ b/projects/app/src/web/core/app/templates.ts @@ -22,7 +22,7 @@ type TemplateType = (AppItemType & { export const simpleBotTemplates: TemplateType = [ { id: 'simpleChat', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', name: '简易机器人', intro: '一个极其简单的 AI 应用，你可以绑定知识库或工具。', type: AppTypeEnum.simple, @@ -31,7 +31,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: FlowNodeTypeEnum.systemConfig, position: { x: 531.2422736065552, @@ -94,7 +94,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: '448745', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.workflowStart, position: { x: 558.4082376415505, @@ -125,7 +125,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'loOvhld2ZTKa', name: 'AI 对话', intro: 'AI 大模型对话', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', flowNodeType: FlowNodeTypeEnum.chatNode, showStatus: true, position: { @@ -252,7 +252,7 @@ export const simpleBotTemplates: TemplateType = [ }, { id: 'chatGuide', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', name: '对话引导 + 变量', intro: '可以在对话开始发送一段提示，或者让用户填写一些内容，作为本次对话的变量', type: AppTypeEnum.simple, @@ -261,7 +261,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: FlowNodeTypeEnum.systemConfig, position: { x: 496.57560693988853, @@ -341,7 +341,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: '448745', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.workflowStart, position: { x: 558.4082376415505, @@ -372,7 +372,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'loOvhld2ZTKa', name: 'AI 对话', intro: 'AI 大模型对话', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', flowNodeType: FlowNodeTypeEnum.chatNode, showStatus: true, position: { @@ -499,7 +499,7 @@ export const simpleBotTemplates: TemplateType = [ }, { id: 'simpleDatasetChat', - avatar: '/imgs/workflow/db.png', + avatar: 'core/workflow/template/datasetSearch', name: '知识库+对话引导', intro: '每次提问时进行一次知识库搜索，将搜索结果注入 LLM 模型进行参考回答', type: AppTypeEnum.simple, @@ -508,7 +508,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: FlowNodeTypeEnum.systemConfig, position: { x: 531.2422736065552, @@ -571,7 +571,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'workflowStartNodeId', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.workflowStart, position: { x: 558.4082376415505, @@ -602,7 +602,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: '7BdojPlukIQw', name: 'AI 对话', intro: 'AI 大模型对话', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', flowNodeType: FlowNodeTypeEnum.chatNode, showStatus: true, position: { @@ -722,7 +722,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'iKBoX2vIzETU', name: '知识库搜索', intro: '调用“语义检索”和“全文检索”能力，从“知识库”中查找可能与问题相关的参考内容', - avatar: '/imgs/workflow/db.png', + avatar: 'core/workflow/template/datasetSearch', flowNodeType: FlowNodeTypeEnum.datasetSearchNode, showStatus: true, position: { @@ -827,7 +827,7 @@ export const simpleBotTemplates: TemplateType = [ }, { id: 'toolChat', - avatar: '/imgs/workflow/history.png', + avatar: 'core/workflow/template/getTime', name: '知道时间的机器人', intro: '通过挂载时间插件，让模型获取当前最新时间', type: AppTypeEnum.simple, @@ -836,7 +836,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: FlowNodeTypeEnum.systemConfig, position: { x: 531.2422736065552, @@ -850,7 +850,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'workflowStartNodeId', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.workflowStart, position: { x: 558.4082376415505, @@ -881,7 +881,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'jrWPV9', name: '工具调用', intro: '通过AI模型自动选择一个或多个功能块进行调用，也可以对插件进行调用。', - avatar: '/imgs/workflow/tool.svg', + avatar: 'core/workflow/template/toolCall', flowNodeType: FlowNodeTypeEnum.tools, showStatus: true, position: { @@ -963,7 +963,7 @@ export const simpleBotTemplates: TemplateType = [ nodeId: 'zBxjo5', name: '获取当前时间', intro: '获取用户当前时区的时间。', - avatar: '/imgs/workflow/getCurrentTime.svg', + avatar: 'core/workflow/template/getTime', flowNodeType: 'pluginModule', showStatus: false, position: { @@ -1021,7 +1021,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: 'userGuide', position: { x: 531.2422736065552, @@ -1084,7 +1084,7 @@ export const workflowTemplates: TemplateType = [ nodeId: '448745', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: 'workflowStart', position: { x: 558.4082376415505, @@ -1115,7 +1115,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'loOvhld2ZTKa', name: '第一轮翻译', intro: 'AI 大模型对话', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', flowNodeType: 'chatNode', showStatus: true, position: { @@ -1235,7 +1235,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'w0oBbQ3YJHye', name: '代码运行', intro: '执行一段简单的脚本代码，通常用于进行复杂的数据处理。', - avatar: '/imgs/workflow/code.svg', + avatar: 'core/workflow/template/codeRun', flowNodeType: 'code', showStatus: true, position: { @@ -1348,7 +1348,7 @@ export const workflowTemplates: TemplateType = [ name: '指定回复', intro: '该模块可以直接回复一段指定的内容。常用于引导、提示。非字符串内容传入时，会转成字符串进行输出。', - avatar: '/imgs/workflow/reply.png', + avatar: 'core/workflow/template/reply', flowNodeType: 'answerNode', position: { x: 3798.4479531204515, @@ -1374,7 +1374,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'gBDvemE4FBhp', name: '文本拼接', intro: '可对固定或传入的文本进行加工后输出，非字符串类型数据最终会转成字符串类型。', - avatar: '/imgs/workflow/textEditor.svg', + avatar: 'core/workflow/template/textConcat', flowNodeType: 'textEditor', position: { x: 1031.371061396644, @@ -1463,7 +1463,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'bcqtxqxE2R6o', name: '合并输出结果', intro: '可对固定或传入的文本进行加工后输出，非字符串类型数据最终会转成字符串类型。', - avatar: '/imgs/workflow/textEditor.svg', + avatar: 'core/workflow/template/textConcat', flowNodeType: 'textEditor', position: { x: 3113.6227559936665, @@ -1593,7 +1593,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: 'userGuide', position: { x: 262.2732338817093, @@ -1656,7 +1656,7 @@ export const workflowTemplates: TemplateType = [ nodeId: '448745', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: 'workflowStart', position: { x: 295.8944548701009, @@ -1687,7 +1687,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'NOgbnBzUwDgT', name: '工具调用', intro: '通过AI模型自动选择一个或多个功能块进行调用，也可以对插件进行调用。', - avatar: '/imgs/workflow/tool.svg', + avatar: 'core/workflow/template/toolCall', flowNodeType: 'tools', showStatus: true, position: { @@ -1769,7 +1769,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'GMELVPxHfpg5', name: 'HTTP 请求', intro: '调用谷歌搜索，查询相关内容', - avatar: '/imgs/workflow/http.png', + avatar: 'core/workflow/template/httpRequest', flowNodeType: 'httpRequest468', showStatus: true, position: { @@ -1914,7 +1914,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'poIbrrA8aiR0', name: '代码运行', intro: '执行一段简单的脚本代码，通常用于进行复杂的数据处理。', - avatar: '/imgs/workflow/code.svg', + avatar: 'core/workflow/template/codeRun', flowNodeType: 'code', showStatus: true, position: { @@ -2032,7 +2032,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: 'userGuide', position: { x: 531.2422736065552, @@ -2095,7 +2095,7 @@ export const workflowTemplates: TemplateType = [ nodeId: '448745', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: 'workflowStart', position: { x: 532.1275542407774, @@ -2126,7 +2126,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'tMyUnRL5jIrC', name: 'HTTP 请求', intro: '可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）', - avatar: '/imgs/workflow/http.png', + avatar: 'core/workflow/template/httpRequest', flowNodeType: 'httpRequest468', showStatus: true, position: { @@ -2291,7 +2291,7 @@ export const workflowTemplates: TemplateType = [ name: '指定回复', intro: '该模块可以直接回复一段指定的内容。常用于引导、提示。非字符串内容传入时，会转成字符串进行输出。', - avatar: '/imgs/workflow/reply.png', + avatar: 'core/workflow/template/reply', flowNodeType: 'answerNode', position: { x: 2204.4609372615846, @@ -2317,7 +2317,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'vEXJF8pQ8eOv', name: '文本拼接', intro: '可对固定或传入的文本进行加工后输出，非字符串类型数据最终会转成字符串类型。', - avatar: '/imgs/workflow/textEditor.svg', + avatar: 'core/workflow/template/textConcat', flowNodeType: 'textEditor', position: { x: 1544.8821308368042, @@ -2426,7 +2426,7 @@ export const workflowTemplates: TemplateType = [ }, { id: 'CQ', - avatar: '/imgs/workflow/cq.png', + avatar: 'core/workflow/template/questionClassify', name: '问题分类 + 知识库', intro: '先对用户的问题进行分类，再根据不同类型问题，执行不同的操作', type: AppTypeEnum.workflow, @@ -2435,7 +2435,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'userGuide', name: '系统配置', intro: '可以配置应用的系统参数', - avatar: '/imgs/workflow/userGuide.png', + avatar: 'core/workflow/template/systemConfig', flowNodeType: FlowNodeTypeEnum.systemConfig, position: { x: 531.2422736065552, @@ -2498,7 +2498,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'workflowStartNodeId', name: '流程开始', intro: '', - avatar: '/imgs/workflow/userChatInput.svg', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.workflowStart, position: { x: 558.4082376415505, @@ -2529,7 +2529,7 @@ export const workflowTemplates: TemplateType = [ nodeId: '7BdojPlukIQw', name: 'AI 对话', intro: 'AI 大模型对话', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', flowNodeType: FlowNodeTypeEnum.chatNode, showStatus: true, position: { @@ -2650,7 +2650,7 @@ export const workflowTemplates: TemplateType = [ name: '问题分类', intro: '根据用户的历史记录和当前问题判断该次提问的类型。可以添加多组问题类型，下面是一个模板例子：\n类型1: 打招呼\n类型2: 关于商品“使用”问题\n类型3: 关于商品“购买”问题\n类型4: 其他问题', - avatar: '/imgs/workflow/cq.png', + avatar: 'core/workflow/template/questionClassify', flowNodeType: FlowNodeTypeEnum.classifyQuestion, showStatus: true, position: { @@ -2732,7 +2732,7 @@ export const workflowTemplates: TemplateType = [ name: '指定回复', intro: '该模块可以直接回复一段指定的内容。常用于引导、提示。非字符串内容传入时，会转成字符串进行输出。', - avatar: '/imgs/workflow/reply.png', + avatar: 'core/workflow/template/reply', flowNodeType: FlowNodeTypeEnum.answerNode, position: { x: 1874.9167551056487, @@ -2757,7 +2757,7 @@ export const workflowTemplates: TemplateType = [ nodeId: 'MNMMMIjjWyMU', name: '知识库搜索', intro: '调用“语义检索”和“全文检索”能力，从“知识库”中查找可能与问题相关的参考内容', - avatar: '/imgs/workflow/db.png', + avatar: 'core/workflow/template/datasetSearch', flowNodeType: FlowNodeTypeEnum.datasetSearchNode, showStatus: true, position: { @@ -2883,7 +2883,7 @@ export const workflowTemplates: TemplateType = [ export const pluginTemplates: TemplateType = [ { id: 'plugin-simple', - avatar: '/imgs/workflow/AI.png', + avatar: 'core/workflow/template/aiChat', name: '默认模板', intro: '标准的插件初始模板', type: AppTypeEnum.plugin, @@ -2891,7 +2891,7 @@ export const pluginTemplates: TemplateType = [ { nodeId: 'pluginInput', name: '自定义插件输入', - avatar: '/imgs/workflow/input.png', + avatar: 'core/workflow/template/workflowStart', flowNodeType: FlowNodeTypeEnum.pluginInput, showStatus: false, position: { @@ -2930,7 +2930,7 @@ export const pluginTemplates: TemplateType = [ nodeId: 'pluginInput', name: '自定义插件输入', intro: '自定义配置外部输入，使用插件时，仅暴露自定义配置的输入', - avatar: '/imgs/workflow/input.png', + avatar: 'core/workflow/template/workflowStart', flowNodeType: 'pluginInput', showStatus: false, position: { @@ -3015,7 +3015,7 @@ export const pluginTemplates: TemplateType = [ nodeId: 'rKBYGQuYefae', name: 'HTTP 请求', intro: '可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）', - avatar: '/imgs/workflow/http.png', + avatar: 'core/workflow/template/httpRequest', flowNodeType: 'httpRequest468', showStatus: true, position: { diff --git a/projects/app/src/web/core/workflow/utils.ts b/projects/app/src/web/core/workflow/utils.ts index cdca446b642..0a54c6b93d3 100644 --- a/projects/app/src/web/core/workflow/utils.ts +++ b/projects/app/src/web/core/workflow/utils.ts @@ -84,6 +84,7 @@ export const storeNode2FlowNode = ({ const nodeItem: FlowNodeItemType = { ...template, ...storeNode, + avatar: template.avatar ?? storeNode.avatar, version: storeNode.version ?? template.version ?? defaultNodeVersion, /*