xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-01 23:56:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
sijinhui 2024-05-17 10:22:36 +08:00
parent aac77eb980
commit 722bc7f638
3 changed files with 60 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/utils.ts
View File

@ -83,58 +83,6 @@ export async function downloadAs(text: string, filename: string) {
} }
} }
// export function compressImage(file: File, maxSize: number): Promise<string> {
// return new Promise((resolve, reject) => {
// const reader = new FileReader();
// reader.onload = () => {
// // 直接解析为 Data URL
// resolve(reader.result as string);
// };
// reader.onerror = reject;
// reader.readAsDataURL(file);
// });
// return new Promise((resolve, reject) => {
// const reader = new FileReader();
// reader.onload = (readerEvent: any) => {
// const image = new Image();
// image.onload = () => {
// let canvas = document.createElement("canvas");
// let ctx = canvas.getContext("2d");
// let width = image.width;
// let height = image.height;
// let quality = 0.9;
// let dataUrl;
//
// do {
// canvas.width = width;
// canvas.height = height;
// ctx?.clearRect(0, 0, canvas.width, canvas.height);
// ctx?.drawImage(image, 0, 0, width, height);
// dataUrl = canvas.toDataURL("image/jpeg", quality);
//
// if (dataUrl.length < maxSize) break;
//
// if (quality > 0.5) {
// // Prioritize quality reduction
// quality -= 0.1;
// } else {
// // Then reduce the size
// width *= 0.9;
// height *= 0.9;
// }
// } while (dataUrl.length > maxSize);
//
// resolve(dataUrl);
// };
// image.onerror = reject;
// image.src = readerEvent.target.result;
// };
// reader.onerror = reject;
// reader.readAsDataURL(file);
// });
// }
export function readFromFile() { export function readFromFile() {
return new Promise<string>((res, rej) => { return new Promise<string>((res, rej) => {
const fileInput = document.createElement("input"); const fileInput = document.createElement("input");
@ -312,11 +260,7 @@ export function isVisionModel(model: string) {
const isGpt4Turbo = const isGpt4Turbo =
model.includes("gpt-4-turbo") && !model.includes("preview"); model.includes("gpt-4-turbo") && !model.includes("preview");
const isGpt4o = model === "gpt-4o";
return ( return (
visionKeywords.some((keyword) => model.includes(keyword)) || visionKeywords.some((keyword) => model.includes(keyword)) || isGpt4Turbo
isGpt4Turbo ||
isGpt4o
); );
} }

87
app/utils/chat.ts
View File

@ -3,39 +3,9 @@ import heic2any from "heic2any";
export function compressImage(file: File, maxSize: number): Promise<string> { export function compressImage(file: File, maxSize: number): Promise<string> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const reader = new FileReader(); const reader = new FileReader();
reader.onload = (readerEvent: any) => { reader.onload = () => {
const image = new Image(); // 直接解析为 Data URL
image.onload = () => { resolve(reader.result as string);
let canvas = document.createElement("canvas");
let ctx = canvas.getContext("2d");
let width = image.width;
let height = image.height;
let quality = 0.9;
let dataUrl;
do {
canvas.width = width;
canvas.height = height;
ctx?.clearRect(0, 0, canvas.width, canvas.height);
ctx?.drawImage(image, 0, 0, width, height);
dataUrl = canvas.toDataURL("image/jpeg", quality);
if (dataUrl.length < maxSize) break;
if (quality > 0.5) {
// Prioritize quality reduction
quality -= 0.1;
} else {
// Then reduce the size
width *= 0.9;
height *= 0.9;
}
} while (dataUrl.length > maxSize);
resolve(dataUrl);
};
image.onerror = reject;
image.src = readerEvent.target.result;
}; };
reader.onerror = reject; reader.onerror = reject;
@ -51,4 +21,55 @@ export function compressImage(file: File, maxSize: number): Promise<string> {
reader.readAsDataURL(file); reader.readAsDataURL(file);
}); });
// return new Promise((resolve, reject) => {
// const reader = new FileReader();
// reader.onload = (readerEvent: any) => {
// const image = new Image();
// image.onload = () => {
// let canvas = document.createElement("canvas");
// let ctx = canvas.getContext("2d");
// let width = image.width;
// let height = image.height;
// let quality = 0.9;
// let dataUrl;
//
// do {
// canvas.width = width;
// canvas.height = height;
// ctx?.clearRect(0, 0, canvas.width, canvas.height);
// ctx?.drawImage(image, 0, 0, width, height);
// dataUrl = canvas.toDataURL("image/jpeg", quality);
//
// if (dataUrl.length < maxSize) break;
//
// if (quality > 0.5) {
// // Prioritize quality reduction
// quality -= 0.1;
// } else {
// // Then reduce the size
// width *= 0.9;
// height *= 0.9;
// }
// } while (dataUrl.length > maxSize);
//
// resolve(dataUrl);
// };
// image.onerror = reject;
// image.src = readerEvent.target.result;
// };
// reader.onerror = reject;
//
// if (file.type.includes("heic")) {
// heic2any({ blob: file, toType: "image/jpeg" })
// .then((blob) => {
// reader.readAsDataURL(blob as Blob);
// })
// .catch((e) => {
// reject(e);
// });
// }
//
// reader.readAsDataURL(file);
// });
} }

5
yarn.lock
View File

@ -4438,6 +4438,11 @@ hastscript@^8.0.0:
property-information "^6.0.0" property-information "^6.0.0"
space-separated-tokens "^2.0.0" space-separated-tokens "^2.0.0"
heic2any@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/heic2any/-/heic2any-0.0.4.tgz#eddb8e6fec53c8583a6e18b65069bb5e8d19028a"
integrity sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==
highlight-words-core@^1.2.0: highlight-words-core@^1.2.0:
version "1.2.2" version "1.2.2"
resolved "https://registry.npmmirror.com/highlight-words-core/-/highlight-words-core-1.2.2.tgz#1eff6d7d9f0a22f155042a00791237791b1eeaaa" resolved "https://registry.npmmirror.com/highlight-words-core/-/highlight-words-core-1.2.2.tgz#1eff6d7d9f0a22f155042a00791237791b1eeaaa"