chore: schema type change

web/app/components/workflow/nodes/_base/components/variable/utils.ts

@@ -221,7 +221,7 @@ const findExceptVarInObject = (obj: any, filterVar: (payload: Var, selector: Val
     variable: obj.variable,
     type: isFile ? VarType.file : VarType.object,
     children: childrenResult,
-    alias: obj.alias,
+    schemaType: obj.schemaType,
   }
 
   return res

web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx

@@ -79,6 +79,7 @@ type Props = {
   zIndex?: number
   currentTool?: Tool
   currentProvider?: ToolWithProvider
+  preferSchemaType?: boolean
 }
 
 const DEFAULT_VALUE_SELECTOR: Props['value'] = []
@@ -111,6 +112,7 @@ const VarReferencePicker: FC<Props> = ({
   zIndex,
   currentTool,
   currentProvider,
+  preferSchemaType,
 }) => {
   const { t } = useTranslation()
   const store = useStoreApi()
@@ -562,6 +564,7 @@ const VarReferencePicker: FC<Props> = ({
               itemWidth={isAddBtnTrigger ? 260 : (minWidth || triggerWidth)}
               isSupportFileVar={isSupportFileVar}
               zIndex={zIndex}
+              preferSchemaType={preferSchemaType}
             />
           )}
         </PortalToFollowElemContent>

web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx

@@ -15,6 +15,7 @@ type Props = {
   itemWidth?: number
   isSupportFileVar?: boolean
   zIndex?: number
+  preferSchemaType?: boolean
 }
 const VarReferencePopup: FC<Props> = ({
   vars,
@@ -23,6 +24,7 @@ const VarReferencePopup: FC<Props> = ({
   itemWidth,
   isSupportFileVar = true,
   zIndex,
+  preferSchemaType,
 }) => {
   const { t } = useTranslation()
   const pipelineId = useStore(s => s.pipelineId)
@@ -69,6 +71,7 @@ const VarReferencePopup: FC<Props> = ({
           zIndex={zIndex}
           showManageInputField={showManageRagInputFields}
           onManageInputField={() => setShowInputFieldPanel?.(true)}
+          preferSchemaType={preferSchemaType}
         />
       }
     </div >

web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx

@@ -34,6 +34,7 @@ type ObjectChildrenProps = {
   onHovering?: (value: boolean) => void
   itemWidth?: number
   isSupportFileVar?: boolean
+  preferSchemaType?: boolean
 }
 
 type ItemProps = {
@@ -51,6 +52,7 @@ type ItemProps = {
   isInCodeGeneratorInstructionEditor?: boolean
   zIndex?: number
   className?: string
+  preferSchemaType?: boolean
 }
 
 const objVarTypes = [VarType.object, VarType.file]
@@ -69,6 +71,7 @@ const Item: FC<ItemProps> = ({
   isInCodeGeneratorInstructionEditor,
   zIndex,
   className,
+  preferSchemaType,
 }) => {
   const isStructureOutput = itemData.type === VarType.object && (itemData.children as StructuredOutput)?.schema?.properties
   const isFile = itemData.type === VarType.file && !isStructureOutput
@@ -211,7 +214,7 @@ const Item: FC<ItemProps> = ({
               <div title={itemData.des} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable.split('.').slice(-1)[0]}</div>
             )}
           </div>
-          <div className='ml-1 shrink-0 text-xs font-normal capitalize text-text-tertiary'>{itemData.alias || itemData.type}</div>
+          <div className='ml-1 shrink-0 text-xs font-normal capitalize text-text-tertiary'>{(preferSchemaType && itemData.schemaType) ? itemData.schemaType : itemData.type}</div>
           {
             (isObj || isStructureOutput) && (
               <ChevronRight className={cn('ml-0.5 h-3 w-3 text-text-quaternary', isHovering && 'text-text-tertiary')} />
@@ -224,7 +227,7 @@ const Item: FC<ItemProps> = ({
       }}>
         {(isStructureOutput || isObj) && (
           <PickerStructurePanel
-            root={{ nodeId, nodeName: title, attrName: itemData.variable, attrAlias: itemData.alias }}
+            root={{ nodeId, nodeName: title, attrName: itemData.variable, attrAlias: itemData.schemaType }}
             payload={structuredOutput!}
             onHovering={setIsChildrenHovering}
             onSelect={(valueSelector) => {
@@ -246,6 +249,7 @@ const ObjectChildren: FC<ObjectChildrenProps> = ({
   onHovering,
   itemWidth,
   isSupportFileVar,
+  preferSchemaType,
 }) => {
   const currObjPath = objPath
   const itemRef = useRef<HTMLDivElement>(null)
@@ -290,6 +294,7 @@ const ObjectChildren: FC<ObjectChildrenProps> = ({
             onHovering={setIsChildrenHovering}
             isSupportFileVar={isSupportFileVar}
             isException={v.isException}
+            preferSchemaType={preferSchemaType}
           />
         ))
       }
@@ -312,6 +317,7 @@ type Props = {
   showManageInputField?: boolean
   onManageInputField?: () => void
   autoFocus?: boolean
+  preferSchemaType?: boolean
 }
 const VarReferenceVars: FC<Props> = ({
   hideSearch,
@@ -328,6 +334,7 @@ const VarReferenceVars: FC<Props> = ({
   showManageInputField,
   onManageInputField,
   autoFocus = true,
+  preferSchemaType,
 }) => {
   const { t } = useTranslation()
   const [searchText, setSearchText] = useState('')
@@ -417,6 +424,7 @@ const VarReferenceVars: FC<Props> = ({
                     isFlat={item.isFlat}
                     isInCodeGeneratorInstructionEditor={isInCodeGeneratorInstructionEditor}
                     zIndex={zIndex}
+                    preferSchemaType={preferSchemaType}
                   />
                 ))}
                 {item.isFlat && !filteredVars[i + 1]?.isFlat && !!filteredVars.find(item => !item.isFlat) && (

web/app/components/workflow/nodes/knowledge-base/panel.tsx

@@ -6,7 +6,6 @@ import {
 import { useTranslation } from 'react-i18next'
 import type { KnowledgeBaseNodeType } from './types'
 import {
-  ChunkStructureEnum,
   IndexMethodEnum,
 } from './types'
 import ChunkStructure from './components/chunk-structure'
@@ -24,7 +23,6 @@ import Split from '../_base/components/split'
 import { useNodesReadOnly } from '@/app/components/workflow/hooks'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
 import type { Var } from '@/app/components/workflow/types'
-import { CHUNK_TYPE_MAP } from '@/app/components/workflow/utils/tool'
 
 const Panel: FC<NodePanelProps<KnowledgeBaseNodeType>> = ({
   id,
@@ -48,13 +46,9 @@ const Panel: FC<NodePanelProps<KnowledgeBaseNodeType>> = ({
   } = useConfig(id)
 
   const filterVar = useCallback((variable: Var) => {
-    if (data.chunk_structure === ChunkStructureEnum.general && variable.alias === CHUNK_TYPE_MAP.general_chunks)
+    // console.log(variable.schemaType)
-      return true
+    // return variable.schemaType === 'aaa'
-    if (data.chunk_structure === ChunkStructureEnum.parent_child && variable.alias === CHUNK_TYPE_MAP.parent_child_chunks)
+    return true
-      return true
-    if (data.chunk_structure === ChunkStructureEnum.question_answer && variable.alias === CHUNK_TYPE_MAP.qa_chunks)
-      return true
-    return false
   }, [data.chunk_structure])
 
   return (
@@ -78,6 +72,7 @@ const Panel: FC<NodePanelProps<KnowledgeBaseNodeType>> = ({
           filterVar={filterVar}
           isFilterFileVar
           isSupportFileVar={false}
+          preferSchemaType
         />
       </BoxGroupField>
       <Group

web/app/components/workflow/types.ts

@@ -305,7 +305,7 @@ export type Var = {
   isLoopVariable?: boolean
   nodeId?: string
   isRagVariable?: boolean
-  alias?: string
+  schemaType?: string
 }
 
 export type NodeOutPutVar = {