Merge branch 'main' into dconeybe/dataconnect/Emulator_2_13_0

dconeybe · web-flow · commit 8d26eb5526f1 · 2025-09-25T21:22:08.000Z
diff --git a/firebase-ai/CHANGELOG.md b/firebase-ai/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - [changed] **Breaking Change**: Removed the `candidateCount` option from `LiveGenerationConfig`
+- [changed] Added better error messages to `ServiceConnectionHandshakeFailedException`
 
 # 17.3.0
 
diff --git a/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/AIModels.kt b/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",
           )
     }
   }
diff --git a/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/ToolTests.kt b/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)
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/LiveGenerativeModel.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/LiveGenerativeModel.kt
@@ -32,6 +32,7 @@ import com.google.firebase.ai.type.Tool
 import com.google.firebase.annotations.concurrent.Blocking
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
 import com.google.firebase.auth.internal.InternalAuthProvider
+import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession
 import io.ktor.websocket.Frame
 import io.ktor.websocket.close
 import io.ktor.websocket.readBytes
@@ -114,8 +115,9 @@ internal constructor(
         )
         .toInternal()
     val data: String = Json.encodeToString(clientMessage)
+    var webSession: DefaultClientWebSocketSession? = null
     try {
-      val webSession = controller.getWebSocketSession(location)
+      webSession = controller.getWebSocketSession(location)
       webSession.send(Frame.Text(data))
       val receivedJsonStr = webSession.incoming.receive().readBytes().toString(Charsets.UTF_8)
       val receivedJson = JSON.parseToJsonElement(receivedJsonStr)
@@ -131,7 +133,10 @@ internal constructor(
         throw ServiceConnectionHandshakeFailedException("Unable to connect to the server")
       }
     } catch (e: ClosedReceiveChannelException) {
-      throw ServiceConnectionHandshakeFailedException("Channel was closed by the server", e)
+      val reason = webSession?.closeReason?.await()
+      val message =
+        "Channel was closed by the server.${if(reason!=null) " Details: ${reason.message}" else "" }"
+      throw ServiceConnectionHandshakeFailedException(message, e)
     }
   }
 
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/common/APIController.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/common/APIController.kt
@@ -38,7 +38,7 @@ import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.plugins.websocket.ClientWebSocketSession
+import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession
 import io.ktor.client.plugins.websocket.WebSockets
 import io.ktor.client.plugins.websocket.webSocketSession
 import io.ktor.client.request.HttpRequestBuilder
@@ -174,7 +174,7 @@ internal constructor(
         "wss://firebasevertexai.googleapis.com/ws/google.firebase.vertexai.v1beta.GenerativeService/BidiGenerateContent?key=$key"
     }
 
