Merge branch 'feat/rag-2' of https://github.com/langgenius/dify into feat/rag-2

web/app/components/base/prompt-editor/plugins/workflow-variable-block/component.tsx

@@ -62,7 +62,7 @@ const WorkflowVariableBlockComponent = ({
     }
   )()
   const [localWorkflowNodesMap, setLocalWorkflowNodesMap] = useState<WorkflowNodesMap>(workflowNodesMap)
-  const node = localWorkflowNodesMap![variables[0]]
+  const node = localWorkflowNodesMap![variables[isRagVar ? 1 : 0]]
   const isEnv = isENV(variables)
   const isChatVar = isConversationVar(variables)
   const isException = isExceptionVariable(varName, node?.type)
@@ -76,6 +76,9 @@ const WorkflowVariableBlockComponent = ({
     if (conversationVariables)
       variableValid = conversationVariables.some(v => v.variable === `${variables?.[0] ?? ''}.${variables?.[1] ?? ''}`)
   }
+  else if (isRagVar) {
+    variableValid = !!node || (variables[0] === 'rag' && variables[1] === 'shared')
+  }
   else {
     variableValid = !!node
   }

web/app/components/workflow/nodes/_base/components/variable-tag.tsx

@@ -27,18 +27,18 @@ const VariableTag = ({
   availableNodes,
 }: VariableTagProps) => {
   const nodes = useNodes<CommonNodeType>()
+  const isRagVar = isRagVariableVar(valueSelector)
   const node = useMemo(() => {
     if (isSystemVar(valueSelector)) {
       const startNode = availableNodes?.find(n => n.data.type === BlockEnum.Start)
       if (startNode)
         return startNode
     }
-    return getNodeInfoById(availableNodes || nodes, valueSelector[0])
+    return getNodeInfoById(availableNodes || nodes, isRagVar ? valueSelector[1] : valueSelector[0])
-  }, [nodes, valueSelector, availableNodes])
+  }, [nodes, valueSelector, availableNodes, isRagVar])
 
   const isEnv = isENV(valueSelector)
   const isChatVar = isConversationVar(valueSelector)
-  const isRagVar = isRagVariableVar(valueSelector)
   const isValid = Boolean(node) || isEnv || isChatVar || isRagVar
 
   const variableName = isSystemVar(valueSelector) ? valueSelector.slice(0).join('.') : valueSelector.slice(1).join('.')

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

@@ -390,8 +390,9 @@ const VarReferencePicker: FC<Props> = ({
     if (isEnv) return 'environment'
     if (isChatVar) return 'conversation'
     if (isLoopVar) return 'loop'
+    if (isRagVar) return 'rag'
     return 'system'
-  }, [isEnv, isChatVar, isLoopVar])
+  }, [isEnv, isChatVar, isLoopVar, isRagVar])
 
   return (
     <div className={cn(className, !readonly && 'cursor-pointer')}>

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

@@ -135,8 +135,9 @@ const Item: FC<ItemProps> = ({
     if (isEnv) return 'environment'
     if (isChatVar) return 'conversation'
     if (isLoopVar) return 'loop'
+    if (isRagVariable) return 'rag'
     return 'system'
-  }, [isEnv, isChatVar, isSys, isLoopVar])
+  }, [isEnv, isChatVar, isSys, isLoopVar, isRagVariable])
   return (
     <PortalToFollowElem
       open={open}
@@ -159,7 +160,7 @@ const Item: FC<ItemProps> = ({
               variableCategory={variableCategory}
               isExceptionVariable={isException}
             />
-            {!isEnv && !isChatVar && (
+            {!isEnv && !isChatVar && !isRagVariable && (
               <div title={itemData.variable} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable}</div>
             )}
             {isEnv && (

web/app/components/workflow/nodes/_base/components/variable/variable-label/hooks.ts

@@ -2,9 +2,11 @@ import { useMemo } from 'react'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
 import { BubbleX, Env } from '@/app/components/base/icons/src/vender/line/others'
 import { Loop } from '@/app/components/base/icons/src/vender/workflow'
+import { InputField } from '@/app/components/base/icons/src/vender/pipeline'
 import {
   isConversationVar,
   isENV,
+  isRagVariableVar,
   isSystemVar,
 } from '../utils'
 import { VarInInspectType } from '@/types/workflow'
@@ -13,6 +15,9 @@ export const useVarIcon = (variables: string[], variableCategory?: VarInInspectT
   if (variableCategory === 'loop')
     return Loop
 
+  if (variableCategory === 'rag' || isRagVariableVar(variables))
+    return InputField
+
   if (isENV(variables) || variableCategory === VarInInspectType.environment || variableCategory === 'environment')
     return Env
 
@@ -41,7 +46,11 @@ export const useVarColor = (variables: string[], isExceptionVariable?: boolean,
 }
 
 export const useVarName = (variables: string[], notShowFullPath?: boolean) => {
-  const variableFullPathName = variables.slice(1).join('.')
+  let variableFullPathName = variables.slice(1).join('.')
+
+  if (isRagVariableVar(variables))
+    variableFullPathName = variables.slice(2).join('.')
+
   const variablesLength = variables.length
   const varName = useMemo(() => {
     const isSystem = isSystemVar(variables)