7x31
/
ChatGPT-Next-Web
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ts error

This commit is contained in:
lloydzhou 2024-10-09 13:49:33 +08:00
parent a925b424a8
commit 93ca303b6c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/store/chat.ts
View File

@ -18,6 +18,7 @@ import {
StoreKey, StoreKey,
SUMMARIZE_MODEL, SUMMARIZE_MODEL,
GEMINI_SUMMARIZE_MODEL, GEMINI_SUMMARIZE_MODEL,
ServiceProvider,
} from "../constant"; } from "../constant";
import Locale, { getLang } from "../locales"; import Locale, { getLang } from "../locales";
import { isDalle3, safeLocalStorage } from "../utils"; import { isDalle3, safeLocalStorage } from "../utils";
@ -107,7 +108,10 @@ function createEmptySession(): ChatSession {
}; };
} }
function getSummarizeModel(currentModel: string, providerName: string) { function getSummarizeModel(
currentModel: string,
providerName: string,
): string[] {
// if it is using gpt-* models, force to use 4o-mini to summarize // if it is using gpt-* models, force to use 4o-mini to summarize
if (currentModel.startsWith("gpt") || currentModel.startsWith("chatgpt")) { if (currentModel.startsWith("gpt") || currentModel.startsWith("chatgpt")) {
const configStore = useAppConfig.getState(); const configStore = useAppConfig.getState();
@ -121,7 +125,10 @@ function getSummarizeModel(currentModel: string, providerName: string) {
(m) => m.name === SUMMARIZE_MODEL && m.available, (m) => m.name === SUMMARIZE_MODEL && m.available,
); );
if (summarizeModel) { if (summarizeModel) {
return [summarizeModel.name, summarizeModel.providerName]; return [
summarizeModel.name,
summarizeModel.provider?.providerName as string,
];
} }
} }
if (currentModel.startsWith("gemini")) { if (currentModel.startsWith("gemini")) {
@ -613,7 +620,7 @@ export const useChatStore = createPersistStore(
session.mask.modelConfig.model, session.mask.modelConfig.model,
session.mask.modelConfig.providerName, session.mask.modelConfig.providerName,
); );
const api: ClientApi = getClientApi(providerName); const api: ClientApi = getClientApi(providerName as ServiceProvider);
// remove error messages if any // remove error messages if any
const messages = session.messages; const messages = session.messages;
@ -822,8 +829,8 @@ export const useChatStore = createPersistStore(
if (version < 3.3) { if (version < 3.3) {
newState.sessions.forEach((s) => { newState.sessions.forEach((s) => {
const config = useAppConfig.getState(); const config = useAppConfig.getState();
s.mask.modelConfig.compressModel = undefined; s.mask.modelConfig.compressModel = "";
s.mask.modelConfig.compressProviderName = undefined; s.mask.modelConfig.compressProviderName = "";
}); });
} }

4
app/store/config.ts
View File

@ -71,8 +71,8 @@ export const DEFAULT_CONFIG = {
sendMemory: true, sendMemory: true,
historyMessageCount: 4, historyMessageCount: 4,
compressMessageLengthThreshold: 1000, compressMessageLengthThreshold: 1000,
compressModel: undefined, compressModel: "",
compressProviderName: undefined, compressProviderName: "",
enableInjectSystemPrompts: true, enableInjectSystemPrompts: true,
template: config?.template ?? DEFAULT_INPUT_TEMPLATE, template: config?.template ?? DEFAULT_INPUT_TEMPLATE,
size: "1024x1024" as DalleSize, size: "1024x1024" as DalleSize,