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/components/chat.tsx
#	app/components/home.tsx
#	app/components/settings.tsx
#	app/components/sidebar.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/layout.tsx
#	app/store/access.ts
#	app/utils/model.ts
This commit is contained in:
sijinhui
2024-07-25 21:22:36 +08:00
parent 30d67cd718 f5499ff699
commit 7e1cdbec80
35 changed files with 1789 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/utils/chat.ts
View File

@@ -133,7 +133,7 @@ export function base64Image2Blob(base64Data: string, contentType: string) {
return new Blob([byteArray], { type: contentType });
}
export function uploadImage(file: File): Promise<string> {
export function uploadImage(file: Blob): Promise<string> {
if (!window._SW_ENABLED) {
// if serviceWorker register error, using compressImage
return compressImage(file, 256 * 1024);

36
app/utils/model.ts
View File

@@ -100,16 +100,34 @@ export function collectModelTableWithDefaultModel(
defaultModel: string,
) {
let modelTable = collectModelTable(models, customModels);
// if (defaultModel && defaultModel !== "") {
// modelTable[defaultModel] = {
// ...modelTable[defaultModel],
// name: defaultModel,
// available: true,
// describe: "默认模型",
// // provider:
// // modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
// isDefault: true,
// };
// }
if (defaultModel && defaultModel !== "") {
modelTable[defaultModel] = {
...modelTable[defaultModel],
name: defaultModel,
available: true,
describe: "默认模型",
// provider:
// modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
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;
}