labring · c121914yu · Jul 18, 2024 · Jul 11, 2024 · Jul 15, 2024 · Jul 12, 2024
diff --git 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' \

diff --git 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/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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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/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;
@@ -79,6 +79,7 @@ export type NodeTemplateListItemType = {
   isTool?: boolean;
   author?: string;
   unique?: boolean; // 唯一的
+  currentCost?: number; // 当前积分消耗
 };
 
 export type NodeTemplateListType = {

diff --git 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": {