Merge e83f2bad84 into d958441d7f

Merge pull request #6570 from zhang-zhonggui/main
Add gemini-2.5-pro tag, you can use free gemini-2.5-pro
2025-10-08 02:56:39 +08:00 · 2025-07-20 16:40:24 +03:00 · 2025-07-17 11:30:34 +08:00 · 2025-07-17 08:07:15 +08:00 · 2025-07-17 07:48:12 +08:00 · 2025-07-14 13:37:52 +08:00
2 changed files with 7 additions and 5 deletions
--- a/app/constant.ts
+++ b/app/constant.ts
@ -479,19 +479,20 @@ export const VISION_MODEL_REGEXES = [
  /vision/,
  /gpt-4o/,
  /gpt-4\.1/,
-  /claude-3/,
+  /claude.*[34]/,
  /gemini-1\.5/,
  /gemini-exp/,
-  /gemini-2\.0/,
+  /gemini-2\.[05]/,
  /learnlm/,
  /qwen-vl/,
  /qwen2-vl/,
-  /gpt-4-turbo(?!.*preview)/, // Matches "gpt-4-turbo" but not "gpt-4-turbo-preview"
-  /^dall-e-3$/, // Matches exactly "dall-e-3"
+  /gpt-4-turbo(?!.*preview)/,
+  /^dall-e-3$/,
  /glm-4v/,
  /vl/i,
  /o3/,
  /o4-mini/,
+  /grok-4/i,
 ];

 export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/];
@ -554,6 +555,7 @@ const googleModels = [
  "gemini-2.0-pro-exp",
  "gemini-2.0-pro-exp-02-05",
  "gemini-2.5-pro-preview-06-05",
+  "gemini-2.5-pro"
 ];

 const anthropicModels = [
--- a/app/store/config.ts
+++ b/app/store/config.ts
@ -203,7 +203,7 @@ export const useAppConfig = createPersistStore(
      const models = currentState.models.slice();
      state.models.forEach((pModel) => {
        const idx = models.findIndex(
-          (v) => v.name === pModel.name && v.provider === pModel.provider,
+          (v) => v.name === pModel.name && v.provider.id === pModel.provider.id,
        );
        if (idx !== -1) models[idx] = pModel;
        else models.push(pModel);
Author	SHA1	Message	Date
Aihararaです	378ae7e412	Merge `e83f2bad84` into `d958441d7f`	2025-07-20 16:40:24 +03:00
RiverRay	d958441d7f	Merge pull request #6570 from zhang-zhonggui/main Some checks failed Run Tests / test (push) Has been cancelled Details Add gemini-2.5-pro tag, you can use free gemini-2.5-pro	2025-07-17 11:30:34 +08:00
zzg	1600b96454	Update constant.ts 添加gemini-2.5-pro,可以免费使用Google Gemini	2025-07-17 08:07:15 +08:00
zzg	47047a60b2	Update constant.ts 添加免费的Gemini 2.5 Pro进行使用	2025-07-17 07:48:12 +08:00
RiverRay	80d7fd9b98	Merge pull request #6562 from LePao1/main Some checks failed Run Tests / test (push) Has been cancelled Details fix: Update the regular expressions to support image upload functionality for multimodal Claude 4 and Gemini 2.5 series.	2025-07-14 13:37:52 +08:00
LePao1	e8a18d0b38	fix: Update the regular expressions to support image upload functionality for multimodal Claude 4 and Gemini 2.5 series.	2025-07-13 21:20:20 +08:00
Aiharara	e83f2bad84	Fix provider comparison issue in model comparison Fixed an issue where comparing models using the provider object directly resulted in errors. Changed to compare provider.id to ensure the comparison is based on a unique identifier, accurately determining if the models are the same. If the provider comparison fails, more models will be stored in persistStore. Although this issue is not immediately visible in the frontend due to subsequent processing, it leads to increased memory usage and longer startup times with each page reload.	2025-04-29 04:51:14 +08:00