Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web

Merge pull request #5932 from fengzai6/update-google-models
Update google models to add gemini-2.0
2026-04-22 02:54:26 +08:00 · 2024-12-21 01:07:38 +00:00 · 2024-12-21 00:43:02 +08:00 · 2024-12-21 00:41:45 +08:00 · 2024-12-21 00:40:45 +08:00 · 2024-12-16 10:57:34 +00:00
5 changed files with 11 additions and 9 deletions
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -317,13 +317,14 @@ const openaiModels = [
 ];

 const googleModels = [
-  "gemini-1.0-pro",
+  "gemini-1.0-pro", // Deprecated on 2/15/2025
  "gemini-1.5-pro-latest",
  "gemini-1.5-flash-latest",
+  "gemini-1.5-flash-8b-latest",
  "gemini-exp-1114",
  "gemini-exp-1121",
  "learnlm-1.5-pro-experimental",
-  "gemini-pro-vision",
+  "gemini-2.0-flash-exp",
 ];

 const anthropicModels = [
--- a/app/masks/cn.ts
+++ b/app/masks/cn.ts
@@ -3,7 +3,7 @@ import { BuiltinMask } from "./typing";
 export const CN_MASKS: BuiltinMask[] = [
  {
    avatar: "1f5bc-fe0f",
-    name: "以文搜图",
+    name: "AI文生图",
    context: [
      {
        id: "text-to-pic-0",
@@ -28,7 +28,7 @@ export const CN_MASKS: BuiltinMask[] = [
        id: "text-to-pic-3",
        role: "system",
        content:
-          "助手善于判断用户意图，当确定需要提供图片时，助手会变得沉默寡言，只使用以下格式输出markdown图片：![描述](https://image.pollinations.ai/prompt/描述)，因为这个语法可以自动按照提示生成并渲染图片。一般用户给出的描述会比较简单并且信息不足，助手会将其中的描述自行补足替换为AI生成图片所常用的复杂冗长的英文提示，以大幅提高生成图片质量和丰富程度，比如增加相机光圈、具体场景描述等内容。助手会避免用代码块或原始块包围markdown标记，因为那样只会渲染出代码块或原始块而不是图片。",
+          "助手善于判断用户意图，当确定需要提供图片时，助手会变得沉默寡言，只使用以下格式输出markdown图片：![description](https://image.pollinations.ai/prompt/description?nologo=true)，因为这个语法可以自动按照提示生成并渲染图片。一般用户给出的描述会比较简单并且信息不足，助手会将其中的描述自行补足替换为AI生成图片所常用的复杂冗长的英文提示，以大幅提高生成图片质量和丰富程度，比如增加相机光圈、具体场景描述等内容。助手会避免用代码块或原始块包围markdown标记，因为那样只会渲染出代码块或原始块而不是图片。url中的空格等符号需要转义。",
        date: "",
      },
    ],
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -261,6 +261,7 @@ export function isVisionModel(model: string) {
    "claude-3",
    "gemini-1.5",
    "gemini-exp",
+    "gemini-2.0",
    "learnlm",
    "qwen-vl",
    "qwen2-vl",
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
    "@tauri-apps/cli": "1.5.11",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/react": "^16.1.0",
    "@types/jest": "^29.5.14",
    "@types/js-yaml": "4.0.9",
    "@types/lodash-es": "^4.17.12",
--- a/yarn.lock
+++ b/yarn.lock
@@ -2127,10 +2127,10 @@
    lodash "^4.17.21"
    redent "^3.0.0"

-"@testing-library/react@^16.0.1":
-  version "16.0.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.0.1.tgz#29c0ee878d672703f5e7579f239005e4e0faa875"
-  integrity sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==
+"@testing-library/react@^16.1.0":
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.1.0.tgz#aa0c61398bac82eaf89776967e97de41ac742d71"
+  integrity sha512-Q2ToPvg0KsVL0ohND9A3zLJWcOXXcO8IDu3fj11KhNt0UlCWyFyvnCIBkd12tidB2lkiVRG8VFqdhcqhqnAQtg==
  dependencies:
    "@babel/runtime" "^7.12.5"
Author	SHA1	Message	Date
GH Action - Upstream Sync	e3a2e786d8	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-12-21 01:07:38 +00:00
Dogtiti	eceec092cf	Merge pull request #5932 from fengzai6/update-google-models Some checks are pending Run Tests / test (push) Waiting to run Details Update google models to add gemini-2.0	2024-12-21 00:43:02 +08:00
Dogtiti	42743410a8	Merge pull request #5940 from ChatGPTNextWeb/dependabot/npm_and_yarn/testing-library/react-16.1.0 chore(deps-dev): bump @testing-library/react from 16.0.1 to 16.1.0	2024-12-21 00:41:45 +08:00
Dogtiti	0f04756d4c	Merge pull request #5936 from InitialXKO/main 面具“以文搜图”改成“AI文生图”，微调提示让图片生成更稳定无水印	2024-12-21 00:40:45 +08:00
dependabot[bot]	acdded8161	chore(deps-dev): bump @testing-library/react from 16.0.1 to 16.1.0 Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 16.0.1 to 16.1.0. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v16.0.1...v16.1.0) --- updated-dependencies: - dependency-name: "@testing-library/react" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 10:57:34 +00:00
InitialXKO	e939ce5a02	面具“以文搜图”改成“AI文生图”，微调提示让图片生成更稳定无水印	2024-12-13 22:29:14 +08:00
Nacho.L	46a0b100f7	Update versionKeywords	2024-12-13 08:29:43 +08:00
Nacho.L	e27e8fb0e1	Update google models	2024-12-13 07:22:16 +08:00