Merge branch 'fireperf-aqs' into td/session-sorting

tejasd · web-flow · commit 2cef209a2231 · 2025-08-14T11:02:44.000-04:00
diff --git a/.github/workflows/ai-nightlies.yml b/.github/workflows/ai-nightlies.yml
@@ -0,0 +1,66 @@
+name: Firebase AI Nightlies
+
+on:
+  schedule:
+    - cron: 2 7 * * *  # Runs automatically once a day
+  workflow_dispatch:   # Allow triggering the workflow manually
+
+jobs:
+  nightlies:
+    name: "Nightlies"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+      - uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+
+      - uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
+
+      - name: Run tests
+        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt) }}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        with:
+          api-level: 31
+          arch: x86_64
+          ram-size: 4096M
+          heap-size: 4096M
+          script: |
+            adb logcat -v time > logcat.txt &
+            ./gradlew firebase-ai:connectedCheck withErrorProne -PtargetBackend="prod"
+
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: logcat.txt
+          path: logcat.txt
+          retention-days: 7
+          if-no-files-found: ignore
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -72,6 +72,7 @@ jobs:
         run: |
           ./gradlew ${{matrix.module}}:check withErrorProne
       - name: Compute upload file name
+        if: always()
         run: |
           MODULE=${{matrix.module}}
           echo "ARTIFACT_NAME=${MODULE//:/_}" >> $GITHUB_ENV
diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
@@ -34,7 +34,7 @@ env:
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
   FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.12.0' }}
   FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
   FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
   FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}
diff --git a/.github/workflows/dataconnect_demo_app.yml b/.github/workflows/dataconnect_demo_app.yml
@@ -18,7 +18,7 @@ on:
 
 env:
   FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.12.0' }}
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
   FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase
diff --git a/ci/fireci/fireciplugins/binary_size.py b/ci/fireci/fireciplugins/binary_size.py
@@ -55,6 +55,13 @@ def binary_size(pull_request, log, metrics_service_url, access_token):
   affected_artifacts, all_artifacts = _parse_artifacts()
   artifacts = affected_artifacts if pull_request else all_artifacts
   sdks = ','.join(artifacts)
+  if not sdks:
+    _logger.info(
+      "No sdks found whose binary size to measure ("
+      "pull_request=%s affected_artifacts=%s all_artifacts=%s)",
+      pull_request, affected_artifacts, all_artifacts
+    )
+    return
 
   workdir = 'health-metrics/apk-size'
   process = gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir=workdir, check=False)
diff --git a/firebase-ai/CHANGELOG.md b/firebase-ai/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+* [changed] Added better description for requests which fail due to the Gemini API not being
+  configured.
 * [feature] added support for Imagen Editing, including inpainting, outpainting, control, style 
   transfer, and subject references (#7075)
 
diff --git a/firebase-ai/firebase-ai.gradle.kts b/firebase-ai/firebase-ai.gradle.kts
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   id("firebase-library")
   id("kotlin-android")
+  id("copy-google-services")
   alias(libs.plugins.kotlinx.serialization)
 }
 
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
@@ -17,7 +17,6 @@ package com.google.firebase.ai
 
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
 import com.google.firebase.ai.type.GenerativeBackend
 
 class AIModels {
@@ -48,15 +47,7 @@ class AIModels {
 
     fun setup() {
       val context = InstrumentationRegistry.getInstrumentation().context
-      app =
-        FirebaseApp.initializeApp(
-          context,
-          FirebaseOptions.Builder()
-            .setApiKey(API_KEY)
-            .setApplicationId(APP_ID)
-            .setProjectId(PROJECT_ID)
-            .build()
-        )
+      app = FirebaseApp.initializeApp(context)
       flash2Model =
         FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI())
           .generativeModel(
diff --git a/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/ImagenTests.kt b/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/ImagenTests.kt
@@ -22,10 +22,13 @@ import com.google.firebase.ai.type.ImagenEditingConfig
 import com.google.firebase.ai.type.ImagenRawImage
 import com.google.firebase.ai.type.PublicPreviewAPI
 import kotlinx.coroutines.runBlocking
+import org.junit.Ignore
 import org.junit.Test
 
 @OptIn(PublicPreviewAPI::class)
 class ImagenTests {
+
+  @Ignore("Currently not supported by backend model")
   @Test
   fun testGenerateAndEditImage() {
     val imageGenerationModel = FirebaseAI.getInstance(app()).imagenModel("imagen-3.0-generate-002")
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
@@ -334,6 +334,9 @@ private suspend fun validateResponse(response: HttpResponse) {
   if (message.contains("The prompt could not be submitted")) {
     throw PromptBlockedException(message)
   }
+  if (message.contains("genai config not found")) {
+    throw APINotConfiguredException()
+  }
   getServiceDisabledErrorDetailsOrNull(error)?.let {
     val errorMessage =
       if (it.metadata?.get("service") == "firebasevertexai.googleapis.com") {
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Exceptions.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Exceptions.kt
@@ -89,6 +89,16 @@ internal constructor(
 internal class UnsupportedUserLocationException(cause: Throwable? = null) :
   FirebaseCommonAIException("User location is not supported for the API use.", cause)
 
+/**
+ * The user's project does not have the Gemini Developer API enabled in the Firebase Console.
+ *
+ * See the Firebase documentation for the
+ * [steps](https://firebase.google.com/docs/ai-logic/faq-and-troubleshooting?api=dev#error-genai-config-not-found)
+ * to enable the Gemini Developer API.
+ */
+internal class APINotConfiguredException(cause: Throwable? = null) :
+  FirebaseCommonAIException("Gemini Developer API not enabled in Firebase console.", cause)
+
 /**
  * Some form of state occurred that shouldn't have.
  *
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Exceptions.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Exceptions.kt
@@ -61,6 +61,8 @@ internal constructor(message: String, cause: Throwable? = null) : RuntimeExcepti
               ContentBlockedException(cause.message ?: "", cause.cause)
             is com.google.firebase.ai.common.QuotaExceededException ->
               QuotaExceededException(cause.message ?: "", cause.cause)
+            is com.google.firebase.ai.common.APINotConfiguredException ->
+              APINotConfiguredException(cause.cause)
             else -> UnknownException(cause.message ?: "", cause)
           }
         is TimeoutCancellationException ->
@@ -149,6 +151,16 @@ internal constructor(message: String, cause: Throwable? = null) :
 public class UnsupportedUserLocationException internal constructor(cause: Throwable? = null) :
   FirebaseAIException("User location is not supported for the API use.", cause)
 
+/**
+ * The user's project does not have the Gemini Developer API enabled in the Firebase Console.
+ *
+ * See the Firebase documentation for the
+ * [steps](https://firebase.google.com/docs/ai-logic/faq-and-troubleshooting?api=dev#error-genai-config-not-found)
+ * to enable the Gemini Developer API.
+ */
+internal class APINotConfiguredException internal constructor(cause: Throwable? = null) :
+  FirebaseAIException("Gemini Developer API not enabled in Firebase console.", cause)
+
 /**
  * Some form of state occurred that shouldn't have.
  *
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCache.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCache.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.appdistribution.impl;
 
+import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.annotations.concurrent.Lightweight;
@@ -66,6 +67,20 @@ Task<T> getOrCreateTask(TaskProducer<T> producer) {
     return taskCompletionSource.getTask();
   }
 
+  /**
+   * Returns a task that completes when this object's internal sequential executor has finished
+   * processing all enqueued operations.
+   * <p>
+   * This method should never be called in production code; however, it is useful in unit tests to
+   * ensure deterministic behavior.
+   */
+  @VisibleForTesting
+  Task<Void> newTaskForSequentialExecutorFlush() {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(() -> taskCompletionSource.setResult(null));
+    return taskCompletionSource.getTask();
+  }
+
   private static <T> boolean isOngoing(Task<T> task) {
     return task != null && !task.isComplete();
   }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/NewReleaseFetcherTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/NewReleaseFetcherTest.java
@@ -112,6 +112,7 @@ public void checkForNewRelease_whenCalledMultipleTimes_onlyFetchesReleasesOnce()
 
     // Don't set the result until after calling twice, to make sure that the task from the first
     // call is still ongoing.
+    awaitTask(newReleaseFetcher.cachedCheckForNewRelease.newTaskForSequentialExecutorFlush());
     task.setResult(null);
     awaitTask(checkForNewReleaseTask1);
     awaitTask(checkForNewReleaseTask2);
diff --git a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt
@@ -44,7 +44,6 @@ import io.kotest.property.checkAll
 import io.kotest.property.exhaustive.enum
 import java.util.UUID
 import kotlinx.coroutines.test.runTest
-import org.junit.Ignore
 import org.junit.Test
 
 class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
@@ -484,7 +483,7 @@ class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
     checkAll(Exhaustive.enum<N5ekmae3jn>()) { enumValue ->
       val tagValue = Arb.dataConnect.tag().next(randomSource())
       val key = connector.enumKeyInsert.execute(enumValue) { tag = tagValue }.data.key
-      key.asClue { it.enumValue shouldBe enumValue }
+      key.asClue { it.enumValue shouldBe Known(enumValue) }
       val queryResult = connector.enumKeyGetByKey.execute(key)
       queryResult.asClue {
         val item = it.data.item.shouldNotBeNull()
@@ -498,11 +497,6 @@ class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
   @Test
-  @Ignore(
-    "TODO(cl/785956954) Re-enable this test once testing against a data connect " +
-      "emulator that fixes serialization when more than one user-defined enum type " +
-      "in the data"
-  )
   fun multipleEnumColumns() = runTest {
     checkAll(NUM_ITERATIONS, Arb.enum<N5ekmae3jn>(), Arb.enum<S7yayynb25>()) { enum1, enum2 ->
       val key = connector.multipleEnumColumnsInsert.execute(enum1, enum2).data.key
diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 firebaseLibrary {
   libraryGroup = "dataconnect"
   testLab.enabled = false
-  publishJavadoc = false
+  publishJavadoc = true
   releaseNotes {
     name.set("{{data_connect_short}}")
     versionName.set("data-connect")
diff --git a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json
@@ -1,5 +1,5 @@
 {
-  "defaultVersion": "2.10.1",
+  "defaultVersion": "2.11.0",
   "versions": [
     {
       "version": "1.3.4",
@@ -918,6 +918,24 @@
       "os": "linux",
       "size": 29266104,
       "sha512DigestHex": "669ec517e81c52157c6fec60f0aca2856b564c6181764bb3d80107481770289a1fac1c88cdc2fa1a1d246b2e5a5cd19a100444bcef53b7727886283cabea2ecb"
+    },
+    {
+      "version": "2.11.0",
+      "os": "windows",
+      "size": 29719040,
+      "sha512DigestHex": "45627a2c13de13da17c340f0940609e7745bd86dda080316f47ce13378445070390daa2548a1658493fd2567d9fa4ad2d0162f8fec6127b7d4d414a8d575bcd5"
+    },
+    {
+      "version": "2.11.0",
+      "os": "macos",
+      "size": 29234016,
+      "sha512DigestHex": "b224ada8dd36839435e613bc085b819635659728d07f50a22b0c40abcb3112e1f418a66041c59aee10920e5a846a783e27ed344779f98cd5005faff475e2a035"
+    },
+    {
+      "version": "2.11.0",
+      "os": "linux",
+      "size": 29159608,
+      "sha512DigestHex": "af3bad81cc0c0d822a75381db06d4b191c64dd73abdcbd368830e736574b7212d22a3a87c74ce52adee3ca9630876da7b600f8c31f1498d4a76359e51f872a39"
     }
   ]
 }
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedConnector.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedConnector.kt
@@ -28,13 +28,11 @@ import com.google.firebase.dataconnect.FirebaseDataConnect
  * All methods and properties of [GeneratedConnector] are thread-safe and may be safely called
  * and/or accessed concurrently from multiple threads and/or coroutines.
  *
- * ### Stable for Inheritance (after graduating to "Generally Available")
+ * ### Stable for Inheritance
  *
  * The [GeneratedConnector] interface _is_ stable for inheritance in third-party libraries, as new
  * methods will not be added to this interface and contracts of the existing methods will not be
- * changed. Note, however, that this interface is still subject to changes, up to and including
- * outright deletion, until the Firebase Data Connect product graduates from "alpha" and/or "beta"
- * to "Generally Available" status.
+ * changed, except possibly during major version number changes.
  */
 public interface GeneratedConnector<T : GeneratedConnector<T>> {
 
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedMutation.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedMutation.kt
@@ -30,13 +30,11 @@ import kotlinx.serialization.SerializationStrategy
  * All methods and properties of [GeneratedMutation] are thread-safe and may be safely called and/or
  * accessed concurrently from multiple threads and/or coroutines.
  *
- * ### Stable for Inheritance (after graduating to "Generally Available")
+ * ### Stable for Inheritance
  *
  * The [GeneratedMutation] interface _is_ stable for inheritance in third-party libraries, as new
  * methods will not be added to this interface and contracts of the existing methods will not be
- * changed. Note, however, that this interface is still subject to changes, up to and including
- * outright deletion, until the Firebase Data Connect product graduates from "alpha" and/or "beta"
- * to "Generally Available" status.
+ * changed, except possibly during major version number changes.
  */
 public interface GeneratedMutation<Connector : GeneratedConnector<Connector>, Data, Variables> :
   GeneratedOperation<Connector, Data, Variables> {
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedOperation.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedOperation.kt
@@ -31,13 +31,11 @@ import kotlinx.serialization.SerializationStrategy
  * All methods and properties of [GeneratedOperation] are thread-safe and may be safely called
  * and/or accessed concurrently from multiple threads and/or coroutines.
  *
- * ### Stable for Inheritance (after graduating to "Generally Available")
+ * ### Stable for Inheritance
  *
  * The [GeneratedOperation] interface _is_ stable for inheritance in third-party libraries, as new
  * methods will not be added to this interface and contracts of the existing methods will not be
- * changed. Note, however, that this interface is still subject to changes, up to and including
- * outright deletion, until the Firebase Data Connect product graduates from "alpha" and/or "beta"
- * to "Generally Available" status.
+ * changed, except possibly during major version number changes.
  */
 public interface GeneratedOperation<Connector : GeneratedConnector<Connector>, Data, Variables> {
 
diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedQuery.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedQuery.kt
@@ -30,13 +30,11 @@ import kotlinx.serialization.SerializationStrategy
  * All methods and properties of [GeneratedQuery] are thread-safe and may be safely called and/or
  * accessed concurrently from multiple threads and/or coroutines.
  *
- * ### Stable for Inheritance (after graduating to "Generally Available")
+ * ### Stable for Inheritance
  *
  * The [GeneratedQuery] interface _is_ stable for inheritance in third-party libraries, as new
  * methods will not be added to this interface and contracts of the existing methods will not be
- * changed. Note, however, that this interface is still subject to changes, up to and including
- * outright deletion, until the Firebase Data Connect product graduates from "alpha" and/or "beta"
- * to "Generally Available" status.
+ * changed, except possibly during major version number changes.
  */
 public interface GeneratedQuery<Connector : GeneratedConnector<Connector>, Data, Variables> :
   GeneratedOperation<Connector, Data, Variables> {
diff --git a/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/util/AlphanumericStringUtilUnitTest.kt b/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/util/AlphanumericStringUtilUnitTest.kt
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/health-metrics/apk-size/app/configure.gradle b/health-metrics/apk-size/app/configure.gradle
diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`21`	`21`	`plugins {`
`22`	`22`	`id("firebase-library")`
`23`	`23`	`id("kotlin-android")`
	`24`	`+ id("copy-google-services")`
`24`	`25`	`alias(libs.plugins.kotlinx.serialization)`
`25`	`26`	`}`
`26`	`27`