GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-23 06:00:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5444 from skymkmk/pr-fix-model-config-hydration

Browse Source 
fix: config hydration and default model forced to set gpt-3.5-turbo
This commit is contained in:
Dogtiti 2024-09-18 15:26:47 +08:00 committed by GitHub
commit d51bbb4a81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/store/access.ts
View File

@ -204,8 +204,8 @@ export const useAccessStore = createPersistStore(
.then((res) => { .then((res) => {
// Set default model from env request // Set default model from env request
let defaultModel = res.defaultModel ?? ""; let defaultModel = res.defaultModel ?? "";
DEFAULT_CONFIG.modelConfig.model = if (defaultModel !== "")
defaultModel !== "" ? defaultModel : "gpt-3.5-turbo"; DEFAULT_CONFIG.modelConfig.model = defaultModel;
return res; return res;
}) })
.then((res: DangerConfig) => { .then((res: DangerConfig) => {

15
app/store/config.ts
View File

@ -143,6 +143,21 @@ export const useAppConfig = createPersistStore(
{ {
name: StoreKey.Config, name: StoreKey.Config,
version: 4, version: 4,
merge(persistedState, currentState) {
const state = persistedState as ChatConfig | undefined;
if (!state) return { ...currentState };
const models = currentState.models.slice();
state.models.forEach((pModel) => {
const idx = models.findIndex(
(v) => v.name === pModel.name && v.provider === pModel.provider,
);
if (idx !== -1) models[idx] = pModel;
else models.push(pModel);
});
return { ...currentState, ...state, models: models };
},
migrate(persistedState, version) { migrate(persistedState, version) {
const state = persistedState as ChatConfig; const state = persistedState as ChatConfig;