update function calling stuff

Author: VinayGuthal

firebase-vertexai/api.txt

@@ -132,7 +132,7 @@ package com.google.firebase.vertexai.java {
     method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> send(String text);
     method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> sendFunctionResponse(java.util.List<com.google.firebase.vertexai.type.FunctionResponsePart> functionList);
     method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> sendMediaStream(java.util.List<com.google.firebase.vertexai.type.MediaData> mediaChunks);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> startAudioConversation(kotlin.jvm.functions.Function1<? super java.util.List<com.google.firebase.vertexai.type.FunctionCallPart>,? extends java.util.List<com.google.firebase.vertexai.type.FunctionResponsePart>>? functionCallsHandler);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> startAudioConversation(kotlin.jvm.functions.Function1<? super com.google.firebase.vertexai.type.FunctionCallPart,com.google.firebase.vertexai.type.FunctionResponsePart>? functionCallHandler);
     method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> stopAudioConversation();
     method public abstract void stopReceiving();
     field public static final com.google.firebase.vertexai.java.LiveSessionFutures.Companion Companion;
@@ -631,7 +631,7 @@ package com.google.firebase.vertexai.type {
     method public suspend Object? send(String text, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public suspend Object? sendFunctionResponse(java.util.List<com.google.firebase.vertexai.type.FunctionResponsePart> functionList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public suspend Object? sendMediaStream(java.util.List<com.google.firebase.vertexai.type.MediaData> mediaChunks, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public suspend Object? startAudioConversation(kotlin.jvm.functions.Function1<? super java.util.List<com.google.firebase.vertexai.type.FunctionCallPart>,? extends java.util.List<com.google.firebase.vertexai.type.FunctionResponsePart>>? functionCallsHandler = null, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? startAudioConversation(kotlin.jvm.functions.Function1<? super com.google.firebase.vertexai.type.FunctionCallPart,com.google.firebase.vertexai.type.FunctionResponsePart>? functionCallHandler = null, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public void stopAudioConversation();
     method public void stopReceiving();
   }

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/java/LiveSessionFutures.kt

@@ -41,11 +41,11 @@ public abstract class LiveSessionFutures internal constructor() {
    * Starts an audio conversation with the Gemini server, which can only be stopped using
    * stopAudioConversation.
    *
-   * @param functionCallsHandler A callback function that is invoked whenever the server receives a
+   * @param functionCallHandler A callback function that is invoked whenever the server receives a
    * function call.
    */
   public abstract fun startAudioConversation(
-    functionCallsHandler: ((List<FunctionCallPart>) -> List<FunctionResponsePart>)?
+    functionCallHandler: ((FunctionCallPart) -> FunctionResponsePart)?
   ): ListenableFuture<Unit>
 
   /** Stops the audio conversation with the Gemini Server. */
@@ -121,8 +121,8 @@ public abstract class LiveSessionFutures internal constructor() {
       SuspendToFutureAdapter.launchFuture { session.sendMediaStream(mediaChunks) }
 
     override fun startAudioConversation(
-      functionCallsHandler: ((List<FunctionCallPart>) -> List<FunctionResponsePart>)?
-    ) = SuspendToFutureAdapter.launchFuture { session.startAudioConversation(functionCallsHandler) }
+      functionCallHandler: ((FunctionCallPart) -> FunctionResponsePart)?
+    ) = SuspendToFutureAdapter.launchFuture { session.startAudioConversation(functionCallHandler) }
 
     override fun stopAudioConversation() =
       SuspendToFutureAdapter.launchFuture { session.stopAudioConversation() }

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

@@ -152,7 +152,7 @@ internal constructor(
   }
 
   private fun fillServerResponseAudioQueue(
-    functionCallsHandler: ((List<FunctionCallPart>) -> List<FunctionResponsePart>)? = null
+    functionCallsHandler: ((FunctionCallPart) -> FunctionResponsePart)? = null
   ) {
     CoroutineScope(backgroundDispatcher).launch {
       receive(listOf(ContentModality.AUDIO)).collect {
@@ -164,7 +164,7 @@ internal constructor(
             while (!playBackQueue.isEmpty()) playBackQueue.poll()
           LiveContentResponse.Status.NORMAL ->
             if (!it.functionCalls.isNullOrEmpty() && functionCallsHandler != null) {
-              sendFunctionResponse(functionCallsHandler(it.functionCalls))
+              sendFunctionResponse(it.functionCalls.map(functionCallsHandler).toList())
             } else {
               val audioData = it.data?.parts?.get(0)?.asInlineDataPartOrNull()?.inlineData
               if (audioData != null) {
@@ -189,11 +189,11 @@ internal constructor(
    * Starts an audio conversation with the Gemini server, which can only be stopped using
    * [stopAudioConversation].
    *
-   * @param functionCallsHandler A callback function that is invoked whenever the server receives a
+   * @param functionCallHandler A callback function that is invoked whenever the server receives a
    * function call.
    */
   public suspend fun startAudioConversation(
-    functionCallsHandler: ((List<FunctionCallPart>) -> List<FunctionResponsePart>)? = null
+    functionCallHandler: ((FunctionCallPart) -> FunctionResponsePart)? = null
   ) {
     if (isRecording) {
       Log.w(TAG, "startAudioConversation called after the recording has already started.")
@@ -204,7 +204,7 @@ internal constructor(
     audioHelper!!.setupAudioTrack()
     fillRecordedAudioQueue()
     CoroutineScope(backgroundDispatcher).launch { sendAudioDataToServer() }
-    fillServerResponseAudioQueue(functionCallsHandler)
+    fillServerResponseAudioQueue(functionCallHandler)
     playServerResponseAudio()
   }