Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: Add the chat model to the Python version of the dataset configuration page. (#18735)

balibabu40b5845e26c1
diff --git a/web/src/components/parse-configuration/graph-rag-form-fields.tsx b/web/src/components/parse-configuration/graph-rag-form-fields.tsx
index ce0a2cbdc4..649b5e099a 100644
--- a/web/src/components/parse-configuration/graph-rag-form-fields.tsx
+++ b/web/src/components/parse-configuration/graph-rag-form-fields.tsx
@@ -18,7 +18,7 @@ import { FormLayout } from '@/constants/form';
import { DocumentParserType, GenerateType } from '@/constants/knowledge';
import { useTranslate } from '@/hooks/common-hooks';
import { cn } from '@/lib/utils';
-import { useKnowledgeBaseContext } from '@/pages/dataset/contexts/knowledge-base-context';
+import { useOwnerTenantId } from '@/pages/dataset/contexts/knowledge-base-context';
import { LLMModelItem } from '@/pages/dataset/setting/python/configuration/common-item';
import { upperFirst } from 'lodash';
import { useCallback, useMemo } from 'react';
@@ -134,6 +134,7 @@ const GraphRagItems = function GraphRagItems({
}: GraphRagItemsProps) {
const { t } = useTranslate('knowledgeConfiguration');
const form = useFormContext();
+ const ownerTenantId = useOwnerTenantId();
const useRaptor = useWatch({
control: form.control,
@@ -161,7 +162,7 @@ const GraphRagItems = function GraphRagItems({
<LLMModelItem
label={t('globalIndexModel')}
name={'parser_config.llm_id'}
- ownerTenantId={useKnowledgeBaseContext().knowledgeBase?.tenant_id}
+ ownerTenantId={ownerTenantId}
/>
<UseGraphRagFormField
data={data}
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index 3d6978b437..7d4a7f361e 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -618,6 +618,9 @@ export default {
rebuildTip: '从所有已关联的数据源重新下载文件并再次解析。',
baseInfo: '基础信息',
globalIndex: '全局索引',
+ globalIndexModel: '索引模型',
+ globalIndexModelTip:
+ '用于生成自动元数据、自动关键词和自动问题。模型性能会影响生成质量。',
dataSource: '数据源',
linkSourceSetTip: '管理与此知识库的数据源链接',
linkDataSource: '链接数据源',
@@ -1097,7 +1100,8 @@ NER:使用 spaCy NER 和基于规则的关键词提取来抽取 Entities 和 R
queritApiKeyTip:
'选择 Querit 后,将使用 Querit 的网络搜索结果补充知识库检索。',
queritApiKeyMessage: '请输入你的 Querit API Key',
- serplyApiKeyTip: '选择 Serply 后,将使用 Serply 的网络搜索结果补充知识库检索。',
+ serplyApiKeyTip:
+ '选择 Serply 后,将使用 Serply 的网络搜索结果补充知识库检索。',
serplyApiKeyMessage: '请输入你的 Serply API Key',
youcomApiKeyTip:
'可选。You.com 在限速端点上无需 API Key 即可使用;填写 Key 可解除限速。',
diff --git a/web/src/pages/dataset/contexts/knowledge-base-context.tsx b/web/src/pages/dataset/contexts/knowledge-base-context.tsx
index 1f04945da1..9ddd9c8724 100644
--- a/web/src/pages/dataset/contexts/knowledge-base-context.tsx
+++ b/web/src/pages/dataset/contexts/knowledge-base-context.tsx
@@ -32,3 +32,8 @@ export const useKnowledgeBaseContext = (): KnowledgeBaseContextType => {
}
return context;
};
+
+// oxlint-disable-next-line react-refresh/only-export-components
+export const useOwnerTenantId = (): string | undefined => {
+ return useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+};
diff --git a/web/src/pages/dataset/setting/go/general-form.tsx b/web/src/pages/dataset/setting/go/general-form.tsx
index 475e55c17d..b743fd47c4 100644
--- a/web/src/pages/dataset/setting/go/general-form.tsx
+++ b/web/src/pages/dataset/setting/go/general-form.tsx
@@ -14,13 +14,14 @@ import { LanguageTranslationMap } from '@/constants/common';
import { useMemo } from 'react';
import { useFormContext } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
-import { useKnowledgeBaseContext } from '../../contexts/knowledge-base-context';
+import { useOwnerTenantId } from '../../contexts/knowledge-base-context';
import { EmbeddingModelItem } from './embedding-model-form-field';
import { PermissionFormField } from './permission-form-field';
export function GeneralForm() {
const form = useFormContext();
const { t } = useTranslation();
+ const ownerTenantId = useOwnerTenantId();
const languageOptions = useMemo(() => {
return Object.keys(LanguageTranslationMap).map((x) => ({
@@ -126,7 +127,7 @@ export function GeneralForm() {
<PermissionFormField></PermissionFormField>
<EmbeddingModelItem
isEdit={true}
- ownerTenantId={useKnowledgeBaseContext().knowledgeBase?.tenant_id}
+ ownerTenantId={ownerTenantId}
></EmbeddingModelItem>
<PageRankFormField></PageRankFormField>
</>
diff --git a/web/src/pages/dataset/setting/python/configuration/audio.tsx b/web/src/pages/dataset/setting/python/configuration/audio.tsx
index ae4289f2b8..03ebfc01e6 100644
--- a/web/src/pages/dataset/setting/python/configuration/audio.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/audio.tsx
@@ -3,13 +3,14 @@ import {
AutoQuestionsFormField,
} from '@/components/auto-keywords-form-field';
import { ConfigurationFormContainer } from '../configuration-form-container';
-import { AutoMetadata } from './common-item';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function AudioConfiguration() {
return (
<ConfigurationFormContainer>
<>
+ <GlobalIndexModelItem />
<AutoMetadata />
<AutoKeywordsFormField
layout={FormLayout.Horizontal}
diff --git a/web/src/pages/dataset/setting/python/configuration/book.tsx b/web/src/pages/dataset/setting/python/configuration/book.tsx
index 1d9c7f9d81..1f36008f34 100644
--- a/web/src/pages/dataset/setting/python/configuration/book.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/book.tsx
@@ -7,18 +7,19 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function BookConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
</ConfigurationFormContainer>
<ConfigurationFormContainer>
diff --git a/web/src/pages/dataset/setting/python/configuration/common-item.tsx b/web/src/pages/dataset/setting/python/configuration/common-item.tsx
index 7251e11d63..d842241c14 100644
--- a/web/src/pages/dataset/setting/python/configuration/common-item.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/common-item.tsx
@@ -41,7 +41,10 @@ import {
IMetaDataReturnJSONSettings,
} from '../../../components/metedata/interface';
import { ManageMetadataModal } from '../../../components/metedata/manage-modal';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
+import {
+ useOwnerTenantId,
+ useKnowledgeBaseContext,
+} from '../../../contexts/knowledge-base-context';
import {
useHandleKbEmbedding,
useHasParsedDocument,
@@ -521,3 +524,16 @@ export function LLMModelItem({
</>
);
}
+
+export function GlobalIndexModelItem() {
+ const { t } = useTranslate('knowledgeConfiguration');
+ const ownerTenantId = useOwnerTenantId();
+ return (
+ <LLMModelItem
+ isEdit={true}
+ name="parser_config.llm_id"
+ label={t('globalIndexModel')}
+ ownerTenantId={ownerTenantId}
+ />
+ );
+}
diff --git a/web/src/pages/dataset/setting/python/configuration/email.tsx b/web/src/pages/dataset/setting/python/configuration/email.tsx
index cd137d99be..c7484ecbf2 100644
--- a/web/src/pages/dataset/setting/python/configuration/email.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/email.tsx
@@ -3,13 +3,14 @@ import {
AutoQuestionsFormField,
} from '@/components/auto-keywords-form-field';
import { ConfigurationFormContainer } from '../configuration-form-container';
-import { AutoMetadata } from './common-item';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function EmailConfiguration() {
return (
<ConfigurationFormContainer>
<>
+ <GlobalIndexModelItem />
<AutoMetadata />
<AutoKeywordsFormField
layout={FormLayout.Horizontal}
diff --git a/web/src/pages/dataset/setting/python/configuration/knowledge-graph.tsx b/web/src/pages/dataset/setting/python/configuration/knowledge-graph.tsx
index 8912467fae..d86130c0d0 100644
--- a/web/src/pages/dataset/setting/python/configuration/knowledge-graph.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/knowledge-graph.tsx
@@ -1,11 +1,13 @@
import { DelimiterFormField } from '@/components/delimiter-form-field';
import { EntityTypesFormField } from '@/components/entity-types-form-field';
import { MaxTokenNumberFormField } from '@/components/max-token-number-from-field';
+import { GlobalIndexModelItem } from './common-item';
export function KnowledgeGraphConfiguration() {
return (
<>
<>
+ <GlobalIndexModelItem />
<EntityTypesFormField></EntityTypesFormField>
<MaxTokenNumberFormField max={8192 * 2}></MaxTokenNumberFormField>
<DelimiterFormField></DelimiterFormField>
diff --git a/web/src/pages/dataset/setting/python/configuration/laws.tsx b/web/src/pages/dataset/setting/python/configuration/laws.tsx
index a15142193a..25f5fa46b0 100644
--- a/web/src/pages/dataset/setting/python/configuration/laws.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/laws.tsx
@@ -7,18 +7,19 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function LawsConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
</ConfigurationFormContainer>
<ConfigurationFormContainer>
diff --git a/web/src/pages/dataset/setting/python/configuration/manual.tsx b/web/src/pages/dataset/setting/python/configuration/manual.tsx
index 9bccadfbdb..a0f604b95b 100644
--- a/web/src/pages/dataset/setting/python/configuration/manual.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/manual.tsx
@@ -7,18 +7,19 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function ManualConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
</ConfigurationFormContainer>
<ConfigurationFormContainer>
diff --git a/web/src/pages/dataset/setting/python/configuration/naive.tsx b/web/src/pages/dataset/setting/python/configuration/naive.tsx
index 93968551bc..056bd9b3c6 100644
--- a/web/src/pages/dataset/setting/python/configuration/naive.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/naive.tsx
@@ -11,16 +11,17 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
import {
AutoMetadata,
+ GlobalIndexModelItem,
ImageContextWindow,
OverlappedPercent,
} from './common-item';
import { FormLayout } from '@/constants/form';
export function NaiveConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
@@ -28,6 +29,7 @@ export function NaiveConfiguration() {
testId="ds-settings-parser-pdf-parser-select"
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
<MaxTokenNumberFormField
initialValue={512}
sliderTestId="ds-settings-parser-recommended-chunk-size-slider"
diff --git a/web/src/pages/dataset/setting/python/configuration/one.tsx b/web/src/pages/dataset/setting/python/configuration/one.tsx
index 74fb46aa29..d234dca931 100644
--- a/web/src/pages/dataset/setting/python/configuration/one.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/one.tsx
@@ -4,17 +4,18 @@ import {
} from '@/components/auto-keywords-form-field';
import { LayoutRecognizeFormField } from '@/components/layout-recognize-form-field';
import { ConfigurationFormContainer } from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function OneConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
<>
<AutoMetadata />
<AutoKeywordsFormField
diff --git a/web/src/pages/dataset/setting/python/configuration/paper.tsx b/web/src/pages/dataset/setting/python/configuration/paper.tsx
index 263b0d801d..cdbe2c4563 100644
--- a/web/src/pages/dataset/setting/python/configuration/paper.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/paper.tsx
@@ -7,18 +7,19 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function PaperConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
</ConfigurationFormContainer>
<ConfigurationFormContainer>
diff --git a/web/src/pages/dataset/setting/python/configuration/picture.tsx b/web/src/pages/dataset/setting/python/configuration/picture.tsx
index b74529ca44..0f2aa62e84 100644
--- a/web/src/pages/dataset/setting/python/configuration/picture.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/picture.tsx
@@ -3,13 +3,14 @@ import {
AutoQuestionsFormField,
} from '@/components/auto-keywords-form-field';
import { ConfigurationFormContainer } from '../configuration-form-container';
-import { AutoMetadata } from './common-item';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function PictureConfiguration() {
return (
<ConfigurationFormContainer>
<>
+ <GlobalIndexModelItem />
<AutoMetadata />
<AutoKeywordsFormField
layout={FormLayout.Horizontal}
diff --git a/web/src/pages/dataset/setting/python/configuration/presentation.tsx b/web/src/pages/dataset/setting/python/configuration/presentation.tsx
index caed3614f7..6596bd24f9 100644
--- a/web/src/pages/dataset/setting/python/configuration/presentation.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/presentation.tsx
@@ -7,18 +7,19 @@ import {
ConfigurationFormContainer,
MainContainer,
} from '../configuration-form-container';
-import { useKnowledgeBaseContext } from '../../../contexts/knowledge-base-context';
-import { AutoMetadata } from './common-item';
+import { useOwnerTenantId } from '../../../contexts/knowledge-base-context';
+import { AutoMetadata, GlobalIndexModelItem } from './common-item';
import { FormLayout } from '@/constants/form';
export function PresentationConfiguration() {
- const ownerTenantId = useKnowledgeBaseContext().knowledgeBase?.tenant_id;
+ const ownerTenantId = useOwnerTenantId();
return (
<MainContainer>
<ConfigurationFormContainer>
<LayoutRecognizeFormField
ownerTenantId={ownerTenantId}
></LayoutRecognizeFormField>
+ <GlobalIndexModelItem />
</ConfigurationFormContainer>
<ConfigurationFormContainer>
diff --git a/web/src/pages/dataset/setting/python/configuration/resume.tsx b/web/src/pages/dataset/setting/python/configuration/resume.tsx
index 6ad3c94c5b..b9e57313c5 100644
--- a/web/src/pages/dataset/setting/python/configuration/resume.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/resume.tsx
@@ -1,8 +1,10 @@
+import { ConfigurationFormContainer } from '../configuration-form-container';
+import { GlobalIndexModelItem } from './common-item';
+
export function ResumeConfiguration() {
return (
- <></>
- // <ConfigurationFormContainer>
- // <TagItems></TagItems>
- // </ConfigurationFormContainer>
+ <ConfigurationFormContainer>
+ <GlobalIndexModelItem />
+ </ConfigurationFormContainer>
);
}
diff --git a/web/src/pages/dataset/setting/python/configuration/table.tsx b/web/src/pages/dataset/setting/python/configuration/table.tsx
index 40febbf0e4..20382adc87 100644
--- a/web/src/pages/dataset/setting/python/configuration/table.tsx
+++ b/web/src/pages/dataset/setting/python/configuration/table.tsx
@@ -10,6 +10,7 @@ import {
import { useTranslate } from '@/hooks/common-hooks';
import { useFormContext, useWatch } from 'react-hook-form';
import { ConfigurationFormContainer } from '../configuration-form-container';
+import { GlobalIndexModelItem } from './common-item';
const ROLE_OPTIONS = [
{ value: 'both', labelKey: 'tableColumnRoleBoth' },
@@ -68,6 +69,7 @@ export function TableConfiguration() {
return (
<ConfigurationFormContainer>
+ <GlobalIndexModelItem />
<FormItem className="space-y-2">
<FormLabel className="text-sm font-medium">
{t('tableColumnMode')}
diff --git a/web/src/pages/dataset/setting/python/general-form.tsx b/web/src/pages/dataset/setting/python/general-form.tsx
index ae45ad96e9..ebade0b285 100644
--- a/web/src/pages/dataset/setting/python/general-form.tsx
+++ b/web/src/pages/dataset/setting/python/general-form.tsx
@@ -14,7 +14,7 @@ import { LanguageTranslationMap } from '@/constants/common';
import { useMemo } from 'react';
import { useFormContext } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
-import { useKnowledgeBaseContext } from '../../contexts/knowledge-base-context';
+import { useOwnerTenantId } from '../../contexts/knowledge-base-context';
import { TagItems } from './components/tag-item';
import { EmbeddingModelItem } from './configuration/common-item';
import { PermissionFormField } from './permission-form-field';
@@ -22,6 +22,7 @@ import { PermissionFormField } from './permission-form-field';
export function GeneralForm() {
const form = useFormContext();
const { t } = useTranslation();
+ const ownerTenantId = useOwnerTenantId();
const languageOptions = useMemo(() => {
return Object.keys(LanguageTranslationMap).map((x) => ({
@@ -126,7 +127,7 @@ export function GeneralForm() {
<PermissionFormField></PermissionFormField>
<EmbeddingModelItem
isEdit={true}
- ownerTenantId={useKnowledgeBaseContext().knowledgeBase?.tenant_id}
+ ownerTenantId={ownerTenantId}
></EmbeddingModelItem>
<PageRankFormField></PageRankFormField>
diff --git a/web/src/pages/dataset/testing/testing-form.tsx b/web/src/pages/dataset/testing/testing-form.tsx
index 7702809699..0232115fc7 100644
--- a/web/src/pages/dataset/testing/testing-form.tsx
+++ b/web/src/pages/dataset/testing/testing-form.tsx
@@ -40,7 +40,7 @@ import { Send } from 'lucide-react';
import { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
-import { useKnowledgeBaseContext } from '../contexts/knowledge-base-context';
+import { useOwnerTenantId } from '../contexts/knowledge-base-context';
type TestingFormProps = Pick<
ReturnType<typeof useTestRetrieval>,
@@ -54,6 +54,7 @@ export default function TestingForm({
}: TestingFormProps) {
const { t } = useTranslation();
const { id } = useParams();
+ const ownerTenantId = useOwnerTenantId();
const knowledgeBaseId = id;
const formSchema = z
@@ -107,9 +108,7 @@ export default function TestingForm({
<SimilaritySliderFormField
isTooltipShown={true}
></SimilaritySliderFormField>
- <RerankFormFields
- ownerTenantId={useKnowledgeBaseContext().knowledgeBase?.tenant_id}
- ></RerankFormFields>
+ <RerankFormFields ownerTenantId={ownerTenantId}></RerankFormFields>
<CrossLanguageFormField
name={'cross_languages'}
></CrossLanguageFormField>