Merge branch 'main' into feat/memory-orchestration-fed

web/app/components/workflow/hooks/use-checklist.ts

@@ -42,6 +42,9 @@ import { fetchDatasets } from '@/service/datasets'
 import { MAX_TREE_DEPTH } from '@/config'
 import useNodesAvailableVarList, { useGetNodesAvailableVarList } from './use-nodes-available-var-list'
 import { getNodeUsedVars, isSpecialVar } from '../nodes/_base/components/variable/utils'
+import { useModelList } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import type { KnowledgeBaseNodeType } from '../nodes/knowledge-base/types'
 
 export const useChecklist = (nodes: Node[], edges: Edge[]) => {
   const { t } = useTranslation()
@@ -57,6 +60,8 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
   const getToolIcon = useGetToolIcon()
 
   const map = useNodesAvailableVarList(nodes)
+  const { data: embeddingModelList } = useModelList(ModelTypeEnum.textEmbedding)
+  const { data: rerankModelList } = useModelList(ModelTypeEnum.rerank)
 
   const getCheckData = useCallback((data: CommonNodeType<{}>) => {
     let checkData = data
@@ -72,8 +77,15 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
         _datasets,
       } as CommonNodeType<KnowledgeRetrievalNodeType>
     }
+    else if (data.type === BlockEnum.KnowledgeBase) {
+      checkData = {
+        ...data,
+        _embeddingModelList: embeddingModelList,
+        _rerankModelList: rerankModelList,
+      } as CommonNodeType<KnowledgeBaseNodeType>
+    }
     return checkData
-  }, [datasetsDetail])
+  }, [datasetsDetail, embeddingModelList, rerankModelList])
 
   const needWarningNodes = useMemo(() => {
     const list = []
@@ -180,6 +192,8 @@ export const useChecklistBeforePublish = () => {
   const { getStartNodes } = useWorkflow()
   const workflowStore = useWorkflowStore()
   const { getNodesAvailableVarList } = useGetNodesAvailableVarList()
+  const { data: embeddingModelList } = useModelList(ModelTypeEnum.textEmbedding)
+  const { data: rerankModelList } = useModelList(ModelTypeEnum.rerank)
 
   const getCheckData = useCallback((data: CommonNodeType<{}>, datasets: DataSet[]) => {
     let checkData = data
@@ -199,6 +213,13 @@ export const useChecklistBeforePublish = () => {
         _datasets,
       } as CommonNodeType<KnowledgeRetrievalNodeType>
     }
+    else if (data.type === BlockEnum.KnowledgeBase) {
+      checkData = {
+        ...data,
+        _embeddingModelList: embeddingModelList,
+        _rerankModelList: rerankModelList,
+      } as CommonNodeType<KnowledgeBaseNodeType>
+    }
     return checkData
   }, [])
 

web/app/components/workflow/nodes/knowledge-base/components/embedding-model.tsx

@@ -57,6 +57,7 @@ const EmbeddingModel = ({
         modelList={embeddingModelList}
         onSelect={handleEmbeddingModelChange}
         readonly={readonly}
+        showDeprecatedWarnIcon
       />
     </Field>
   )

web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.tsx

@@ -44,6 +44,7 @@ const RerankingModelSelector = ({
       modelList={rerankModelList}
       onSelect={handleRerankingModelChange}
       readonly={readonly}
+      showDeprecatedWarnIcon
     />
   )
 }

web/app/components/workflow/nodes/knowledge-base/default.ts

@@ -31,6 +31,8 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
       embedding_model,
       embedding_model_provider,
       index_chunk_variable_selector,
+      _embeddingModelList,
+      _rerankModelList,
     } = payload
 
     const {
@@ -39,6 +41,12 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
       reranking_model,
     } = retrieval_model || {}
 
+    const currentEmbeddingModelProvider = _embeddingModelList?.find(provider => provider.provider === embedding_model_provider)
+    const currentEmbeddingModel = currentEmbeddingModelProvider?.models.find(model => model.model === embedding_model)
+
+    const currentRerankingModelProvider = _rerankModelList?.find(provider => provider.provider === reranking_model?.reranking_provider_name)
+    const currentRerankingModel = currentRerankingModelProvider?.models.find(model => model.model === reranking_model?.reranking_model_name)
+
     if (!chunk_structure) {
       return {
         isValid: false,
@@ -60,10 +68,18 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
       }
     }
 
-    if (indexing_technique === IndexingType.QUALIFIED && (!embedding_model || !embedding_model_provider)) {
-      return {
-        isValid: false,
-        errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsRequired'),
+    if (indexing_technique === IndexingType.QUALIFIED) {
+      if (!embedding_model || !embedding_model_provider) {
+        return {
+          isValid: false,
+          errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsRequired'),
+        }
+      }
+      else if (!currentEmbeddingModel) {
+        return {
+          isValid: false,
+          errorMessage: t('workflow.nodes.knowledgeBase.embeddingModelIsInvalid'),
+        }
       }
     }
 
@@ -74,10 +90,18 @@ const nodeDefault: NodeDefault<KnowledgeBaseNodeType> = {
       }
     }
 
-    if (reranking_enable && (!reranking_model || !reranking_model.reranking_provider_name || !reranking_model.reranking_model_name)) {
-      return {
-        isValid: false,
-        errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsRequired'),
+    if (reranking_enable) {
+      if (!reranking_model || !reranking_model.reranking_provider_name || !reranking_model.reranking_model_name) {
+        return {
+          isValid: false,
+          errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsRequired'),
+        }
+      }
+      else if (!currentRerankingModel) {
+        return {
+          isValid: false,
+          errorMessage: t('workflow.nodes.knowledgeBase.rerankingModelIsInvalid'),
+        }
       }
     }
 

web/app/components/workflow/nodes/knowledge-base/types.ts

@@ -3,6 +3,7 @@ import type { IndexingType } from '@/app/components/datasets/create/step-two'
 import type { RETRIEVE_METHOD } from '@/types/app'
 import type { WeightedScoreEnum } from '@/models/datasets'
 import type { RerankingModeEnum } from '@/models/datasets'
+import type { Model } from '@/app/components/header/account-setting/model-provider-page/declarations'
 export { WeightedScoreEnum } from '@/models/datasets'
 export { IndexingType as IndexMethodEnum } from '@/app/components/datasets/create/step-two'
 export { RETRIEVE_METHOD as RetrievalSearchMethodEnum } from '@/types/app'
@@ -49,4 +50,6 @@ export type KnowledgeBaseNodeType = CommonNodeType & {
   embedding_model_provider?: string
   keyword_number: number
   retrieval_model: RetrievalSetting
+  _embeddingModelList?: Model[]
+  _rerankModelList?: Model[]
 }

web/app/components/workflow/store/workflow/debug/mock-data.ts

@@ -12,6 +12,9 @@ export const vars: VarInInspect[] = [
     value_type: VarType.string,
     value: 'text value...',
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
   {
     id: 'fdklajljgldjglkagjlk',
@@ -22,6 +25,9 @@ export const vars: VarInInspect[] = [
     value_type: VarType.string,
     value: 'made zhizhang',
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
 ]
 
@@ -35,6 +41,9 @@ export const conversationVars: VarInInspect[] = [
     value_type: VarType.string,
     value: 'conversation var value...',
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
   {
     id: 'con2',
@@ -45,6 +54,9 @@ export const conversationVars: VarInInspect[] = [
     value_type: VarType.number,
     value: 456,
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
 ]
 
@@ -58,6 +70,9 @@ export const systemVars: VarInInspect[] = [
     value_type: VarType.string,
     value: 'Hello robot!',
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
   {
     id: 'sys2',
@@ -68,5 +83,8 @@ export const systemVars: VarInInspect[] = [
     value_type: VarType.string,
     value: 'djflakjerlkjdlksfjslakjsdfl',
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   },
 ]

web/app/components/workflow/utils/debug.ts

@@ -21,5 +21,8 @@ export const outputToVarInInspect = ({
     value_type: VarType.string, // TODO: wait for api or get from node
     value,
     edited: false,
+    visible: true,
+    is_truncated: false,
+    full_content: { size_bytes: 0, download_url: '' },
   }
 }