reloading model when engine params have new values

This commit is contained in:
Faisal Amir 2024-01-04 11:27:41 +07:00
parent f97fdaed30
commit 214739e143
6 changed files with 130 additions and 20 deletions

View File

@ -9,12 +9,20 @@ import {
TooltipTrigger, TooltipTrigger,
} from '@janhq/uikit' } from '@janhq/uikit'
import { useAtomValue } from 'jotai' import { useAtomValue, useSetAtom } from 'jotai'
import { InfoIcon } from 'lucide-react' import { InfoIcon } from 'lucide-react'
import { useActiveModel } from '@/hooks/useActiveModel'
import useUpdateModelParameters from '@/hooks/useUpdateModelParameters' import useUpdateModelParameters from '@/hooks/useUpdateModelParameters'
import { getActiveThreadIdAtom } from '@/helpers/atoms/Thread.atom' import { getConfigurationsData } from '@/utils/componentSettings'
import { toSettingParams } from '@/utils/model_param'
import {
engineParamsUpdateAtom,
getActiveThreadIdAtom,
getActiveThreadModelParamsAtom,
} from '@/helpers/atoms/Thread.atom'
type Props = { type Props = {
name: string name: string
@ -27,8 +35,24 @@ const Checkbox: React.FC<Props> = ({ name, title, checked, description }) => {
const { updateModelParameter } = useUpdateModelParameters() const { updateModelParameter } = useUpdateModelParameters()
const threadId = useAtomValue(getActiveThreadIdAtom) const threadId = useAtomValue(getActiveThreadIdAtom)
const activeModelParams = useAtomValue(getActiveThreadModelParamsAtom)
const modelSettingParams = toSettingParams(activeModelParams)
const engineParams = getConfigurationsData(modelSettingParams)
const setEngineParamsUpdate = useSetAtom(engineParamsUpdateAtom)
const { stopModel } = useActiveModel()
const onCheckedChange = (checked: boolean) => { const onCheckedChange = (checked: boolean) => {
if (!threadId) return if (!threadId) return
if (engineParams.some((x) => x.name.includes(name))) {
setEngineParamsUpdate(true)
stopModel()
} else {
setEngineParamsUpdate(false)
}
updateModelParameter(threadId, name, checked) updateModelParameter(threadId, name, checked)
} }

View File

@ -0,0 +1,49 @@
import React, { useEffect, useState } from 'react'
import { useActiveModel } from '@/hooks/useActiveModel'
export default function ModelReload() {
const { stateModel } = useActiveModel()
const [loader, setLoader] = useState(0)
// This is fake loader please fix this when we have realtime percentage when load model
useEffect(() => {
if (stateModel.loading) {
if (loader === 24) {
setTimeout(() => {
setLoader(loader + 1)
}, 250)
} else if (loader === 50) {
setTimeout(() => {
setLoader(loader + 1)
}, 250)
} else if (loader === 78) {
setTimeout(() => {
setLoader(loader + 1)
}, 250)
} else if (loader === 99) {
setLoader(99)
} else {
setLoader(loader + 1)
}
} else {
setLoader(0)
}
}, [stateModel.loading, loader])
if (!stateModel.loading) return null
return (
<div className=" mb-1 mt-2 py-2 text-center">
<div className="relative inline-block overflow-hidden rounded-lg border border-neutral-50 bg-blue-50 px-4 py-2 font-semibold text-blue-600 shadow-lg">
<div
className="absolute left-0 top-0 h-full bg-blue-200"
style={{ width: `${loader}%` }}
/>
<span className="relative z-10">
Reloading model {stateModel.model}
</span>
</div>
</div>
)
}

View File

@ -7,13 +7,22 @@ import {
TooltipTrigger, TooltipTrigger,
} from '@janhq/uikit' } from '@janhq/uikit'
import { useAtomValue } from 'jotai' import { useAtomValue, useSetAtom } from 'jotai'
import { InfoIcon } from 'lucide-react' import { InfoIcon } from 'lucide-react'
import { useActiveModel } from '@/hooks/useActiveModel'
import useUpdateModelParameters from '@/hooks/useUpdateModelParameters' import useUpdateModelParameters from '@/hooks/useUpdateModelParameters'
import { getActiveThreadIdAtom } from '@/helpers/atoms/Thread.atom' import { getConfigurationsData } from '@/utils/componentSettings'
import { toSettingParams } from '@/utils/model_param'
import {
engineParamsUpdateAtom,
getActiveThreadIdAtom,
getActiveThreadModelParamsAtom,
} from '@/helpers/atoms/Thread.atom'
type Props = { type Props = {
title: string title: string
@ -33,9 +42,24 @@ const ModelConfigInput: React.FC<Props> = ({
const { updateModelParameter } = useUpdateModelParameters() const { updateModelParameter } = useUpdateModelParameters()
const threadId = useAtomValue(getActiveThreadIdAtom) const threadId = useAtomValue(getActiveThreadIdAtom)
const activeModelParams = useAtomValue(getActiveThreadModelParamsAtom)
const modelSettingParams = toSettingParams(activeModelParams)
const engineParams = getConfigurationsData(modelSettingParams)
const setEngineParamsUpdate = useSetAtom(engineParamsUpdateAtom)
const { stopModel } = useActiveModel()
const onValueChanged = (e: React.ChangeEvent<HTMLTextAreaElement>) => { const onValueChanged = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
if (!threadId) return if (!threadId) return
if (engineParams.some((x) => x.name.includes(name))) {
setEngineParamsUpdate(true)
stopModel()
} else {
setEngineParamsUpdate(false)
}
updateModelParameter(threadId, name, e.target.value) updateModelParameter(threadId, name, e.target.value)
} }

View File

@ -68,10 +68,10 @@ export default function EventHandler({ children }: { children: ReactNode }) {
setTimeout(async () => { setTimeout(async () => {
setActiveModel(undefined) setActiveModel(undefined)
setStateModel({ state: 'start', loading: false, model: '' }) setStateModel({ state: 'start', loading: false, model: '' })
toaster({ // toaster({
title: 'Success!', // title: 'Success!',
description: `Model ${model.id} has been stopped.`, // description: `Model ${model.id} has been stopped.`,
}) // })
}, 500) }, 500)
} }

View File

@ -61,6 +61,9 @@ export default function useSendChatMessage() {
const activeModelParams = useAtomValue(getActiveThreadModelParamsAtom) const activeModelParams = useAtomValue(getActiveThreadModelParamsAtom)
const engineParamsUpdate = useAtomValue(engineParamsUpdateAtom) const engineParamsUpdate = useAtomValue(engineParamsUpdateAtom)
const setEngineParamsUpdate = useSetAtom(engineParamsUpdateAtom)
const [reloadModel, setReloadModel] = useState(false)
useEffect(() => { useEffect(() => {
modelRef.current = activeModel modelRef.current = activeModel
@ -139,7 +142,7 @@ export default function useSendChatMessage() {
return return
} }
console.log(engineParamsUpdate) if (engineParamsUpdate) setReloadModel(true)
const activeThreadState = threadStates[activeThread.id] const activeThreadState = threadStates[activeThread.id]
const runtimeParams = toRuntimeParams(activeModelParams) const runtimeParams = toRuntimeParams(activeModelParams)
@ -263,9 +266,13 @@ export default function useSendChatMessage() {
} }
events.emit(EventName.OnMessageSent, messageRequest) events.emit(EventName.OnMessageSent, messageRequest)
setReloadModel(false)
setEngineParamsUpdate(false)
} }
return { return {
reloadModel,
sendChatMessage, sendChatMessage,
resendChatMessage, resendChatMessage,
queuedMessage, queuedMessage,

View File

@ -11,6 +11,7 @@ import { twMerge } from 'tailwind-merge'
import LogoMark from '@/containers/Brand/Logo/Mark' import LogoMark from '@/containers/Brand/Logo/Mark'
import ModelReload from '@/containers/Loader/ModelReload'
import ModelStart from '@/containers/Loader/ModelStart' import ModelStart from '@/containers/Loader/ModelStart'
import { currentPromptAtom } from '@/containers/Providers/Jotai' import { currentPromptAtom } from '@/containers/Providers/Jotai'
@ -33,6 +34,7 @@ import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
import { import {
activeThreadAtom, activeThreadAtom,
engineParamsUpdateAtom,
getActiveThreadIdAtom, getActiveThreadIdAtom,
waitingToSendMessage, waitingToSendMessage,
} from '@/helpers/atoms/Thread.atom' } from '@/helpers/atoms/Thread.atom'
@ -49,7 +51,7 @@ const ChatScreen = () => {
const [currentPrompt, setCurrentPrompt] = useAtom(currentPromptAtom) const [currentPrompt, setCurrentPrompt] = useAtom(currentPromptAtom)
const activeThreadState = useAtomValue(activeThreadStateAtom) const activeThreadState = useAtomValue(activeThreadStateAtom)
const { sendChatMessage, queuedMessage } = useSendChatMessage() const { sendChatMessage, queuedMessage, reloadModel } = useSendChatMessage()
const isWaitingForResponse = activeThreadState?.waitingForResponse ?? false const isWaitingForResponse = activeThreadState?.waitingForResponse ?? false
const isDisabledChatbox = const isDisabledChatbox =
currentPrompt.trim().length === 0 || isWaitingForResponse currentPrompt.trim().length === 0 || isWaitingForResponse
@ -61,6 +63,7 @@ const ChatScreen = () => {
const textareaRef = useRef<HTMLTextAreaElement>(null) const textareaRef = useRef<HTMLTextAreaElement>(null)
const modelRef = useRef(activeModel) const modelRef = useRef(activeModel)
const engineParamsUpdate = useAtomValue(engineParamsUpdateAtom)
useEffect(() => { useEffect(() => {
modelRef.current = activeModel modelRef.current = activeModel
@ -146,17 +149,20 @@ const ChatScreen = () => {
</div> </div>
)} )}
<ModelStart /> {!engineParamsUpdate && <ModelStart />}
{/* {reloadModel && ( {reloadModel && (
<div className="mb-2 text-center"> <>
<span className="text-muted-foreground"> <ModelReload />
Model is reloading to apply new changes. <div className="mb-2 text-center">
</span> <span className="text-muted-foreground">
</div> Model is reloading to apply new changes.
)} */} </span>
</div>
</>
)}
{queuedMessage && ( {queuedMessage && !reloadModel && (
<div className="mb-2 text-center"> <div className="mb-2 text-center">
<span className="text-muted-foreground"> <span className="text-muted-foreground">
Message queued. It can be sent once the model has started Message queued. It can be sent once the model has started