feat: tools vars limit

langgenius · Mar 15, 2024 · 5ee7fc4 · 5ee7fc4
1 parent 338dd1c
commit 5ee7fc4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/web/app/components/workflow/nodes/tool/components/input-var-list.tsx b/web/app/components/workflow/nodes/tool/components/input-var-list.tsx
@@ -4,7 +4,7 @@ import React, { useCallback } from 'react'
 import produce from 'immer'
 import type { ToolVarInput } from '../types'
 import { VarType as VarKindType } from '../types'
-import { type ValueSelector } from '@/app/components/workflow/types'
+import type { 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 @@ type Props = {
   value: ToolVarInput[]
   onChange: (value: ToolVarInput[]) => void
   isSupportConstantValue?: boolean
+  filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
 }
 
 const InputVarList: FC<Props> = ({
@@ -26,6 +27,7 @@ const InputVarList: FC<Props> = ({
   value,
   onChange,
   isSupportConstantValue,
+  filterVar,
 }) => {
   const language = useLanguage()
 
@@ -92,6 +94,7 @@ const InputVarList: FC<Props> = ({
                 onChange={handleChange(variable)}
                 isSupportConstantValue={isSupportConstantValue}
                 defaultVarKindType={varInput?.variable_type}
+                filterVar={filterVar}
               />
               {tooltip && <div className='leading-[18px] text-xs font-normal text-gray-600'>{tooltip[language] || tooltip.en_US}</div>}
             </div>

diff --git a/web/app/components/workflow/nodes/tool/panel.tsx b/web/app/components/workflow/nodes/tool/panel.tsx
@@ -28,6 +28,7 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
     inputs,
     toolInputVarSchema,
     setInputVar,
+    filterVar,
     toolSettingSchema,
     toolSettingValue,
     setToolSettingValue,
@@ -80,6 +81,7 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
                 schema={toolInputVarSchema as any}
                 value={inputs.tool_parameters}
                 onChange={setInputVar}
+                filterVar={filterVar}
                 isSupportConstantValue
               />
             </Field>

diff --git a/web/app/components/workflow/nodes/tool/use-config.ts b/web/app/components/workflow/nodes/tool/use-config.ts
@@ -12,10 +12,9 @@ import { fetchBuiltInToolList, fetchCollectionList, fetchCustomToolList, updateB
 import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
 import Toast from '@/app/components/base/toast'
 import type { Props as FormProps } from '@/app/components/workflow/nodes/_base/components/before-run-form/form'
-import { InputVarType } from '@/app/components/workflow/types'
-import type { InputVar } from '@/app/components/workflow/types'
+import { InputVarType, VarType as VarVarType } from '@/app/components/workflow/types'
+import type { InputVar, Var } from '@/app/components/workflow/types'
 import useOneStepRun from '@/app/components/workflow/nodes/_base/hooks/use-one-step-run'
-
 const useConfig = (id: string, payload: ToolNodeType) => {
   const { t } = useTranslation()
   const language = useLanguage()
@@ -27,7 +26,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
   * tool_configurations: tool setting, not dynamic setting
   * tool_parameters: tool dynamic setting(by user)
   */
-  const { provider_id, provider_name, provider_type, tool_name, tool_configurations, tool_parameters: toolInputs } = inputs
+  const { provider_id, provider_name, provider_type, tool_name, tool_configurations } = inputs
   const isBuiltIn = provider_type === CollectionType.builtIn
   const [currCollection, setCurrCollection] = useState<Collection | null | undefined>(null)
   const fetchCurrCollection = useCallback(async () => {
@@ -43,6 +42,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
       return
 
     fetchCurrCollection()
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [provider_id])
 
   // Auth
@@ -63,7 +63,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     })
     await fetchCurrCollection()
     hideSetAuthModal()
-  }, [currCollection])
+  }, [currCollection?.name, fetchCurrCollection, hideSetAuthModal, t])
 
   const [currTool, setCurrTool] = useState<Tool | null>(null)
   const formSchemas = currTool ? toolParametersToFormSchemas(currTool.parameters) : []
@@ -94,6 +94,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
       })
     })
     setInputs(inputsWithDefaultValue)
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currTool])
 
   // setting when call
@@ -104,6 +105,11 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     })
   }, [inputs, setInputs])
 
+  // TODO: dynamic setting as the current var type
+  const filterVar = useCallback((varPayload: Var) => {
+    return varPayload.type !== VarVarType.arrayFile
+  }, [])
+
   const isLoading = currTool && (isBuiltIn ? !currCollection : false)
 
   useEffect(() => {
@@ -123,6 +129,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
       if (currTool)
         setCurrTool(currTool)
     })()
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [provider_name])
 
   // single run
@@ -149,13 +156,13 @@ const useConfig = (id: string, payload: ToolNodeType) => {
   const singleRunForms = (() => {
     const formInputs: InputVar[] = []
     toolInputVarSchema.forEach((item: any) => {
-      const targetItem = toolInputs.find(input => input.variable === item.variable)
+      // const targetItem = toolInputs.find(input => input.variable === item.variable)
       // TODO: support selector
       // if (targetItem?.variable_type === VarType.selector) {
       formInputs.push({
         label: item.label[language] || item.label.en_US,
         variable: item.variable,
-        type: InputVarType.textInput,
+        type: InputVarType.textInput, // TODO: to form input
         required: item.required,
       })
       // }
@@ -176,6 +183,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     setToolSettingValue,
     toolInputVarSchema,
     setInputVar,
+    filterVar,
     currCollection,
     isShowAuthBtn,
     showSetAuth,