mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-26 17:16:52 +08:00
### What problem does this PR solve? Feat: The agent can only retrieve content from the knowledge base or memory. #4213 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
@ -79,7 +79,7 @@ export function Header() {
|
|||||||
{ path: Routes.Chats, name: t('header.chat'), icon: MessageSquareText },
|
{ path: Routes.Chats, name: t('header.chat'), icon: MessageSquareText },
|
||||||
{ path: Routes.Searches, name: t('header.search'), icon: Search },
|
{ path: Routes.Searches, name: t('header.search'), icon: Search },
|
||||||
{ path: Routes.Agents, name: t('header.flow'), icon: Cpu },
|
{ path: Routes.Agents, name: t('header.flow'), icon: Cpu },
|
||||||
{ path: Routes.Memories, name: t('header.Memories'), icon: Cpu },
|
{ path: Routes.Memories, name: t('header.memories'), icon: Cpu },
|
||||||
{ path: Routes.Files, name: t('header.fileManager'), icon: File },
|
{ path: Routes.Files, name: t('header.fileManager'), icon: File },
|
||||||
],
|
],
|
||||||
[t],
|
[t],
|
||||||
|
|||||||
@ -99,7 +99,7 @@ export default {
|
|||||||
search: 'Search',
|
search: 'Search',
|
||||||
welcome: 'Welcome to',
|
welcome: 'Welcome to',
|
||||||
dataset: 'Dataset',
|
dataset: 'Dataset',
|
||||||
Memories: 'Memory',
|
memories: 'Memory',
|
||||||
},
|
},
|
||||||
memories: {
|
memories: {
|
||||||
llmTooltip:
|
llmTooltip:
|
||||||
@ -2169,7 +2169,7 @@ Important structured information may include: names, dates, locations, events, k
|
|||||||
agentStatus: 'Agent status:',
|
agentStatus: 'Agent status:',
|
||||||
},
|
},
|
||||||
saveToMemory: 'Save to memory',
|
saveToMemory: 'Save to memory',
|
||||||
memory: 'Memory',
|
retrievalFrom: 'Retrieval from',
|
||||||
},
|
},
|
||||||
llmTools: {
|
llmTools: {
|
||||||
bad_calculator: {
|
bad_calculator: {
|
||||||
|
|||||||
@ -93,7 +93,7 @@ export default {
|
|||||||
search: '搜索',
|
search: '搜索',
|
||||||
welcome: '欢迎来到',
|
welcome: '欢迎来到',
|
||||||
dataset: '知识库',
|
dataset: '知识库',
|
||||||
Memories: '记忆',
|
memories: '记忆',
|
||||||
},
|
},
|
||||||
memories: {
|
memories: {
|
||||||
llmTooltip: '分析对话内容,提取关键信息,并生成结构化的记忆摘要。',
|
llmTooltip: '分析对话内容,提取关键信息,并生成结构化的记忆摘要。',
|
||||||
@ -1970,7 +1970,7 @@ Tokenizer 会根据所选方式将内容存储为对应的数据结构。`,
|
|||||||
agentStatus: '智能体状态:',
|
agentStatus: '智能体状态:',
|
||||||
},
|
},
|
||||||
saveToMemory: '保存到Memory',
|
saveToMemory: '保存到Memory',
|
||||||
memory: 'Memory',
|
retrievalFrom: '检索来源',
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
profile: 'All rights reserved @ React',
|
profile: 'All rights reserved @ React',
|
||||||
|
|||||||
@ -79,6 +79,11 @@ export const DataOperationsOperatorOptions = [
|
|||||||
|
|
||||||
export const SwitchElseTo = 'end_cpn_ids';
|
export const SwitchElseTo = 'end_cpn_ids';
|
||||||
|
|
||||||
|
export enum RetrievalFrom {
|
||||||
|
Dataset = 'dataset',
|
||||||
|
Memory = 'memory',
|
||||||
|
}
|
||||||
|
|
||||||
export const initialRetrievalValues = {
|
export const initialRetrievalValues = {
|
||||||
query: AgentGlobalsSysQueryWithBrace,
|
query: AgentGlobalsSysQueryWithBrace,
|
||||||
top_n: 8,
|
top_n: 8,
|
||||||
@ -91,6 +96,7 @@ export const initialRetrievalValues = {
|
|||||||
use_kg: false,
|
use_kg: false,
|
||||||
toc_enhance: false,
|
toc_enhance: false,
|
||||||
cross_languages: [],
|
cross_languages: [],
|
||||||
|
retrieval_from: RetrievalFrom.Dataset,
|
||||||
outputs: {
|
outputs: {
|
||||||
formalized_content: {
|
formalized_content: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
|||||||
@ -20,14 +20,20 @@ import {
|
|||||||
FormLabel,
|
FormLabel,
|
||||||
FormMessage,
|
FormMessage,
|
||||||
} from '@/components/ui/form';
|
} from '@/components/ui/form';
|
||||||
|
import { Radio } from '@/components/ui/radio';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { UseKnowledgeGraphFormField } from '@/components/use-knowledge-graph-item';
|
import { UseKnowledgeGraphFormField } from '@/components/use-knowledge-graph-item';
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
import { zodResolver } from '@hookform/resolvers/zod';
|
||||||
import { memo, useMemo } from 'react';
|
import { memo, useMemo } from 'react';
|
||||||
import { useForm, useFormContext } from 'react-hook-form';
|
import {
|
||||||
|
UseFormReturn,
|
||||||
|
useForm,
|
||||||
|
useFormContext,
|
||||||
|
useWatch,
|
||||||
|
} from 'react-hook-form';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
import { initialRetrievalValues } from '../../constant';
|
import { RetrievalFrom, initialRetrievalValues } from '../../constant';
|
||||||
import { useWatchFormChange } from '../../hooks/use-watch-form-change';
|
import { useWatchFormChange } from '../../hooks/use-watch-form-change';
|
||||||
import { INextOperatorForm } from '../../interface';
|
import { INextOperatorForm } from '../../interface';
|
||||||
import { FormWrapper } from '../components/form-wrapper';
|
import { FormWrapper } from '../components/form-wrapper';
|
||||||
@ -55,6 +61,42 @@ export const FormSchema = z.object({
|
|||||||
...RetrievalPartialSchema,
|
...RetrievalPartialSchema,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export function MemoryDatasetForm() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const form = useFormContext();
|
||||||
|
const retrievalFrom = useWatch({
|
||||||
|
control: form.control,
|
||||||
|
name: 'retrieval_from',
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<RAGFlowFormItem name="retrieval_from" label={t('flow.retrievalFrom')}>
|
||||||
|
<Radio.Group>
|
||||||
|
<Radio value={RetrievalFrom.Dataset}>
|
||||||
|
{t('knowledgeDetails.dataset')}
|
||||||
|
</Radio>
|
||||||
|
<Radio value={RetrievalFrom.Memory}>{t('header.memories')}</Radio>
|
||||||
|
</Radio.Group>
|
||||||
|
</RAGFlowFormItem>
|
||||||
|
{retrievalFrom === RetrievalFrom.Memory ? (
|
||||||
|
<MemoriesFormField label={t('header.memories')}></MemoriesFormField>
|
||||||
|
) : (
|
||||||
|
<KnowledgeBaseFormField showVariable></KnowledgeBaseFormField>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useHideKnowledgeGraphField(form: UseFormReturn<any>) {
|
||||||
|
const retrievalFrom = useWatch({
|
||||||
|
control: form.control,
|
||||||
|
name: 'retrieval_from',
|
||||||
|
});
|
||||||
|
|
||||||
|
return retrievalFrom === RetrievalFrom.Memory;
|
||||||
|
}
|
||||||
|
|
||||||
export function EmptyResponseField() {
|
export function EmptyResponseField() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const form = useFormContext();
|
const form = useFormContext();
|
||||||
@ -106,6 +148,8 @@ function RetrievalForm({ node }: INextOperatorForm) {
|
|||||||
resolver: zodResolver(FormSchema),
|
resolver: zodResolver(FormSchema),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const hideKnowledgeGraphField = useHideKnowledgeGraphField(form);
|
||||||
|
|
||||||
useWatchFormChange(node?.id, form);
|
useWatchFormChange(node?.id, form);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -114,8 +158,7 @@ function RetrievalForm({ node }: INextOperatorForm) {
|
|||||||
<RAGFlowFormItem name="query" label={t('flow.query')}>
|
<RAGFlowFormItem name="query" label={t('flow.query')}>
|
||||||
<PromptEditor></PromptEditor>
|
<PromptEditor></PromptEditor>
|
||||||
</RAGFlowFormItem>
|
</RAGFlowFormItem>
|
||||||
<KnowledgeBaseFormField showVariable></KnowledgeBaseFormField>
|
<MemoryDatasetForm></MemoryDatasetForm>
|
||||||
<MemoriesFormField label={t('flow.memory')}></MemoriesFormField>
|
|
||||||
<Collapse title={<div>{t('flow.advancedSettings')}</div>}>
|
<Collapse title={<div>{t('flow.advancedSettings')}</div>}>
|
||||||
<FormContainer>
|
<FormContainer>
|
||||||
<SimilaritySliderFormField
|
<SimilaritySliderFormField
|
||||||
@ -123,12 +166,20 @@ function RetrievalForm({ node }: INextOperatorForm) {
|
|||||||
isTooltipShown
|
isTooltipShown
|
||||||
></SimilaritySliderFormField>
|
></SimilaritySliderFormField>
|
||||||
<TopNFormField></TopNFormField>
|
<TopNFormField></TopNFormField>
|
||||||
<RerankFormFields></RerankFormFields>
|
{hideKnowledgeGraphField || (
|
||||||
<MetadataFilter canReference></MetadataFilter>
|
<>
|
||||||
|
<RerankFormFields></RerankFormFields>
|
||||||
|
<MetadataFilter canReference></MetadataFilter>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<EmptyResponseField></EmptyResponseField>
|
<EmptyResponseField></EmptyResponseField>
|
||||||
<CrossLanguageFormField name="cross_languages"></CrossLanguageFormField>
|
{hideKnowledgeGraphField || (
|
||||||
<UseKnowledgeGraphFormField name="use_kg"></UseKnowledgeGraphFormField>
|
<>
|
||||||
<TOCEnhanceFormField name="toc_enhance"></TOCEnhanceFormField>
|
<CrossLanguageFormField name="cross_languages"></CrossLanguageFormField>
|
||||||
|
<UseKnowledgeGraphFormField name="use_kg"></UseKnowledgeGraphFormField>
|
||||||
|
<TOCEnhanceFormField name="toc_enhance"></TOCEnhanceFormField>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</FormContainer>
|
</FormContainer>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
<Output list={outputList}></Output>
|
<Output list={outputList}></Output>
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
import { Collapse } from '@/components/collapse';
|
import { Collapse } from '@/components/collapse';
|
||||||
import { CrossLanguageFormField } from '@/components/cross-language-form-field';
|
import { CrossLanguageFormField } from '@/components/cross-language-form-field';
|
||||||
import { FormContainer } from '@/components/form-container';
|
import { FormContainer } from '@/components/form-container';
|
||||||
import { KnowledgeBaseFormField } from '@/components/knowledge-base-item';
|
|
||||||
import { MemoriesFormField } from '@/components/memories-form-field';
|
|
||||||
import { MetadataFilter } from '@/components/metadata-filter';
|
import { MetadataFilter } from '@/components/metadata-filter';
|
||||||
import { RerankFormFields } from '@/components/rerank';
|
import { RerankFormFields } from '@/components/rerank';
|
||||||
import { SimilaritySliderFormField } from '@/components/similarity-slider';
|
import { SimilaritySliderFormField } from '@/components/similarity-slider';
|
||||||
@ -18,7 +16,9 @@ import { DescriptionField } from '../../components/description-field';
|
|||||||
import { FormWrapper } from '../../components/form-wrapper';
|
import { FormWrapper } from '../../components/form-wrapper';
|
||||||
import {
|
import {
|
||||||
EmptyResponseField,
|
EmptyResponseField,
|
||||||
|
MemoryDatasetForm,
|
||||||
RetrievalPartialSchema,
|
RetrievalPartialSchema,
|
||||||
|
useHideKnowledgeGraphField,
|
||||||
} from '../../retrieval-form/next';
|
} from '../../retrieval-form/next';
|
||||||
import { useValues } from '../use-values';
|
import { useValues } from '../use-values';
|
||||||
import { useWatchFormChange } from '../use-watch-change';
|
import { useWatchFormChange } from '../use-watch-change';
|
||||||
@ -36,14 +36,15 @@ const RetrievalForm = () => {
|
|||||||
resolver: zodResolver(FormSchema),
|
resolver: zodResolver(FormSchema),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const hideKnowledgeGraphField = useHideKnowledgeGraphField(form);
|
||||||
|
|
||||||
useWatchFormChange(form);
|
useWatchFormChange(form);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Form {...form}>
|
<Form {...form}>
|
||||||
<FormWrapper>
|
<FormWrapper>
|
||||||
<DescriptionField></DescriptionField>
|
<DescriptionField></DescriptionField>
|
||||||
<KnowledgeBaseFormField showVariable></KnowledgeBaseFormField>
|
<MemoryDatasetForm></MemoryDatasetForm>
|
||||||
<MemoriesFormField label={t('flow.memory')}></MemoriesFormField>
|
|
||||||
<Collapse title={<div>{t('flow.advancedSettings')}</div>}>
|
<Collapse title={<div>{t('flow.advancedSettings')}</div>}>
|
||||||
<FormContainer>
|
<FormContainer>
|
||||||
<SimilaritySliderFormField
|
<SimilaritySliderFormField
|
||||||
@ -51,12 +52,21 @@ const RetrievalForm = () => {
|
|||||||
isTooltipShown
|
isTooltipShown
|
||||||
></SimilaritySliderFormField>
|
></SimilaritySliderFormField>
|
||||||
<TopNFormField></TopNFormField>
|
<TopNFormField></TopNFormField>
|
||||||
<RerankFormFields></RerankFormFields>
|
{hideKnowledgeGraphField || (
|
||||||
<MetadataFilter canReference></MetadataFilter>
|
<>
|
||||||
|
<RerankFormFields></RerankFormFields>
|
||||||
|
<MetadataFilter canReference></MetadataFilter>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
<EmptyResponseField></EmptyResponseField>
|
<EmptyResponseField></EmptyResponseField>
|
||||||
<CrossLanguageFormField name="cross_languages"></CrossLanguageFormField>
|
{hideKnowledgeGraphField || (
|
||||||
<UseKnowledgeGraphFormField name="use_kg"></UseKnowledgeGraphFormField>
|
<>
|
||||||
<TOCEnhanceFormField name="toc_enhance"></TOCEnhanceFormField>
|
<CrossLanguageFormField name="cross_languages"></CrossLanguageFormField>
|
||||||
|
<UseKnowledgeGraphFormField name="use_kg"></UseKnowledgeGraphFormField>
|
||||||
|
<TOCEnhanceFormField name="toc_enhance"></TOCEnhanceFormField>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</FormContainer>
|
</FormContainer>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</FormWrapper>
|
</FormWrapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user