From 9a3a8d146487217d21cef7ea0dbe84276b1903c6 Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Thu, 28 Nov 2024 21:46:30 +0700 Subject: [PATCH] fix: remove filter on recommend model --- web/hooks/useRecommendedModel.ts | 14 ++++++-------- web/screens/Thread/ThreadLeftPanel/index.tsx | 8 ++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/web/hooks/useRecommendedModel.ts b/web/hooks/useRecommendedModel.ts index 549543684..d5bf0aba7 100644 --- a/web/hooks/useRecommendedModel.ts +++ b/web/hooks/useRecommendedModel.ts @@ -30,14 +30,12 @@ export default function useRecommendedModel() { const downloadedModels = useAtomValue(downloadedModelsAtom) const getAndSortDownloadedModels = useCallback(async (): Promise => { - const models = downloadedModels - .filter((model) => model.engine === InferenceEngine.cortex_llamacpp) - .sort((a, b) => - a.engine !== InferenceEngine.cortex_llamacpp && - b.engine === InferenceEngine.cortex_llamacpp - ? 1 - : -1 - ) + const models = downloadedModels.sort((a, b) => + a.engine !== InferenceEngine.cortex_llamacpp && + b.engine === InferenceEngine.cortex_llamacpp + ? 1 + : -1 + ) setSortedModels(models) return models }, [downloadedModels]) diff --git a/web/screens/Thread/ThreadLeftPanel/index.tsx b/web/screens/Thread/ThreadLeftPanel/index.tsx index a77ac2d25..61c6672fc 100644 --- a/web/screens/Thread/ThreadLeftPanel/index.tsx +++ b/web/screens/Thread/ThreadLeftPanel/index.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { Thread } from '@janhq/core' +import { InferenceEngine, Thread } from '@janhq/core' import { Button } from '@janhq/joi' import { useAtomValue, useSetAtom } from 'jotai' @@ -71,7 +71,11 @@ const ThreadLeftPanel = () => { threads.length === 0 && downloadedModels.length > 0 ) { - requestCreateNewThread(assistants[0], recommendedModel) + const model = downloadedModels.filter( + (model) => model.engine === InferenceEngine.cortex_llamacpp + ) + const selectedModel = model[0] || recommendedModel + requestCreateNewThread(assistants[0], selectedModel) } else if (threadDataReady && !activeThreadId) { setActiveThread(threads[0]) }