From 9bd27cebcb445bd14ef5abf1c7f3660d47d02925 Mon Sep 17 00:00:00 2001
From: Yingjie He <yingjiehe@squareup.com>
Date: Fri, 11 Apr 2025 10:41:48 -0700
Subject: [PATCH] fix: fix gemini model not found (#2157)

---
 crates/goose/src/providers/google.rs          | 17 +++++++------
 .../settings/models/GooseModels.tsx           | 25 ++++++++++---------
 .../settings/models/hardcoded_stuff.tsx       |  3 ++-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/crates/goose/src/providers/google.rs b/crates/goose/src/providers/google.rs
index b6755854..7216c185 100644
--- a/crates/goose/src/providers/google.rs
+++ b/crates/goose/src/providers/google.rs
@@ -17,14 +17,15 @@ use url::Url;
 pub const GOOGLE_API_HOST: &str = "https://generativelanguage.googleapis.com";
 pub const GOOGLE_DEFAULT_MODEL: &str = "gemini-2.0-flash";
 pub const GOOGLE_KNOWN_MODELS: &[&str] = &[
-    "models/gemini-1.5-pro-latest",
-    "models/gemini-1.5-pro",
-    "models/gemini-1.5-flash-latest",
-    "models/gemini-1.5-flash",
-    "models/gemini-2.0-flash",
-    "models/gemini-2.0-flash-lite-preview-02-05",
-    "models/gemini-2.0-flash-thinking-exp-01-21",
-    "models/gemini-2.0-pro-exp-02-05",
+    "gemini-1.5-pro-latest",
+    "gemini-1.5-pro",
+    "gemini-1.5-flash-latest",
+    "gemini-1.5-flash",
+    "gemini-2.0-flash",
+    "gemini-2.0-flash-lite-preview-02-05",
+    "gemini-2.0-flash-thinking-exp-01-21",
+    "gemini-2.0-pro-exp-02-05",
+    "gemini-2.5-pro-exp-03-25",
 ];
 
 pub const GOOGLE_DOC_URL: &str = "https://ai.google/get-started/our-models/";
diff --git a/ui/desktop/src/components/settings/models/GooseModels.tsx b/ui/desktop/src/components/settings/models/GooseModels.tsx
index 346288d0..2b73dc4d 100644
--- a/ui/desktop/src/components/settings/models/GooseModels.tsx
+++ b/ui/desktop/src/components/settings/models/GooseModels.tsx
@@ -16,16 +16,17 @@ export const gooseModels: Model[] = [
   { id: 13, name: 'gemini-2.0-flash-lite-preview-02-05', provider: 'Google' },
   { id: 14, name: 'gemini-2.0-flash-thinking-exp-01-21', provider: 'Google' },
   { id: 15, name: 'gemini-2.0-pro-exp-02-05', provider: 'Google' },
-  { id: 16, name: 'llama-3.3-70b-versatile', provider: 'Groq' },
-  { id: 17, name: 'qwen2.5', provider: 'Ollama' },
-  { id: 18, name: 'anthropic/claude-3.5-sonnet', provider: 'OpenRouter' },
-  { id: 19, name: 'gpt-4o', provider: 'Azure OpenAI' },
-  { id: 20, name: 'claude-3-7-sonnet@20250219', provider: 'GCP Vertex AI' },
-  { id: 21, name: 'claude-3-5-sonnet-v2@20241022', provider: 'GCP Vertex AI' },
-  { id: 22, name: 'claude-3-5-sonnet@20240620', provider: 'GCP Vertex AI' },
-  { id: 23, name: 'claude-3-5-haiku@20241022', provider: 'GCP Vertex AI' },
-  { id: 24, name: 'gemini-2.0-pro-exp-02-05', provider: 'GCP Vertex AI' },
-  { id: 25, name: 'gemini-2.0-flash-001', provider: 'GCP Vertex AI' },
-  { id: 26, name: 'gemini-1.5-pro-002', provider: 'GCP Vertex AI' },
-  { id: 27, name: 'gemini-2.5-pro-exp-03-25', provider: 'GCP Vertex AI' },
+  { id: 16, name: 'gemini-2.5-pro-exp-03-25', provider: 'Google' },
+  { id: 17, name: 'llama-3.3-70b-versatile', provider: 'Groq' },
+  { id: 18, name: 'qwen2.5', provider: 'Ollama' },
+  { id: 19, name: 'anthropic/claude-3.5-sonnet', provider: 'OpenRouter' },
+  { id: 20, name: 'gpt-4o', provider: 'Azure OpenAI' },
+  { id: 21, name: 'claude-3-7-sonnet@20250219', provider: 'GCP Vertex AI' },
+  { id: 22, name: 'claude-3-5-sonnet-v2@20241022', provider: 'GCP Vertex AI' },
+  { id: 23, name: 'claude-3-5-sonnet@20240620', provider: 'GCP Vertex AI' },
+  { id: 24, name: 'claude-3-5-haiku@20241022', provider: 'GCP Vertex AI' },
+  { id: 25, name: 'gemini-2.0-pro-exp-02-05', provider: 'GCP Vertex AI' },
+  { id: 26, name: 'gemini-2.0-flash-001', provider: 'GCP Vertex AI' },
+  { id: 27, name: 'gemini-1.5-pro-002', provider: 'GCP Vertex AI' },
+  { id: 28, name: 'gemini-2.5-pro-exp-03-25', provider: 'GCP Vertex AI' },
 ];
diff --git a/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx b/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
index 668974cc..c300e780 100644
--- a/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
+++ b/ui/desktop/src/components/settings/models/hardcoded_stuff.tsx
@@ -14,6 +14,7 @@ export const google_models = [
   'gemini-2.0-flash-lite-preview-02-05',
   'gemini-2.0-flash-thinking-exp-01-21',
   'gemini-2.0-pro-exp-02-05',
+  'gemini-2.5-pro-exp-03-25',
 ];
 
 export const groq_models = ['llama-3.3-70b-versatile'];
@@ -49,7 +50,7 @@ export const default_models = {
 };
 
 export function getDefaultModel(key: string): string | undefined {
-  return default_models[key] || undefined;
+  return default_models[key as keyof typeof default_models] || undefined;
 }
 
 export const short_list = ['gpt-4o', 'claude-3-5-sonnet-latest'];