pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Click on the relevant question tag to continue searching for answers #2247 (#2320)

Browse Source 
### What problem does this PR solve?

feat: Click on the relevant question tag to continue searching for
answers #2247

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
balibabu
2024-09-09 14:02:08 +08:00
committed by GitHub
parent 22acd0ac67
commit fbe68034aa
6 changed files with 74 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
web/src/pages/chat/hooks.ts
View File

@ -19,21 +19,12 @@ import {
} from '@/hooks/common-hooks';
import {
useRegenerateMessage,
useRemoveMessageById,
useRemoveMessagesAfterCurrentMessage,
useScrollToBottom,
useSelectDerivedMessages,
useSendMessageWithSse,
} from '@/hooks/logic-hooks';
import {
IAnswer,
IConversation,
IDialog,
Message,
} from '@/interfaces/database/chat';
import { IConversation, IDialog, Message } from '@/interfaces/database/chat';
import { IChunk } from '@/interfaces/database/knowledge';
import { getFileExtension } from '@/utils';
import { buildMessageUuid } from '@/utils/chat';
import { useMutationState } from '@tanstack/react-query';
import { get } from 'lodash';
import trim from 'lodash/trim';
@ -251,118 +242,6 @@ export const useSetConversation = () => {
return { setConversation };
};
export const useSelectCurrentConversation = () => {
const [currentConversation, setCurrentConversation] =
useState<IClientConversation>({} as IClientConversation);
const { data: conversation, loading } = useFetchNextConversation();
const { data: dialog } = useFetchNextDialog();
const { conversationId, dialogId } = useGetChatSearchParams();
const { removeMessageById } = useRemoveMessageById(setCurrentConversation);
const { removeMessagesAfterCurrentMessage } =
useRemoveMessagesAfterCurrentMessage(setCurrentConversation);
// Show the entered message in the conversation immediately after sending the message
const addNewestConversation = useCallback(
(message: Message, answer: string = '') => {
setCurrentConversation((pre) => {
return {
...pre,
message: [
...pre.message,
{
...message,
id: buildMessageUuid(message),
} as IMessage,
{
role: MessageType.Assistant,
content: answer,
id: buildMessageUuid({ ...message, role: MessageType.Assistant }),
reference: {},
} as IMessage,
],
};
});
},
[],
);
// Add the streaming message to the last item in the message list
const addNewestAnswer = useCallback((answer: IAnswer) => {
setCurrentConversation((pre) => {
const latestMessage = pre.message?.at(-1);
if (latestMessage) {
return {
...pre,
message: [
...pre.message.slice(0, -1),
{
...latestMessage,
content: answer.answer,
reference: answer.reference,
id: buildMessageUuid({
id: answer.id,
role: MessageType.Assistant,
}),
prompt: answer.prompt,
} as IMessage,
],
};
}
return pre;
});
}, []);
const removeLatestMessage = useCallback(() => {
setCurrentConversation((pre) => {
const nextMessages = pre.message?.slice(0, -2) ?? [];
return {
...pre,
message: nextMessages,
};
});
}, []);
const addPrologue = useCallback(() => {
if (dialogId !== '' && conversationId === '') {
const prologue = dialog.prompt_config?.prologue;
const nextMessage = {
role: MessageType.Assistant,
content: prologue,
id: uuid(),
} as IMessage;
setCurrentConversation({
id: '',
dialog_id: dialogId,
reference: [],
message: [nextMessage],
} as any);
}
}, [conversationId, dialog, dialogId]);
useEffect(() => {
addPrologue();
}, [addPrologue]);
useEffect(() => {
if (conversationId) {
setCurrentConversation(conversation);
}
}, [conversation, conversationId]);
return {
currentConversation,
addNewestConversation,
removeLatestMessage,
addNewestAnswer,
removeMessageById,
removeMessagesAfterCurrentMessage,
loading,
};
};
// export const useScrollToBottom = (currentConversation: IClientConversation) => {
// const ref = useRef<HTMLDivElement>(null);
@ -430,32 +309,6 @@ export const useSelectNextMessages = () => {
};
};
export const useFetchConversationOnMount = () => {
const { conversationId } = useGetChatSearchParams();
const {
currentConversation,
addNewestConversation,
removeLatestMessage,
addNewestAnswer,
loading,
removeMessageById,
removeMessagesAfterCurrentMessage,
} = useSelectCurrentConversation();
const ref = useScrollToBottom(currentConversation);
return {
currentConversation,
addNewestConversation,
ref,
removeLatestMessage,
addNewestAnswer,
conversationId,
loading,
removeMessageById,
removeMessagesAfterCurrentMessage,
};
};
export const useHandleMessageInputChange = () => {
const [value, setValue] = useState('');
@ -477,7 +330,7 @@ export const useSendNextMessage = () => {
const { conversationId } = useGetChatSearchParams();
const { handleInputChange, value, setValue } = useHandleMessageInputChange();
const { handleClickConversation } = useClickConversationCard();
const { send, answer, done, setDone } = useSendMessageWithSse();
const { send, answer, done, setDone, resetAnswer } = useSendMessageWithSse();
const {
ref,
derivedMessages,
@ -557,10 +410,11 @@ export const useSendNextMessage = () => {
useEffect(() => {
// #1289
console.log('🚀 ~ useEffect ~ answer:', answer, done);
if (
answer.answer &&
!done &&
(answer?.conversationId === conversationId || conversationId === '')
(answer?.conversationId === conversationId ||
(!done && conversationId === ''))
) {
addNewestAnswer(answer);
}
@ -570,8 +424,10 @@ export const useSendNextMessage = () => {
// #1289 switch to another conversion window when the last conversion answer doesn't finish.
if (conversationId) {
setDone(true);
} else {
resetAnswer();
}
}, [setDone, conversationId]);
}, [setDone, conversationId, resetAnswer]);
const handlePressEnter = useCallback(
(documentIds: string[]) => {