Revert "feat:conversation variable support file array" (#21273)

api/core/workflow/nodes/variable_assigner/v2/constants.py

@@ -8,5 +8,4 @@ EMPTY_VALUE_MAPPING = {
     SegmentType.ARRAY_STRING: [],
     SegmentType.ARRAY_NUMBER: [],
     SegmentType.ARRAY_OBJECT: [],
-    SegmentType.ARRAY_FILE: [],
 }

api/core/workflow/nodes/variable_assigner/v2/helpers.py

@@ -1,6 +1,5 @@
 from typing import Any
 
-from core.file import File
 from core.variables import SegmentType
 
 from .enums import Operation
@@ -86,8 +85,6 @@ def is_input_value_valid(*, variable_type: SegmentType, operation: Operation, va
             return isinstance(value, int | float)
         case SegmentType.ARRAY_OBJECT if operation == Operation.APPEND:
             return isinstance(value, dict)
-        case SegmentType.ARRAY_FILE if operation == Operation.APPEND:
-            return isinstance(value, File)
 
         # Array & Extend / Overwrite
         case SegmentType.ARRAY_ANY if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
@@ -98,8 +95,6 @@ def is_input_value_valid(*, variable_type: SegmentType, operation: Operation, va
             return isinstance(value, list) and all(isinstance(item, int | float) for item in value)
         case SegmentType.ARRAY_OBJECT if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
             return isinstance(value, list) and all(isinstance(item, dict) for item in value)
-        case SegmentType.ARRAY_FILE if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
-            return isinstance(value, list) and all(isinstance(item, File) for item in value)
 
         case _:
             return False

api/factories/variable_factory.py

@@ -101,8 +101,6 @@ def _build_variable_from_mapping(*, mapping: Mapping[str, Any], selector: Sequen
             result = ArrayNumberVariable.model_validate(mapping)
         case SegmentType.ARRAY_OBJECT if isinstance(value, list):
             result = ArrayObjectVariable.model_validate(mapping)
-        case SegmentType.ARRAY_FILE if isinstance(value, list):
-            result = ArrayFileVariable.model_validate(mapping)
         case _:
             raise VariableError(f"not supported value type {value_type}")
     if result.size > dify_config.MAX_VARIABLE_SIZE:

web/app/components/workflow/panel/chat-variable-panel/components/variable-modal.tsx

@@ -37,7 +37,6 @@ const typeList = [
   ChatVarType.ArrayString,
   ChatVarType.ArrayNumber,
   ChatVarType.ArrayObject,
-  ChatVarType.ArrayFile,
 ]
 
 const objectPlaceholder = `#  example
@@ -128,7 +127,6 @@ const ChatVariableModal = ({
       case ChatVarType.ArrayString:
       case ChatVarType.ArrayNumber:
       case ChatVarType.ArrayObject:
-      case ChatVarType.ArrayFile:
         return value?.filter(Boolean) || []
     }
   }
@@ -296,7 +294,6 @@ const ChatVariableModal = ({
           </div>
         </div>
         {/* default value */}
-        {type !== ChatVarType.ArrayFile && (
         <div className='mb-4'>
           <div className='system-sm-semibold mb-1 flex h-6 items-center justify-between text-text-secondary'>
             <div>{t('workflow.chatVariable.modal.value')}</div>
@@ -375,7 +372,6 @@ const ChatVariableModal = ({
             )}
           </div>
         </div>
-        )}
         {/* description */}
         <div className=''>
           <div className='system-sm-semibold mb-1 flex h-6 items-center text-text-secondary'>{t('workflow.chatVariable.modal.description')}</div>

web/app/components/workflow/panel/chat-variable-panel/type.ts

@@ -5,5 +5,4 @@ export enum ChatVarType {
   ArrayString = 'array[string]',
   ArrayNumber = 'array[number]',
   ArrayObject = 'array[object]',
-  ArrayFile = 'array[file]',
 }