From d6a44e99903cd3ad4cafd802c1822c0ca6687877 Mon Sep 17 00:00:00 2001 From: Yi Xiao <54782454+YIXIAO0@users.noreply.github.com> Date: Mon, 30 Sep 2024 22:10:27 +0800 Subject: [PATCH] fix: request params for internal dataset (#8940) --- .../dataset-config/settings-modal/index.tsx | 18 ++++++++++-------- .../datasets/settings/form/index.tsx | 16 +++++++++------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx b/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx index 7b3b4abc0f..ee211325cf 100644 --- a/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx +++ b/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx @@ -59,10 +59,10 @@ const SettingsModal: FC = ({ const { t } = useTranslation() const { notify } = useToastContext() const ref = useRef(null) + const isExternal = currentDataset.provider === 'external' const [topK, setTopK] = useState(currentDataset?.external_retrieval_model.top_k ?? 2) const [scoreThreshold, setScoreThreshold] = useState(currentDataset?.external_retrieval_model.score_threshold ?? 0.5) const [scoreThresholdEnabled, setScoreThresholdEnabled] = useState(currentDataset?.external_retrieval_model.score_threshold_enabled ?? false) - const { setShowAccountSettingModal } = useModalContext() const [loading, setLoading] = useState(false) const { isCurrentWorkspaceDatasetOperator } = useAppContext() @@ -122,19 +122,21 @@ const SettingsModal: FC = ({ description, permission, indexing_technique: indexMethod, - external_retrieval_model: { - top_k: topK, - score_threshold: scoreThreshold, - score_threshold_enabled: scoreThresholdEnabled, - }, retrieval_model: { ...postRetrievalConfig, score_threshold: postRetrievalConfig.score_threshold_enabled ? postRetrievalConfig.score_threshold : 0, }, - external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id, - external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id, embedding_model: localeCurrentDataset.embedding_model, embedding_model_provider: localeCurrentDataset.embedding_model_provider, + ...(isExternal && { + external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id, + external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id, + external_retrieval_model: { + top_k: topK, + score_threshold: scoreThreshold, + score_threshold_enabled: scoreThresholdEnabled, + }, + }), }, } as any if (permission === 'partial_members') { diff --git a/web/app/components/datasets/settings/form/index.tsx b/web/app/components/datasets/settings/form/index.tsx index ed0865f871..a3b6e79c3b 100644 --- a/web/app/components/datasets/settings/form/index.tsx +++ b/web/app/components/datasets/settings/form/index.tsx @@ -141,19 +141,21 @@ const Form = () => { description, permission, indexing_technique: indexMethod, - external_retrieval_model: { - top_k: topK, - score_threshold: scoreThreshold, - score_threshold_enabled: scoreThresholdEnabled, - }, retrieval_model: { ...postRetrievalConfig, score_threshold: postRetrievalConfig.score_threshold_enabled ? postRetrievalConfig.score_threshold : 0, }, - external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id, - external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id, embedding_model: embeddingModel.model, embedding_model_provider: embeddingModel.provider, + ...(currentDataset!.provider === 'external' && { + external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id, + external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id, + external_retrieval_model: { + top_k: topK, + score_threshold: scoreThreshold, + score_threshold_enabled: scoreThresholdEnabled, + }, + }), }, } as any if (permission === 'partial_members') {