xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-16 22:13:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev

Browse Source 
# Conflicts:
#	app/config/server.ts
#	app/utils/model.ts
This commit is contained in:
sijinhui
2024-05-07 16:39:45 +08:00
parent 377e8d19b6 3513c6801e
commit 5b1f0355ce
8 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/utils/model.ts
View File

@@ -66,14 +66,13 @@ export function collectModelTableWithDefaultModel(
) {
let modelTable = collectModelTable(models, customModels);
if (defaultModel && defaultModel !== "") {
delete modelTable[defaultModel];
modelTable[defaultModel] = {
...modelTable[defaultModel],
name: defaultModel,
displayName: defaultModel,
available: true,
describe: "默认模型",
provider:
modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
// provider:
// modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
isDefault: true,
};
}