make more fields required

Author: dlarocque

firebase-ai/api.txt

@@ -435,11 +435,11 @@ package com.google.firebase.ai.type {
   }
 
   public final class GroundingSupport {
-    ctor public GroundingSupport(com.google.firebase.ai.type.Segment? segment, java.util.List<java.lang.Integer> groundingChunkIndices);
+    ctor public GroundingSupport(com.google.firebase.ai.type.Segment segment, java.util.List<java.lang.Integer> groundingChunkIndices);
     method public java.util.List<java.lang.Integer> getGroundingChunkIndices();
-    method public com.google.firebase.ai.type.Segment? getSegment();
+    method public com.google.firebase.ai.type.Segment getSegment();
     property public final java.util.List<java.lang.Integer> groundingChunkIndices;
-    property public final com.google.firebase.ai.type.Segment? segment;
+    property public final com.google.firebase.ai.type.Segment segment;
   }
 
   public final class HarmBlockMethod {
@@ -942,10 +942,10 @@ package com.google.firebase.ai.type {
   }
 
   public final class SearchEntryPoint {
-    ctor public SearchEntryPoint(String? renderedContent, String? sdkBlob);
-    method public String? getRenderedContent();
+    ctor public SearchEntryPoint(String renderedContent, String? sdkBlob);
+    method public String getRenderedContent();
     method public String? getSdkBlob();
-    property public final String? renderedContent;
+    property public final String renderedContent;
     property public final String? sdkBlob;
   }
 

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

@@ -337,15 +337,15 @@ public class GroundingMetadata(
         retrievalQueries = retrievalQueries.orEmpty(),
         groundingAttribution = groundingAttribution?.map { it.toPublic() }.orEmpty(),
         groundingChunks = groundingChunks?.map { it.toPublic() }.orEmpty(),
-        groundingSupports = groundingSupports?.map { it.toPublic() }.orEmpty()
+        groundingSupports = groundingSupports?.map { it.toPublic() }.orEmpty().filterNotNull()
       )
   }
 }
 
 /**
  * Represents a Google Search entry point.
  *
- * When using this feature, you are required to comply with the
+ * When using this API, you are required to comply with the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google
  * Search".
  *
@@ -355,23 +355,30 @@ public class GroundingMetadata(
  * @property sdkBlob A blob of data for the client SDK to render the search entry point.
  */
 public class SearchEntryPoint(
-  public val renderedContent: String?,
+  public val renderedContent: String,
   public val sdkBlob: String?,
 ) {
   @Serializable
   internal data class Internal(
     val renderedContent: String?,
     val sdkBlob: String?,
   ) {
-    internal fun toPublic() = SearchEntryPoint(renderedContent = renderedContent, sdkBlob = sdkBlob)
+    internal fun toPublic(): SearchEntryPoint {
+      // If rendered content is null, the user must not display the grounded result. If they do,
+      // they violate the service terms. To prevent this from happening, throw an exception.
+      if (renderedContent == null) {
+        throw SerializationException("renderedContent is null, should be a string")
+      }
+      return SearchEntryPoint(renderedContent = renderedContent, sdkBlob = sdkBlob)
+    }
   }
 }
 
 /**
  * Represents a chunk of retrieved data that supports a claim in the model's response. This is part
  * of the grounding information provided when grounding is enabled.
  *
- * When using this feature, you are required to comply with the
+ * When using this API, you are required to comply with the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google
  * Search".
  *
@@ -391,7 +398,7 @@ public class GroundingChunk(
 /**
  * A grounding chunk from the web.
  *
- * When using this feature, you are required to comply with the
+ * When using this API, you are required to comply with the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google
  * Search".
  *
@@ -415,7 +422,7 @@ public class WebGroundingChunk(
  * Provides information about how a specific segment of the model's response is supported by the
  * retrieved grounding chunks.
  *
- * When using this feature, you are required to comply with the
+ * When using this API, you are required to comply with the
  * [Service Specific Terms](https://cloud.google.com/terms/service-terms) for "Grounding with Google
  * Search".
  *
@@ -426,19 +433,23 @@ public class WebGroundingChunk(
  * that support the claim made in the associated `segment` of the response.
  */
 public class GroundingSupport(
-  public val segment: Segment?,
+  public val segment: Segment,
   public val groundingChunkIndices: List<Int>,
 ) {
   @Serializable
   internal data class Internal(
     val segment: Segment.Internal?,
     val groundingChunkIndices: List<Int>?,
   ) {
-    internal fun toPublic() =
-      GroundingSupport(
-        segment = segment?.toPublic(),
+    internal fun toPublic(): GroundingSupport? {
+      if (segment == null) {
+        return null
+      }
+      return GroundingSupport(
+        segment = segment.toPublic(),
         groundingChunkIndices = groundingChunkIndices.orEmpty(),
       )
+    }
   }
 }
 

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

@@ -619,19 +619,19 @@ internal class VertexAIUnarySnapshotTests {
         groundingMetadata.groundingSupports.size shouldBe 3
         val groundingSupport = groundingMetadata.groundingSupports.first()
         groundingSupport.segment.shouldNotBeNull()
-        groundingSupport.segment?.startIndex shouldBe 0
-        groundingSupport.segment?.partIndex shouldBe 0
-        groundingSupport.segment?.endIndex shouldBe 56
-        groundingSupport.segment?.text shouldBe
+        groundingSupport.segment.startIndex shouldBe 0
+        groundingSupport.segment.partIndex shouldBe 0
+        groundingSupport.segment.endIndex shouldBe 56
+        groundingSupport.segment.text shouldBe
           "The current weather in London, United Kingdom is cloudy."
         groundingSupport.groundingChunkIndices.first() shouldBe 0
 
         val secondGroundingSupport = groundingMetadata.groundingSupports[1]
         secondGroundingSupport.segment.shouldNotBeNull()
-        secondGroundingSupport.segment?.startIndex shouldBe 57
-        secondGroundingSupport.segment?.partIndex shouldBe 0
-        secondGroundingSupport.segment?.endIndex shouldBe 123
-        secondGroundingSupport.segment?.text shouldBe
+        secondGroundingSupport.segment.startIndex shouldBe 57
+        secondGroundingSupport.segment.partIndex shouldBe 0
+        secondGroundingSupport.segment.endIndex shouldBe 123
+        secondGroundingSupport.segment.text shouldBe
           "The temperature is 67°F (19°C), but it feels like 75°F (24°C)."
         secondGroundingSupport.groundingChunkIndices.first() shouldBe 1
       }