feat: Search for the answers you want based on the selected knowledge base #2247 (#2287)

### What problem does this PR solve?

feat: Search for the answers you want based on the selected knowledge
base #2247

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
balibabu
2024-09-06 15:42:55 +08:00
committed by GitHub
parent b5a2711c05
commit 925dd2aa85
8 changed files with 46 additions and 103 deletions

View File

@ -7,13 +7,14 @@ import { getExtension } from '@/utils/document-util';
import { InfoCircleOutlined } from '@ant-design/icons';
import { Button, Flex, Popover, Space } from 'antd';
import DOMPurify from 'dompurify';
import { useCallback } from 'react';
import { useCallback, useMemo } from 'react';
import Markdown from 'react-markdown';
import reactStringReplace from 'react-string-replace';
import SyntaxHighlighter from 'react-syntax-highlighter';
import remarkGfm from 'remark-gfm';
import { visitParents } from 'unist-util-visit-parents';
import { useTranslation } from 'react-i18next';
import styles from './index.less';
const reg = /(#{2}\d+\${2})/g;
@ -25,11 +26,22 @@ const MarkdownContent = ({
reference,
clickDocumentButton,
content,
loading,
}: {
content: string;
loading: boolean;
reference: IReference;
clickDocumentButton?: (documentId: string, chunk: IChunk) => void;
}) => {
const { t } = useTranslation();
const contentWithCursor = useMemo(() => {
let text = content;
if (text === '') {
text = t('chat.searching');
}
return loading ? text?.concat('~~2$$') : text;
}, [content, loading, t]);
const fileThumbnails = useSelectFileThumbnails();
const handleDocumentButtonClick = useCallback(
@ -173,7 +185,7 @@ const MarkdownContent = ({
} as any
}
>
{content}
{contentWithCursor}
</Markdown>
);
};

View File

@ -1,26 +1,19 @@
import { MessageType } from '@/constants/chat';
import { useTestChunkRetrieval } from '@/hooks/knowledge-hooks';
import { useSendMessageWithSse } from '@/hooks/logic-hooks';
import { IAnswer } from '@/interfaces/database/chat';
import api from '@/utils/api';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { IMessage } from '../chat/interface';
import { isEmpty } from 'lodash';
import { useCallback, useEffect, useState } from 'react';
export const useSendQuestion = (kbIds: string[]) => {
const { send, answer, done } = useSendMessageWithSse(api.ask);
const { testChunk, loading } = useTestChunkRetrieval();
const [sendingLoading, setSendingLoading] = useState(false);
const message: IMessage = useMemo(() => {
return {
id: '',
content: answer.answer,
role: MessageType.Assistant,
reference: answer.reference,
};
}, [answer]);
const [currentAnswer, setCurrentAnswer] = useState({} as IAnswer);
const sendQuestion = useCallback(
(question: string) => {
setCurrentAnswer({} as IAnswer);
setSendingLoading(true);
send({ kb_ids: kbIds, question });
testChunk({ kb_id: kbIds, highlight: true, question });
@ -28,11 +21,17 @@ export const useSendQuestion = (kbIds: string[]) => {
[send, testChunk, kbIds],
);
useEffect(() => {
if (!isEmpty(answer)) {
setCurrentAnswer(answer);
}
}, [answer]);
useEffect(() => {
if (done) {
setSendingLoading(false);
}
}, [done]);
return { sendQuestion, message, loading, sendingLoading };
return { sendQuestion, loading, sendingLoading, answer: currentAnswer };
};

View File

@ -1,5 +1,7 @@
.searchPage {
// height: 100%;
.card {
width: 100%;
}
}
.searchSide {

View File

@ -1,10 +1,10 @@
import HightLightMarkdown from '@/components/highlight-markdown';
import { ImageWithPopover } from '@/components/image';
import MessageItem from '@/components/message-item';
import { useSelectTestingResult } from '@/hooks/knowledge-hooks';
import { IReference } from '@/interfaces/database/chat';
import { Card, Flex, Input, Layout, List, Space } from 'antd';
import { useState } from 'react';
import MarkdownContent from '../chat/markdown-content';
import { useSendQuestion } from './hooks';
import SearchSidebar from './sidebar';
@ -16,8 +16,7 @@ const { Search } = Input;
const SearchPage = () => {
const [checkedList, setCheckedList] = useState<string[]>([]);
const list = useSelectTestingResult();
const { sendQuestion, message, sendingLoading } =
useSendQuestion(checkedList);
const { sendQuestion, answer, sendingLoading } = useSendQuestion(checkedList);
return (
<Layout className={styles.searchPage}>
@ -33,19 +32,20 @@ const SearchPage = () => {
placeholder="input search text"
onSearch={sendQuestion}
size="large"
/>
<MessageItem
item={message}
nickname="You"
reference={message.reference ?? ({} as IReference)}
loading={sendingLoading}
index={0}
></MessageItem>
disabled={checkedList.length === 0}
/>
<MarkdownContent
loading={sendingLoading}
content={answer.answer}
reference={answer.reference ?? ({} as IReference)}
clickDocumentButton={() => {}}
></MarkdownContent>
<List
dataSource={list.chunks}
renderItem={(item) => (
<List.Item>
<Card>
<Card className={styles.card}>
<Space>
<ImageWithPopover id={item.img_id}></ImageWithPopover>
<HightLightMarkdown>