-  suspend fun getWebSocketSession(location: String): ClientWebSocketSession =
+  suspend fun getWebSocketSession(location: String): DefaultClientWebSocketSession =
     client.webSocketSession(getBidiEndpoint(location)) { applyCommonHeaders() }
 
   fun generateContentStream(
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/LiveSession.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/LiveSession.kt
@@ -29,7 +29,7 @@ import com.google.firebase.ai.common.util.CancelledCoroutineScope
 import com.google.firebase.ai.common.util.accumulateUntil
 import com.google.firebase.ai.common.util.childJob
 import com.google.firebase.annotations.concurrent.Blocking
-import io.ktor.client.plugins.websocket.ClientWebSocketSession
+import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession
 import io.ktor.websocket.Frame
 import io.ktor.websocket.close
 import io.ktor.websocket.readBytes
@@ -59,7 +59,7 @@ import kotlinx.serialization.json.Json
 @OptIn(ExperimentalSerializationApi::class)
 public class LiveSession
 internal constructor(
-  private val session: ClientWebSocketSession,
+  private val session: DefaultClientWebSocketSession,
   @Blocking private val blockingDispatcher: CoroutineContext,
   private var audioHelper: AudioHelper? = null,
   private val firebaseApp: FirebaseApp,
diff --git a/firebase-ai/src/test/java/com/google/firebase/ai/GenerativeModelTesting.kt b/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
       )
 
diff --git a/firebase-ai/src/test/java/com/google/firebase/ai/common/APIControllerTests.kt b/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,
diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
@@ -10,6 +10,10 @@
   [#7376](//github.com/firebase/firebase-android-sdk/issues/7376)
 - [changed] Improve query performance via internal memoization of calculated document data.
   [#7370](//github.com/firebase/firebase-android-sdk/issues/7370)
+- [changed] Improve query performance by avoiding excessive Comparator instance creation.
+  [#7388](//github.com/firebase/firebase-android-sdk/pull/7388)
+- [changed] Improve query performance by using an unsorted HashMap instead of a sorted TreeMap.
+  [#7389](//github.com/firebase/firebase-android-sdk/pull/7389)
 
 # 26.0.0
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/DocumentViewChangeSet.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/DocumentViewChangeSet.java
@@ -19,16 +19,15 @@
 import com.google.firebase.firestore.core.DocumentViewChange.Type;
 import com.google.firebase.firestore.model.DocumentKey;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.TreeMap;
 
 /** A set of changes to documents with respect to a view. This set is mutable. */
 public class DocumentViewChangeSet {
-  // This map is sorted to make the unit tests simpler.
-  private final TreeMap<DocumentKey, DocumentViewChange> changes;
+  private final HashMap<DocumentKey, DocumentViewChange> changes;
 
   public DocumentViewChangeSet() {
-    changes = new TreeMap<>();
+    changes = new HashMap<>();
   }
 
   public void addChange(DocumentViewChange change) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java
@@ -29,6 +29,7 @@
 import com.google.firebase.firestore.remote.TargetChange;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -156,6 +157,7 @@ public DocumentChanges computeDocChanges(
             ? oldDocumentSet.getFirstDocument()
             : null;
 
+    Comparator<Document> queryComparator = query.comparator();
     for (Map.Entry<DocumentKey, Document> entry : docChanges) {
       DocumentKey key = entry.getKey();
       Document oldDoc = oldDocumentSet.getDocument(key);
@@ -182,9 +184,9 @@ public DocumentChanges computeDocChanges(
             changeSet.addChange(DocumentViewChange.create(Type.MODIFIED, newDoc));
             changeApplied = true;
 
-            if ((lastDocInLimit != null && query.comparator().compare(newDoc, lastDocInLimit) > 0)
+            if ((lastDocInLimit != null && queryComparator.compare(newDoc, lastDocInLimit) > 0)
                 || (firstDocInLimit != null
-                    && query.comparator().compare(newDoc, firstDocInLimit) < 0)) {
+                    && queryComparator.compare(newDoc, firstDocInLimit) < 0)) {
               // This doc moved from inside the limit to outside the limit. That means there may be
               // some doc in the local cache that should be included instead.
               needsRefill = true;
@@ -296,15 +298,17 @@ public ViewChange applyChanges(
     mutatedKeys = docChanges.mutatedKeys;
 
     // Sort changes based on type and query comparator.
+
     List<DocumentViewChange> viewChanges = docChanges.changeSet.getChanges();
+    Comparator<Document> queryComparator = query.comparator();
     Collections.sort(
         viewChanges,
         (DocumentViewChange o1, DocumentViewChange o2) -> {
           int typeComp = Integer.compare(View.changeTypeOrder(o1), View.changeTypeOrder(o2));
           if (typeComp != 0) {
             return typeComp;
           }
-          return query.comparator().compare(o1.getDocument(), o2.getDocument());
+          return queryComparator.compare(o1.getDocument(), o2.getDocument());
         });
     applyTargetChange(targetChange);
     List<LimboDocumentChange> limboDocumentChanges =
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/DocumentViewChangeSetTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/DocumentViewChangeSetTest.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore.core;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.testutil.TestUtil.EMPTY_MAP;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
 import static org.junit.Assert.assertEquals;
@@ -71,20 +72,14 @@ public void testTrack() {
 
     List<DocumentViewChange> changes = set.getChanges();
 
-    assertEquals(7, changes.size());
-    assertEquals(added, changes.get(0).getDocument());
-    assertEquals(Type.ADDED, changes.get(0).getType());
-    assertEquals(removed, changes.get(1).getDocument());
-    assertEquals(Type.REMOVED, changes.get(1).getType());
-    assertEquals(modified, changes.get(2).getDocument());
-    assertEquals(Type.MODIFIED, changes.get(2).getType());
-    assertEquals(addedThenModified, changes.get(3).getDocument());
-    assertEquals(Type.ADDED, changes.get(3).getType());
-    assertEquals(removedThenAdded, changes.get(4).getDocument());
-    assertEquals(Type.MODIFIED, changes.get(4).getType());
-    assertEquals(modifiedThenRemoved, changes.get(5).getDocument());
-    assertEquals(Type.REMOVED, changes.get(5).getType());
-    assertEquals(modifiedThenModified, changes.get(6).getDocument());
-    assertEquals(Type.MODIFIED, changes.get(6).getType());
+    assertThat(changes)
+        .containsExactly(
+            DocumentViewChange.create(Type.ADDED, added),
+            DocumentViewChange.create(Type.REMOVED, removed),
+            DocumentViewChange.create(Type.MODIFIED, modified),
+            DocumentViewChange.create(Type.ADDED, addedThenModified),
+            DocumentViewChange.create(Type.MODIFIED, removedThenAdded),
+            DocumentViewChange.create(Type.REMOVED, modifiedThenRemoved),
+            DocumentViewChange.create(Type.MODIFIED, modifiedThenModified));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,12 @@ class AIModels {`
`51`	`51`	`flash2Model =`
`52`	`52`	`FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI())`
`53`	`53`	`.generativeModel(`
`54`		`- modelName = "gemini-2.0-flash",`
	`54`	`+ modelName = "gemini-2.5-flash",`
`55`	`55`	`)`
`56`	`56`	`flash2LiteModel =`
`57`	`57`	`FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI())`
`58`	`58`	`.generativeModel(`
`59`		`- modelName = "gemini-2.0-flash-lite",`
	`59`	`+ modelName = "gemini-2.5-flash-lite",`
`60`	`60`	`)`
`61`	`61`	`}`
`62`	`62`	`}`