whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: topic naming assistant using incorrect language model

Browse Source
This commit is contained in:
kangfenmao 2024-07-10 16:27:09 +08:00
parent e311adc417
commit 4a116da753
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/renderer/src/services/api.ts
View File

@ -3,7 +3,7 @@ import { uuid } from '@renderer/utils'
import { EVENT_NAMES, EventEmitter } from './event'
import { ChatCompletionMessageParam, ChatCompletionSystemMessageParam } from 'openai/resources'
import OpenAI from 'openai'
import { getAssistantProvider, getDefaultModel } from './assistant'
import { getAssistantProvider, getDefaultModel, getProviderByModel, getTopNamingModel } from './assistant'
import { takeRight } from 'lodash'
import dayjs from 'dayjs'
@ -77,10 +77,9 @@ interface FetchMessagesSummaryParams {
}
export async function fetchMessagesSummary({ messages, assistant }: FetchMessagesSummaryParams) {
const provider = getAssistantProvider(assistant)
const model = getTopNamingModel() || getDefaultModel()
const provider = getProviderByModel(model)
const openaiProvider = getOpenAiProvider(provider)
const defaultModel = getDefaultModel()
const model = assistant.model || defaultModel
const userMessages: ChatCompletionMessageParam[] = takeRight(messages, 5).map((message) => ({
role: 'user',

4
src/renderer/src/services/assistant.ts
View File

@ -28,6 +28,10 @@ export function getDefaultModel() {
return store.getState().llm.defaultModel
}
export function getTopNamingModel() {
return store.getState().llm.topicNamingModel
}
export function getAssistantProvider(assistant: Assistant) {
const providers = store.getState().llm.providers
const provider = providers.find((p) => p.id === assistant.model?.provider)