Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix defaultModel undefined error #5071

Merged
merged 5 commits into from
Jul 25, 2024
Merged

Fix defaultModel undefined error #5071

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fd68bc
Fix defaultModel undefined error
ZTH7 Jul 21, 2024
aa4e855
Compatibility changes
ZTH7 Jul 22, 2024
46a47db
Merge branch 'ChatGPTNextWeb:main' into main
ZTH7 Jul 25, 2024
5c04d3c
Change method
ZTH7 Jul 25, 2024
c4334d4
Update model.ts
ZTH7 Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions app/utils/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,18 @@ export function collectModelTableWithDefaultModel(
) {
let modelTable = collectModelTable(models, customModels);
if (defaultModel && defaultModel !== "") {
modelTable[defaultModel] = {
...modelTable[defaultModel],
name: defaultModel,
available: true,
isDefault: true,
};
if (defaultModel.includes('@')) {
if (defaultModel in modelTable) {
modelTable[defaultModel].isDefault = true;
}
} else {
for (const key of Object.keys(modelTable)) {
if (modelTable[key].available && key.split('@').shift() == defaultModel) {
modelTable[key].isDefault = true;
break;
}
}
}
}
return modelTable;
}
Expand Down
Loading