Merge branch 'main' into rl.vertex.check.update

Author: rlazo

firebase-ai/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [fixed] **Breaking Change**: Fixed missing builder methods and return types in builders.
 * [changed] **Breaking Change**: `LiveModelFutures.connect` now returns `ListenableFuture<LiveSessionFutures>` instead of `ListenableFuture<LiveSession>`.
     * **Action Required:** Remove any transformations from LiveSession object to LiveSessionFutures object.
     * **Action Required:** Change type of variable handling `LiveModelFutures.connect` to `ListenableFuture<LiveSessionsFutures>`

firebase-ai/api.txt

@@ -216,12 +216,10 @@ package com.google.firebase.ai.type {
     method public <T extends com.google.firebase.ai.type.Part> com.google.firebase.ai.type.Content.Builder addPart(T data);
     method public com.google.firebase.ai.type.Content.Builder addText(String text);
     method public com.google.firebase.ai.type.Content build();
-    method public java.util.List<com.google.firebase.ai.type.Part> getParts();
-    method public String? getRole();
-    method public void setParts(java.util.List<com.google.firebase.ai.type.Part>);
-    method public void setRole(String?);
-    property public final java.util.List<com.google.firebase.ai.type.Part> parts;
-    property public final String? role;
+    method public com.google.firebase.ai.type.Content.Builder setParts(java.util.List<com.google.firebase.ai.type.Part> parts);
+    method public com.google.firebase.ai.type.Content.Builder setRole(String? role);
+    field public java.util.List<com.google.firebase.ai.type.Part> parts;
+    field public String? role;
   }
 
   public final class ContentBlockedException extends com.google.firebase.ai.type.FirebaseAIException {
@@ -355,6 +353,17 @@ package com.google.firebase.ai.type {
   public static final class GenerationConfig.Builder {
     ctor public GenerationConfig.Builder();
     method public com.google.firebase.ai.type.GenerationConfig build();
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setCandidateCount(Integer? candidateCount);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setFrequencyPenalty(Float? frequencyPenalty);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setMaxOutputTokens(Integer? maxOutputTokens);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setPresencePenalty(Float? presencePenalty);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setResponseMimeType(String? responseMimeType);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setResponseModalities(java.util.List<com.google.firebase.ai.type.ResponseModality>? responseModalities);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setResponseSchema(com.google.firebase.ai.type.Schema? responseSchema);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setStopSequences(java.util.List<java.lang.String>? stopSequences);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setTemperature(Float? temperature);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setTopK(Integer? topK);
+    method public com.google.firebase.ai.type.GenerationConfig.Builder setTopP(Float? topP);
     field public Integer? candidateCount;
     field public Float? frequencyPenalty;
     field public Integer? maxOutputTokens;

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Candidate.kt

@@ -51,7 +51,7 @@ internal constructor(
     val groundingMetadata: GroundingMetadata? = null,
   ) {
     internal fun toPublic(): Candidate {
-      val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
+      val safetyRatings = safetyRatings?.mapNotNull { it.toPublic() }.orEmpty()
       val citations = citationMetadata?.toPublic()
       val finishReason = finishReason?.toPublic()
 
@@ -120,23 +120,31 @@ internal constructor(
   internal data class Internal
   @JvmOverloads
   constructor(
-    val category: HarmCategory.Internal,
-    val probability: HarmProbability.Internal,
+    val category: HarmCategory.Internal? = null,
+    val probability: HarmProbability.Internal? = null,
     val blocked: Boolean? = null, // TODO(): any reason not to default to false?
     val probabilityScore: Float? = null,
     val severity: HarmSeverity.Internal? = null,
     val severityScore: Float? = null,
   ) {
 
     internal fun toPublic() =
-      SafetyRating(
-        category = category.toPublic(),
-        probability = probability.toPublic(),
-        probabilityScore = probabilityScore ?: 0f,
-        blocked = blocked,
-        severity = severity?.toPublic(),
-        severityScore = severityScore
-      )
+      // Due to a bug in the backend, it's possible that we receive
+      // an invalid `SafetyRating` value, without either category or
+      // probability. We return null in those cases to enable
+      // filtering by the higher level types.
+      if (category == null || probability == null) {
+        null
+      } else {
+        SafetyRating(
+          category = category.toPublic(),
+          probability = probability.toPublic(),
+          probabilityScore = probabilityScore ?: 0f,
+          blocked = blocked,
+          severity = severity?.toPublic(),
+          severityScore = severityScore
+        )
+      }
   }
 }
 

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Content.kt

@@ -44,14 +44,17 @@ constructor(public val role: String? = "user", public val parts: List<Part>) {
   public class Builder {
 
     /** The producer of the content. Must be either 'user' or 'model'. By default, it's "user". */
-    public var role: String? = "user"
+    @JvmField public var role: String? = "user"
 
     /**
      * The mutable list of [Part]s comprising the [Content].
      *
      * Prefer using the provided helper methods over modifying this list directly.
      */
-    public var parts: MutableList<Part> = arrayListOf()
+    @JvmField public var parts: MutableList<Part> = arrayListOf()
+
+    public fun setRole(role: String?): Content.Builder = apply { this.role = role }
+    public fun setParts(parts: MutableList<Part>): Content.Builder = apply { this.parts = parts }
 
     /** Adds a new [Part] to [parts]. */
     @JvmName("addPart")

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/GenerationConfig.kt

@@ -136,6 +136,36 @@ private constructor(
     @JvmField public var responseSchema: Schema? = null
     @JvmField public var responseModalities: List<ResponseModality>? = null
 
+    public fun setTemperature(temperature: Float?): Builder = apply {
+      this.temperature = temperature
+    }
+    public fun setTopK(topK: Int?): Builder = apply { this.topK = topK }
+    public fun setTopP(topP: Float?): Builder = apply { this.topP = topP }
+    public fun setCandidateCount(candidateCount: Int?): Builder = apply {
+      this.candidateCount = candidateCount
+    }
+    public fun setMaxOutputTokens(maxOutputTokens: Int?): Builder = apply {
+      this.maxOutputTokens = maxOutputTokens
+    }
+    public fun setPresencePenalty(presencePenalty: Float?): Builder = apply {
+      this.presencePenalty = presencePenalty
+    }
+    public fun setFrequencyPenalty(frequencyPenalty: Float?): Builder = apply {
+      this.frequencyPenalty = frequencyPenalty
+    }
+    public fun setStopSequences(stopSequences: List<String>?): Builder = apply {
+      this.stopSequences = stopSequences
+    }
+    public fun setResponseMimeType(responseMimeType: String?): Builder = apply {
+      this.responseMimeType = responseMimeType
+    }
+    public fun setResponseSchema(responseSchema: Schema?): Builder = apply {
+      this.responseSchema = responseSchema
+    }
+    public fun setResponseModalities(responseModalities: List<ResponseModality>?): Builder = apply {
+      this.responseModalities = responseModalities
+    }
+
     /** Create a new [GenerationConfig] with the attached arguments. */
     public fun build(): GenerationConfig =
       GenerationConfig(

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/PromptFeedback.kt

@@ -42,7 +42,7 @@ public class PromptFeedback(
   ) {
 
     internal fun toPublic(): PromptFeedback {
-      val safetyRatings = safetyRatings?.map { it.toPublic() }.orEmpty()
+      val safetyRatings = safetyRatings?.mapNotNull { it.toPublic() }.orEmpty()
       return PromptFeedback(blockReason?.toPublic(), safetyRatings, blockReasonMessage)
     }
   }

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

@@ -36,7 +36,10 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.withTimeout
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
+@RunWith(RobolectricTestRunner::class)
 internal class VertexAIStreamingSnapshotTests {
   private val testTimeout = 5.seconds
 
@@ -85,6 +88,18 @@ internal class VertexAIStreamingSnapshotTests {
       }
     }
 
+  @Test
+  fun `invalid safety ratings during image generation`() =
+    goldenVertexStreamingFile("streaming-success-image-invalid-safety-ratings.txt") {
+      val responses = model.generateContentStream("prompt")
+
+      withTimeout(testTimeout) {
+        val responseList = responses.toList()
+
+        responseList.isEmpty() shouldBe false
+      }
+    }
+
   @Test
   fun `unknown enum in finish reason`() =
     goldenVertexStreamingFile("streaming-failure-unknown-finish-enum.txt") {

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

@@ -55,8 +55,11 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import org.json.JSONArray
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 @OptIn(PublicPreviewAPI::class)
+@RunWith(RobolectricTestRunner::class)
 internal class VertexAIUnarySnapshotTests {
   private val testTimeout = 5.seconds
 
@@ -125,6 +128,16 @@ internal class VertexAIUnarySnapshotTests {
       }
     }
 
+  @Test
+  fun `invalid safety ratings during image generation`() =
+    goldenVertexUnaryFile("unary-success-image-invalid-safety-ratings.json") {
+      withTimeout(testTimeout) {
+        val response = model.generateContent("prompt")
+
+        response.candidates.isEmpty() shouldBe false
+      }
+    }
+
   @Test
   fun `unknown enum in finish reason`() =
     goldenVertexUnaryFile("unary-failure-unknown-enum-finish-reason.json") {

firebase-ai/src/testUtil/java/com/google/firebase/ai/JavaCompileTests.java

@@ -57,11 +57,13 @@
 import com.google.firebase.ai.type.PublicPreviewAPI;
 import com.google.firebase.ai.type.ResponseModality;
 import com.google.firebase.ai.type.SafetyRating;
+import com.google.firebase.ai.type.Schema;
 import com.google.firebase.ai.type.SpeechConfig;
 import com.google.firebase.ai.type.TextPart;
 import com.google.firebase.ai.type.UsageMetadata;
 import com.google.firebase.ai.type.Voices;
 import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -92,8 +94,37 @@ public void initializeJava() throws Exception {
   }
 
   private GenerationConfig getConfig() {
-    return new GenerationConfig.Builder().build();
-    // TODO b/406558430 GenerationConfig.Builder.setParts returns void
+    return new GenerationConfig.Builder()
+        .setTopK(10)
+        .setTopP(11.0F)
+        .setTemperature(32.0F)
+        .setCandidateCount(1)
+        .setMaxOutputTokens(0xCAFEBABE)
+        .setFrequencyPenalty(1.0F)
+        .setPresencePenalty(2.0F)
+        .setStopSequences(List.of("foo", "bar"))
+        .setResponseMimeType("image/jxl")
+        .setResponseModalities(List.of(ResponseModality.TEXT, ResponseModality.TEXT))
+        .setResponseSchema(getSchema())
+        .build();
+  }
+
+  private Schema getSchema() {
+    return Schema.obj(
+        Map.of(
+            "foo", Schema.numInt(),
+            "bar", Schema.numInt("Some integer"),
+            "baz", Schema.numInt("Some integer", false),
+            "qux", Schema.numDouble(),
+            "quux", Schema.numFloat("Some floating point number"),
+            "xyzzy", Schema.array(Schema.numInt(), "A list of integers"),
+            "fee", Schema.numLong(),
+            "ber",
+                Schema.obj(
+                    Map.of(
+                        "bez", Schema.array(Schema.numDouble("Nullable double", true)),
+                        "qez", Schema.enumeration(List.of("A", "B", "C"), "One of 3 letters"),
+                        "qeez", Schema.str("A funny string")))));
   }
 
   private LiveGenerationConfig getLiveConfig() {
@@ -113,13 +144,14 @@ private LiveGenerationConfig getLiveConfig() {
   private void testFutures(GenerativeModelFutures futures) throws Exception {
     Content content =
         new Content.Builder()
+            .setParts(new ArrayList<>())
             .addText("Fake prompt")
             .addFileData("fakeuri", "image/png")
             .addInlineData(new byte[] {}, "text/json")
             .addImage(Bitmap.createBitmap(0, 0, Bitmap.Config.HARDWARE))
             .addPart(new FunctionCallPart("fakeFunction", Map.of("fakeArg", JsonNull.INSTANCE)))
+            .setRole("user")
             .build();
-    // TODO b/406558430 Content.Builder.setParts and Content.Builder.setRole return void
     Executor executor = FirebaseExecutors.directExecutor();
     ListenableFuture<CountTokensResponse> countResponse = futures.countTokens(content);
     validateCountTokensResponse(countResponse.get());

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java

@@ -139,8 +139,9 @@ static Architecture getValue() {
   public static String streamToString(InputStream is) {
     // Previous code was running into this: http://code.google.com/p/android/issues/detail?id=14562
     // on Android 2.3.3. The below code below does not exhibit that problem.
-    final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
-    return s.hasNext() ? s.next() : "";
+    try (final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A")) {
+      return s.hasNext() ? s.next() : "";
+    }
   }
 
   public static String sha1(String source) {