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

# Conflicts:
#	app/store/config.ts
#	app/utils.ts
#	yarn.lock
This commit is contained in:
sijinhui
2024-05-17 09:59:38 +08:00
11 changed files with 158 additions and 78 deletions

View File

@@ -62,9 +62,10 @@ import {
getMessageTextContent,
getMessageImages,
isVisionModel,
compressImage,
} from "../utils";
import { compressImage } from "@/app/utils/chat";
import dynamic from "next/dynamic";
import { ChatControllerPool } from "../client/controller";