From 5c8c6f479517ca4681b3caf43738a337c29689df Mon Sep 17 00:00:00 2001 From: hiro Date: Tue, 23 Jan 2024 17:55:23 +0700 Subject: [PATCH 1/4] fix: Change to fixed `localhost` instead of using host variable --- web/screens/LocalServer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/screens/LocalServer/index.tsx b/web/screens/LocalServer/index.tsx index 83b5989af..f9a803aa7 100644 --- a/web/screens/LocalServer/index.tsx +++ b/web/screens/LocalServer/index.tsx @@ -129,7 +129,7 @@ const LocalServerScreen = () => { {serverEnabled && ( From 8ce454ae6199c827652967c44235689cb810fafa Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Mon, 22 Jan 2024 20:02:08 +0700 Subject: [PATCH 2/4] fix: error message when not enough RAM --- web/screens/Chat/ErrorMessage/index.tsx | 49 ++++++++++++++++--------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx index 41d58dbdd..045e8185a 100644 --- a/web/screens/Chat/ErrorMessage/index.tsx +++ b/web/screens/Chat/ErrorMessage/index.tsx @@ -9,6 +9,7 @@ import { Button } from '@janhq/uikit' import { useAtomValue, useSetAtom } from 'jotai' import { RefreshCcw } from 'lucide-react' +import { useActiveModel } from '@/hooks/useActiveModel' import useSendChatMessage from '@/hooks/useSendChatMessage' import { extensionManager } from '@/extension' @@ -16,6 +17,7 @@ import { deleteMessageAtom, getCurrentChatMessagesAtom, } from '@/helpers/atoms/ChatMessage.atom' +import { totalRamAtom } from '@/helpers/atoms/SystemBar.atom' import { activeThreadAtom } from '@/helpers/atoms/Thread.atom' const ErrorMessage = ({ message }: { message: ThreadMessage }) => { @@ -23,6 +25,8 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => { const thread = useAtomValue(activeThreadAtom) const deleteMessage = useSetAtom(deleteMessageAtom) const { resendChatMessage } = useSendChatMessage() + const { activeModel } = useActiveModel() + const totalRam = useAtomValue(totalRamAtom) const regenerateMessage = async () => { const lastMessageIndex = messages.length - 1 @@ -66,24 +70,33 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => { {message.status === MessageStatus.Error && (
-

Apologies, something's amiss!

- Jan's in beta. Find troubleshooting guides{' '} - - here - {' '} - or reach out to us on{' '} - - Discord - {' '} - for assistance. + {Number(activeModel?.metadata.size) * 1.25 > totalRam ? ( + <> + Oops! Model size exceeds available RAM. Consider selecting a + smaller model or upgrading your RAM for smoother performance. + + ) : ( + <> +

Apologies, something's amiss!

+ Jan's in beta. Find troubleshooting guides{' '} + + here + {' '} + or reach out to us on{' '} + + Discord + {' '} + for assistance. + + )}
)} From 7d511cfbb0212b769762cd04b96aba0cde0f79c7 Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Tue, 23 Jan 2024 13:20:51 +0700 Subject: [PATCH 3/4] update login calculate not enough ram for error message --- web/screens/Chat/ErrorMessage/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx index 045e8185a..8879b15be 100644 --- a/web/screens/Chat/ErrorMessage/index.tsx +++ b/web/screens/Chat/ErrorMessage/index.tsx @@ -70,7 +70,7 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => { {message.status === MessageStatus.Error && (
- {Number(activeModel?.metadata.size) * 1.25 > totalRam ? ( + {Number(activeModel?.metadata.size) > totalRam ? ( <> Oops! Model size exceeds available RAM. Consider selecting a smaller model or upgrading your RAM for smoother performance. From d6242def98951b945caefd19115192afa4f8f2b8 Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Tue, 23 Jan 2024 10:57:46 +0700 Subject: [PATCH 4/4] fix: active model when start server --- web/screens/LocalServer/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/screens/LocalServer/index.tsx b/web/screens/LocalServer/index.tsx index f9a803aa7..600437b62 100644 --- a/web/screens/LocalServer/index.tsx +++ b/web/screens/LocalServer/index.tsx @@ -108,9 +108,7 @@ const LocalServerScreen = () => { window.core?.api?.stopServer() setServerEnabled(false) } else { - if (!activeModel) { - startModel(String(selectedModel?.id)) - } + startModel(String(selectedModel?.id)) window.core?.api?.startServer({ host, port,