fix: load model fail overlays thread message error

janhq · Feb 2, 2024 · 22bfe3c · 22bfe3c
1 parent 36ad16f
commit 22bfe3c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 54 deletions.
diff --git a/web/hooks/useSetActiveThread.ts b/web/hooks/useSetActiveThread.ts
@@ -8,6 8,8 @@ import {
 
 import { useAtomValue, useSetAtom } from 'jotai'
 
 import { loadModelErrorAtom } from './useActiveModel'
 
 import { extensionManager } from '@/extension'
 import { setConvoMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
 import {
@@ -24,6 26,7 @@ export default function useSetActiveThread() {
  const setThreadMessage = useSetAtom(setConvoMessagesAtom)
  const setThreadModelParams = useSetAtom(setThreadModelParamsAtom)
  const setIsGeneratingResponse = useSetAtom(isGeneratingResponseAtom)
  const setLoadModelError = useSetAtom(loadModelErrorAtom)
 
  const setActiveThread = async (thread: Thread) => {
  if (activeThreadId === thread.id) {
@@ -32,6 35,7 @@ export default function useSetActiveThread() {
  }
 
  setIsGeneratingResponse(false)
  setLoadModelError(undefined)
  events.emit(InferenceEvent.OnInferenceStopped, thread.id)
 
  // load the corresponding messages

diff --git a/web/screens/Chat/ChatBody/index.tsx b/web/screens/Chat/ChatBody/index.tsx
@@ -25,7 25,6 @@ const ChatBody: React.FC = () => {
  const messages = useAtomValue(getCurrentChatMessagesAtom)
  const { downloadedModels } = useGetDownloadedModels()
  const { setMainViewState } = useMainViewState()
- const loadModelError = useAtomValue(loadModelErrorAtom)
 
  if (downloadedModels.length === 0)
  return (
@@ -86,9 85,8 @@ const ChatBody: React.FC = () => {
  message.content.length > 0) && (
  <ChatItem {...message} key={message.id} />
  )}
- {!loadModelError &&
- (message.status === MessageStatus.Error ||
- message.status === MessageStatus.Stopped) &&
  {(message.status === MessageStatus.Error ||
  message.status === MessageStatus.Stopped) &&
  index === messages.length - 1 && (
  <ErrorMessage message={message} />
  )}

diff --git a/web/screens/Chat/LoadModelErrorMessage/index.tsx b/web/screens/Chat/LoadModelErrorMessage/index.tsx
diff --git a/web/screens/Chat/index.tsx b/web/screens/Chat/index.tsx
@@ -70,7 70,6 @@ const ChatScreen: React.FC = () => {
  const activeModel = useAtomValue(activeModelAtom)
 
  const isGeneratingResponse = useAtomValue(isGeneratingResponseAtom)
- const loadModelError = useAtomValue(loadModelErrorAtom)
 
  const { getRootProps, isDragReject } = useDropzone({
  noClick: true,
@@ -213,7 212,6 @@ const ChatScreen: React.FC = () => {
  )}
 
  {activeModel && isGeneratingResponse && <GenerateResponse />}
- {loadModelError && <LoadModelErrorMessage />}
  <ChatInput />
  </div>
  </div>