Merge branch 'main' into dl/grpc-max-message-size

Author: dlarocque

ai-logic/firebase-ai/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- [feature] Added automatic function calling support for `LiveGenerativeModel`. (#8223)
+
 # 17.13.0
 
 - [feature] Expanded `SpeechConfig` to support `MultiSpeakerVoiceConfig` and `LanguageCode`.

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

@@ -20,7 +20,11 @@ import com.google.firebase.FirebaseApp
 import com.google.firebase.ai.common.APIController
 import com.google.firebase.ai.common.AppCheckHeaderProvider
 import com.google.firebase.ai.common.JSON
+import com.google.firebase.ai.type.AutoFunctionDeclaration
 import com.google.firebase.ai.type.Content
+import com.google.firebase.ai.type.FirebaseAutoFunctionException
+import com.google.firebase.ai.type.FunctionCallPart
+import com.google.firebase.ai.type.FunctionResponsePart
 import com.google.firebase.ai.type.GenerativeBackend
 import com.google.firebase.ai.type.LiveClientSetupMessage
 import com.google.firebase.ai.type.LiveGenerationConfig
@@ -40,8 +44,11 @@ import io.ktor.websocket.readBytes
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.jsonObject
 
 /**
  * Represents a multimodal model (like Gemini) capable of real-time content generation based on
@@ -140,7 +147,9 @@ internal constructor(
         session = webSession,
         blockingDispatcher = blockingDispatcher,
         firebaseApp = firebaseApp,
-        connectionFactory = connectFactory
+        connectionFactory = connectFactory,
+        hasFunction = ::hasFunction,
+        executeFunction = ::executeFunction
       )
     } catch (e: ClosedReceiveChannelException) {
       val reason = webSession?.closeReason?.await()
@@ -150,6 +159,55 @@ internal constructor(
     }
   }
 
+  internal fun hasFunction(call: FunctionCallPart): Boolean {
+    return tools
+      .flatMap { it.autoFunctionDeclarations ?: emptyList() }
+      .firstOrNull { it.name == call.name && it.functionReference != null } != null
+  }
+
+  @OptIn(InternalSerializationApi::class)
+  internal suspend fun executeFunction(call: FunctionCallPart): FunctionResponsePart {
+    if (tools.isEmpty()) {
+      throw RuntimeException("No registered tools")
+    }
+    val tool = tools.flatMap { it.autoFunctionDeclarations ?: emptyList() }
+    val declaration =
+      tool.firstOrNull { it.name == call.name }
+        ?: throw RuntimeException("No registered function named ${call.name}")
+    return executeFunction<Any, Any>(
+      call,
+      declaration as AutoFunctionDeclaration<Any, Any>,
+      JsonObject(call.args).toString()
+    )
+  }
+
+  @OptIn(InternalSerializationApi::class)
+  internal suspend fun <I : Any, O : Any> executeFunction(
+    functionCall: FunctionCallPart,
+    functionDeclaration: AutoFunctionDeclaration<I, O>,
+    parameter: String
+  ): FunctionResponsePart {
+    val inputDeserializer = functionDeclaration.inputSchema.getSerializer()
+    val input = JSON.decodeFromString(inputDeserializer, parameter)
+    val functionReference =
+      functionDeclaration.functionReference
+        ?: throw RuntimeException("Function reference for ${functionDeclaration.name} is missing")
+    try {
+      val output = functionReference.invoke(input)
+      val outputSerializer = functionDeclaration.outputSchema?.getSerializer()
+      if (outputSerializer != null) {
+        return FunctionResponsePart.from(
+            JSON.encodeToJsonElement(outputSerializer, output).jsonObject
+          )
+          .normalizeAgainstCall(functionCall)
+      }
+      return (output as FunctionResponsePart).normalizeAgainstCall(functionCall)
+    } catch (e: FirebaseAutoFunctionException) {
+      return FunctionResponsePart.from(JsonObject(mapOf("error" to JsonPrimitive(e.message))))
+        .normalizeAgainstCall(functionCall)
+    }
+  }
+
   private companion object {
     private val TAG = LiveGenerativeModel::class.java.simpleName
   }

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

@@ -75,7 +75,9 @@ internal constructor(
   private val firebaseApp: FirebaseApp,
   private val connectionFactory:
     (suspend (SessionResumptionConfig?) -> DefaultClientWebSocketSession)? =
-    null
+    null,
+  private val hasFunction: ((FunctionCallPart) -> Boolean)? = null,
+  private val executeFunction: (suspend (FunctionCallPart) -> FunctionResponsePart)? = null
 ) {
   /**
    * Coroutine scope that we batch data on for network related behavior.
@@ -580,6 +582,14 @@ internal constructor(
               // It's fine to suspend here since you can't have a function call running concurrently
               // with an audio response
               sendFunctionResponse(it.functionCalls.map(functionCallHandler).toList())
+            } else if (
+              hasFunction != null &&
+                executeFunction != null &&
+                it.functionCalls.all { f -> hasFunction.invoke(f) }
+            ) {
+              sendFunctionResponse(
+                it.functionCalls.map { call -> executeFunction.invoke(call) }.toList()
+              )
             } else {
               Log.w(
                 TAG,

ci/danger/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
       nap
       open4 (~> 1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -44,13 +44,13 @@ GEM
       pstore (~> 0.1)
       terminal-table (>= 1, < 5)
     drb (2.2.3)
-    faraday (2.14.2)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     git (2.3.3)
       activesupport (>= 5.0)
@@ -59,7 +59,7 @@ GEM
       rchardet (~> 1.8)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.19.5)
+    json (2.20.0)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)

encoders/firebase-decoders-json/src/main/java/com/google/firebase/decoders/TypeToken.java

@@ -28,11 +28,11 @@
  *
  * <ol>
  *   <li>Primitive types
- *   <li>Array Types: primitive arrays(i.e. {@code int[]}) and object arrays(i.e. {@code Foo[]})
- *   <li>Plain class types. i.e. {@code Foo}
- *   <li>Generic types. i.e. {@code Foo<String, Double>}
- *   <li>Wildcard types: only support {@code Foo<? extend Bar>} by downgrading it to {@code
- *       Foo<Bar>}, and throw exception when stumbled upon {@code Foo<? super Bar>}.
+ *   <li>Array Types: primitive arrays (like {@code int[]}) and object arrays (like {@code Foo[]})
+ *   <li>Plain class types, for example, {@code Foo}
+ *   <li>Generic types, for example, {@code Foo<String, Double>}
+ *   <li>Wildcard types: only support {@code Foo<? extend Bar>} by downgrading it to
+ * {@code Foo<Bar>}, and throw exception when stumbled upon {@code Foo<? super Bar>}.
  * </ol>
  */
 public abstract class TypeToken<T> {
@@ -175,7 +175,7 @@ String getTypeTokenLiteral() {
 
   /**
    * {@link ArrayToken} is used to represent Array types in a type-safe manner. such as: primitive
-   * arrays(i.e. {@code int[]}) and object arrays(i.e. {@code Foo[]})
+   * arrays (that is, {@code int[]}) and object arrays (that is, {@code Foo[]})
    */
   public static class ArrayToken<T> extends TypeToken<T> {
     private final TypeToken<?> componentType;

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/getters/AnnotationProperty.java

@@ -20,7 +20,7 @@
 /** Represents an annotation property/method with its value as explicitly set in source. */
 @AutoValue
 public abstract class AnnotationProperty {
-  /** Name of the property, e.g. \"value\". */
+  /** Name of the property, for example \"value\". */
   public abstract String name();
 
   /** Value of the property. */

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/getters/Getter.java

@@ -45,7 +45,7 @@ public abstract class Getter {
   /**
    * Getter's underlying Java type.
    *
-   * <p>The type is fully resolved with respect to generics, i.e. {@code Optional<MyType<String>>},
+   * <p>The type is fully resolved with respect to generics, for example, {@code Optional<MyType<String>>},
    * not {@code Optional<T>}.
    */
   public TypeMirror getUnderlyingType() {

encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Types.kt

@@ -55,18 +55,19 @@ sealed class Primitive(override val javaName: String, val defaultValue: String)
  * Can be one of [Message] or [ProtoEnum].
  */
 sealed class UserDefined : ProtobufType() {
-  /** A fully qualified protobuf message name, i.e. `com.example.Outer.Inner`. */
+  /** A fully qualified protobuf message name, for example, `com.example.Outer.Inner`. */
   abstract val protobufFullName: String
 
   /**
-   * Specifies the scope that this type is defined in, i.e. a [Owner.Package] or a parent [Message].
+   * Specifies the scope that this type is defined in, that is, a [Owner.Package] or a parent
+   * [Message].
    */
   abstract val owner: Owner
 
   /** Unqualified name of this type */
   abstract val name: String
 
-  /** A fully qualified java name of this type, i.e. `com.example.Outer$Inner`. */
+  /** A fully qualified java name of this type, for example, `com.example.Outer$Inner`. */
   override val javaName: String
     get() = "${owner.javaName}${owner.scopeSeparator}$name"
 

firebase-abt/src/main/java/com/google/firebase/abt/AbtExperimentInfo.java

@@ -149,7 +149,7 @@ public AbtExperimentInfo(
    *
    * @param experimentInfoMap A {@link Map} that contains all the keys specified in {@link
    *     #ALL_REQUIRED_KEYS}. The values of each key must be convertible to the appropriate type,
-   *     e.g., the value for {@link #EXPERIMENT_START_TIME_KEY} must be an ISO 8601 Date string.
+   *     for example, the value for {@link #EXPERIMENT_START_TIME_KEY} must be an ISO 8601 Date string.
    * @return An {@link AbtExperimentInfo} with the values of the experiment in {@code
    *     experimentInfoMap}.
    * @throws AbtException If one of the keys is missing, or any of the values cannot be converted to

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- [feature] Added OOM and Anomaly trigger collection for the ProfilingManager API [#8343]
+
 # 20.0.6
 
 - [fixed] Fixed race condition that caused logs from background threads to not be attached to