merge main

web/app/components/workflow/nodes/tool/components/input-var-list.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'
 import type { ToolVarInputs } from '../types'
 import { VarType as VarKindType } from '../types'
 import cn from '@/utils/classnames'
-import type { ValueSelector, Var } from '@/app/components/workflow/types'
+import type { ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types'
 import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
@@ -17,6 +17,7 @@ import { VarType } from '@/app/components/workflow/types'
 import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
 import { noop } from 'lodash-es'
+import type { Tool } from '@/app/components/tools/types'
 
 type Props = {
   readOnly: boolean
@@ -27,6 +28,8 @@ type Props = {
   onOpen?: (index: number) => void
   isSupportConstantValue?: boolean
   filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
+  currentTool?: Tool
+  currentProvider?: ToolWithProvider
 }
 
 const InputVarList: FC<Props> = ({
@@ -38,6 +41,8 @@ const InputVarList: FC<Props> = ({
   onOpen = noop,
   isSupportConstantValue,
   filterVar,
+  currentTool,
+  currentProvider,
 }) => {
   const language = useLanguage()
   const { t } = useTranslation()
@@ -58,6 +63,8 @@ const InputVarList: FC<Props> = ({
       return 'ModelSelector'
     else if (type === FormTypeEnum.toolSelector)
       return 'ToolSelector'
+    else if (type === FormTypeEnum.dynamicSelect || type === FormTypeEnum.select)
+      return 'Select'
     else
       return 'String'
   }
@@ -149,6 +156,7 @@ const InputVarList: FC<Props> = ({
   const handleOpen = useCallback((index: number) => {
     return () => onOpen(index)
   }, [onOpen])
+
   return (
     <div className='space-y-3'>
       {
@@ -163,7 +171,8 @@ const InputVarList: FC<Props> = ({
           } = schema
           const varInput = value[variable]
           const isNumber = type === FormTypeEnum.textNumber
-          const isSelect = type === FormTypeEnum.select
+          const isDynamicSelect = type === FormTypeEnum.dynamicSelect
+          const isSelect = type === FormTypeEnum.select || type === FormTypeEnum.dynamicSelect
           const isFile = type === FormTypeEnum.file || type === FormTypeEnum.files
           const isAppSelector = type === FormTypeEnum.appSelector
           const isModelSelector = type === FormTypeEnum.modelSelector
@@ -198,11 +207,13 @@ const InputVarList: FC<Props> = ({
                   value={varInput?.type === VarKindType.constant ? (varInput?.value ?? '') : (varInput?.value ?? [])}
                   onChange={handleNotMixedTypeChange(variable)}
                   onOpen={handleOpen(index)}
-                  defaultVarKindType={varInput?.type || (isNumber ? VarKindType.constant : VarKindType.variable)}
+                  defaultVarKindType={varInput?.type || ((isNumber || isDynamicSelect) ? VarKindType.constant : VarKindType.variable)}
                   isSupportConstantValue={isSupportConstantValue}
                   filterVar={isNumber ? filterVar : undefined}
                   availableVars={isSelect ? availableVars : undefined}
                   schema={schema}
+                  currentTool={currentTool}
+                  currentProvider={currentProvider}
                 />
               )}
               {isFile && (

web/app/components/workflow/nodes/tool/panel.tsx

@@ -42,6 +42,7 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
     isLoading,
     outputSchema,
     hasObjectOutput,
+    currTool,
   } = useConfig(id, data)
 
   if (isLoading) {
@@ -80,6 +81,8 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
                 filterVar={filterVar}
                 isSupportConstantValue
                 onOpen={handleOnVarOpen}
+                currentProvider={currCollection}
+                currentTool={currTool}
               />
             </Field>
           )}