mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-23 10:00:08 +08:00
fix: topic naming assistant using incorrect language model
This commit is contained in:
parent
e311adc417
commit
4a116da753
@ -3,7 +3,7 @@ import { uuid } from '@renderer/utils'
|
|||||||
import { EVENT_NAMES, EventEmitter } from './event'
|
import { EVENT_NAMES, EventEmitter } from './event'
|
||||||
import { ChatCompletionMessageParam, ChatCompletionSystemMessageParam } from 'openai/resources'
|
import { ChatCompletionMessageParam, ChatCompletionSystemMessageParam } from 'openai/resources'
|
||||||
import OpenAI from 'openai'
|
import OpenAI from 'openai'
|
||||||
import { getAssistantProvider, getDefaultModel } from './assistant'
|
import { getAssistantProvider, getDefaultModel, getProviderByModel, getTopNamingModel } from './assistant'
|
||||||
import { takeRight } from 'lodash'
|
import { takeRight } from 'lodash'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
|
|
||||||
@ -77,10 +77,9 @@ interface FetchMessagesSummaryParams {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function fetchMessagesSummary({ messages, assistant }: 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 openaiProvider = getOpenAiProvider(provider)
|
||||||
const defaultModel = getDefaultModel()
|
|
||||||
const model = assistant.model || defaultModel
|
|
||||||
|
|
||||||
const userMessages: ChatCompletionMessageParam[] = takeRight(messages, 5).map((message) => ({
|
const userMessages: ChatCompletionMessageParam[] = takeRight(messages, 5).map((message) => ({
|
||||||
role: 'user',
|
role: 'user',
|
||||||
|
|||||||
@ -28,6 +28,10 @@ export function getDefaultModel() {
|
|||||||
return store.getState().llm.defaultModel
|
return store.getState().llm.defaultModel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getTopNamingModel() {
|
||||||
|
return store.getState().llm.topicNamingModel
|
||||||
|
}
|
||||||
|
|
||||||
export function getAssistantProvider(assistant: Assistant) {
|
export function getAssistantProvider(assistant: Assistant) {
|
||||||
const providers = store.getState().llm.providers
|
const providers = store.getState().llm.providers
|
||||||
const provider = providers.find((p) => p.id === assistant.model?.provider)
|
const provider = providers.find((p) => p.id === assistant.model?.provider)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user