Merge branch 'main' into rl.vertex.warn

Author: rlazo

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:

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)
       }
     }
 

firebase-vertexai/CHANGELOG.md

@@ -3,7 +3,12 @@
   `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`.

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)

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/FirebaseVertexAI.kt

@@ -81,6 +81,7 @@ internal constructor(
     return GenerativeModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
+      firebaseApp,
       generationConfig,
       safetySettings,
       tools,
@@ -124,6 +125,7 @@ internal constructor(
     return ImagenModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
+      firebaseApp,
       generationConfig,
       safetySettings,
       requestOptions,

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),
     ),
   )

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),
     ),
   )

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
+      }
+    }
   }
 }
 

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!!)
   }

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)
   }
 }