chore: Refactor thread state management (#4350)
* chore: Refactor thread state management • Replace isGeneratingResponseAtom with isBlockingSendAtom • Update dependencies in ChatBody, ChatInput, and MessageToolbar components • Remove unused code and variables * chore: clean states
This commit is contained in:
parent
c0f3fb5007
commit
3af34c0d56
@ -56,7 +56,7 @@ export default function ModelHandler() {
|
|||||||
const activeModel = useAtomValue(activeModelAtom)
|
const activeModel = useAtomValue(activeModelAtom)
|
||||||
const setActiveModel = useSetAtom(activeModelAtom)
|
const setActiveModel = useSetAtom(activeModelAtom)
|
||||||
const setStateModel = useSetAtom(stateModelAtom)
|
const setStateModel = useSetAtom(stateModelAtom)
|
||||||
const [subscribedGeneratingMessage, setSubscribedGeneratingMessage] = useAtom(
|
const subscribedGeneratingMessage = useAtomValue(
|
||||||
subscribedGeneratingMessageAtom
|
subscribedGeneratingMessageAtom
|
||||||
)
|
)
|
||||||
const activeThread = useAtomValue(activeThreadAtom)
|
const activeThread = useAtomValue(activeThreadAtom)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Thread, ThreadContent, ThreadState } from '@janhq/core'
|
import { Thread, ThreadContent, ThreadState } from '@janhq/core'
|
||||||
|
|
||||||
import { atom } from 'jotai'
|
import { atom } from 'jotai'
|
||||||
import { atomWithStorage } from 'jotai/utils'
|
import { atomWithStorage, selectAtom } from 'jotai/utils'
|
||||||
|
|
||||||
import { ModelParams } from '@/types/model'
|
import { ModelParams } from '@/types/model'
|
||||||
|
|
||||||
@ -34,6 +34,22 @@ export const threadStatesAtom = atomWithStorage<Record<string, ThreadState>>(
|
|||||||
{}
|
{}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether there is a thread waiting for response or not
|
||||||
|
*/
|
||||||
|
const isWaitingForResponseAtom = selectAtom(threadStatesAtom, (threads) =>
|
||||||
|
Object.values(threads).some((t) => t.waitingForResponse)
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Combine 2 states to reduce rerender
|
||||||
|
* 1. isWaitingForResponse
|
||||||
|
* 2. isGenerating
|
||||||
|
*/
|
||||||
|
export const isBlockingSendAtom = atom(
|
||||||
|
(get) => get(isWaitingForResponseAtom) || get(isGeneratingResponseAtom)
|
||||||
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores all threads for the current user
|
* Stores all threads for the current user
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -16,8 +16,7 @@ import EmptyThread from './EmptyThread'
|
|||||||
import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
|
import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
|
||||||
import {
|
import {
|
||||||
activeThreadAtom,
|
activeThreadAtom,
|
||||||
isGeneratingResponseAtom,
|
isBlockingSendAtom,
|
||||||
threadStatesAtom,
|
|
||||||
} from '@/helpers/atoms/Thread.atom'
|
} from '@/helpers/atoms/Thread.atom'
|
||||||
|
|
||||||
const ChatConfigurator = memo(() => {
|
const ChatConfigurator = memo(() => {
|
||||||
@ -65,12 +64,7 @@ const ChatBody = memo(
|
|||||||
const prevScrollTop = useRef(0)
|
const prevScrollTop = useRef(0)
|
||||||
const isUserManuallyScrollingUp = useRef(false)
|
const isUserManuallyScrollingUp = useRef(false)
|
||||||
const currentThread = useAtomValue(activeThreadAtom)
|
const currentThread = useAtomValue(activeThreadAtom)
|
||||||
const threadStates = useAtomValue(threadStatesAtom)
|
const isBlockingSend = useAtomValue(isBlockingSendAtom)
|
||||||
const isGeneratingResponse = useAtomValue(isGeneratingResponseAtom)
|
|
||||||
|
|
||||||
const isStreamingResponse = Object.values(threadStates).some(
|
|
||||||
(threadState) => threadState.waitingForResponse
|
|
||||||
)
|
|
||||||
|
|
||||||
const count = useMemo(
|
const count = useMemo(
|
||||||
() => (messages?.length ?? 0) + (loadModelError ? 1 : 0),
|
() => (messages?.length ?? 0) + (loadModelError ? 1 : 0),
|
||||||
@ -87,35 +81,11 @@ const ChatBody = memo(
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
isUserManuallyScrollingUp.current = false
|
isUserManuallyScrollingUp.current = false
|
||||||
if (parentRef.current) {
|
if (parentRef.current && isBlockingSend) {
|
||||||
parentRef.current.scrollTo({ top: parentRef.current.scrollHeight })
|
parentRef.current.scrollTo({ top: parentRef.current.scrollHeight })
|
||||||
virtualizer.scrollToIndex(count - 1)
|
virtualizer.scrollToIndex(count - 1)
|
||||||
}
|
}
|
||||||
}, [count, virtualizer])
|
}, [count, virtualizer, isBlockingSend, currentThread?.id])
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
isUserManuallyScrollingUp.current = false
|
|
||||||
if (parentRef.current && isGeneratingResponse) {
|
|
||||||
parentRef.current.scrollTo({ top: parentRef.current.scrollHeight })
|
|
||||||
virtualizer.scrollToIndex(count - 1)
|
|
||||||
}
|
|
||||||
}, [count, virtualizer, isGeneratingResponse])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
isUserManuallyScrollingUp.current = false
|
|
||||||
if (parentRef.current && isGeneratingResponse) {
|
|
||||||
parentRef.current.scrollTo({ top: parentRef.current.scrollHeight })
|
|
||||||
virtualizer.scrollToIndex(count - 1)
|
|
||||||
}
|
|
||||||
}, [count, virtualizer, isGeneratingResponse, currentThread?.id])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
isUserManuallyScrollingUp.current = false
|
|
||||||
if (parentRef.current) {
|
|
||||||
parentRef.current.scrollTo({ top: parentRef.current.scrollHeight })
|
|
||||||
virtualizer.scrollToIndex(count - 1)
|
|
||||||
}
|
|
||||||
}, [count, currentThread?.id, virtualizer])
|
|
||||||
|
|
||||||
const items = virtualizer.getVirtualItems()
|
const items = virtualizer.getVirtualItems()
|
||||||
|
|
||||||
@ -124,7 +94,7 @@ const ChatBody = memo(
|
|||||||
_,
|
_,
|
||||||
instance
|
instance
|
||||||
) => {
|
) => {
|
||||||
if (isUserManuallyScrollingUp.current === true && isStreamingResponse)
|
if (isUserManuallyScrollingUp.current === true && isBlockingSend)
|
||||||
return false
|
return false
|
||||||
return (
|
return (
|
||||||
// item.start < (instance.scrollOffset ?? 0) &&
|
// item.start < (instance.scrollOffset ?? 0) &&
|
||||||
@ -136,7 +106,7 @@ const ChatBody = memo(
|
|||||||
(event: React.UIEvent<HTMLElement>) => {
|
(event: React.UIEvent<HTMLElement>) => {
|
||||||
const currentScrollTop = event.currentTarget.scrollTop
|
const currentScrollTop = event.currentTarget.scrollTop
|
||||||
|
|
||||||
if (prevScrollTop.current > currentScrollTop && isStreamingResponse) {
|
if (prevScrollTop.current > currentScrollTop && isBlockingSend) {
|
||||||
isUserManuallyScrollingUp.current = true
|
isUserManuallyScrollingUp.current = true
|
||||||
} else {
|
} else {
|
||||||
const currentScrollTop = event.currentTarget.scrollTop
|
const currentScrollTop = event.currentTarget.scrollTop
|
||||||
@ -154,7 +124,7 @@ const ChatBody = memo(
|
|||||||
}
|
}
|
||||||
prevScrollTop.current = currentScrollTop
|
prevScrollTop.current = currentScrollTop
|
||||||
},
|
},
|
||||||
[isStreamingResponse]
|
[isBlockingSend]
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -35,22 +35,19 @@ import RichTextEditor from './RichTextEditor'
|
|||||||
import { showRightPanelAtom } from '@/helpers/atoms/App.atom'
|
import { showRightPanelAtom } from '@/helpers/atoms/App.atom'
|
||||||
import { experimentalFeatureEnabledAtom } from '@/helpers/atoms/AppConfig.atom'
|
import { experimentalFeatureEnabledAtom } from '@/helpers/atoms/AppConfig.atom'
|
||||||
import { activeAssistantAtom } from '@/helpers/atoms/Assistant.atom'
|
import { activeAssistantAtom } from '@/helpers/atoms/Assistant.atom'
|
||||||
import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
|
|
||||||
import { selectedModelAtom } from '@/helpers/atoms/Model.atom'
|
import { selectedModelAtom } from '@/helpers/atoms/Model.atom'
|
||||||
import { spellCheckAtom } from '@/helpers/atoms/Setting.atom'
|
import { spellCheckAtom } from '@/helpers/atoms/Setting.atom'
|
||||||
import {
|
import {
|
||||||
activeSettingInputBoxAtom,
|
activeSettingInputBoxAtom,
|
||||||
activeThreadAtom,
|
activeThreadAtom,
|
||||||
getActiveThreadIdAtom,
|
getActiveThreadIdAtom,
|
||||||
isGeneratingResponseAtom,
|
isBlockingSendAtom,
|
||||||
threadStatesAtom,
|
|
||||||
} from '@/helpers/atoms/Thread.atom'
|
} from '@/helpers/atoms/Thread.atom'
|
||||||
import { activeTabThreadRightPanelAtom } from '@/helpers/atoms/ThreadRightPanel.atom'
|
import { activeTabThreadRightPanelAtom } from '@/helpers/atoms/ThreadRightPanel.atom'
|
||||||
|
|
||||||
const ChatInput = () => {
|
const ChatInput = () => {
|
||||||
const activeThread = useAtomValue(activeThreadAtom)
|
const activeThread = useAtomValue(activeThreadAtom)
|
||||||
const { stateModel } = useActiveModel()
|
const { stateModel } = useActiveModel()
|
||||||
const messages = useAtomValue(getCurrentChatMessagesAtom)
|
|
||||||
const spellCheck = useAtomValue(spellCheckAtom)
|
const spellCheck = useAtomValue(spellCheckAtom)
|
||||||
|
|
||||||
const [currentPrompt, setCurrentPrompt] = useAtom(currentPromptAtom)
|
const [currentPrompt, setCurrentPrompt] = useAtom(currentPromptAtom)
|
||||||
@ -67,8 +64,7 @@ const ChatInput = () => {
|
|||||||
const fileInputRef = useRef<HTMLInputElement>(null)
|
const fileInputRef = useRef<HTMLInputElement>(null)
|
||||||
const imageInputRef = useRef<HTMLInputElement>(null)
|
const imageInputRef = useRef<HTMLInputElement>(null)
|
||||||
const experimentalFeature = useAtomValue(experimentalFeatureEnabledAtom)
|
const experimentalFeature = useAtomValue(experimentalFeatureEnabledAtom)
|
||||||
const isGeneratingResponse = useAtomValue(isGeneratingResponseAtom)
|
const isBlockingSend = useAtomValue(isBlockingSendAtom)
|
||||||
const threadStates = useAtomValue(threadStatesAtom)
|
|
||||||
const activeAssistant = useAtomValue(activeAssistantAtom)
|
const activeAssistant = useAtomValue(activeAssistantAtom)
|
||||||
const { stopInference } = useActiveModel()
|
const { stopInference } = useActiveModel()
|
||||||
|
|
||||||
@ -77,10 +73,6 @@ const ChatInput = () => {
|
|||||||
activeTabThreadRightPanelAtom
|
activeTabThreadRightPanelAtom
|
||||||
)
|
)
|
||||||
|
|
||||||
const isStreamingResponse = Object.values(threadStates).some(
|
|
||||||
(threadState) => threadState.waitingForResponse
|
|
||||||
)
|
|
||||||
|
|
||||||
const refAttachmentMenus = useClickOutside(() => setShowAttacmentMenus(false))
|
const refAttachmentMenus = useClickOutside(() => setShowAttacmentMenus(false))
|
||||||
const [showRightPanel, setShowRightPanel] = useAtom(showRightPanelAtom)
|
const [showRightPanel, setShowRightPanel] = useAtom(showRightPanelAtom)
|
||||||
|
|
||||||
@ -302,7 +294,7 @@ const ChatInput = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!isGeneratingResponse && !isStreamingResponse ? (
|
{!isBlockingSend ? (
|
||||||
<>
|
<>
|
||||||
{currentPrompt.length !== 0 && (
|
{currentPrompt.length !== 0 && (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@ -30,6 +30,7 @@ import {
|
|||||||
} from '@/helpers/atoms/ChatMessage.atom'
|
} from '@/helpers/atoms/ChatMessage.atom'
|
||||||
import {
|
import {
|
||||||
activeThreadAtom,
|
activeThreadAtom,
|
||||||
|
isBlockingSendAtom,
|
||||||
updateThreadAtom,
|
updateThreadAtom,
|
||||||
updateThreadStateLastMessageAtom,
|
updateThreadStateLastMessageAtom,
|
||||||
} from '@/helpers/atoms/Thread.atom'
|
} from '@/helpers/atoms/Thread.atom'
|
||||||
@ -43,6 +44,7 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
|
|||||||
const clipboard = useClipboard({ timeout: 1000 })
|
const clipboard = useClipboard({ timeout: 1000 })
|
||||||
const updateThreadLastMessage = useSetAtom(updateThreadStateLastMessageAtom)
|
const updateThreadLastMessage = useSetAtom(updateThreadStateLastMessageAtom)
|
||||||
const updateThread = useSetAtom(updateThreadAtom)
|
const updateThread = useSetAtom(updateThreadAtom)
|
||||||
|
const isBlockingSend = useAtomValue(isBlockingSendAtom)
|
||||||
|
|
||||||
const onDeleteClick = useCallback(async () => {
|
const onDeleteClick = useCallback(async () => {
|
||||||
deleteMessage(message.id ?? '')
|
deleteMessage(message.id ?? '')
|
||||||
@ -91,7 +93,8 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
|
|||||||
<div className="flex flex-row items-center">
|
<div className="flex flex-row items-center">
|
||||||
<div className="flex gap-1 bg-[hsla(var(--app-bg))]">
|
<div className="flex gap-1 bg-[hsla(var(--app-bg))]">
|
||||||
{message.role === ChatCompletionRole.User &&
|
{message.role === ChatCompletionRole.User &&
|
||||||
message.content[0]?.type === ContentType.Text && (
|
message.content[0]?.type === ContentType.Text &&
|
||||||
|
!isBlockingSend && (
|
||||||
<div
|
<div
|
||||||
className="cursor-pointer rounded-lg border border-[hsla(var(--app-border))] p-2"
|
className="cursor-pointer rounded-lg border border-[hsla(var(--app-border))] p-2"
|
||||||
onClick={onEditClick}
|
onClick={onEditClick}
|
||||||
@ -110,7 +113,8 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
|
|||||||
|
|
||||||
{message.id === messages[messages.length - 1]?.id &&
|
{message.id === messages[messages.length - 1]?.id &&
|
||||||
!messages[messages.length - 1]?.metadata?.error &&
|
!messages[messages.length - 1]?.metadata?.error &&
|
||||||
!messages[messages.length - 1].attachments?.length && (
|
!messages[messages.length - 1].attachments?.length &&
|
||||||
|
!isBlockingSend && (
|
||||||
<div
|
<div
|
||||||
className="cursor-pointer rounded-lg border border-[hsla(var(--app-border))] p-2"
|
className="cursor-pointer rounded-lg border border-[hsla(var(--app-border))] p-2"
|
||||||
onClick={resendChatMessage}
|
onClick={resendChatMessage}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user