From 4a116da753f4e7413fe1885c1323f8f90f76e4eb Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Wed, 10 Jul 2024 16:27:09 +0800 Subject: [PATCH] fix: topic naming assistant using incorrect language model --- src/renderer/src/services/api.ts | 7 +++---- src/renderer/src/services/assistant.ts | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/services/api.ts b/src/renderer/src/services/api.ts index 09b39da1..09d26d86 100644 --- a/src/renderer/src/services/api.ts +++ b/src/renderer/src/services/api.ts @@ -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', diff --git a/src/renderer/src/services/assistant.ts b/src/renderer/src/services/assistant.ts index e5864e1a..a93e6a59 100644 --- a/src/renderer/src/services/assistant.ts +++ b/src/renderer/src/services/assistant.ts @@ -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)