Merge branch 'main' into dl/map-expressions

Author: dlarocque

ai-logic/firebase-ai/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Unreleased
 
-- [feature] Added support for [Maps Grounding](https://ai.google.dev/gemini-api/docs/maps-grounding) (#7950)
 - [fixed] Fixed an issue causing network timeouts to throw the incorrect exception type, instead of
   `RequestTimeoutException` (#7966)
+- [fixed] Fixed missing `toString()` implemenation for `InferenceSource` (#7970)
+- [fixed] Fixed an issue causing the SDK to throw an exception if an unknown message was received
+  from the LiveAPI model, instead of ignoring it (#7975)
 
 # 17.10.1
 

ai-logic/firebase-ai/api.txt

@@ -637,20 +637,6 @@ package com.google.firebase.ai.type {
     method public com.google.firebase.ai.type.GenerativeBackend vertexAI(String location = "us-central1");
   }
 
-  public final class GoogleMaps {
-    ctor public GoogleMaps();
-  }
-
-  public final class GoogleMapsGroundingChunk {
-    ctor public GoogleMapsGroundingChunk(String? uri, String? title, String? placeId);
-    method public String? getPlaceId();
-    method public String? getTitle();
-    method public String? getUri();
-    property public final String? placeId;
-    property public final String? title;
-    property public final String? uri;
-  }
-
   public final class GoogleSearch {
     ctor public GoogleSearch();
   }
@@ -664,12 +650,8 @@ package com.google.firebase.ai.type {
   }
 
   public final class GroundingChunk {
-    ctor public GroundingChunk();
-    ctor public GroundingChunk(com.google.firebase.ai.type.WebGroundingChunk? web = null);
-    ctor public GroundingChunk(com.google.firebase.ai.type.WebGroundingChunk? web = null, com.google.firebase.ai.type.GoogleMapsGroundingChunk? maps = null);
-    method public com.google.firebase.ai.type.GoogleMapsGroundingChunk? getMaps();
+    ctor public GroundingChunk(com.google.firebase.ai.type.WebGroundingChunk? web);
     method public com.google.firebase.ai.type.WebGroundingChunk? getWeb();
-    property public final com.google.firebase.ai.type.GoogleMapsGroundingChunk? maps;
     property public final com.google.firebase.ai.type.WebGroundingChunk? web;
   }
 
@@ -1185,17 +1167,6 @@ package com.google.firebase.ai.type {
     method public com.google.firebase.ai.type.JsonSchema<java.lang.String> string(String? description = null, boolean nullable = false, com.google.firebase.ai.type.StringFormat? format = null, String? title = null);
   }
 
-  public final class LatLng {
-    ctor public LatLng(double latitude, double longitude);
-    method public double component1();
-    method public double component2();
-    method public com.google.firebase.ai.type.LatLng copy(double latitude, double longitude);
-    method public double getLatitude();
-    method public double getLongitude();
-    property public final double latitude;
-    property public final double longitude;
-  }
-
   @com.google.firebase.ai.type.PublicPreviewAPI public final class LiveAudioConversationConfig {
     field public static final com.google.firebase.ai.type.LiveAudioConversationConfig.Companion Companion;
   }
@@ -1301,6 +1272,9 @@ package com.google.firebase.ai.type {
     property public final java.util.List<java.lang.String> functionIds;
   }
 
+  @com.google.firebase.ai.type.PublicPreviewAPI public final class LiveServerUnknownMessage implements com.google.firebase.ai.type.LiveServerMessage {
+  }
+
   @com.google.firebase.ai.type.PublicPreviewAPI public final class LiveSession {
     method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public boolean isAudioConversationActive();
@@ -1402,28 +1376,6 @@ package com.google.firebase.ai.type {
     property public final com.google.firebase.ai.type.GenerateContentResponse response;
   }
 
-  public final class RetrievalConfig {
-    method public static com.google.firebase.ai.type.RetrievalConfig.Builder builder();
-    field public static final com.google.firebase.ai.type.RetrievalConfig.Companion Companion;
-  }
-
-  public static final class RetrievalConfig.Builder {
-    ctor public RetrievalConfig.Builder();
-    method public com.google.firebase.ai.type.RetrievalConfig build();
-    method public com.google.firebase.ai.type.RetrievalConfig.Builder setLanguageCode(String? languageCode);
-    method public com.google.firebase.ai.type.RetrievalConfig.Builder setLatLng(com.google.firebase.ai.type.LatLng? latLng);
-    field public String? languageCode;
-    field public com.google.firebase.ai.type.LatLng? latLng;
-  }
-
-  public static final class RetrievalConfig.Companion {
-    method public com.google.firebase.ai.type.RetrievalConfig.Builder builder();
-  }
-
-  public final class RetrievalConfigKt {
-    method public static com.google.firebase.ai.type.RetrievalConfig retrievalConfig(kotlin.jvm.functions.Function1<? super com.google.firebase.ai.type.RetrievalConfig.Builder,kotlin.Unit> init);
-  }
-
   public final class SafetyRating {
     method public Boolean? getBlocked();
     method public com.google.firebase.ai.type.HarmCategory getCategory();
@@ -1666,8 +1618,6 @@ package com.google.firebase.ai.type {
     method public static com.google.firebase.ai.type.Tool codeExecution();
     method public static com.google.firebase.ai.type.Tool functionDeclarations(java.util.List<com.google.firebase.ai.type.FunctionDeclaration> functionDeclarations);
     method public static com.google.firebase.ai.type.Tool functionDeclarations(java.util.List<com.google.firebase.ai.type.FunctionDeclaration>? functionDeclarations = null, java.util.List<? extends com.google.firebase.ai.type.AutoFunctionDeclaration<? extends java.lang.Object?,? extends java.lang.Object?>>? autoFunctionDeclarations);
-    method public static com.google.firebase.ai.type.Tool googleMaps();
-    method public static com.google.firebase.ai.type.Tool googleMaps(com.google.firebase.ai.type.GoogleMaps googleMaps = com.google.firebase.ai.type.GoogleMaps());
     method public static com.google.firebase.ai.type.Tool googleSearch();
     method public static com.google.firebase.ai.type.Tool googleSearch(com.google.firebase.ai.type.GoogleSearch googleSearch = com.google.firebase.ai.type.GoogleSearch());
     method public static com.google.firebase.ai.type.Tool urlContext();
@@ -1679,18 +1629,14 @@ package com.google.firebase.ai.type {
     method public com.google.firebase.ai.type.Tool codeExecution();
     method public com.google.firebase.ai.type.Tool functionDeclarations(java.util.List<com.google.firebase.ai.type.FunctionDeclaration> functionDeclarations);
     method public com.google.firebase.ai.type.Tool functionDeclarations(java.util.List<com.google.firebase.ai.type.FunctionDeclaration>? functionDeclarations = null, java.util.List<? extends com.google.firebase.ai.type.AutoFunctionDeclaration<? extends java.lang.Object?,? extends java.lang.Object?>>? autoFunctionDeclarations);
-    method public com.google.firebase.ai.type.Tool googleMaps();
-    method public com.google.firebase.ai.type.Tool googleMaps(com.google.firebase.ai.type.GoogleMaps googleMaps = com.google.firebase.ai.type.GoogleMaps());
     method public com.google.firebase.ai.type.Tool googleSearch();
     method public com.google.firebase.ai.type.Tool googleSearch(com.google.firebase.ai.type.GoogleSearch googleSearch = com.google.firebase.ai.type.GoogleSearch());
     method public com.google.firebase.ai.type.Tool urlContext();
     method public com.google.firebase.ai.type.Tool urlContext(com.google.firebase.ai.type.UrlContext urlContext = com.google.firebase.ai.type.UrlContext());
   }
 
   public final class ToolConfig {
-    ctor public ToolConfig();
-    ctor public ToolConfig(com.google.firebase.ai.type.FunctionCallingConfig? functionCallingConfig = null);
-    ctor public ToolConfig(com.google.firebase.ai.type.FunctionCallingConfig? functionCallingConfig = null, com.google.firebase.ai.type.RetrievalConfig? retrievalConfig = null);
+    ctor public ToolConfig(com.google.firebase.ai.type.FunctionCallingConfig? functionCallingConfig);
   }
 
   public final class Transcription {

ai-logic/firebase-ai/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.11.0
+version=17.10.2
 latestReleasedVersion=17.10.1

ai-logic/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/GroundingTests.kt

@@ -336,12 +336,6 @@ public class FinishReason private constructor(public val name: String, public va
  * Vertex AI Gemini API (see [Service Terms](https://cloud.google.com/terms/service-terms) section
  * within the Service Specific Terms).
  *
- * If using Grounding with Google Maps, you are required to comply with the "Grounding with Google
- * Maps" usage requirements for your chosen API provider:
- * [Gemini Developer API](https://ai.google.dev/gemini-api/terms#grounding-with-google-maps) or
- * Vertex AI Gemini API (see [Service Terms](https://cloud.google.com/terms/service-terms) section
- * within the Service Specific Terms).
- *
  * @property webSearchQueries The list of web search queries that the model performed to gather the
  * grounding information. These can be used to allow users to explore the search results themselves.
  * @property searchEntryPoint Google Search entry point for web searches. This contains an HTML/CSS
@@ -414,40 +408,15 @@ public class SearchEntryPoint(
  * Represents a chunk of retrieved data that supports a claim in the model's response.
  *
  * @property web Contains details if the grounding chunk is from a web source.
- * @property maps Contains details if the grounding chunk is from a Google Maps source.
  */
-public class GroundingChunk
-@JvmOverloads
-constructor(
-  public val web: WebGroundingChunk? = null,
-  public val maps: GoogleMapsGroundingChunk? = null,
+public class GroundingChunk(
+  public val web: WebGroundingChunk?,
 ) {
-
   @Serializable
   internal data class Internal(
     val web: WebGroundingChunk.Internal?,
-    val maps: GoogleMapsGroundingChunk.Internal?,
   ) {
-    internal fun toPublic() = GroundingChunk(web = web?.toPublic(), maps?.toPublic())
-  }
-}
-
-/**
- * A grounding chunk from Google Maps.
- *
- * @property uri The URI of the place.
- * @property title The title of the place.
- * @property placeId This Place's resource name, in `places/{place_id}` format. This can be used to
- * look up the place using the Google Maps API.
- */
-public class GoogleMapsGroundingChunk(
-  public val uri: String?,
-  public val title: String?,
-  public val placeId: String?,
-) {
-  @Serializable
-  internal data class Internal(val uri: String?, val title: String?, val placeId: String?) {
-    fun toPublic() = GoogleMapsGroundingChunk(uri, title, placeId)
+    internal fun toPublic() = GroundingChunk(web = web?.toPublic())
   }
 }
 

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

@@ -16,6 +16,7 @@
 
 package com.google.firebase.ai.type
 
+import android.util.Log
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.serialization.DeserializationStrategy
@@ -136,6 +137,15 @@ public class LiveServerSetupComplete : LiveServerMessage {
   }
 }
 
+@PublicPreviewAPI
+public class LiveServerUnknownMessage private constructor() : LiveServerMessage {
+  @Serializable
+  internal data class InternalWrapper(@Transient val unused: Unit? = null) :
+    InternalLiveServerMessage {
+    override fun toPublic() = LiveServerUnknownMessage()
+  }
+}
+
 /**
  * Request for the client to execute the provided [functionCalls].
  *
@@ -233,10 +243,13 @@ internal object LiveServerMessageSerializer :
       "toolCallCancellation" in jsonObject ->
         LiveServerToolCallCancellation.InternalWrapper.serializer()
       "goAway" in jsonObject -> LiveServerGoAway.InternalWrapper.serializer()
-      else ->
-        throw SerializationException(
-          "Unknown LiveServerMessage response type. Keys found: ${jsonObject.keys}"
+      else -> {
+        Log.w(
+          "LiveServerMsgSerializer",
+          "Ignoring unknown LiveServerMessage response type. Keys found: ${jsonObject.keys}"
         )
+        LiveServerUnknownMessage.InternalWrapper.serializer()
+      }
     }
   }
 }

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

@@ -578,6 +578,7 @@ internal constructor(
             // Notify the application
             goAwayHandler?.invoke(it)
           }
+          is LiveServerUnknownMessage -> {} // Ignore. Logging happens at de-serialization time
         }
       }
       .launchIn(networkScope)