From 6508e7e1e403126ae0d412d53ee01d64dfb2632e Mon Sep 17 00:00:00 2001 From: Yi Date: Sun, 29 Sep 2024 14:52:47 +0800 Subject: [PATCH] fix: retrieval config for rerank cases --- web/app/(commonLayout)/datasets/NewDatasetCard.tsx | 4 ++-- .../datasets/documents/detail/completed/SegmentCard.tsx | 3 ++- web/app/components/datasets/hit-testing/index.tsx | 4 +++- web/app/components/datasets/hit-testing/textarea.tsx | 2 -- .../workflow/nodes/knowledge-retrieval/use-config.ts | 9 +++++++-- web/i18n/en-US/dataset-hit-testing.ts | 1 + web/i18n/zh-Hans/dataset-hit-testing.ts | 1 + web/i18n/zh-Hant/dataset-hit-testing.ts | 1 + 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/web/app/(commonLayout)/datasets/NewDatasetCard.tsx b/web/app/(commonLayout)/datasets/NewDatasetCard.tsx index 47eb4e8827..5dd244ad41 100644 --- a/web/app/(commonLayout)/datasets/NewDatasetCard.tsx +++ b/web/app/(commonLayout)/datasets/NewDatasetCard.tsx @@ -14,7 +14,7 @@ const CreateAppCard = forwardRef((_, ref) => {
- +
((_, ref) => {
{t('dataset.createDataset')}
 -
{t('dataset.createDatasetIntro')}
+
{t('dataset.createDatasetIntro')}
{t('dataset.connectDataset')}
diff --git a/web/app/components/datasets/documents/detail/completed/SegmentCard.tsx b/web/app/components/datasets/documents/detail/completed/SegmentCard.tsx index f5512838ab..839b2be399 100644 --- a/web/app/components/datasets/documents/detail/completed/SegmentCard.tsx +++ b/web/app/components/datasets/documents/detail/completed/SegmentCard.tsx @@ -55,6 +55,7 @@ type ISegmentCardProps = { const SegmentCard: FC = ({ detail = {}, contentExternal, + isExternal, refSource, score, onClick, @@ -219,7 +220,7 @@ const SegmentCard: FC = ({ textCls="text-xs text-gray-700 !font-normal overflow-hidden whitespace-nowrap text-ellipsis" />
- {t('datasetHitTesting.viewChart')} + {isExternal ? t('datasetHitTesting.viewDetail') : t('datasetHitTesting.viewChart')}
diff --git a/web/app/components/datasets/hit-testing/index.tsx b/web/app/components/datasets/hit-testing/index.tsx index 33cf824b59..2e21c268e4 100644 --- a/web/app/components/datasets/hit-testing/index.tsx +++ b/web/app/components/datasets/hit-testing/index.tsx @@ -72,6 +72,7 @@ const HitTesting: FC = ({ datasetId }: Props) => { setExternalCurrParagraph({ paraInfo: detail, showModal: true }) } const { dataset: currentDataset } = useContext(DatasetDetailContext) + const isExternal = currentDataset?.provider === 'external' const [retrievalConfig, setRetrievalConfig] = useState(currentDataset?.retrieval_model_dict as RetrievalConfig) const [isShowModifyRetrievalModal, setIsShowModifyRetrievalModal] = useState(false) @@ -90,6 +91,7 @@ const HitTesting: FC = ({ datasetId }: Props) => { title: record.title, uri: record.metadata ? record.metadata['x-amz-bedrock-kb-source-uri'] : '', }} + isExternal={isExternal} detail={record.segment} contentExternal={record.content} score={record.score} @@ -133,7 +135,7 @@ const HitTesting: FC = ({ datasetId }: Props) => { setLoading={setSubmitLoading} setText={setText} text={text} - isExternal={currentDataset?.provider === 'external'} + isExternal={isExternal} onClickRetrievalMethod={() => setIsShowModifyRetrievalModal(true)} retrievalConfig={retrievalConfig} isEconomy={currentDataset?.indexing_technique === 'economy'} diff --git a/web/app/components/datasets/hit-testing/textarea.tsx b/web/app/components/datasets/hit-testing/textarea.tsx index a3b0d49713..0c5ac18118 100644 --- a/web/app/components/datasets/hit-testing/textarea.tsx +++ b/web/app/components/datasets/hit-testing/textarea.tsx @@ -83,7 +83,6 @@ const TextAreaWithButton = ({ } const externalRetrievalTestingOnSubmit = async () => { - setLoading(true) const [e, res] = await asyncRunSafe( externalKnowledgeBaseHitTesting({ datasetId, @@ -99,7 +98,6 @@ const TextAreaWithButton = ({ onUpdateList?.() } setLoading(false) - _onSubmit && _onSubmit() } const retrievalMethod = isEconomy ? RETRIEVE_METHOD.invertedIndex : retrievalConfig.search_method diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts b/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts index e45c4be257..6ed8d72291 100644 --- a/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts +++ b/web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts @@ -205,10 +205,11 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => { const handleOnDatasetsChange = useCallback((newDatasets: DataSet[]) => { const { - allEconomic, mixtureHighQualityAndEconomic, + mixtureInternalAndExternal, inconsistentEmbeddingModel, allInternal, + allExternal, } = getSelectedDatasetsMode(newDatasets) const newInputs = produce(inputs, (draft) => { draft.dataset_ids = newDatasets.map(d => d.id) @@ -221,7 +222,11 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => { setInputs(newInputs) setSelectedDatasets(newDatasets) - if (allInternal && (allEconomic || mixtureHighQualityAndEconomic || inconsistentEmbeddingModel)) + if ( + (allInternal && (mixtureHighQualityAndEconomic || inconsistentEmbeddingModel)) + || mixtureInternalAndExternal + || (allExternal && newDatasets.length > 1) + ) setRerankModelOpen(true) }, [inputs, setInputs, payload.retrieval_mode]) diff --git a/web/i18n/en-US/dataset-hit-testing.ts b/web/i18n/en-US/dataset-hit-testing.ts index 7d56906fc9..6dbfa47fee 100644 --- a/web/i18n/en-US/dataset-hit-testing.ts +++ b/web/i18n/en-US/dataset-hit-testing.ts @@ -24,6 +24,7 @@ const translation = { }, noRecentTip: 'No recent query results here', viewChart: 'View VECTOR CHART', + viewDetail: 'View Detail', } export default translation diff --git a/web/i18n/zh-Hans/dataset-hit-testing.ts b/web/i18n/zh-Hans/dataset-hit-testing.ts index f3fd7925a3..09cfdc2824 100644 --- a/web/i18n/zh-Hans/dataset-hit-testing.ts +++ b/web/i18n/zh-Hans/dataset-hit-testing.ts @@ -24,6 +24,7 @@ const translation = { }, noRecentTip: '最近无查询结果', viewChart: '查看向量图表', + viewDetail: '查看详情', } export default translation diff --git a/web/i18n/zh-Hant/dataset-hit-testing.ts b/web/i18n/zh-Hant/dataset-hit-testing.ts index a1e84112ef..aed73497de 100644 --- a/web/i18n/zh-Hant/dataset-hit-testing.ts +++ b/web/i18n/zh-Hant/dataset-hit-testing.ts @@ -23,6 +23,7 @@ const translation = { }, noRecentTip: '最近無查詢結果', viewChart: '查看向量圖表', + viewDetail: '查看詳情', } export default translation