Merge e154d2e into 482ac0e

Author: rlazo

firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/AIModels.kt

@@ -51,12 +51,12 @@ class AIModels {
       flash2Model =
         FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI())
           .generativeModel(
-            modelName = "gemini-2.0-flash",
+            modelName = "gemini-2.5-flash",
           )
       flash2LiteModel =
         FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI())
           .generativeModel(
-            modelName = "gemini-2.0-flash-lite",
+            modelName = "gemini-2.5-flash-lite",
           )
     }
   }

firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/ToolTests.kt

@@ -299,7 +299,7 @@ class ToolTests {
       val model =
         FirebaseAI.getInstance(app(), GenerativeBackend.vertexAI())
           .generativeModel(
-            modelName = "gemini-2.0-flash",
+            modelName = "gemini-2.5-flash",
             toolConfig =
               ToolConfig(
                 functionCallingConfig = FunctionCallingConfig(FunctionCallingConfig.Mode.ANY)

firebase-ai/src/test/java/com/google/firebase/ai/GenerativeModelTesting.kt

@@ -72,7 +72,7 @@ internal class GenerativeModelTesting {
     val apiController =
       APIController(
         "super_cool_test_key",
-        "gemini-1.5-flash",
+        "gemini-2.5-flash",
         RequestOptions(timeout = 5.seconds, endpoint = "https://my.custom.endpoint"),
         mockEngine,
         TEST_CLIENT_ID,
@@ -84,7 +84,7 @@ internal class GenerativeModelTesting {
 
     val generativeModel =
       GenerativeModel(
-        "gemini-1.5-flash",
+        "gemini-2.5-flash",
         systemInstruction = content { text("system instruction") },
         controller = apiController
       )
@@ -120,7 +120,7 @@ internal class GenerativeModelTesting {
     val apiController =
       APIController(
         "super_cool_test_key",
-        "gemini-1.5-flash",
+        "gemini-2.5-flash",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -133,7 +133,7 @@ internal class GenerativeModelTesting {
     // Creating the
     val generativeModel =
       GenerativeModel(
-        "projects/PROJECTID/locations/INVALID_LOCATION/publishers/google/models/gemini-1.5-flash",
+        "projects/PROJECTID/locations/INVALID_LOCATION/publishers/google/models/gemini-2.5-flash",
         controller = apiController
       )
 

firebase-ai/src/test/java/com/google/firebase/ai/common/APIControllerTests.kt

@@ -112,7 +112,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         "genai-android/${BuildConfig.VERSION_NAME}",
@@ -142,7 +142,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(timeout = 5.seconds, endpoint = "https://my.custom.endpoint"),
         mockEngine,
         TEST_CLIENT_ID,
@@ -172,7 +172,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -199,7 +199,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -227,7 +227,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -319,7 +319,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -356,7 +356,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
@@ -382,7 +382,7 @@ internal class RequestFormatTests {
     val controller =
       APIController(
         "super_cool_test_key",
-        "gemini-pro-1.5",
+        "gemini-pro-2.5",
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,