diff --git a/api/core/agent/plugin_entities.py b/api/core/agent/plugin_entities.py index 308aea9c5d..691737b86a 100644 --- a/api/core/agent/plugin_entities.py +++ b/api/core/agent/plugin_entities.py @@ -41,7 +41,7 @@ class AgentStrategyParameter(PluginParameter): APP_SELECTOR = CommonParameterType.APP_SELECTOR.value MODEL_SELECTOR = CommonParameterType.MODEL_SELECTOR.value TOOLS_SELECTOR = CommonParameterType.TOOLS_SELECTOR.value - VAR_SELECTOR = CommonParameterType.VAR_SELECTOR.value + ANY = CommonParameterType.ANY.value # deprecated, should not use. SYSTEM_FILES = CommonParameterType.SYSTEM_FILES.value diff --git a/api/core/entities/parameter_entities.py b/api/core/entities/parameter_entities.py index 013e874306..e5282b1cbe 100644 --- a/api/core/entities/parameter_entities.py +++ b/api/core/entities/parameter_entities.py @@ -14,7 +14,7 @@ class CommonParameterType(StrEnum): APP_SELECTOR = "app-selector" MODEL_SELECTOR = "model-selector" TOOLS_SELECTOR = "array[tools]" - VAR_SELECTOR = "var-selector" + ANY = "any" # TOOL_SELECTOR = "tool-selector" diff --git a/api/core/plugin/entities/parameters.py b/api/core/plugin/entities/parameters.py index 9ee1b5cfb9..9c99d67c0c 100644 --- a/api/core/plugin/entities/parameters.py +++ b/api/core/plugin/entities/parameters.py @@ -36,7 +36,7 @@ class PluginParameterType(enum.StrEnum): APP_SELECTOR = CommonParameterType.APP_SELECTOR.value MODEL_SELECTOR = CommonParameterType.MODEL_SELECTOR.value TOOLS_SELECTOR = CommonParameterType.TOOLS_SELECTOR.value - VAR_SELECTOR = CommonParameterType.VAR_SELECTOR.value + ANY = CommonParameterType.ANY.value # deprecated, should not use. SYSTEM_FILES = CommonParameterType.SYSTEM_FILES.value @@ -136,7 +136,7 @@ def cast_parameter_value(typ: enum.StrEnum, value: Any, /): if value and not isinstance(value, list): raise ValueError("The tools selector must be a list.") return value - case PluginParameterType.VAR_SELECTOR: + case PluginParameterType.ANY: if value and not isinstance(value, str | dict | list | NumberType): raise ValueError("The var selector must be a string, dictionary, list or number.") return value diff --git a/api/core/tools/entities/tool_entities.py b/api/core/tools/entities/tool_entities.py index b72103490d..5ffcb4bc5e 100644 --- a/api/core/tools/entities/tool_entities.py +++ b/api/core/tools/entities/tool_entities.py @@ -246,7 +246,7 @@ class ToolParameter(PluginParameter): FILES = PluginParameterType.FILES.value APP_SELECTOR = PluginParameterType.APP_SELECTOR.value MODEL_SELECTOR = PluginParameterType.MODEL_SELECTOR.value - VAR_SELECTOR = PluginParameterType.VAR_SELECTOR.value + ANY = PluginParameterType.ANY.value # deprecated, should not use. SYSTEM_FILES = PluginParameterType.SYSTEM_FILES.value diff --git a/web/app/components/header/account-setting/model-provider-page/declarations.ts b/web/app/components/header/account-setting/model-provider-page/declarations.ts index 4f2f9fc1f0..caf34131b7 100644 --- a/web/app/components/header/account-setting/model-provider-page/declarations.ts +++ b/web/app/components/header/account-setting/model-provider-page/declarations.ts @@ -19,7 +19,7 @@ export enum FormTypeEnum { toolSelector = 'tool-selector', multiToolSelector = 'array[tools]', appSelector = 'app-selector', - varSelector = 'var-selector', + any = 'any', } export type FormOption = { diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx index 85f04013ec..14a56ca27b 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx @@ -410,7 +410,7 @@ function Form< ) } - if (formSchema.type === FormTypeEnum.varSelector) { + if (formSchema.type === FormTypeEnum.any) { const { variable, label, required, scope, } = formSchema as (CredentialFormSchemaTextInput | CredentialFormSchemaSecretInput) diff --git a/web/app/components/workflow/nodes/agent/use-config.ts b/web/app/components/workflow/nodes/agent/use-config.ts index 8026b0e1d0..5ecf1657f6 100644 --- a/web/app/components/workflow/nodes/agent/use-config.ts +++ b/web/app/components/workflow/nodes/agent/use-config.ts @@ -96,7 +96,7 @@ const useConfig = (id: string, payload: AgentNodeType) => { const getParamVarType = useCallback((paramName: string) => { const isVariable = currentStrategy?.parameters.some( - param => param.name === paramName && param.type === FormTypeEnum.varSelector, + param => param.name === paramName && param.type === FormTypeEnum.any, ) if (isVariable) return VarType.variable return VarType.constant