Merge ac27891d5d 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-07 18:46:38 +08:00 · 2025-07-17 19:52:35 +08: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-02-20 08:31:36 +00:00
2 changed files with 5 additions and 1 deletions
--- a/app/constant.ts
+++ b/app/constant.ts
@ -555,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,10 @@ 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
+            && v.provider.providerName === pModel.provider.providerName
+            && v.provider.providerType === pModel.provider.providerType,
        );
        if (idx !== -1) models[idx] = pModel;
        else models.push(pModel);
Author	SHA1	Message	Date
code-october	603339eb72	Merge `ac27891d5d` into `d958441d7f`	2025-07-17 19:52:35 +08: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
code-october	ac27891d5d	修复app-config.models 重复保存的问题（#6266）	2025-02-20 08:31:36 +00:00