浏览代码

feat: enhance index type handling and add error notification for missing embedding model (#16836)

tags/1.2.0
Wu Tianwei 6 个月前
父节点
当前提交
cd7ac20d80
没有帐户链接到提交者的电子邮件
共有 3 个文件被更改,包括 18 次插入13 次删除
  1. 16
    13
      web/app/components/datasets/create/step-two/index.tsx
  2. 1
    0
      web/i18n/en-US/app-debug.ts
  3. 1
    0
      web/i18n/zh-Hans/app-debug.ts

+ 16
- 13
web/app/components/datasets/create/step-two/index.tsx 查看文件

@@ -169,12 +169,11 @@ const StepTwo = ({
const [rules, setRules] = useState<PreProcessingRule[]>([])
const [defaultConfig, setDefaultConfig] = useState<Rules>()
const hasSetIndexType = !!indexingType
const [indexType, setIndexType] = useState<IndexingType>(
(indexingType
|| isAPIKeySet)
? IndexingType.QUALIFIED
: IndexingType.ECONOMICAL,
)
const [indexType, setIndexType] = useState<IndexingType>(() => {
if (hasSetIndexType)
return indexingType
return isAPIKeySet ? IndexingType.QUALIFIED : IndexingType.ECONOMICAL
})

const [previewFile, setPreviewFile] = useState<DocumentItem>(
(datasetId && documentDetail)
@@ -421,6 +420,13 @@ const StepTwo = ({
}
else { // create
const indexMethod = getIndexing_technique()
if (indexMethod === IndexingType.QUALIFIED && (!embeddingModel.model || !embeddingModel.provider)) {
Toast.notify({
type: 'error',
message: t('appDebug.datasetConfig.embeddingModelRequired'),
})
return
}
if (
!isReRankModelSelected({
rerankModelList,
@@ -568,7 +574,6 @@ const StepTwo = ({
// get indexing type by props
if (indexingType)
setIndexType(indexingType as IndexingType)

else
setIndexType(isAPIKeySet ? IndexingType.QUALIFIED : IndexingType.ECONOMICAL)
}, [isAPIKeySet, indexingType, datasetId])
@@ -848,10 +853,9 @@ const StepTwo = ({
description={t('datasetCreation.stepTwo.qualifiedTip')}
icon={<Image src={indexMethodIcon.high_quality} alt='' />}
isActive={!hasSetIndexType && indexType === IndexingType.QUALIFIED}
disabled={!isAPIKeySet || hasSetIndexType}
disabled={hasSetIndexType}
onSwitched={() => {
if (isAPIKeySet)
setIndexType(IndexingType.QUALIFIED)
setIndexType(IndexingType.QUALIFIED)
}}
/>
)}
@@ -894,11 +898,10 @@ const StepTwo = ({
description={t('datasetCreation.stepTwo.economicalTip')}
icon={<Image src={indexMethodIcon.economical} alt='' />}
isActive={!hasSetIndexType && indexType === IndexingType.ECONOMICAL}
disabled={!isAPIKeySet || hasSetIndexType || docForm !== ChunkingMode.text}
disabled={hasSetIndexType || docForm !== ChunkingMode.text}
ref={economyDomRef}
onSwitched={() => {
if (isAPIKeySet && docForm === ChunkingMode.text)
setIndexType(IndexingType.ECONOMICAL)
setIndexType(IndexingType.ECONOMICAL)
}}
/>
</PortalToFollowElemTrigger>

+ 1
- 0
web/i18n/en-US/app-debug.ts 查看文件

@@ -483,6 +483,7 @@ const translation = {
title: 'Multi-path retrieval',
description: 'Based on user intent, queries across all Knowledge, retrieves relevant text from multi-sources, and selects the best results matching the user query after reranking.',
},
embeddingModelRequired: 'A configured Embedding Model is required',
rerankModelRequired: 'A configured Rerank Model is required',
params: 'Params',
top_k: 'Top K',

+ 1
- 0
web/i18n/zh-Hans/app-debug.ts 查看文件

@@ -475,6 +475,7 @@ const translation = {
title: '多路召回',
description: '根据用户意图同时匹配所有知识库,从多路知识库查询相关文本片段,经过重排序步骤,从多路查询结果中选择匹配用户问题的最佳结果。',
},
embeddingModelRequired: '未配置 Embedding 模型',
rerankModelRequired: '未配置 Rerank 模型',
params: '参数设置',
top_k: 'Top K',

正在加载...
取消
保存