Merge branch 'feat/plugins' into dev/plugin-deploy

web/app/components/header/account-setting/model-provider-page/declarations.ts

@@ -116,7 +116,16 @@ export type CredentialFormSchemaBase = {
   scope?: string
 }
 
-export type CredentialFormSchemaTextInput = CredentialFormSchemaBase & { max_length?: number; placeholder?: TypeWithI18N }
+export type CredentialFormSchemaTextInput = CredentialFormSchemaBase & {
+  max_length?: number;
+  placeholder?: TypeWithI18N,
+  template?: {
+    enabled: boolean
+  },
+  auto_generate?: {
+    type: string
+  }
+}
 export type CredentialFormSchemaNumberInput = CredentialFormSchemaBase & { min?: number; max?: number; placeholder?: TypeWithI18N }
 export type CredentialFormSchemaSelect = CredentialFormSchemaBase & { options: FormOption[]; placeholder?: TypeWithI18N }
 export type CredentialFormSchemaRadio = CredentialFormSchemaBase & { options: FormOption[] }

web/app/components/header/account-setting/model-provider-page/model-selector/deprecated-model-trigger.tsx

@@ -22,22 +22,24 @@ const ModelTrigger: FC<ModelTriggerProps> = ({
 
   return (
     <div
-      className={cn('group flex flex-grow items-center p-[3px] pl-1 h-8 gap-1 rounded-lg bg-components-input-bg-disabled cursor-pointer', className)}
+      className={cn('group flex flex-grow box-content items-center p-[3px] pl-1 h-8 gap-1 rounded-lg bg-components-input-bg-disabled cursor-pointer', className)}
     >
-      <div className='flex items-center py-[1px] gap-1 grow'>
+      <div className='flex items-center w-full'>
-        <ModelIcon
+        <div className='flex items-center py-[1px] gap-1 min-w-0 flex-1'>
-          className="w-4 h-4"
+          <ModelIcon
-          provider={currentProvider}
+            className="w-4 h-4"
-          modelName={modelName}
+            provider={currentProvider}
-        />
+            modelName={modelName}
-        <div className='system-sm-regular text-components-input-text-filled truncate'>
+          />
-          {modelName}
+          <div className='system-sm-regular text-components-input-text-filled truncate'>
+            {modelName}
+          </div>
+        </div>
+        <div className='shrink-0 flex items-center justify-center'>
+          <Tooltip popupContent={t('common.modelProvider.deprecated')}>
+            <AlertTriangle className='w-4 h-4 text-text-warning-secondary' />
+          </Tooltip>
         </div>
-      </div>
-      <div className='shrink-0 flex items-center justify-center w-4 h-4'>
-        <Tooltip popupContent={t('common.modelProvider.deprecated')}>
-          <AlertTriangle className='w-4 h-4 text-text-warning-secondary' />
-        </Tooltip>
       </div>
     </div>
   )

web/app/components/workflow/nodes/_base/components/agent-strategy.tsx

@@ -1,4 +1,4 @@
-import type { CredentialFormSchemaNumberInput } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import type { CredentialFormSchemaNumberInput, CredentialFormSchemaTextInput } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { type CredentialFormSchema, FormTypeEnum, ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type { ToolVarInputs } from '../../tool/types'
 import ListEmpty from '@/app/components/base/list-empty'
@@ -19,7 +19,6 @@ import { useWorkflowStore } from '../../../store'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
 import type { NodeOutPutVar } from '../../../types'
 import type { Node } from 'reactflow'
-import { toType } from '@/app/components/tools/utils/to-form-schema'
 
 export type Strategy = {
   agent_strategy_provider_name: string
@@ -43,16 +42,8 @@ type CustomSchema<Type, Field = {}> = Omit<CredentialFormSchema, 'type'> & { typ
 
 type ToolSelectorSchema = CustomSchema<'tool-selector'>
 type MultipleToolSelectorSchema = CustomSchema<'array[tools]'>
-type StringSchema = CustomSchema<'string', {
-  template?: {
-    enabled: boolean
-  },
-  auto_generate?: {
-    type: string
-  }
-}>
 
-type CustomField = ToolSelectorSchema | MultipleToolSelectorSchema | StringSchema
+type CustomField = ToolSelectorSchema | MultipleToolSelectorSchema
 
 export const AgentStrategy = memo((props: AgentStrategyProps) => {
   const { strategy, onStrategyChange, formSchema, formValue, onFormValueChange, nodeOutputVars, availableNodes } = props
@@ -64,9 +55,48 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
     setControlPromptEditorRerenderKey,
   } = workflowStore.getState()
   const override: ComponentProps<typeof Form<CustomField>>['override'] = [
-    [FormTypeEnum.textNumber],
+    [FormTypeEnum.textNumber, FormTypeEnum.textInput],
     (schema, props) => {
       switch (schema.type) {
+        case FormTypeEnum.textInput: {
+          const def = schema as CredentialFormSchemaTextInput
+          const value = props.value[schema.variable]
+          const onChange = (value: string) => {
+            props.onChange({ ...props.value, [schema.variable]: value })
+          }
+          const handleGenerated = (value: string) => {
+            onChange(value)
+            setControlPromptEditorRerenderKey(Math.random())
+          }
+          return <Editor
+            value={value}
+            onChange={onChange}
+            onGenerated={handleGenerated}
+            title={renderI18nObject(schema.label)}
+            headerClassName='bg-transparent px-0 text-text-secondary system-sm-semibold-uppercase'
+            containerBackgroundClassName='bg-transparent'
+            gradientBorder={false}
+            isSupportPromptGenerator={!!def.auto_generate?.type}
+            titleTooltip={schema.tooltip && renderI18nObject(schema.tooltip)}
+            editorContainerClassName='px-0'
+            availableNodes={availableNodes}
+            nodesOutputVars={nodeOutputVars}
+            isSupportJinja={def.template?.enabled}
+            varList={[]}
+            modelConfig={
+              defaultModel.data
+                ? {
+                  mode: 'chat',
+                  name: defaultModel.data.model,
+                  provider: defaultModel.data.provider.provider,
+                  completion_params: {},
+                } : undefined
+            }
+            placeholderClassName='px-2 py-1'
+            titleClassName='system-sm-semibold-uppercase text-text-secondary text-[13px]'
+            inputClassName='px-2 py-1 bg-components-input-bg-normal focus:bg-components-input-bg-active focus:border-components-input-border-active focus:border rounded-lg'
+          />
+        }
         case FormTypeEnum.textNumber: {
           const def = schema as CredentialFormSchemaNumberInput
           if (!def.max || !def.min)
@@ -136,44 +166,6 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
           />
         )
       }
-      case 'string': {
-        const value = props.value[schema.variable]
-        const onChange = (value: string) => {
-          props.onChange({ ...props.value, [schema.variable]: value })
-        }
-        const handleGenerated = (value: string) => {
-          onChange(value)
-          setControlPromptEditorRerenderKey(Math.random())
-        }
-        return <Editor
-          value={value}
-          onChange={onChange}
-          onGenerated={handleGenerated}
-          title={renderI18nObject(schema.label)}
-          headerClassName='bg-transparent px-0 text-text-secondary system-sm-semibold-uppercase'
-          containerBackgroundClassName='bg-transparent'
-          gradientBorder={false}
-          isSupportPromptGenerator={!!schema.auto_generate?.type}
-          titleTooltip={schema.tooltip && renderI18nObject(schema.tooltip)}
-          editorContainerClassName='px-0'
-          availableNodes={availableNodes}
-          nodesOutputVars={nodeOutputVars}
-          isSupportJinja={schema.template?.enabled}
-          varList={[]}
-          modelConfig={
-            defaultModel.data
-              ? {
-                mode: 'chat',
-                name: defaultModel.data.model,
-                provider: defaultModel.data.provider.provider,
-                completion_params: {},
-              } : undefined
-          }
-          placeholderClassName='px-2 py-1'
-          titleClassName='system-sm-semibold-uppercase text-text-secondary text-[13px]'
-          inputClassName='px-2 py-1 bg-components-input-bg-normal focus:bg-components-input-bg-active focus:border-components-input-border-active focus:border rounded-lg'
-        />
-      }
     }
   }
   return <div className='space-y-2'>
@@ -182,18 +174,9 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
       strategy
         ? <div>
           <Form<CustomField>
-            formSchemas={[...formSchema, {
+            formSchemas={[
-              name: 'max_iteration',
+              ...formSchema,
-              type: toType('number'),
+            ]}
-              required: true,
-              label: {
-                en_US: 'Max Iteration',
-                zh_Hans: '最大迭代次数',
-                pt_BR: 'Max Iteration',
-              },
-              show_on: [],
-              variable: 'max-ite',
-            }]}
             value={formValue}
             onChange={onFormValueChange}
             validating={false}