mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-08-16 05:25:58 +08:00
Fix: Knowledge Graph Extraction Conflict Between Dataset-Level and File-Specific Configurations #7198 (#7199)
### What problem does this PR solve? Fix: Knowledge Graph Extraction Conflict Between Dataset-Level and File-Specific Configurations #7198 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
parent
67dee2d74e
commit
64dd187498
@ -21,8 +21,10 @@ import { useFetchParserListOnMount, useShowAutoKeywords } from './hooks';
|
|||||||
|
|
||||||
import { DocumentParserType } from '@/constants/knowledge';
|
import { DocumentParserType } from '@/constants/knowledge';
|
||||||
import { useTranslate } from '@/hooks/common-hooks';
|
import { useTranslate } from '@/hooks/common-hooks';
|
||||||
|
import { useFetchKnowledgeBaseConfiguration } from '@/hooks/knowledge-hooks';
|
||||||
import { IParserConfig } from '@/interfaces/database/document';
|
import { IParserConfig } from '@/interfaces/database/document';
|
||||||
import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
|
import { IChangeParserConfigRequestBody } from '@/interfaces/request/document';
|
||||||
|
import { get } from 'lodash';
|
||||||
import { AutoKeywordsItem, AutoQuestionsItem } from '../auto-keywords-item';
|
import { AutoKeywordsItem, AutoQuestionsItem } from '../auto-keywords-item';
|
||||||
import { DatasetConfigurationContainer } from '../dataset-configuration-container';
|
import { DatasetConfigurationContainer } from '../dataset-configuration-container';
|
||||||
import Delimiter from '../delimiter';
|
import Delimiter from '../delimiter';
|
||||||
@ -78,6 +80,11 @@ const ChunkMethodModal: React.FC<IProps> = ({
|
|||||||
form,
|
form,
|
||||||
);
|
);
|
||||||
const { t } = useTranslate('knowledgeDetails');
|
const { t } = useTranslate('knowledgeDetails');
|
||||||
|
const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration();
|
||||||
|
|
||||||
|
const useGraphRag = useMemo(() => {
|
||||||
|
return knowledgeDetails.parser_config?.graphrag?.use_graphrag;
|
||||||
|
}, [knowledgeDetails.parser_config?.graphrag?.use_graphrag]);
|
||||||
|
|
||||||
const handleOk = async () => {
|
const handleOk = async () => {
|
||||||
const values = await form.validateFields();
|
const values = await form.validateFields();
|
||||||
@ -124,10 +131,25 @@ const ChunkMethodModal: React.FC<IProps> = ({
|
|||||||
parserConfig?.pages?.map((x) => ({ from: x[0], to: x[1] })) ?? [];
|
parserConfig?.pages?.map((x) => ({ from: x[0], to: x[1] })) ?? [];
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
pages: pages.length > 0 ? pages : [{ from: 1, to: 1024 }],
|
pages: pages.length > 0 ? pages : [{ from: 1, to: 1024 }],
|
||||||
parser_config: omit(parserConfig, 'pages'),
|
parser_config: {
|
||||||
|
...omit(parserConfig, 'pages'),
|
||||||
|
graphrag: {
|
||||||
|
use_graphrag: get(
|
||||||
|
parserConfig,
|
||||||
|
'graphrag.use_graphrag',
|
||||||
|
useGraphRag,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [form, parserConfig, visible]);
|
}, [
|
||||||
|
form,
|
||||||
|
knowledgeDetails.parser_config,
|
||||||
|
parserConfig,
|
||||||
|
useGraphRag,
|
||||||
|
visible,
|
||||||
|
]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
@ -317,7 +339,9 @@ const ChunkMethodModal: React.FC<IProps> = ({
|
|||||||
<ParseConfiguration></ParseConfiguration>
|
<ParseConfiguration></ParseConfiguration>
|
||||||
</DatasetConfigurationContainer>
|
</DatasetConfigurationContainer>
|
||||||
)}
|
)}
|
||||||
{showGraphRagItems(selectedTag) && <UseGraphRagItem></UseGraphRagItem>}
|
{showGraphRagItems(selectedTag) && useGraphRag && (
|
||||||
|
<UseGraphRagItem></UseGraphRagItem>
|
||||||
|
)}
|
||||||
{showEntityTypes && <EntityTypesItem></EntityTypesItem>}
|
{showEntityTypes && <EntityTypesItem></EntityTypesItem>}
|
||||||
</Form>
|
</Form>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
@ -48,6 +48,7 @@ export interface ParserConfig {
|
|||||||
raptor?: Raptor;
|
raptor?: Raptor;
|
||||||
tag_kb_ids?: string[];
|
tag_kb_ids?: string[];
|
||||||
topn_tags?: number;
|
topn_tags?: number;
|
||||||
|
graphrag?: { use_graphrag?: boolean };
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IKnowledgeFileParserConfig {
|
export interface IKnowledgeFileParserConfig {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user