Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 0ef3d402 by Archer Committed by GitHub
Options

Test version (#4792) 

* plugin node version select (#4760)

* plugin node version select

* type

* fix

* fix

* perf: version list

* fix node version (#4787)

* change my select

* fix-ui

* fix test

* add test

* fix

* remove invalid version field

* filter deprecated field

* fix: claude tool call

* fix: test

---------

Co-authored-by: heheer <heheer@sealos.io>
parent 3cc6b8a1
Showing with 685 additions and 362 deletions
docSite/content/zh-cn/docs/development/upgrading/498.md
...@@ -22,6 +22,7 @@ weight: 792 ...@@ -22,6 +22,7 @@ weight: 792
1. Chat log list 优化，避免大数据时超出内存限制。 1. Chat log list 优化，避免大数据时超出内存限制。
2. 预加载 token 计算 worker，避免主任务中并发创建导致线程阻塞。 2. 预加载 token 计算 worker，避免主任务中并发创建导致线程阻塞。
3. 工作流节点版本控制交互优化。
## 🐛 修复 ## 🐛 修复
...@@ -31,4 +32,5 @@ weight: 792 ...@@ -31,4 +32,5 @@ weight: 792
4. 重新训练时，图片过期索引未成功清除，导致图片会丢失。 4. 重新训练时，图片过期索引未成功清除，导致图片会丢失。
5. 重新训练权限问题。 5. 重新训练权限问题。
6. 文档链接地址。 6. 文档链接地址。
7. Claude 工具调用，由于 index 为空，导致工具调用失败。
packages/global/core/ai/prompt/AIChat.ts
...@@ -331,7 +331,7 @@ export const getQuotePrompt = (version?: string, role: 'user' | 'system' = 'user ...@@ -331,7 +331,7 @@ export const getQuotePrompt = (version?: string, role: 'user' | 'system' = 'user
}; };
// Document quote prompt // Document quote prompt
export const getDocumentQuotePrompt = (version: string) => { export const getDocumentQuotePrompt = (version?: string) => {
const promptMap = { const promptMap = {
['4.9.2']: `将 <FilesContent></FilesContent> 中的内容作为本次对话的参考: ['4.9.2']: `将 <FilesContent></FilesContent> 中的内容作为本次对话的参考:
<FilesContent> <FilesContent>
......
packages/global/core/ai/prompt/utils.ts
export const getPromptByVersion = (version?: string, promptMap: Record<string, string> = {}) => { export const getPromptByVersion = (version?: string, promptMap: Record<string, string> = {}) => {
// 版本号大的在前面
const versions = Object.keys(promptMap).sort((a, b) => { const versions = Object.keys(promptMap).sort((a, b) => {
const [majorA, minorA, patchA] = a.split('.').map(Number); const [majorA, minorA, patchA] = a.split('.').map(Number);
const [majorB, minorB, patchB] = b.split('.').map(Number); const [majorB, minorB, patchB] = b.split('.').map(Number);
...@@ -15,5 +16,5 @@ export const getPromptByVersion = (version?: string, promptMap: Record<string, s ...@@ -15,5 +16,5 @@ export const getPromptByVersion = (version?: string, promptMap: Record<string, s
if (version in promptMap) { if (version in promptMap) {
return promptMap[version]; return promptMap[version];
} }
return promptMap[versions[versions.length - 1]]; return promptMap[versions[0]];
}; };
packages/global/core/workflow/node/constant.ts
...@@ -218,7 +218,6 @@ export const FlowValueTypeMap: Record< ...@@ -218,7 +218,6 @@ export const FlowValueTypeMap: Record<
}; };
export const EDGE_TYPE = 'default'; export const EDGE_TYPE = 'default';
export const defaultNodeVersion = '481';
export const chatHistoryValueDesc = `{ export const chatHistoryValueDesc = `{
obj: System | Human | AI; obj: System | Human | AI;
...@@ -236,3 +235,10 @@ export const datasetQuoteValueDesc = `{ ...@@ -236,3 +235,10 @@ export const datasetQuoteValueDesc = `{
export const datasetSelectValueDesc = `{ export const datasetSelectValueDesc = `{
datasetId: string; datasetId: string;
}[]`; }[]`;
export const AppNodeFlowNodeTypeMap: Record<any, boolean> = {
[FlowNodeTypeEnum.pluginModule]: true,
[FlowNodeTypeEnum.appModule]: true,
[FlowNodeTypeEnum.tool]: true,
[FlowNodeTypeEnum.toolSet]: true
};
packages/global/core/workflow/runtime/type.d.ts
...@@ -101,7 +101,7 @@ export type RuntimeNodeItemType = { ...@@ -101,7 +101,7 @@ export type RuntimeNodeItemType = {
outputs: FlowNodeOutputItemType[]; outputs: FlowNodeOutputItemType[];
pluginId?: string; // workflow id / plugin id pluginId?: string; // workflow id / plugin id
version: string; version?: string;
}; };
export type RuntimeEdgeItemType = StoreEdgeItemType & { export type RuntimeEdgeItemType = StoreEdgeItemType & {
......
packages/global/core/workflow/template/system/abandoned/runApp/index.ts
...@@ -25,7 +25,6 @@ export const RunAppModule: FlowNodeTemplateType = { ...@@ -25,7 +25,6 @@ export const RunAppModule: FlowNodeTemplateType = {
name: i18nT('workflow:application_call'), name: i18nT('workflow:application_call'),
intro: i18nT('workflow:select_another_application_to_call'), intro: i18nT('workflow:select_another_application_to_call'),
showStatus: true, showStatus: true,
version: '481',
isTool: true, isTool: true,
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/aiChat/index.ts
...@@ -19,7 +19,6 @@ import { ...@@ -19,7 +19,6 @@ import {
Input_Template_UserChatInput, Input_Template_UserChatInput,
Input_Template_File_Link Input_Template_File_Link
} from '../../input'; } from '../../input';
import { chatNodeSystemPromptTip, systemPromptTip } from '../../tip';
import { getHandleConfig } from '../../utils'; import { getHandleConfig } from '../../utils';
import { i18nT } from '../../../../../../web/i18n/utils'; import { i18nT } from '../../../../../../web/i18n/utils';
...@@ -121,12 +120,7 @@ export const AiChatModule: FlowNodeTemplateType = { ...@@ -121,12 +120,7 @@ export const AiChatModule: FlowNodeTemplateType = {
valueType: WorkflowIOValueTypeEnum.string valueType: WorkflowIOValueTypeEnum.string
}, },
// settings modal --- // settings modal ---
{ Input_Template_System_Prompt,
...Input_Template_System_Prompt,
label: i18nT('common:core.ai.Prompt'),
description: systemPromptTip,
placeholder: chatNodeSystemPromptTip
},
Input_Template_History, Input_Template_History,
Input_Template_Dataset_Quote, Input_Template_Dataset_Quote,
Input_Template_File_Link, Input_Template_File_Link,
......
packages/global/core/workflow/template/system/assignedAnswer.ts
...@@ -18,7 +18,6 @@ export const AssignedAnswerModule: FlowNodeTemplateType = { ...@@ -18,7 +18,6 @@ export const AssignedAnswerModule: FlowNodeTemplateType = {
name: i18nT('workflow:assigned_reply'), name: i18nT('workflow:assigned_reply'),
intro: i18nT('workflow:intro_assigned_reply'), intro: i18nT('workflow:intro_assigned_reply'),
courseUrl: '/docs/guide/dashboard/workflow/reply/', courseUrl: '/docs/guide/dashboard/workflow/reply/',
version: '481',
isTool: true, isTool: true,
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/customFeedback.ts
...@@ -18,7 +18,6 @@ export const CustomFeedbackNode: FlowNodeTemplateType = { ...@@ -18,7 +18,6 @@ export const CustomFeedbackNode: FlowNodeTemplateType = {
name: i18nT('workflow:custom_feedback'), name: i18nT('workflow:custom_feedback'),
intro: i18nT('workflow:intro_custom_feedback'), intro: i18nT('workflow:intro_custom_feedback'),
courseUrl: '/docs/guide/dashboard/workflow/custom_feedback/', courseUrl: '/docs/guide/dashboard/workflow/custom_feedback/',
version: '486',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.textareaInput, key: NodeInputKeyEnum.textareaInput,
......
packages/global/core/workflow/template/system/datasetConcat.ts
...@@ -42,7 +42,6 @@ export const DatasetConcatModule: FlowNodeTemplateType = { ...@@ -42,7 +42,6 @@ export const DatasetConcatModule: FlowNodeTemplateType = {
intro: i18nT('workflow:intro_knowledge_base_search_merge'), intro: i18nT('workflow:intro_knowledge_base_search_merge'),
showStatus: false, showStatus: false,
version: '486',
courseUrl: '/docs/guide/dashboard/workflow/knowledge_base_search_merge/', courseUrl: '/docs/guide/dashboard/workflow/knowledge_base_search_merge/',
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/http468.ts
...@@ -28,7 +28,6 @@ export const HttpNode468: FlowNodeTemplateType = { ...@@ -28,7 +28,6 @@ export const HttpNode468: FlowNodeTemplateType = {
showStatus: true, showStatus: true,
isTool: true, isTool: true,
courseUrl: '/docs/guide/dashboard/workflow/http/', courseUrl: '/docs/guide/dashboard/workflow/http/',
version: '481',
inputs: [ inputs: [
{ {
...Input_Template_DynamicInput, ...Input_Template_DynamicInput,
......
packages/global/core/workflow/template/system/ifElse/index.ts
...@@ -24,7 +24,6 @@ export const IfElseNode: FlowNodeTemplateType = { ...@@ -24,7 +24,6 @@ export const IfElseNode: FlowNodeTemplateType = {
intro: i18nT('workflow:execute_different_branches_based_on_conditions'), intro: i18nT('workflow:execute_different_branches_based_on_conditions'),
showStatus: true, showStatus: true,
courseUrl: '/docs/guide/dashboard/workflow/tfswitch/', courseUrl: '/docs/guide/dashboard/workflow/tfswitch/',
version: '481',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.ifElseList, key: NodeInputKeyEnum.ifElseList,
......
packages/global/core/workflow/template/system/interactive/formInput.ts
...@@ -23,7 +23,6 @@ export const FormInputNode: FlowNodeTemplateType = { ...@@ -23,7 +23,6 @@ export const FormInputNode: FlowNodeTemplateType = {
name: i18nT('app:workflow.form_input'), name: i18nT('app:workflow.form_input'),
intro: i18nT(`app:workflow.form_input_tip`), intro: i18nT(`app:workflow.form_input_tip`),
isTool: true, isTool: true,
version: '4811',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.description, key: NodeInputKeyEnum.description,
......
packages/global/core/workflow/template/system/interactive/userSelect.ts
...@@ -24,7 +24,6 @@ export const UserSelectNode: FlowNodeTemplateType = { ...@@ -24,7 +24,6 @@ export const UserSelectNode: FlowNodeTemplateType = {
name: i18nT('app:workflow.user_select'), name: i18nT('app:workflow.user_select'),
intro: i18nT(`app:workflow.user_select_tip`), intro: i18nT(`app:workflow.user_select_tip`),
isTool: true, isTool: true,
version: '489',
courseUrl: '/docs/guide/dashboard/workflow/user-selection/', courseUrl: '/docs/guide/dashboard/workflow/user-selection/',
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/laf.ts
...@@ -33,7 +33,6 @@ export const LafModule: FlowNodeTemplateType = { ...@@ -33,7 +33,6 @@ export const LafModule: FlowNodeTemplateType = {
showStatus: true, showStatus: true,
isTool: true, isTool: true,
courseUrl: '/docs/guide/dashboard/workflow/laf/', courseUrl: '/docs/guide/dashboard/workflow/laf/',
version: '481',
inputs: [ inputs: [
{ {
...Input_Template_DynamicInput, ...Input_Template_DynamicInput,
......
packages/global/core/workflow/template/system/loop/loop.ts
...@@ -29,7 +29,6 @@ export const LoopNode: FlowNodeTemplateType = { ...@@ -29,7 +29,6 @@ export const LoopNode: FlowNodeTemplateType = {
name: i18nT('workflow:loop'), name: i18nT('workflow:loop'),
intro: i18nT('workflow:intro_loop'), intro: i18nT('workflow:intro_loop'),
showStatus: true, showStatus: true,
version: '4811',
courseUrl: '/docs/guide/dashboard/workflow/loop/', courseUrl: '/docs/guide/dashboard/workflow/loop/',
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/loop/loopEnd.ts
...@@ -19,7 +19,6 @@ export const LoopEndNode: FlowNodeTemplateType = { ...@@ -19,7 +19,6 @@ export const LoopEndNode: FlowNodeTemplateType = {
avatar: 'core/workflow/template/loopEnd', avatar: 'core/workflow/template/loopEnd',
name: i18nT('workflow:loop_end'), name: i18nT('workflow:loop_end'),
showStatus: false, showStatus: false,
version: '4811',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.loopEndInput, key: NodeInputKeyEnum.loopEndInput,
......
packages/global/core/workflow/template/system/loop/loopStart.ts
...@@ -24,7 +24,6 @@ export const LoopStartNode: FlowNodeTemplateType = { ...@@ -24,7 +24,6 @@ export const LoopStartNode: FlowNodeTemplateType = {
unique: true, unique: true,
forbidDelete: true, forbidDelete: true,
showStatus: false, showStatus: false,
version: '4811',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.loopStartInput, key: NodeInputKeyEnum.loopStartInput,
......
packages/global/core/workflow/template/system/pluginConfig.ts
...@@ -15,7 +15,6 @@ export const PluginConfigNode: FlowNodeTemplateType = { ...@@ -15,7 +15,6 @@ export const PluginConfigNode: FlowNodeTemplateType = {
intro: '', intro: '',
unique: true, unique: true,
forbidDelete: true, forbidDelete: true,
version: '4811',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/pluginInput.ts
...@@ -16,7 +16,6 @@ export const PluginInputModule: FlowNodeTemplateType = { ...@@ -16,7 +16,6 @@ export const PluginInputModule: FlowNodeTemplateType = {
name: i18nT('workflow:plugin_input'), name: i18nT('workflow:plugin_input'),
intro: i18nT('workflow:intro_plugin_input'), intro: i18nT('workflow:intro_plugin_input'),
showStatus: false, showStatus: false,
version: '481',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/pluginOutput.ts
...@@ -16,7 +16,6 @@ export const PluginOutputModule: FlowNodeTemplateType = { ...@@ -16,7 +16,6 @@ export const PluginOutputModule: FlowNodeTemplateType = {
name: i18nT('workflow:template.plugin_output'), name: i18nT('workflow:template.plugin_output'),
intro: i18nT('workflow:intro_custom_plugin_output'), intro: i18nT('workflow:intro_custom_plugin_output'),
showStatus: false, showStatus: false,
version: '481',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/runApp.ts
...@@ -13,7 +13,6 @@ export const RunAppNode: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const RunAppNode: FlowNodeTemplateType = {
name: '', name: '',
showStatus: false, showStatus: false,
isTool: false, isTool: false,
version: '481',
inputs: [], // [{key:'pluginId'},...] inputs: [], // [{key:'pluginId'},...]
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/runPlugin.ts
...@@ -13,7 +13,6 @@ export const RunPluginModule: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const RunPluginModule: FlowNodeTemplateType = {
name: '', name: '',
showStatus: false, showStatus: false,
isTool: true, isTool: true,
version: '481',
inputs: [], // [{key:'pluginId'},...] inputs: [], // [{key:'pluginId'},...]
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/runTool.ts
...@@ -13,7 +13,6 @@ export const RunToolNode: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const RunToolNode: FlowNodeTemplateType = {
name: '', name: '',
showStatus: false, showStatus: false,
isTool: true, isTool: true,
version: '4.9.6',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/runToolSet.ts
...@@ -13,7 +13,6 @@ export const RunToolSetNode: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const RunToolSetNode: FlowNodeTemplateType = {
name: '', name: '',
showStatus: false, showStatus: false,
isTool: true, isTool: true,
version: '4.9.6',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/sandbox/index.ts
...@@ -27,7 +27,6 @@ export const CodeNode: FlowNodeTemplateType = { ...@@ -27,7 +27,6 @@ export const CodeNode: FlowNodeTemplateType = {
intro: i18nT('workflow:execute_a_simple_script_code_usually_for_complex_data_processing'), intro: i18nT('workflow:execute_a_simple_script_code_usually_for_complex_data_processing'),
showStatus: true, showStatus: true,
courseUrl: '/docs/guide/dashboard/workflow/sandbox/', courseUrl: '/docs/guide/dashboard/workflow/sandbox/',
version: '482',
inputs: [ inputs: [
{ {
...Input_Template_DynamicInput, ...Input_Template_DynamicInput,
......
packages/global/core/workflow/template/system/stopTool.ts
...@@ -13,7 +13,6 @@ export const StopToolNode: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const StopToolNode: FlowNodeTemplateType = {
avatar: 'core/workflow/template/stopTool', avatar: 'core/workflow/template/stopTool',
name: i18nT('workflow:tool_call_termination'), name: i18nT('workflow:tool_call_termination'),
intro: i18nT('workflow:intro_tool_call_termination'), intro: i18nT('workflow:intro_tool_call_termination'),
version: '481',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/systemConfig.ts
...@@ -15,7 +15,6 @@ export const SystemConfigNode: FlowNodeTemplateType = { ...@@ -15,7 +15,6 @@ export const SystemConfigNode: FlowNodeTemplateType = {
intro: '', intro: '',
unique: true, unique: true,
forbidDelete: true, forbidDelete: true,
version: '481',
inputs: [], inputs: [],
outputs: [] outputs: []
}; };
packages/global/core/workflow/template/system/textEditor.ts
...@@ -24,7 +24,6 @@ export const TextEditorNode: FlowNodeTemplateType = { ...@@ -24,7 +24,6 @@ export const TextEditorNode: FlowNodeTemplateType = {
name: i18nT('workflow:text_concatenation'), name: i18nT('workflow:text_concatenation'),
intro: i18nT('workflow:intro_text_concatenation'), intro: i18nT('workflow:intro_text_concatenation'),
courseUrl: '/docs/guide/dashboard/workflow/text_editor/', courseUrl: '/docs/guide/dashboard/workflow/text_editor/',
version: '4813',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.textareaInput, key: NodeInputKeyEnum.textareaInput,
......
packages/global/core/workflow/template/system/toolParams.ts
...@@ -13,7 +13,6 @@ export const ToolParamsNode: FlowNodeTemplateType = { ...@@ -13,7 +13,6 @@ export const ToolParamsNode: FlowNodeTemplateType = {
avatar: 'core/workflow/template/toolParams', avatar: 'core/workflow/template/toolParams',
name: i18nT('workflow:tool_custom_field'), name: i18nT('workflow:tool_custom_field'),
intro: i18nT('workflow:intro_tool_params_config'), intro: i18nT('workflow:intro_tool_params_config'),
version: '4811',
isTool: true, isTool: true,
inputs: [], inputs: [],
outputs: [] outputs: []
......
packages/global/core/workflow/template/system/variableUpdate/index.tsx
...@@ -19,7 +19,6 @@ export const VariableUpdateNode: FlowNodeTemplateType = { ...@@ -19,7 +19,6 @@ export const VariableUpdateNode: FlowNodeTemplateType = {
intro: i18nT('workflow:update_specified_node_output_or_global_variable'), intro: i18nT('workflow:update_specified_node_output_or_global_variable'),
showStatus: false, showStatus: false,
isTool: true, isTool: true,
version: '481',
courseUrl: '/docs/guide/dashboard/workflow/variable_update/', courseUrl: '/docs/guide/dashboard/workflow/variable_update/',
inputs: [ inputs: [
{ {
......
packages/global/core/workflow/template/system/workflowStart.ts
...@@ -30,7 +30,6 @@ export const WorkflowStart: FlowNodeTemplateType = { ...@@ -30,7 +30,6 @@ export const WorkflowStart: FlowNodeTemplateType = {
intro: '', intro: '',
forbidDelete: true, forbidDelete: true,
unique: true, unique: true,
version: '481',
inputs: [{ ...Input_Template_UserChatInput, toolDescription: i18nT('workflow:user_question') }], inputs: [{ ...Input_Template_UserChatInput, toolDescription: i18nT('workflow:user_question') }],
outputs: [ outputs: [
{ {
......
packages/global/core/workflow/type/index.d.ts
...@@ -37,7 +37,10 @@ export type WorkflowTemplateType = { ...@@ -37,7 +37,10 @@ export type WorkflowTemplateType = {
intro?: string; intro?: string;
author?: string; author?: string;
courseUrl?: string; courseUrl?: string;
version: string;
version?: string;
versionLabel?: string;
isLatestVersion?: boolean;
showStatus?: boolean; showStatus?: boolean;
weight?: number; weight?: number;
......
packages/global/core/workflow/type/io.d.ts
...@@ -63,6 +63,8 @@ export type FlowNodeInputItemType = InputComponentPropsType & { ...@@ -63,6 +63,8 @@ export type FlowNodeInputItemType = InputComponentPropsType & {
canSelectFile?: boolean; canSelectFile?: boolean;
canSelectImg?: boolean; canSelectImg?: boolean;
maxFiles?: number; maxFiles?: number;
deprecated?: boolean;
}; };
export type FlowNodeOutputItemType = { export type FlowNodeOutputItemType = {
...@@ -86,6 +88,8 @@ export type FlowNodeOutputItemType = { ...@@ -86,6 +88,8 @@ export type FlowNodeOutputItemType = {
// component params // component params
customFieldConfig?: CustomFieldConfigType; customFieldConfig?: CustomFieldConfigType;
deprecated?: boolean;
}; };
export type ReferenceItemValueType = [string, string | undefined]; export type ReferenceItemValueType = [string, string | undefined];
......
packages/global/core/workflow/type/node.d.ts
...@@ -34,7 +34,10 @@ export type FlowNodeCommonType = { ...@@ -34,7 +34,10 @@ export type FlowNodeCommonType = {
name: string; name: string;
intro?: string; // template list intro intro?: string; // template list intro
showStatus?: boolean; // chatting response step status showStatus?: boolean; // chatting response step status
version: string;
version?: string;
versionLabel?: string; // Just ui show
isLatestVersion?: boolean; // Just ui show
// data // data
inputs: FlowNodeInputItemType[]; inputs: FlowNodeInputItemType[];
...@@ -48,7 +51,7 @@ export type FlowNodeCommonType = { ...@@ -48,7 +51,7 @@ export type FlowNodeCommonType = {
}; };
export type PluginDataType = { export type PluginDataType = {
version: string; version?: string;
diagram?: string; diagram?: string;
userGuide?: string; userGuide?: string;
courseUrl?: string; courseUrl?: string;
......
packages/service/core/app/plugin/controller.ts
import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d'; import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
import { FlowNodeTypeEnum, defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { import {
appData2FlowNodeIO, appData2FlowNodeIO,
pluginData2FlowNodeIO, pluginData2FlowNodeIO,
...@@ -14,10 +14,16 @@ import { cloneDeep } from 'lodash'; ...@@ -14,10 +14,16 @@ import { cloneDeep } from 'lodash';
import { MongoApp } from '../schema'; import { MongoApp } from '../schema';
import { type SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type'; import { type SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type';
import { getSystemPluginTemplates } from '../../../../plugins/register'; import { getSystemPluginTemplates } from '../../../../plugins/register';
import { getAppLatestVersion, getAppVersionById } from '../version/controller'; import {
checkIsLatestVersion,
getAppLatestVersion,
getAppVersionById
} from '../version/controller';
import { type PluginRuntimeType } from '@fastgpt/global/core/plugin/type'; import { type PluginRuntimeType } from '@fastgpt/global/core/plugin/type';
import { MongoSystemPlugin } from './systemPluginSchema'; import { MongoSystemPlugin } from './systemPluginSchema';
import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin'; import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin';
import { MongoAppVersion } from '../version/schema';
import { i18nT } from '../../../../web/i18n/utils';
/* /*
plugin id rule: plugin id rule:
...@@ -90,20 +96,34 @@ const getSystemPluginTemplateById = async ( ...@@ -90,20 +96,34 @@ const getSystemPluginTemplateById = async (
/* Format plugin to workflow preview node data */ /* Format plugin to workflow preview node data */
export async function getChildAppPreviewNode({ export async function getChildAppPreviewNode({
id appId,
versionId
}: { }: {
id: string; appId: string;
versionId?: string;
}): Promise<FlowNodeTemplateType> { }): Promise<FlowNodeTemplateType> {
const app: ChildAppType = await (async () => { const app: ChildAppType = await (async () => {
const { source, pluginId } = await splitCombinePluginId(id); const { source, pluginId } = await splitCombinePluginId(appId);
if (source === PluginSourceEnum.personal) { if (source === PluginSourceEnum.personal) {
const item = await MongoApp.findById(id).lean(); const item = await MongoApp.findById(appId).lean();
if (!item) return Promise.reject('plugin not found'); if (!item) return Promise.reject('plugin not found');
const version = await getAppLatestVersion(id, item); const version = await getAppVersionById({ appId, versionId, app: item });
if (!version.versionId) return Promise.reject(i18nT('common:app_not_version'));
const versionData = await MongoAppVersion.findById(
version.versionId,
'_id versionName appId time'
).lean();
if (!version.versionId) return Promise.reject('App version not found'); const isLatest = versionData
? await checkIsLatestVersion({
appId,
versionId: versionData._id
})
: true;
return { return {
id: String(item._id), id: String(item._id),
...@@ -118,7 +138,11 @@ export async function getChildAppPreviewNode({ ...@@ -118,7 +138,11 @@ export async function getChildAppPreviewNode({
chatConfig: version.chatConfig chatConfig: version.chatConfig
}, },
templateType: FlowNodeTemplateTypeEnum.teamApp, templateType: FlowNodeTemplateTypeEnum.teamApp,
version: version.versionId, version: version.versionId,
versionLabel: versionData?.versionName || '',
isLatestVersion: isLatest,
originCost: 0, originCost: 0,
currentCost: 0, currentCost: 0,
hasTokenFee: false, hasTokenFee: false,
...@@ -175,7 +199,11 @@ export async function getChildAppPreviewNode({ ...@@ -175,7 +199,11 @@ export async function getChildAppPreviewNode({
userGuide: app.userGuide, userGuide: app.userGuide,
showStatus: app.showStatus, showStatus: app.showStatus,
isTool: true, isTool: true,
version: app.version, version: app.version,
versionLabel: app.versionLabel,
isLatestVersion: app.isLatestVersion,
sourceHandle: isToolSet sourceHandle: isToolSet
? getHandleConfig(false, false, false, false) ? getHandleConfig(false, false, false, false)
: getHandleConfig(true, true, true, true), : getHandleConfig(true, true, true, true),
...@@ -224,7 +252,7 @@ export async function getChildAppRuntimeById( ...@@ -224,7 +252,7 @@ export async function getChildAppRuntimeById(
templateType: FlowNodeTemplateTypeEnum.teamApp, templateType: FlowNodeTemplateTypeEnum.teamApp,
// 用不到 // 用不到
version: item?.pluginData?.nodeVersion || defaultNodeVersion, version: item?.pluginData?.nodeVersion,
originCost: 0, originCost: 0,
currentCost: 0, currentCost: 0,
hasTokenFee: false, hasTokenFee: false,
......
packages/service/core/app/utils.ts
import { MongoDataset } from '../dataset/schema'; import { MongoDataset } from '../dataset/schema';
import { getEmbeddingModel } from '../ai/model'; import { getEmbeddingModel } from '../ai/model';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import {
AppNodeFlowNodeTypeMap,
FlowNodeTypeEnum
} from '@fastgpt/global/core/workflow/node/constant';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node'; import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
import { MongoAppVersion } from './version/schema';
import { checkIsLatestVersion } from './version/controller';
import { Types } from '../../common/mongo';
export async function listAppDatasetDataByTeamIdAndDatasetIds({ export async function listAppDatasetDataByTeamIdAndDatasetIds({
teamId, teamId,
...@@ -35,6 +41,45 @@ export async function rewriteAppWorkflowToDetail({ ...@@ -35,6 +41,45 @@ export async function rewriteAppWorkflowToDetail({
}) { }) {
const datasetIdSet = new Set<string>(); const datasetIdSet = new Set<string>();
// Add node(App Type) versionlabel and latest sign
const appNodes = nodes.filter((node) => AppNodeFlowNodeTypeMap[node.flowNodeType]);
const versionIds = appNodes
.filter((node) => node.version && Types.ObjectId.isValid(node.version))
.map((node) => node.version);
if (versionIds.length > 0) {
const versionDataList = await MongoAppVersion.find(
{
_id: { $in: versionIds }
},
'_id versionName appId time'
).lean();
const versionMap: Record<string, any> = {};
const isLatestChecks = await Promise.all(
versionDataList.map(async (version) => {
const isLatest = await checkIsLatestVersion({
appId: version.appId,
versionId: version._id
});
return { versionId: String(version._id), isLatest };
})
);
const isLatestMap = new Map(isLatestChecks.map((item) => [item.versionId, item.isLatest]));
versionDataList.forEach((version) => {
versionMap[String(version._id)] = version;
});
appNodes.forEach((node) => {
if (!node.version) return;
const versionData = versionMap[String(node.version)];
if (versionData) {
node.versionLabel = versionData.versionName;
node.isLatestVersion = isLatestMap.get(String(node.version)) || false;
}
});
}
// Get all dataset ids from nodes // Get all dataset ids from nodes
nodes.forEach((node) => { nodes.forEach((node) => {
if (node.flowNodeType !== FlowNodeTypeEnum.datasetSearchNode) return; if (node.flowNodeType !== FlowNodeTypeEnum.datasetSearchNode) return;
......
packages/service/core/app/version/controller.ts
...@@ -57,3 +57,22 @@ export const getAppVersionById = async ({ ...@@ -57,3 +57,22 @@ export const getAppVersionById = async ({
// If the version does not exist, the latest version is returned // If the version does not exist, the latest version is returned
return getAppLatestVersion(appId, app); return getAppLatestVersion(appId, app);
}; };
export const checkIsLatestVersion = async ({
appId,
versionId
}: {
appId: string;
versionId: string;
}) => {
const version = await MongoAppVersion.findOne(
{
appId,
isPublish: true,
_id: { $gt: versionId }
},
'_id'
).lean();
return !version;
};
packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
...@@ -723,8 +723,8 @@ async function streamResponse({ ...@@ -723,8 +723,8 @@ async function streamResponse({
} }
// Parse tool calls // Parse tool calls
if (responseChoice?.tool_calls?.length) { if (responseChoice?.tool_calls?.length) {
responseChoice.tool_calls.forEach((toolCall) => { responseChoice.tool_calls.forEach((toolCall, i) => {
const index = toolCall.index; const index = toolCall.index ?? i;
// Call new tool // Call new tool
if (toolCall.id || callingTool) { if (toolCall.id || callingTool) {
......
packages/service/core/workflow/dispatch/chat/oneapi.ts
...@@ -464,7 +464,7 @@ async function getChatMessages({ ...@@ -464,7 +464,7 @@ async function getChatMessages({
aiChatQuoteRole: AiChatQuoteRoleType; // user: replace user prompt; system: replace system prompt aiChatQuoteRole: AiChatQuoteRoleType; // user: replace user prompt; system: replace system prompt
datasetQuotePrompt?: string; datasetQuotePrompt?: string;
datasetQuoteText: string; datasetQuoteText: string;
version: string; version?: string;
useDatasetQuote: boolean; useDatasetQuote: boolean;
histories: ChatItemType[]; histories: ChatItemType[];
......
packages/service/core/workflow/dispatch/index.ts
...@@ -11,6 +11,7 @@ import type { ...@@ -11,6 +11,7 @@ import type {
SystemVariablesType SystemVariablesType
} from '@fastgpt/global/core/workflow/runtime/type'; } from '@fastgpt/global/core/workflow/runtime/type';
import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type.d'; import type { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type.d';
import type { FlowNodeOutputItemType } from '@fastgpt/global/core/workflow/type/io.d';
import type { import type {
AIChatItemValueItemType, AIChatItemValueItemType,
ChatHistoryItemResType, ChatHistoryItemResType,
...@@ -549,7 +550,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -549,7 +550,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
// Skip some special key // Skip some special key
if ( if (
[NodeInputKeyEnum.childrenNodeIdList, NodeInputKeyEnum.httpJsonBody].includes( [NodeInputKeyEnum.childrenNodeIdList, NodeInputKeyEnum.httpJsonBody].includes(
input.key as any input.key as NodeInputKeyEnum
) )
) { ) {
params[input.key] = input.value; params[input.key] = input.value;
......
packages/web/components/common/MySelect/index.tsx
...@@ -15,7 +15,6 @@ import { ...@@ -15,7 +15,6 @@ import {
useDisclosure, useDisclosure,
MenuButton, MenuButton,
Box, Box,
css,
Flex, Flex,
Input Input
} from '@chakra-ui/react'; } from '@chakra-ui/react';
...@@ -32,13 +31,16 @@ import Avatar from '../Avatar'; ...@@ -32,13 +31,16 @@ import Avatar from '../Avatar';
* list: 列表数据 * list: 列表数据
* isLoading: 是否加载中 * isLoading: 是否加载中
* ScrollData: 分页滚动数据控制器 [useScrollPagination] 的返回值 * ScrollData: 分页滚动数据控制器 [useScrollPagination] 的返回值
* customOnOpen: 自定义打开回调
* customOnClose: 自定义关闭回调
* */ * */
export type SelectProps<T = any> = Omit<ButtonProps, 'onChange'> & { export type SelectProps<T = any> = Omit<ButtonProps, 'onChange'> & {
value?: T; value?: T;
valueLabel?: string | React.ReactNode;
placeholder?: string; placeholder?: string;
isSearch?: boolean; isSearch?: boolean;
list: { list: {
alias?: string; alias?: string | React.ReactNode;
icon?: string; icon?: string;
iconSize?: string; iconSize?: string;
label: string | React.ReactNode; label: string | React.ReactNode;
...@@ -49,18 +51,36 @@ export type SelectProps<T = any> = Omit<ButtonProps, 'onChange'> & { ...@@ -49,18 +51,36 @@ export type SelectProps<T = any> = Omit<ButtonProps, 'onChange'> & {
isLoading?: boolean; isLoading?: boolean;
onChange?: (val: T) => any | Promise<any>; onChange?: (val: T) => any | Promise<any>;
ScrollData?: ReturnType<typeof useScrollPagination>['ScrollData']; ScrollData?: ReturnType<typeof useScrollPagination>['ScrollData'];
customOnOpen?: () => void;
customOnClose?: () => void;
};
export const menuItemStyles: MenuItemProps = {
borderRadius: 'sm',
py: 2,
display: 'flex',
alignItems: 'center',
_hover: {
backgroundColor: 'myGray.100'
},
_notLast: {
mb: 1
}
}; };
const MySelect = <T = any,>( const MySelect = <T = any,>(
{ {
placeholder, placeholder,
value, value,
valueLabel,
isSearch = false, isSearch = false,
width = '100%', width = '100%',
list = [], list = [],
onChange, onChange,
isLoading = false, isLoading = false,
ScrollData, ScrollData,
customOnOpen,
customOnClose,
...props ...props
}: SelectProps<T>, }: SelectProps<T>,
ref: ForwardedRef<{ ref: ForwardedRef<{
...@@ -72,21 +92,19 @@ const MySelect = <T = any,>( ...@@ -72,21 +92,19 @@ const MySelect = <T = any,>(
const SelectedItemRef = useRef<HTMLDivElement>(null); const SelectedItemRef = useRef<HTMLDivElement>(null);
const SearchInputRef = useRef<HTMLInputElement>(null); const SearchInputRef = useRef<HTMLInputElement>(null);
const menuItemStyles: MenuItemProps = { const { isOpen, onOpen: defaultOnOpen, onClose: defaultOnClose } = useDisclosure();
borderRadius: 'sm',
py: 2,
display: 'flex',
alignItems: 'center',
_hover: {
backgroundColor: 'myGray.100'
},
_notLast: {
mb: 1
}
};
const { isOpen, onOpen, onClose } = useDisclosure();
const selectItem = useMemo(() => list.find((item) => item.value === value), [list, value]); const selectItem = useMemo(() => list.find((item) => item.value === value), [list, value]);
const onOpen = () => {
defaultOnOpen();
customOnOpen?.();
};
const onClose = () => {
defaultOnClose();
customOnClose?.();
};
const [search, setSearch] = useState(''); const [search, setSearch] = useState('');
const filterList = useMemo(() => { const filterList = useMemo(() => {
if (!isSearch || !search) { if (!isSearch || !search) {
...@@ -105,6 +123,7 @@ const MySelect = <T = any,>( ...@@ -105,6 +123,7 @@ const MySelect = <T = any,>(
} }
})); }));
// Auto scroll
useEffect(() => { useEffect(() => {
if (isOpen && MenuListRef.current && SelectedItemRef.current) { if (isOpen && MenuListRef.current && SelectedItemRef.current) {
const menu = MenuListRef.current; const menu = MenuListRef.current;
...@@ -117,7 +136,7 @@ const MySelect = <T = any,>( ...@@ -117,7 +136,7 @@ const MySelect = <T = any,>(
} }
}, [isSearch, isOpen]); }, [isSearch, isOpen]);
const { runAsync: onclickChange, loading } = useRequest2((val: T) => onChange?.(val)); const { runAsync: onClickChange, loading } = useRequest2((val: T) => onChange?.(val));
const ListRender = useMemo(() => { const ListRender = useMemo(() => {
return ( return (
...@@ -138,7 +157,7 @@ const MySelect = <T = any,>( ...@@ -138,7 +157,7 @@ const MySelect = <T = any,>(
})} })}
onClick={() => { onClick={() => {
if (value !== item.value) { if (value !== item.value) {
onclickChange(item.value); onClickChange(item.value);
} }
}} }}
whiteSpace={'pre-wrap'} whiteSpace={'pre-wrap'}
...@@ -161,7 +180,7 @@ const MySelect = <T = any,>( ...@@ -161,7 +180,7 @@ const MySelect = <T = any,>(
))} ))}
</> </>
); );
}, [filterList, value]); }, [filterList, onClickChange, value]);
const isSelecting = loading || isLoading; const isSelecting = loading || isLoading;
...@@ -200,36 +219,48 @@ const MySelect = <T = any,>( ...@@ -200,36 +219,48 @@ const MySelect = <T = any,>(
: {})} : {})}
{...props} {...props}
> >
<Flex alignItems={'center'}> <Flex alignItems={'center'} justifyContent="space-between" w="100%">
{isSelecting && <MyIcon mr={2} name={'common/loading'} w={'1rem'} />} <Flex alignItems={'center'}>
{isSearch && isOpen ? ( {isSelecting && <MyIcon mr={2} name={'common/loading'} w={'1rem'} />}
<Input {valueLabel ? (
ref={SearchInputRef} <>{valueLabel}</>
autoFocus ) : (
variant={'unstyled'} <>
value={search} {isSearch && isOpen ? (
onChange={(e) => setSearch(e.target.value)} <Input
placeholder={ ref={SearchInputRef}
selectItem?.alias || autoFocus
(typeof selectItem?.label === 'string' ? selectItem?.label : placeholder) variant={'unstyled'}
} value={search}
size={'sm'} onChange={(e) => setSearch(e.target.value)}
w={'100%'} placeholder={
color={'myGray.700'} (typeof selectItem?.alias === 'string' ? selectItem?.alias : '') ||
onBlur={() => { (typeof selectItem?.label === 'string' ? selectItem?.label : placeholder)
setTimeout(() => { }
SearchInputRef?.current?.focus(); size={'sm'}
}, 0); w={'100%'}
}} color={'myGray.700'}
/> onBlur={() => {
) : ( setTimeout(() => {
<> SearchInputRef?.current?.focus();
{selectItem?.icon && ( }, 0);
<Avatar mr={2} src={selectItem.icon as any} w={selectItem.iconSize ?? '1rem'} /> }}
)} />
{selectItem?.alias || selectItem?.label || placeholder} ) : (
</> <>
)} {selectItem?.icon && (
<Avatar
mr={2}
src={selectItem.icon as any}
w={selectItem.iconSize ?? '1rem'}
/>
)}
{selectItem?.alias || selectItem?.label || placeholder}
</>
)}
</>
)}
</Flex>
</Flex> </Flex>
</MenuButton> </MenuButton>
...@@ -252,7 +283,7 @@ const MySelect = <T = any,>( ...@@ -252,7 +283,7 @@ const MySelect = <T = any,>(
'0px 2px 4px rgba(161, 167, 179, 0.25), 0px 0px 1px rgba(121, 141, 159, 0.25);' '0px 2px 4px rgba(161, 167, 179, 0.25), 0px 0px 1px rgba(121, 141, 159, 0.25);'
} }
zIndex={99} zIndex={99}
maxH={'40vh'} maxH={'45vh'}
overflowY={'auto'} overflowY={'auto'}
> >
{ScrollData ? <ScrollData>{ListRender}</ScrollData> : ListRender} {ScrollData ? <ScrollData>{ListRender}</ScrollData> : ListRender}
......
packages/web/hooks/useScrollPagination.tsx
...@@ -190,6 +190,7 @@ export function useScrollPagination< ...@@ -190,6 +190,7 @@ export function useScrollPagination<
params = {}, params = {},
EmptyTip, EmptyTip,
showErrorToast = true, showErrorToast = true,
disalbed = false,
...props ...props
}: { }: {
scrollLoadType?: 'top' | 'bottom'; scrollLoadType?: 'top' | 'bottom';
...@@ -198,6 +199,7 @@ export function useScrollPagination< ...@@ -198,6 +199,7 @@ export function useScrollPagination<
params?: Record<string, any>; params?: Record<string, any>;
EmptyTip?: React.JSX.Element; EmptyTip?: React.JSX.Element;
showErrorToast?: boolean; showErrorToast?: boolean;
disalbed?: boolean;
} & Parameters<typeof useRequest2>[1] } & Parameters<typeof useRequest2>[1]
) { ) {
const { t } = useTranslation(); const { t } = useTranslation();
...@@ -345,10 +347,10 @@ export function useScrollPagination< ...@@ -345,10 +347,10 @@ export function useScrollPagination<
// Reload data // Reload data
useRequest2( useRequest2(
async () => { async () => {
if (disalbed) return;
loadData(true); loadData(true);
}, },
{ {
manual: false,
...props ...props
} }
); );
......
packages/web/i18n/en/app.json
{ {
"Click_to_delete_this_field": "Click to delete this field",
"Filed_is_deprecated": "This field is deprecated",
"MCP_tools_list_is_empty": "MCP tool not resolved", "MCP_tools_list_is_empty": "MCP tool not resolved",
"MCP_tools_parse_failed": "Failed to parse MCP address", "MCP_tools_parse_failed": "Failed to parse MCP address",
"MCP_tools_url": "MCP Address", "MCP_tools_url": "MCP Address",
...@@ -6,7 +8,6 @@ ...@@ -6,7 +8,6 @@
"MCP_tools_url_placeholder": "After filling in the MCP address, click Analysis", "MCP_tools_url_placeholder": "After filling in the MCP address, click Analysis",
"Role_setting": "Permission", "Role_setting": "Permission",
"Run": "Execute", "Run": "Execute",
"team_tags_set": "Team tags",
"Team_Tags": "Team tags", "Team_Tags": "Team tags",
"ai_point_price": "Billing", "ai_point_price": "Billing",
"ai_settings": "AI Configuration", "ai_settings": "AI Configuration",
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
"no_mcp_tools_list": "No data yet, the MCP address needs to be parsed first", "no_mcp_tools_list": "No data yet, the MCP address needs to be parsed first",
"node_not_intro": "This node is not introduced", "node_not_intro": "This node is not introduced",
"not_json_file": "Please select a JSON file", "not_json_file": "Please select a JSON file",
"not_the_newest": "Not the latest",
"oaste_curl_string": "Enter CURL code", "oaste_curl_string": "Enter CURL code",
"open_auto_execute": "Enable automatic execution", "open_auto_execute": "Enable automatic execution",
"open_vision_function_tip": "Models with icon switches have image recognition capabilities. \nAfter being turned on, the model will parse the pictures in the file link and automatically parse the pictures in the user's question (user question ≤ 500 words).", "open_vision_function_tip": "Models with icon switches have image recognition capabilities. \nAfter being turned on, the model will parse the pictures in the file link and automatically parse the pictures in the user's question (user question ≤ 500 words).",
...@@ -138,6 +140,7 @@ ...@@ -138,6 +140,7 @@
"stop_sign_placeholder": "Multiple serial numbers are separated by |, for example: aaa|stop", "stop_sign_placeholder": "Multiple serial numbers are separated by |, for example: aaa|stop",
"stream_response": "Stream", "stream_response": "Stream",
"stream_response_tip": "Turning this switch off forces the model to use non-streaming mode and will not output content directly. \nIn the output of the AI ​​reply, the content output by this model can be obtained for secondary processing.", "stream_response_tip": "Turning this switch off forces the model to use non-streaming mode and will not output content directly. \nIn the output of the AI ​​reply, the content output by this model can be obtained for secondary processing.",
"team_tags_set": "Team tags",
"temperature": "Temperature", "temperature": "Temperature",
"temperature_tip": "Range 0~10. \nThe larger the value, the more divergent the model’s answer is; the smaller the value, the more rigorous the answer.", "temperature_tip": "Range 0~10. \nThe larger the value, the more divergent the model’s answer is; the smaller the value, the more rigorous the answer.",
"template.hard_strict": "Strict Q&A template", "template.hard_strict": "Strict Q&A template",
......
packages/web/i18n/en/common.json
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
"add_new_param": "Add new param", "add_new_param": "Add new param",
"all_quotes": "All quotes", "all_quotes": "All quotes",
"all_result": "Full Results", "all_result": "Full Results",
"app_not_version": "This application has not been published, please publish it first",
"back": "Back", "back": "Back",
"base_config": "Basic Configuration", "base_config": "Basic Configuration",
"bill_already_processed": "Order has been processed", "bill_already_processed": "Order has been processed",
......
packages/web/i18n/zh-CN/app.json
{ {
"Click_to_delete_this_field": "点击删除该字段",
"Filed_is_deprecated": "该字段已弃用",
"MCP_tools_debug": "调试", "MCP_tools_debug": "调试",
"MCP_tools_detail": "查看详情", "MCP_tools_detail": "查看详情",
"MCP_tools_list": "工具列表", "MCP_tools_list": "工具列表",
...@@ -10,7 +12,6 @@ ...@@ -10,7 +12,6 @@
"MCP_tools_url_placeholder": "填入 MCP 地址后，点击解析", "MCP_tools_url_placeholder": "填入 MCP 地址后，点击解析",
"Role_setting": "权限设置", "Role_setting": "权限设置",
"Run": "运行", "Run": "运行",
"team_tags_set": "团队标签",
"Team_Tags": "团队标签", "Team_Tags": "团队标签",
"ai_point_price": "AI积分计费", "ai_point_price": "AI积分计费",
"ai_settings": "AI 配置", "ai_settings": "AI 配置",
...@@ -110,6 +111,7 @@ ...@@ -110,6 +111,7 @@
"no_mcp_tools_list": "暂无数据，需先解析 MCP 地址", "no_mcp_tools_list": "暂无数据，需先解析 MCP 地址",
"node_not_intro": "这个节点没有介绍", "node_not_intro": "这个节点没有介绍",
"not_json_file": "请选择JSON文件", "not_json_file": "请选择JSON文件",
"not_the_newest": "非最新版",
"oaste_curl_string": "输入 CURL 代码", "oaste_curl_string": "输入 CURL 代码",
"open_auto_execute": "启用自动执行", "open_auto_execute": "启用自动执行",
"open_vision_function_tip": "有图示开关的模型即拥有图片识别能力。若开启，模型会解析文件链接里的图片，并自动解析用户问题中的图片（用户问题≤500字时生效）。", "open_vision_function_tip": "有图示开关的模型即拥有图片识别能力。若开启，模型会解析文件链接里的图片，并自动解析用户问题中的图片（用户问题≤500字时生效）。",
...@@ -143,6 +145,7 @@ ...@@ -143,6 +145,7 @@
"stop_sign_placeholder": "多个序列号通过 | 隔开，例如：aaa|stop", "stop_sign_placeholder": "多个序列号通过 | 隔开，例如：aaa|stop",
"stream_response": "流输出", "stream_response": "流输出",
"stream_response_tip": "关闭该开关，可以强制模型使用非流模式，并且不会直接进行内容输出。可以在 AI 回复的输出中，获取本次模型输出的内容进行二次处理。", "stream_response_tip": "关闭该开关，可以强制模型使用非流模式，并且不会直接进行内容输出。可以在 AI 回复的输出中，获取本次模型输出的内容进行二次处理。",
"team_tags_set": "团队标签",
"temperature": "温度", "temperature": "温度",
"temperature_tip": "范围 0～10。值越大，代表模型回答越发散；值越小，代表回答越严谨。", "temperature_tip": "范围 0～10。值越大，代表模型回答越发散；值越小，代表回答越严谨。",
"template.hard_strict": "严格问答模板", "template.hard_strict": "严格问答模板",
......
packages/web/i18n/zh-CN/common.json
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
"add_new_param": "新增参数", "add_new_param": "新增参数",
"all_quotes": "全部引用", "all_quotes": "全部引用",
"all_result": "完整结果", "all_result": "完整结果",
"app_not_version": " 该应用未发布过，请先发布应用",
"back": "返回", "back": "返回",
"base_config": "基础配置", "base_config": "基础配置",
"bill_already_processed": "订单已处理", "bill_already_processed": "订单已处理",
......
packages/web/i18n/zh-Hant/app.json
{ {
"Click_to_delete_this_field": "點擊刪除該字段",
"Filed_is_deprecated": "該字段已棄用",
"MCP_tools_list_is_empty": "未解析到 MCP 工具", "MCP_tools_list_is_empty": "未解析到 MCP 工具",
"MCP_tools_parse_failed": "解析 MCP 地址失敗", "MCP_tools_parse_failed": "解析 MCP 地址失敗",
"MCP_tools_url": "MCP 地址", "MCP_tools_url": "MCP 地址",
...@@ -6,7 +8,6 @@ ...@@ -6,7 +8,6 @@
"MCP_tools_url_placeholder": "填入 MCP 地址後，點擊解析", "MCP_tools_url_placeholder": "填入 MCP 地址後，點擊解析",
"Role_setting": "權限設定", "Role_setting": "權限設定",
"Run": "執行", "Run": "執行",
"team_tags_set": "團隊標籤",
"Team_Tags": "團隊標籤", "Team_Tags": "團隊標籤",
"ai_point_price": "AI 積分計費", "ai_point_price": "AI 積分計費",
"ai_settings": "AI 設定", "ai_settings": "AI 設定",
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
"no_mcp_tools_list": "暫無數據，需先解析 MCP 地址", "no_mcp_tools_list": "暫無數據，需先解析 MCP 地址",
"node_not_intro": "這個節點沒有介紹", "node_not_intro": "這個節點沒有介紹",
"not_json_file": "請選擇 JSON 檔案", "not_json_file": "請選擇 JSON 檔案",
"not_the_newest": "非最新版",
"oaste_curl_string": "輸入 CURL 代碼", "oaste_curl_string": "輸入 CURL 代碼",
"open_auto_execute": "啟用自動執行", "open_auto_execute": "啟用自動執行",
"open_vision_function_tip": "有圖示開關的模型即擁有圖片辨識功能。若開啟，模型會解析檔案連結中的圖片，並自動解析使用者問題中的圖片（使用者問題 ≤ 500 字時生效）。", "open_vision_function_tip": "有圖示開關的模型即擁有圖片辨識功能。若開啟，模型會解析檔案連結中的圖片，並自動解析使用者問題中的圖片（使用者問題 ≤ 500 字時生效）。",
...@@ -138,6 +140,7 @@ ...@@ -138,6 +140,7 @@
"stop_sign_placeholder": "多個序列號透過 | 隔開，例如：aaa|stop", "stop_sign_placeholder": "多個序列號透過 | 隔開，例如：aaa|stop",
"stream_response": "流輸出", "stream_response": "流輸出",
"stream_response_tip": "關閉該開關​​，可以強制模型使用非流模式，並且不會直接進行內容輸出。\n可在 AI 回覆的輸出中，取得本次模型輸出的內容進行二次處理。", "stream_response_tip": "關閉該開關​​，可以強制模型使用非流模式，並且不會直接進行內容輸出。\n可在 AI 回覆的輸出中，取得本次模型輸出的內容進行二次處理。",
"team_tags_set": "團隊標籤",
"temperature": "溫度", "temperature": "溫度",
"temperature_tip": "範圍 0～10。\n值越大，代表模型回答越發散；值越小，代表回答越嚴謹。", "temperature_tip": "範圍 0～10。\n值越大，代表模型回答越發散；值越小，代表回答越嚴謹。",
"template.hard_strict": "嚴格問答範本", "template.hard_strict": "嚴格問答範本",
......
packages/web/i18n/zh-Hant/common.json
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
"add_new_param": "新增參數", "add_new_param": "新增參數",
"all_quotes": "全部引用", "all_quotes": "全部引用",
"all_result": "完整結果", "all_result": "完整結果",
"app_not_version": "該應用未發布過，請先發布應用",
"back": "返回", "back": "返回",
"base_config": "基本設定", "base_config": "基本設定",
"bill_already_processed": "訂單已處理", "bill_already_processed": "訂單已處理",
......
projects/app/src/pageComponents/app/detail/PublishHistoriesSlider.tsx
import React, { useState } from 'react'; import React, { useState } from 'react';
import { import {
getAppVersionDetail, getAppVersionDetail,
getWorkflowVersionList, getAppVersionList,
updateAppVersion updateAppVersion
} from '@/web/core/app/api/version'; } from '@/web/core/app/api/version';
import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination'; import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
...@@ -186,7 +186,7 @@ const TeamCloud = ({ ...@@ -186,7 +186,7 @@ const TeamCloud = ({
ScrollData, ScrollData,
data: scrollDataList, data: scrollDataList,
setData setData
} = useScrollPagination(getWorkflowVersionList, { } = useScrollPagination(getAppVersionList, {
pageSize: 30, pageSize: 30,
params: { params: {
appId: appDetail._id appId: appDetail._id
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/NodeTemplatesModal.tsx
...@@ -24,7 +24,10 @@ import { useSystemStore } from '@/web/common/system/useSystemStore'; ...@@ -24,7 +24,10 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import { nodeTemplate2FlowNode } from '@/web/core/workflow/utils'; import { nodeTemplate2FlowNode } from '@/web/core/workflow/utils';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import {
AppNodeFlowNodeTypeMap,
FlowNodeTypeEnum
} from '@fastgpt/global/core/workflow/node/constant';
import { import {
getPreviewPluginNode, getPreviewPluginNode,
getSystemPlugTemplates, getSystemPlugTemplates,
...@@ -475,11 +478,7 @@ const RenderList = React.memo(function RenderList({ ...@@ -475,11 +478,7 @@ const RenderList = React.memo(function RenderList({
const templateNode = await (async () => { const templateNode = await (async () => {
try { try {
// get plugin preview module // get plugin preview module
if ( if (AppNodeFlowNodeTypeMap[template.flowNodeType]) {
template.flowNodeType === FlowNodeTypeEnum.pluginModule ||
template.flowNodeType === FlowNodeTypeEnum.appModule ||
template.flowNodeType === FlowNodeTypeEnum.toolSet
) {
setLoading(true); setLoading(true);
const res = await getPreviewPluginNode({ appId: template.id }); const res = await getPreviewPluginNode({ appId: template.id });
...@@ -533,21 +532,25 @@ const RenderList = React.memo(function RenderList({ ...@@ -533,21 +532,25 @@ const RenderList = React.memo(function RenderList({
pluginId: templateNode.pluginId pluginId: templateNode.pluginId
}), }),
intro: t(templateNode.intro as any), intro: t(templateNode.intro as any),
inputs: templateNode.inputs.map((input) => ({ inputs: templateNode.inputs
...input, .filter((input) => input.deprecated !== true)
value: defaultValueMap[input.key] ?? input.value, .map((input) => ({
valueDesc: t(input.valueDesc as any), ...input,
label: t(input.label as any), value: defaultValueMap[input.key] ?? input.value,
description: t(input.description as any), valueDesc: t(input.valueDesc as any),
debugLabel: t(input.debugLabel as any), label: t(input.label as any),
toolDescription: t(input.toolDescription as any) description: t(input.description as any),
})), debugLabel: t(input.debugLabel as any),
outputs: templateNode.outputs.map((output) => ({ toolDescription: t(input.toolDescription as any)
...output, })),
valueDesc: t(output.valueDesc as any), outputs: templateNode.outputs
label: t(output.label as any), .filter((output) => output.deprecated !== true)
description: t(output.description as any) .map((output) => ({
})) ...output,
valueDesc: t(output.valueDesc as any),
label: t(output.label as any),
description: t(output.description as any)
}))
}, },
position: { x: mouseX, y: mouseY }, position: { x: mouseX, y: mouseY },
selected: true, selected: true,
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/Label.tsx
...@@ -10,6 +10,8 @@ import { useContextSelector } from 'use-context-selector'; ...@@ -10,6 +10,8 @@ import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '@/pageComponents/app/detail/WorkflowComponents/context'; import { WorkflowContext } from '@/pageComponents/app/detail/WorkflowComponents/context';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel'; import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
type Props = { type Props = {
nodeId: string; nodeId: string;
...@@ -68,8 +70,38 @@ const InputLabel = ({ nodeId, input, RightComponent }: Props) => { ...@@ -68,8 +70,38 @@ const InputLabel = ({ nodeId, input, RightComponent }: Props) => {
</Box> </Box>
)} )}
{input.deprecated && (
<>
<Box flex={'1'} />
<MyTooltip label={t('app:Click_to_delete_this_field')}>
<Flex
px={1.5}
py={1}
bg={'adora.50'}
rounded={'6px'}
fontSize={'14px'}
cursor="pointer"
alignItems={'center'}
_hover={{
bg: 'adora.100'
}}
onClick={() => {
onChangeNode({
nodeId,
type: 'delInput',
key: input.key
});
}}
>
<MyIcon name={'common/info'} color={'adora.600'} w={4} mr={1} />
<Box color={'adora.600'}>{t('app:Filed_is_deprecated')}</Box>
</Flex>
</MyTooltip>
</>
)}
{/* Right Component */} {/* Right Component */}
{RightComponent && ( {!input.deprecated && RightComponent && (
<> <>
<Box flex={'1'} /> <Box flex={'1'} />
{RightComponent} {RightComponent}
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/Label.tsx
...@@ -8,11 +8,17 @@ import { getHandleId } from '@fastgpt/global/core/workflow/utils'; ...@@ -8,11 +8,17 @@ import { getHandleId } from '@fastgpt/global/core/workflow/utils';
import { Position } from 'reactflow'; import { Position } from 'reactflow';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import ValueTypeLabel from '../ValueTypeLabel'; import ValueTypeLabel from '../ValueTypeLabel';
import MyIcon from '@fastgpt/web/components/common/Icon';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '../../../../context';
const OutputLabel = ({ nodeId, output }: { nodeId: string; output: FlowNodeOutputItemType }) => { const OutputLabel = ({ nodeId, output }: { nodeId: string; output: FlowNodeOutputItemType }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { label = '', description, valueType, valueDesc } = output; const { label = '', description, valueType, valueDesc } = output;
const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
return ( return (
<Box position={'relative'}> <Box position={'relative'}>
<Flex <Flex
...@@ -36,6 +42,36 @@ const OutputLabel = ({ nodeId, output }: { nodeId: string; output: FlowNodeOutpu ...@@ -36,6 +42,36 @@ const OutputLabel = ({ nodeId, output }: { nodeId: string; output: FlowNodeOutpu
</Box> </Box>
{description && <QuestionTip ml={1} label={t(description as any)} />} {description && <QuestionTip ml={1} label={t(description as any)} />}
<ValueTypeLabel valueType={valueType} valueDesc={valueDesc} /> <ValueTypeLabel valueType={valueType} valueDesc={valueDesc} />
{output.deprecated && (
<>
<Box flex={'1'} />
<MyTooltip label={t('app:Click_to_delete_this_field')}>
<Flex
px={1.5}
py={1}
bg={'adora.50'}
rounded={'6px'}
fontSize={'14px'}
cursor="pointer"
alignItems={'center'}
_hover={{
bg: 'adora.100'
}}
onClick={() => {
onChangeNode({
nodeId,
type: 'delOutput',
key: output.key
});
}}
>
<MyIcon name={'common/info'} color={'adora.600'} w={4} mr={1} />
<Box color={'adora.600'}>{t('app:Filed_is_deprecated')}</Box>
</Flex>
</MyTooltip>
</>
)}
</Flex> </Flex>
{output.type === FlowNodeOutputTypeEnum.source && ( {output.type === FlowNodeOutputTypeEnum.source && (
<SourceHandle <SourceHandle
......
projects/app/src/pages/api/core/app/create.ts
...@@ -5,7 +5,6 @@ import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils' ...@@ -5,7 +5,6 @@ import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'
import type { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import type { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { AppFolderTypeList } from '@fastgpt/global/core/app/constants'; import { AppFolderTypeList } from '@fastgpt/global/core/app/constants';
import type { AppSchema } from '@fastgpt/global/core/app/type'; import type { AppSchema } from '@fastgpt/global/core/app/type';
import { defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
import { type ShortUrlParams } from '@fastgpt/global/support/marketing/type'; import { type ShortUrlParams } from '@fastgpt/global/support/marketing/type';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
...@@ -125,8 +124,7 @@ export const onCreateApp = async ({ ...@@ -125,8 +124,7 @@ export const onCreateApp = async ({
chatConfig, chatConfig,
type, type,
version: 'v2', version: 'v2',
pluginData, pluginData
'pluginData.nodeVersion': defaultNodeVersion
} }
], ],
{ session, ordered: true } { session, ordered: true }
......
projects/app/src/pages/api/core/app/plugin/getPreviewNode.ts
...@@ -13,13 +13,13 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth'; ...@@ -13,13 +13,13 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants'; import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
export type GetPreviewNodeQuery = { appId: string }; export type GetPreviewNodeQuery = { appId: string; versionId?: string };
async function handler( async function handler(
req: ApiRequestProps<{}, GetPreviewNodeQuery>, req: ApiRequestProps<{}, GetPreviewNodeQuery>,
_res: NextApiResponse<any> _res: NextApiResponse<any>
): Promise<FlowNodeTemplateType> { ): Promise<FlowNodeTemplateType> {
const { appId } = req.query; const { appId, versionId } = req.query;
const { source } = await splitCombinePluginId(appId); const { source } = await splitCombinePluginId(appId);
...@@ -27,7 +27,7 @@ async function handler( ...@@ -27,7 +27,7 @@ async function handler(
await authApp({ req, authToken: true, appId, per: ReadPermissionVal }); await authApp({ req, authToken: true, appId, per: ReadPermissionVal });
} }
return getChildAppPreviewNode({ id: appId }); return getChildAppPreviewNode({ appId, versionId });
} }
export default NextAPI(handler); export default NextAPI(handler);
projects/app/src/pages/api/core/app/version/list.ts
...@@ -11,6 +11,7 @@ import { addSourceMember } from '@fastgpt/service/support/user/utils'; ...@@ -11,6 +11,7 @@ import { addSourceMember } from '@fastgpt/service/support/user/utils';
export type versionListBody = PaginationProps<{ export type versionListBody = PaginationProps<{
appId: string; appId: string;
isPublish?: boolean;
}>; }>;
export type versionListResponse = PaginationResponse<VersionListItemType>; export type versionListResponse = PaginationResponse<VersionListItemType>;
...@@ -19,16 +20,19 @@ async function handler( ...@@ -19,16 +20,19 @@ async function handler(
req: ApiRequestProps<versionListBody>, req: ApiRequestProps<versionListBody>,
_res: NextApiResponse<any> _res: NextApiResponse<any>
): Promise<versionListResponse> { ): Promise<versionListResponse> {
const { appId } = req.body; const { appId, isPublish } = req.body;
const { offset, pageSize } = parsePaginationRequest(req); const { offset, pageSize } = parsePaginationRequest(req);
await authApp({ appId, req, per: WritePermissionVal, authToken: true }); await authApp({ appId, req, per: WritePermissionVal, authToken: true });
const match = {
appId,
isPublish
};
const [result, total] = await Promise.all([ const [result, total] = await Promise.all([
(async () => { (async () => {
const versions = await MongoAppVersion.find({ const versions = await MongoAppVersion.find(match)
appId
})
.sort({ .sort({
time: -1 time: -1
}) })
...@@ -45,7 +49,7 @@ async function handler( ...@@ -45,7 +49,7 @@ async function handler(
})) }))
); );
})(), })(),
MongoAppVersion.countDocuments({ appId }) MongoAppVersion.countDocuments(match)
]); ]);
return { return {
......
projects/app/src/service/core/app/utils.ts
...@@ -146,7 +146,7 @@ export const checkNode = async ({ ...@@ -146,7 +146,7 @@ export const checkNode = async ({
}: { }: {
node: StoreNodeItemType; node: StoreNodeItemType;
ownerTmbId: string; ownerTmbId: string;
}) => { }): Promise<StoreNodeItemType> => {
const pluginId = node.pluginId; const pluginId = node.pluginId;
if (!pluginId) return node; if (!pluginId) return node;
...@@ -160,7 +160,7 @@ export const checkNode = async ({ ...@@ -160,7 +160,7 @@ export const checkNode = async ({
}); });
} }
const preview = await getChildAppPreviewNode({ id: pluginId }); const preview = await getChildAppPreviewNode({ appId: pluginId });
return { return {
...node, ...node,
pluginData: { pluginData: {
...@@ -175,7 +175,6 @@ export const checkNode = async ({ ...@@ -175,7 +175,6 @@ export const checkNode = async ({
} catch (error: any) { } catch (error: any) {
return { return {
...node, ...node,
isError: true,
pluginData: { pluginData: {
error error
} as PluginDataType } as PluginDataType
......
projects/app/src/web/core/app/api/plugin.ts
...@@ -7,7 +7,7 @@ import type { ...@@ -7,7 +7,7 @@ import type {
} from '@fastgpt/global/core/workflow/type/node'; } from '@fastgpt/global/core/workflow/type/node';
import { getMyApps } from '../api'; import { getMyApps } from '../api';
import type { ListAppBody } from '@/pages/api/core/app/list'; import type { ListAppBody } from '@/pages/api/core/app/list';
import { defaultNodeVersion, FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants'; import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
import type { GetPreviewNodeQuery } from '@/pages/api/core/app/plugin/getPreviewNode'; import type { GetPreviewNodeQuery } from '@/pages/api/core/app/plugin/getPreviewNode';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
...@@ -47,7 +47,7 @@ export const getTeamPlugTemplates = (data?: ListAppBody) => ...@@ -47,7 +47,7 @@ export const getTeamPlugTemplates = (data?: ListAppBody) =>
name: app.name, name: app.name,
intro: app.intro, intro: app.intro,
showStatus: false, showStatus: false,
version: app.pluginData?.nodeVersion || defaultNodeVersion, version: app.pluginData?.nodeVersion,
isTool: true, isTool: true,
sourceMember: app.sourceMember sourceMember: app.sourceMember
})) }))
......
projects/app/src/web/core/app/api/version.ts
...@@ -15,7 +15,7 @@ export const getAppLatestVersion = (data: getLatestVersionQuery) => ...@@ -15,7 +15,7 @@ export const getAppLatestVersion = (data: getLatestVersionQuery) =>
export const postPublishApp = (appId: string, data: PostPublishAppProps) => export const postPublishApp = (appId: string, data: PostPublishAppProps) =>
POST(`/core/app/version/publish?appId=${appId}`, data); POST(`/core/app/version/publish?appId=${appId}`, data);
export const getWorkflowVersionList = (data: PaginationProps<{ appId: string }>) => export const getAppVersionList = (data: PaginationProps<{ appId: string }>) =>
POST<versionListResponse>('/core/app/version/list', data); POST<versionListResponse>('/core/app/version/list', data);
export const getAppVersionDetail = (versionId: string, appId: string) => export const getAppVersionDetail = (versionId: string, appId: string) =>
......
projects/app/src/web/core/app/utils.ts
...@@ -7,7 +7,6 @@ import { ...@@ -7,7 +7,6 @@ import {
import { type StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node.d'; import { type StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node.d';
import { import {
chatHistoryValueDesc, chatHistoryValueDesc,
defaultNodeVersion,
FlowNodeInputTypeEnum, FlowNodeInputTypeEnum,
FlowNodeTypeEnum FlowNodeTypeEnum
} from '@fastgpt/global/core/workflow/node/constant'; } from '@fastgpt/global/core/workflow/node/constant';
...@@ -402,7 +401,6 @@ export function form2AppWorkflow( ...@@ -402,7 +401,6 @@ export function form2AppWorkflow(
y: 545 y: 545
}, },
// 这里不需要固定版本，给一个不存在的版本，每次都会用最新版 // 这里不需要固定版本，给一个不存在的版本，每次都会用最新版
version: defaultNodeVersion,
pluginData: tool.pluginData, pluginData: tool.pluginData,
inputs: tool.inputs.map((input) => { inputs: tool.inputs.map((input) => {
// Special key value // Special key value
......
projects/app/src/web/core/workflow/utils.ts
...@@ -9,8 +9,7 @@ import { ...@@ -9,8 +9,7 @@ import {
EDGE_TYPE, EDGE_TYPE,
FlowNodeInputTypeEnum, FlowNodeInputTypeEnum,
FlowNodeOutputTypeEnum, FlowNodeOutputTypeEnum,
FlowNodeTypeEnum, FlowNodeTypeEnum
defaultNodeVersion
} from '@fastgpt/global/core/workflow/node/constant'; } from '@fastgpt/global/core/workflow/node/constant';
import { EmptyNode } from '@fastgpt/global/core/workflow/template/system/emptyNode'; import { EmptyNode } from '@fastgpt/global/core/workflow/template/system/emptyNode';
import { type StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; import { type StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
...@@ -101,10 +100,8 @@ export const storeNode2FlowNode = ({ ...@@ -101,10 +100,8 @@ export const storeNode2FlowNode = ({
...template, ...template,
...storeNode, ...storeNode,
avatar: template.avatar ?? storeNode.avatar, avatar: template.avatar ?? storeNode.avatar,
version: storeNode.version ?? template.version ?? defaultNodeVersion, version: template.version || storeNode.version,
/* // template 中的输入必须都有
Inputs and outputs, New fields are added, not reduced
*/
inputs: templateInputs inputs: templateInputs
.map<FlowNodeInputItemType>((templateInput) => { .map<FlowNodeInputItemType>((templateInput) => {
const storeInput = const storeInput =
...@@ -113,10 +110,8 @@ export const storeNode2FlowNode = ({ ...@@ -113,10 +110,8 @@ export const storeNode2FlowNode = ({
return { return {
...storeInput, ...storeInput,
...templateInput, ...templateInput,
debugLabel: t(templateInput.debugLabel ?? (storeInput.debugLabel as any)), debugLabel: t(templateInput.debugLabel ?? (storeInput.debugLabel as any)),
toolDescription: t(templateInput.toolDescription ?? (storeInput.toolDescription as any)), toolDescription: t(templateInput.toolDescription ?? (storeInput.toolDescription as any)),
selectedTypeIndex: storeInput.selectedTypeIndex ?? templateInput.selectedTypeIndex, selectedTypeIndex: storeInput.selectedTypeIndex ?? templateInput.selectedTypeIndex,
value: storeInput.value, value: storeInput.value,
valueType: storeInput.valueType ?? templateInput.valueType, valueType: storeInput.valueType ?? templateInput.valueType,
...@@ -124,29 +119,29 @@ export const storeNode2FlowNode = ({ ...@@ -124,29 +119,29 @@ export const storeNode2FlowNode = ({
}; };
}) })
.concat( .concat(
/* Concat dynamic inputs */ // 合并 store 中有，template 中没有的输入
storeNode.inputs storeNode.inputs
.filter((item) => !templateInputs.find((input) => input.key === item.key)) .filter((item) => !templateInputs.find((input) => input.key === item.key))
.map((item) => { .map((item) => {
if (!dynamicInput) return item; if (!dynamicInput) return item;
const templateInput = template.inputs.find((input) => input.key === item.key);
return { return {
...item, ...item,
...getInputComponentProps(dynamicInput) ...getInputComponentProps(dynamicInput),
deprecated: templateInput?.deprecated
}; };
}) })
), ),
outputs: templateOutputs outputs: templateOutputs
.map<FlowNodeOutputItemType>((templateOutput) => { .map<FlowNodeOutputItemType>((templateOutput) => {
const storeOutput = const storeOutput =
template.outputs.find((item) => item.key === templateOutput.key) || templateOutput; storeNode.outputs.find((item) => item.key === templateOutput.key) || templateOutput;
return { return {
...storeOutput, ...storeOutput,
...templateOutput, ...templateOutput,
description: t(templateOutput.description ?? (storeOutput.description as any)), description: t(templateOutput.description ?? (storeOutput.description as any)),
id: storeOutput.id ?? templateOutput.id, id: storeOutput.id ?? templateOutput.id,
label: storeOutput.label ?? templateOutput.label, label: storeOutput.label ?? templateOutput.label,
value: storeOutput.value ?? templateOutput.value, value: storeOutput.value ?? templateOutput.value,
...@@ -154,9 +149,15 @@ export const storeNode2FlowNode = ({ ...@@ -154,9 +149,15 @@ export const storeNode2FlowNode = ({
}; };
}) })
.concat( .concat(
storeNode.outputs.filter( storeNode.outputs
(item) => !templateOutputs.find((output) => output.key === item.key) .filter((item) => !templateOutputs.find((output) => output.key === item.key))
) .map((item) => {
const templateOutput = template.outputs.find((output) => output.key === item.key);
return {
...item,
deprecated: templateOutput?.deprecated
};
})
) )
}; };
......
projects/app/test/cases/web/workflow/store2flow.deprecated.test.ts 0 → 100644
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
import { storeNode2FlowNode } from '@/web/core/workflow/utils';
import type { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
describe('storeNode2FlowNode with deprecated inputs/outputs', () => {
beforeEach(() => {
vi.mock('@fastgpt/global/core/workflow/template/constants', () => {
return {
moduleTemplatesFlat: [
{
flowNodeType: 'userInput',
name: 'User Input',
avatar: '',
intro: '',
version: '1.0',
inputs: [
{
key: 'deprecatedInput',
deprecated: true,
label: 'Deprecated Input',
renderTypeList: ['input'],
selectedTypeIndex: 0
}
],
outputs: [
{
key: 'deprecatedOutput',
id: 'deprecatedId',
type: 'input',
deprecated: true,
label: 'Deprecated Output'
}
]
}
]
};
});
});
afterEach(() => {
vi.resetAllMocks();
vi.resetModules();
});
it('should handle deprecated inputs and outputs', () => {
const storeNode = {
nodeId: 'node1',
flowNodeType: 'userInput' as FlowNodeTypeEnum,
position: { x: 0, y: 0 },
inputs: [
{
key: 'deprecatedInput',
value: 'old value',
renderTypeList: ['input'],
label: 'Deprecated Input'
}
],
outputs: [
{
key: 'deprecatedOutput',
id: 'deprecatedId',
type: 'input',
label: 'Deprecated Output'
}
],
name: 'Test Node',
version: '1.0'
};
const result = storeNode2FlowNode({
item: storeNode as any,
t: ((key: any) => key) as any
});
const deprecatedInput = result.data.inputs.find((input) => input.key === 'deprecatedInput');
expect(deprecatedInput).toBeDefined();
expect(deprecatedInput?.deprecated).toBe(true);
const deprecatedOutput = result.data.outputs.find(
(output) => output.key === 'deprecatedOutput'
);
expect(deprecatedOutput).toBeDefined();
expect(deprecatedOutput?.deprecated).toBe(true);
});
});
projects/app/test/cases/web/workflow/store2flow.version.test.ts 0 → 100644
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
import { storeNode2FlowNode } from '@/web/core/workflow/utils';
import type { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
describe('storeNode2FlowNode with version and avatar inheritance', () => {
beforeEach(() => {
vi.mock('@fastgpt/global/core/workflow/template/constants', () => {
return {
moduleTemplatesFlat: [
{
flowNodeType: 'userInput',
name: 'User Input',
avatar: 'template-avatar.png',
intro: '',
version: '2.0',
inputs: [],
outputs: []
}
]
};
});
vi.mock('@fastgpt/global/core/workflow/node/constant', () => {
return {
FlowNodeTypeEnum: { userInput: 'userInput' },
FlowNodeInputTypeEnum: {
addInputParam: 'addInputParam',
input: 'input',
reference: 'reference',
textarea: 'textarea',
numberInput: 'numberInput',
switch: 'switch',
select: 'select'
},
FlowNodeOutputTypeEnum: {
dynamic: 'dynamic',
static: 'static',
source: 'source',
hidden: 'hidden'
},
EDGE_TYPE: 'custom-edge',
chatHistoryValueDesc: 'chat history description',
datasetSelectValueDesc: 'dataset value description',
datasetQuoteValueDesc: 'dataset quote value description'
};
});
});
afterEach(() => {
vi.resetAllMocks();
vi.resetModules();
});
it('should handle version and avatar inheritance', () => {
// 测试场景1：storeNode没有version，使用template的version
const storeNode1 = {
nodeId: 'node1',
flowNodeType: 'userInput' as FlowNodeTypeEnum,
position: { x: 0, y: 0 },
inputs: [],
outputs: [],
name: 'Test Node 1'
};
// 测试场景2：storeNode没有avatar，使用template的avatar
const storeNode2 = {
nodeId: 'node2',
flowNodeType: 'userInput' as FlowNodeTypeEnum,
position: { x: 0, y: 0 },
inputs: [],
outputs: [],
name: 'Test Node 2',
version: '1.0'
};
// 测试场景3：storeNode和template都有avatar，使用template的avatar
const storeNode3 = {
nodeId: 'node3',
flowNodeType: 'userInput' as FlowNodeTypeEnum,
position: { x: 0, y: 0 },
inputs: [],
outputs: [],
name: 'Test Node 3',
version: '3.0',
avatar: 'store-avatar.png'
};
const result1 = storeNode2FlowNode({
item: storeNode1 as any,
t: ((key: any) => key) as any
});
const result2 = storeNode2FlowNode({
item: storeNode2 as any,
t: ((key: any) => key) as any
});
const result3 = storeNode2FlowNode({
item: storeNode3 as any,
t: ((key: any) => key) as any
});
// 验证版本继承关系
expect(result1.data.version).toBe('2.0'); // 使用template的version
expect(result2.data.version).toBe('2.0'); // 使用storeNode的version
expect(result3.data.version).toBe('2.0'); // 使用storeNode的version
// 验证avatar继承关系
expect(result1.data.avatar).toBe('template-avatar.png'); // 使用template的avatar
expect(result2.data.avatar).toBe('template-avatar.png'); // 使用template的avatar
expect(result3.data.avatar).toBe('template-avatar.png'); // 根据源码，应该使用template的avatar
});
});
scripts/openapi/openapi.ts
import { ApiType } from './type'; import type { ApiType } from './type';
type OpenAPIParameter = { type OpenAPIParameter = {
name: string; name: string;
......
test/cases/pages/api/support/mcp/server/toolList.test.ts
...@@ -20,7 +20,19 @@ vi.mock('@fastgpt/service/core/app/schema', () => ({ ...@@ -20,7 +20,19 @@ vi.mock('@fastgpt/service/core/app/schema', () => ({
lean: vi.fn() lean: vi.fn()
}) })
}, },
AppCollectionName: 'apps' AppCollectionName: 'apps',
chatConfigType: {
welcomeText: String,
variables: Array,
questionGuide: Object,
ttsConfig: Object,
whisperConfig: Object,
scheduledTriggerConfig: Object,
chatInputGuide: Object,
fileSelectConfig: Object,
instruction: String,
autoExecute: Object
}
})); }));
vi.mock('@fastgpt/service/core/app/version/controller', () => ({ vi.mock('@fastgpt/service/core/app/version/controller', () => ({
......
test/cases/web/core/app/utils.test.ts deleted 100644 → 0
import { describe, it, expect } from 'vitest';
import {
form2AppWorkflow,
filterSensitiveFormData,
getAppQGuideCustomURL
} from '@/web/core/app/utils';
import { getDefaultAppForm } from '@fastgpt/global/core/app/utils';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import type { AppSchema } from '@fastgpt/global/core/app/type';
describe('web/core/app/utils', () => {
const mockT = (text: string) => text;
describe('form2AppWorkflow', () => {
it('should generate simple chat workflow', () => {
const form = getDefaultAppForm();
const result = form2AppWorkflow(form, mockT);
expect(result.nodes).toHaveLength(3);
expect(result.edges).toHaveLength(1);
expect(result.chatConfig).toBeDefined();
});
it('should generate dataset workflow', () => {
const form = getDefaultAppForm();
form.dataset.datasets = ['dataset1'];
const result = form2AppWorkflow(form, mockT);
expect(result.nodes).toHaveLength(4);
expect(result.edges).toHaveLength(2);
});
it('should generate tools workflow', () => {
const form = getDefaultAppForm();
form.selectedTools = [
{
id: 'tool1',
name: 'Tool 1',
flowNodeType: FlowNodeTypeEnum.tools,
inputs: [],
outputs: []
}
];
const result = form2AppWorkflow(form, mockT);
expect(result.nodes.length).toBeGreaterThan(3);
expect(result.edges.length).toBeGreaterThan(1);
});
});
describe('filterSensitiveFormData', () => {
it('should filter sensitive data', () => {
const form = getDefaultAppForm();
form.dataset.datasets = ['sensitive'];
const result = filterSensitiveFormData(form);
expect(result.dataset).toEqual(getDefaultAppForm().dataset);
expect(result).not.toEqual(form);
});
});
describe('getAppQGuideCustomURL', () => {
it('should get custom URL from app detail', () => {
const appDetail = {
modules: [
{
flowNodeType: FlowNodeTypeEnum.systemConfig,
inputs: [
{
key: NodeInputKeyEnum.chatInputGuide,
value: {
customUrl: 'https://example.com'
}
}
]
}
]
} as AppSchema;
const result = getAppQGuideCustomURL(appDetail);
expect(result).toBe('https://example.com');
});
it('should return empty string if no custom URL', () => {
const appDetail = {
modules: [
{
flowNodeType: FlowNodeTypeEnum.systemConfig,
inputs: [
{
key: NodeInputKeyEnum.chatInputGuide,
value: {}
}
]
}
]
} as AppSchema;
const result = getAppQGuideCustomURL(appDetail);
expect(result).toBe('');
});
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment