Merge branch 'main' into td/duplicate-trace-names-session

tejasd · web-flow · commit e1dd28c92f43 · 2025-03-26T10:40:08.000-04:00
diff --git a/ci/fireci/fireciplugins/api_information.py b/ci/fireci/fireciplugins/api_information.py
@@ -37,9 +37,9 @@ def api_information(auth_token, repo_name, issue_number):
     with open(os.path.join(dir_suffix, filename), 'r') as f:
       outputlines = f.readlines()
       for line in outputlines:
-        if 'error' in line:
+        if 'error:' in line:
           formatted_output_lines.append(line[line.find('error:'):])
-        elif 'warning' in line:
+        elif 'warning:' in line:
           formatted_output_lines.append(line[line.find('warning:'):])
 
     if formatted_output_lines:
diff --git a/firebase-crashlytics-ndk/CHANGELOG.md b/firebase-crashlytics-ndk/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-
+# 19.4.3
+* [changed] Updated internal Crashpad version to commit `8df174`.
 
 # 19.4.2
 * [changed] Updated `firebase-crashlytics` dependency to v19.4.2
diff --git a/firebase-crashlytics-ndk/src/main/jni/Application.mk b/firebase-crashlytics-ndk/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
 APP_ABI := arm64-v8a armeabi-v7a x86_64 x86
 APP_STL := c++_static
-APP_PLATFORM := android-16
+APP_PLATFORM := android-21
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
@@ -44,6 +44,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/exception_handler_protocol.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/initial_signal_dispositions.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/memory_map.cc \
+    $(THIRD_PARTY_PATH)/crashpad/util/linux/pac_helper.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/proc_stat_reader.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/proc_task_reader.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/ptrace_broker.cc \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk
@@ -25,6 +25,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/mini_chromium/base/posix/safe_strerror.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/process/memory.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/rand_util.cc \
+    $(THIRD_PARTY_PATH)/mini_chromium/base/strings/pattern.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_number_conversions.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_util.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/stringprintf.cc \
diff --git a/firebase-crashlytics-ndk/src/third_party/crashpad b/firebase-crashlytics-ndk/src/third_party/crashpad
@@ -1 +1 @@
-Subproject commit c902f6b1c9e43224181969110b83e0053b2ddd3c
+Subproject commit 8df174c64ca2b9dc0f83b089d30760867966b173
diff --git a/firebase-crashlytics-ndk/src/third_party/lss b/firebase-crashlytics-ndk/src/third_party/lss
@@ -1 +1 @@
-Subproject commit 9719c1e1e676814c456b55f5f070eabad6709d31
+Subproject commit ed31caa60f20a4f6569883b2d752ef7522de51e0
diff --git a/firebase-crashlytics-ndk/src/third_party/mini_chromium b/firebase-crashlytics-ndk/src/third_party/mini_chromium
@@ -1 +1 @@
-Subproject commit 4332ddb6963750e1106efdcece6d6e2de6dc6430
+Subproject commit 8b56c7718412ec7d12d05522f7af0cbb787cbb00
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt b/firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt
@@ -128,14 +128,14 @@ class StreamTests {
   fun genStreamError_receivesError() = runBlocking {
     val input = mapOf("data" to "test error")
     val function =
-      functions.getHttpsCallable("genStreamError").withTimeout(2000, TimeUnit.MILLISECONDS)
+      functions.getHttpsCallable("genStreamError").withTimeout(10_000, TimeUnit.MILLISECONDS)
     val subscriber = StreamSubscriber()
 
     function.stream(input).subscribe(subscriber)
 
-    withTimeout(2000) {
+    withTimeout(10_000) {
       while (subscriber.throwable == null) {
-        delay(100)
+        delay(1_000)
       }
     }
 
diff --git a/firebase-vertexai/CHANGELOG.md b/firebase-vertexai/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Unreleased
+* [feature] Emits a warning when attempting to use an incompatible model with
+  `GenerativeModel` or `ImagenModel`.
 * [changed] Added new exception type for quota exceeded scenarios.
 * [feature] `CountTokenRequest` now includes `GenerationConfig` from the model.
-
+* [changed] **Breaking Change**: `ImagenInlineImage.data` now returns the raw
+  image bytes (in JPEG or PNG format, as specified in
+  `ImagenInlineImage.mimeType`) instead of Base64-encoded data. (#6800)
+    * **Action Required:** Remove any Base64 decoding from your
+      `ImagenInlineImage.data` usage.
+    * The `asBitmap()` helper method is unaffected and requires no code changes.
 
 # 16.2.0
 * [fixed] Added support for new values sent by the server for `FinishReason` and `BlockReason`.
diff --git a/firebase-vertexai/firebase-vertexai.gradle.kts b/firebase-vertexai/firebase-vertexai.gradle.kts
@@ -115,6 +115,7 @@ dependencies {
   testImplementation(libs.kotlin.coroutines.test)
   testImplementation(libs.robolectric)
   testImplementation(libs.truth)
+  testImplementation(libs.mockito.core)
 
   androidTestImplementation(libs.androidx.espresso.core)
   androidTestImplementation(libs.androidx.test.junit)
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt
@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai
 
+import android.util.Log
 import com.google.firebase.Firebase
 import com.google.firebase.FirebaseApp
 import com.google.firebase.app
@@ -68,9 +69,19 @@ internal constructor(
     if (location.trim().isEmpty() || location.contains("/")) {
       throw InvalidLocationException(location)
     }
+    if (!modelName.startsWith(GEMINI_MODEL_NAME_PREFIX)) {
+      Log.w(
+        TAG,
+        """Unsupported Gemini model "${modelName}"; see
+      https://firebase.google.com/docs/vertex-ai/models for a list supported Gemini model names.
+      """
+          .trimIndent()
+      )
+    }
     return GenerativeModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
+      firebaseApp,
       generationConfig,
       safetySettings,
       tools,
@@ -102,9 +113,19 @@ internal constructor(
     if (location.trim().isEmpty() || location.contains("/")) {
       throw InvalidLocationException(location)
     }
+    if (!modelName.startsWith(IMAGEN_MODEL_NAME_PREFIX)) {
+      Log.w(
+        TAG,
+        """Unsupported Imagen model "${modelName}"; see
+      https://firebase.google.com/docs/vertex-ai/models for a list supported Imagen model names.
+      """
+          .trimIndent()
+      )
+    }
     return ImagenModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
+      firebaseApp,
       generationConfig,
       safetySettings,
       requestOptions,
@@ -134,6 +155,12 @@ internal constructor(
       val multiResourceComponent = app[FirebaseVertexAIMultiResourceComponent::class.java]
       return multiResourceComponent.get(location)
     }
+
+    private const val GEMINI_MODEL_NAME_PREFIX = "gemini-"
+
+    private const val IMAGEN_MODEL_NAME_PREFIX = "imagen-"
+
+    private val TAG = FirebaseVertexAI::class.java.simpleName
   }
 }
 
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt
@@ -17,6 +17,7 @@
 package com.google.firebase.vertexai
 
 import android.graphics.Bitmap
+import com.google.firebase.FirebaseApp
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
 import com.google.firebase.auth.internal.InternalAuthProvider
 import com.google.firebase.vertexai.common.APIController
@@ -59,6 +60,7 @@ internal constructor(
   internal constructor(
     modelName: String,
     apiKey: String,
+    firebaseApp: FirebaseApp,
     generationConfig: GenerationConfig? = null,
     safetySettings: List<SafetySetting>? = null,
     tools: List<Tool>? = null,
@@ -79,6 +81,7 @@ internal constructor(
       modelName,
       requestOptions,
       "gl-kotlin/${KotlinVersion.CURRENT} fire/${BuildConfig.VERSION_NAME}",
+      firebaseApp,
       AppCheckHeaderProvider(TAG, appCheckTokenProvider, internalAuthProvider),
     ),
   )
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/ImagenModel.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/ImagenModel.kt
@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai
 
+import com.google.firebase.FirebaseApp
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
 import com.google.firebase.auth.internal.InternalAuthProvider
 import com.google.firebase.vertexai.common.APIController
@@ -46,6 +47,7 @@ internal constructor(
   internal constructor(
     modelName: String,
     apiKey: String,
+    firebaseApp: FirebaseApp,
     generationConfig: ImagenGenerationConfig? = null,
     safetySettings: ImagenSafetySettings? = null,
     requestOptions: RequestOptions = RequestOptions(),
@@ -60,6 +62,7 @@ internal constructor(
       modelName,
       requestOptions,
       "gl-kotlin/${KotlinVersion.CURRENT} fire/${BuildConfig.VERSION_NAME}",
+      firebaseApp,
       AppCheckHeaderProvider(TAG, appCheckTokenProvider, internalAuthProvider),
     ),
   )
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt
@@ -18,6 +18,7 @@ package com.google.firebase.vertexai.common
 
 import android.util.Log
 import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
 import com.google.firebase.options
 import com.google.firebase.vertexai.common.util.decodeToFlow
 import com.google.firebase.vertexai.common.util.fullModelName
@@ -91,6 +92,9 @@ internal constructor(
   private val requestOptions: RequestOptions,
   httpEngine: HttpClientEngine,
   private val apiClient: String,
+  private val firebaseApp: FirebaseApp,
+  private val appVersion: Int = 0,
+  private val googleAppId: String,
   private val headerProvider: HeaderProvider?,
 ) {
 
@@ -99,8 +103,19 @@ internal constructor(
     model: String,
     requestOptions: RequestOptions,
     apiClient: String,
+    firebaseApp: FirebaseApp,
     headerProvider: HeaderProvider? = null,
-  ) : this(key, model, requestOptions, OkHttp.create(), apiClient, headerProvider)
+  ) : this(
+    key,
+    model,
+    requestOptions,
+    OkHttp.create(),
+    apiClient,
+    firebaseApp,
+    getVersionNumber(firebaseApp),
+    firebaseApp.options.applicationId,
+    headerProvider
+  )
 
   private val model = fullModelName(model)
 
@@ -175,6 +190,10 @@ internal constructor(
     contentType(ContentType.Application.Json)
     header("x-goog-api-key", key)
     header("x-goog-api-client", apiClient)
+    if (firebaseApp.isDataCollectionDefaultEnabled) {
+      header("X-Firebase-AppId", googleAppId)
+      header("X-Firebase-AppVersion", appVersion)
+    }
   }
 
   private suspend fun HttpRequestBuilder.applyHeaderProvider() {
@@ -240,6 +259,16 @@ internal constructor(
 
   companion object {
     private val TAG = APIController::class.java.simpleName
+
+    private fun getVersionNumber(app: FirebaseApp): Int {
+      try {
+        val context = app.applicationContext
+        return context.packageManager.getPackageInfo(context.packageName, 0).versionCode
+      } catch (e: Exception) {
+        Log.d(TAG, "Error while getting app version: ${e.message}")
+        return 0
+      }
+    }
   }
 }
 
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenGenerationResponse.kt
@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai.type
 
+import android.util.Base64
 import com.google.firebase.vertexai.ImagenModel
 import kotlinx.serialization.Serializable
 
@@ -53,7 +54,7 @@ internal constructor(public val images: List<T>, public val filteredReason: Stri
     val raiFilteredReason: String? = null,
   ) {
     internal fun toPublicInline() =
-      ImagenInlineImage(bytesBase64Encoded!!.toByteArray(), mimeType!!)
+      ImagenInlineImage(Base64.decode(bytesBase64Encoded!!, Base64.NO_WRAP), mimeType!!)
 
     internal fun toPublicGCS() = ImagenGCSImage(gcsUri!!, mimeType!!)
   }
diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenInlineImage.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/ImagenInlineImage.kt
@@ -18,13 +18,13 @@ package com.google.firebase.vertexai.type
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.util.Base64
 
 /**
- * Represents an Imagen-generated image that is contained inline
+ * Represents an Imagen-generated image that is returned as inline data.
  *
- * @param data Contains the raw bytes of the image
- * @param mimeType Contains the MIME type of the image (for example, `"image/png"`)
+ * @property data The raw image bytes in JPEG or PNG format, as specified by [mimeType].
+ * @property mimeType The IANA standard MIME type of the image data; either `"image/png"` or
+ * `"image/jpeg"`; to request a different format, see [ImagenGenerationConfig.imageFormat].
  */
 @PublicPreviewAPI
 public class ImagenInlineImage
@@ -34,7 +34,6 @@ internal constructor(public val data: ByteArray, public val mimeType: String) {
    * Returns the image as an Android OS native [Bitmap] so that it can be saved or sent to the UI.
    */
   public fun asBitmap(): Bitmap {
-    val data = Base64.decode(data, Base64.NO_WRAP)
     return BitmapFactory.decodeByteArray(data, 0, data.size)
   }
 }
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/GenerativeModelTesting.kt
@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai
 
+import com.google.firebase.FirebaseApp
 import com.google.firebase.vertexai.common.APIController
 import com.google.firebase.vertexai.common.JSON
 import com.google.firebase.vertexai.common.util.doBlocking
@@ -42,10 +43,21 @@ import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
+import org.junit.Before
 import org.junit.Test
+import org.mockito.Mockito
 
 internal class GenerativeModelTesting {
   private val TEST_CLIENT_ID = "test"
+  private val TEST_APP_ID = "1:android:12345"
+  private val TEST_VERSION = 1
+
+  private var mockFirebaseApp: FirebaseApp = Mockito.mock<FirebaseApp>()
+
+  @Before
+  fun setup() {
+    Mockito.`when`(mockFirebaseApp.isDataCollectionDefaultEnabled).thenReturn(false)
+  }
 
   @Test
   fun `system calling in request`() = doBlocking {
@@ -64,6 +76,9 @@ internal class GenerativeModelTesting {
         RequestOptions(timeout = 5.seconds, endpoint = "https://my.custom.endpoint"),
         mockEngine,
         TEST_CLIENT_ID,
+        mockFirebaseApp,
+        TEST_VERSION,
+        TEST_APP_ID,
         null,
       )
 
@@ -109,6 +124,9 @@ internal class GenerativeModelTesting {
         RequestOptions(),
         mockEngine,
         TEST_CLIENT_ID,
+        mockFirebaseApp,
+        TEST_VERSION,
+        TEST_APP_ID,
         null,
       )
 
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/util/tests.kt
diff --git a/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt b/firebase-vertexai/src/test/java/com/google/firebase/vertexai/util/tests.kt
