-
+ id={IndexMethodEnum.QUALIFIED}
icon={
}
title={t('datasetCreation.stepTwo.qualified')}
description={t('datasetSettings.form.indexMethodHighQualityTip')}
- showHighlightBorder={method === 'high_quality'}
- onClick={() => setMethod('high_quality')}
+ showHighlightBorder={isHighQuality}
+ onClick={handleIndexMethodChange}
isRecommended
>
}
title={t('datasetSettings.form.indexMethodEconomy')}
description={t('datasetSettings.form.indexMethodEconomyTip')}
- showChildren={method === 'economy'}
- showHighlightBorder={method === 'economy'}
- onClick={() => setMethod('economy')}
+ showChildren={isEconomy}
+ showHighlightBorder={isEconomy}
+ onClick={handleIndexMethodChange}
effectColor='blue'
- showEffectColor={method === 'economy'}
+ showEffectColor={isEconomy}
>
@@ -85,4 +113,4 @@ const IndexMethod = () => {
)
}
-export default IndexMethod
+export default memo(IndexMethod)
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx b/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
index 6a6bb98275..73c1c3ba17 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
@@ -16,7 +16,9 @@ const HEADER_EFFECT_MAP: Record
= {
'orange': ,
'purple': ,
}
-type OptionCardProps = {
+type OptionCardProps = {
+ id: T
+ className?: string
showHighlightBorder?: boolean
showRadio?: boolean
radioIsActive?: boolean
@@ -28,9 +30,11 @@ type OptionCardProps = {
showChildren?: boolean
effectColor?: string
showEffectColor?: boolean
- onClick?: () => void
+ onClick?: (id: T) => void
}
-const OptionCard = ({
+const OptionCard = memo(({
+ id,
+ className,
showHighlightBorder,
showRadio,
radioIsActive,
@@ -43,17 +47,18 @@ const OptionCard = ({
effectColor,
showEffectColor,
onClick,
-}: OptionCardProps) => {
+}) => {
return (
onClick?.(id)}
>
{
effectColor && showEffectColor && (
@@ -110,6 +115,6 @@ const OptionCard = ({
}
)
-}
+}) as
(props: OptionCardProps) => JSX.Element
-export default memo(OptionCard)
+export default OptionCard
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/full-text-search.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/full-text-search.tsx
deleted file mode 100644
index 13b602b08d..0000000000
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/full-text-search.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { FullTextSearch } from '@/app/components/base/icons/src/vender/knowledge'
-import OptionCard from '../option-card'
-
-const FullTextSearchCard = () => {
- return (
- }
- title='Full-Text Search'
- description="Execute full-text search and vector searches simultaneously, re-rank to select the best match for the user's query. Users can choose to set weights or configure to a Rerank model."
- effectColor='purple'
- >
-
-
Vector Search Settings
-
Additional Settings
-
-
Vector Search Settings
-
Additional Settings
-
+ {
+ isHybridSearch && (
+
+ {
+ hybridSearchModeOptions.map(hybridOption => (
+
+ ))
+ }
+
+ )
+ }
+ {
+ isHybridSearch && isHybridSearchWeightedScoreMode && (
+
+ )
+ }
+ {
+ !(isHybridSearch && hybridSearchMode === HybridSearchModeEnum.WeightedScore) && (
+
+ )
+ }
+
+
-
-
-
+ {options.map(renderOptionCard)}
)
}
-export default RetrievalSetting
+export default memo(RetrievalSetting)
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.tsx
new file mode 100644
index 0000000000..609f26fbb2
--- /dev/null
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.tsx
@@ -0,0 +1,48 @@
+import {
+ memo,
+ useMemo,
+} from 'react'
+import ModelSelector from '@/app/components/header/account-setting/model-provider-page/model-selector'
+import { useModelListAndDefaultModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import type { DefaultModel } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import type { RerankingModel } from '../../types'
+
+type RerankingModelSelectorProps = {
+ rerankingModel?: RerankingModel
+ onRerankingModelChange?: (model: RerankingModel) => void
+}
+const RerankingModelSelector = ({
+ rerankingModel,
+ onRerankingModelChange,
+}: RerankingModelSelectorProps) => {
+ const {
+ modelList: rerankModelList,
+ } = useModelListAndDefaultModel(ModelTypeEnum.rerank)
+ const rerankModel = useMemo(() => {
+ if (!rerankingModel)
+ return undefined
+
+ return {
+ provider_name: rerankingModel.reranking_provider_name,
+ model_name: rerankingModel.reranking_model_name,
+ }
+ }, [rerankingModel])
+
+ const handleRerankingModelChange = (model: DefaultModel) => {
+ onRerankingModelChange?.({
+ reranking_provider_name: model.provider,
+ reranking_model_name: model.model,
+ })
+ }
+
+ return (
+
+ )
+}
+
+export default memo(RerankingModelSelector)
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
new file mode 100644
index 0000000000..65ea8de195
--- /dev/null
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
@@ -0,0 +1,42 @@
+import { memo } from 'react'
+import Tooltip from '@/app/components/base/tooltip'
+import Input from '@/app/components/base/input'
+import Switch from '@/app/components/base/switch'
+
+const TopKAndScoreThreshold = () => {
+ return (
+
+
+
+
+
+
+ Score Threshold
+
+
+
+
+
+
-
Vector Search Settings
-
Additional Settings
-
@@ -23,16 +42,37 @@ const Panel: FC> = () => {
className='py-3'
withBorderBottom
>
-
+
-
-
+
+ {
+ data.indexing_technique === IndexMethodEnum.QUALIFIED && (
+
+ )
+ }
-
+
diff --git a/web/app/components/workflow/nodes/knowledge-base/types.ts b/web/app/components/workflow/nodes/knowledge-base/types.ts
index a1ceab42a5..a8f84d31a0 100644
--- a/web/app/components/workflow/nodes/knowledge-base/types.ts
+++ b/web/app/components/workflow/nodes/knowledge-base/types.ts
@@ -1,3 +1,52 @@
import type { CommonNodeType } from '@/app/components/workflow/types'
+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'
+export { WeightedScoreEnum } from '@/models/datasets'
+export { IndexingType as IndexMethodEnum } from '@/app/components/datasets/create/step-two'
+export { RETRIEVE_METHOD as RetrievalSearchMethodEnum } from '@/types/app'
+export { RerankingModeEnum as HybridSearchModeEnum } from '@/models/datasets'
-export type KnowledgeBaseNodeType = CommonNodeType
+export enum ChunkStructureEnum {
+ general = 'general',
+ parent_child = 'parent-child',
+ question_answer = 'question-answer',
+}
+
+export type RerankingModel = {
+ reranking_provider_name: string
+ reranking_model_name: string
+}
+
+export type WeightedScore = {
+ weight_type: WeightedScoreEnum
+ vector_setting: {
+ vector_weight: number
+ embedding_provider_name: string
+ embedding_model_name: string
+ }
+ keyword_setting: {
+ keyword_weight: number
+ }
+}
+
+export type RetrievalSetting = {
+ search_method: RETRIEVE_METHOD
+ reranking_enable?: boolean
+ reranking_model?: RerankingModel
+ weights?: WeightedScore
+ top_k: number
+ score_threshold_enabled: boolean
+ score_threshold: number
+ hybridSearchMode: RerankingModeEnum
+}
+export type KnowledgeBaseNodeType = CommonNodeType & {
+ index_chunk_variable_selector: string[]
+ chunk_structure: ChunkStructureEnum
+ indexing_technique: IndexingType
+ embedding_model?: string
+ embedding_model_provider?: string
+ keyword_number: number
+ retrieval_model: RetrievalSetting
+}
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index e6d019e8ca..d100cceafa 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -42,7 +42,7 @@ export enum BlockEnum {
LoopStart = 'loop-start',
LoopEnd = 'loop-end',
DataSource = 'data-source',
- KnowledgeBase = 'knowledge-base',
+ KnowledgeBase = 'knowledge-index',
}
export enum ControlMode {