Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4156 from janhq/fix/remote-model

Browse Source 
fix: remove filter on recommend model
This commit is contained in:
Louis 2024-11-28 22:25:44 +07:00 committed by GitHub
commit 0c37be302c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/hooks/useRecommendedModel.ts
View File

@ -30,14 +30,12 @@ export default function useRecommendedModel() {
const downloadedModels = useAtomValue(downloadedModelsAtom) const downloadedModels = useAtomValue(downloadedModelsAtom)
const getAndSortDownloadedModels = useCallback(async (): Promise<Model[]> => { const getAndSortDownloadedModels = useCallback(async (): Promise<Model[]> => {
const models = downloadedModels const models = downloadedModels.sort((a, b) =>
.filter((model) => model.engine === InferenceEngine.cortex_llamacpp) a.engine !== InferenceEngine.cortex_llamacpp &&
.sort((a, b) => b.engine === InferenceEngine.cortex_llamacpp
a.engine !== InferenceEngine.cortex_llamacpp && ? 1
b.engine === InferenceEngine.cortex_llamacpp : -1
? 1 )
: -1
)
setSortedModels(models) setSortedModels(models)
return models return models
}, [downloadedModels]) }, [downloadedModels])

8
web/screens/Thread/ThreadLeftPanel/index.tsx
View File

@ -1,6 +1,6 @@
import { useCallback, useEffect, useState } from 'react' import { useCallback, useEffect, useState } from 'react'
import { Thread } from '@janhq/core' import { InferenceEngine, Thread } from '@janhq/core'
import { Button } from '@janhq/joi' import { Button } from '@janhq/joi'
import { useAtomValue, useSetAtom } from 'jotai' import { useAtomValue, useSetAtom } from 'jotai'
@ -71,7 +71,11 @@ const ThreadLeftPanel = () => {
threads.length === 0 && threads.length === 0 &&
downloadedModels.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) { } else if (threadDataReady && !activeThreadId) {
setActiveThread(threads[0]) setActiveThread(threads[0])
} }