From bfc48e9f2143e13ce7a2ab625d82c69ce7b4286a Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Fri, 8 Aug 2025 16:48:16 -0700
Subject: [PATCH 1/2] [Firebase AI] Improve Live API FunctionCalling

---
 firebaseai/src/LiveSession.cs  | 22 ++++++++++++++++++++
 firebaseai/src/ModelContent.cs | 38 ++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/firebaseai/src/LiveSession.cs b/firebaseai/src/LiveSession.cs
index 7eb5eb9c..52030a7d 100644
--- a/firebaseai/src/LiveSession.cs
+++ b/firebaseai/src/LiveSession.cs
@@ -103,6 +103,28 @@ public async Task SendAsync(
       ModelContent? content = null,
       bool turnComplete = false,
       CancellationToken cancellationToken = default) {
+    // If the content has FunctionResponseParts, we handle those separately.
+    if (content.HasValue) {
+      var functionParts = content?.Parts.OfType<ModelContent.FunctionResponsePart>().ToList();
+      if (functionParts.Count > 0) {
+        Dictionary<string, object> toolResponse = new() {
+          { "toolResponse", new Dictionary<string, object>() {
+            { "functionResponses", functionParts.Select(frPart => (frPart as ModelContent.Part).ToJson()["functionResponse"]).ToList() }
+          }}
+        };
+        var toolResponseBytes = Encoding.UTF8.GetBytes(Json.Serialize(toolResponse));
+
+        await InternalSendBytesAsync(new ArraySegment<byte>(toolResponseBytes), cancellationToken);
+        if (functionParts.Count < content?.Parts.Count) {
+          // There are other parts to send, so send them with the other method.
+          content = new ModelContent(role: content?.Role,
+              parts: content?.Parts.Where(p => p is not ModelContent.FunctionResponsePart));
+        } else {
+          return;
+        }
+      }
+    }
+
     // Prepare the message payload
     Dictionary<string, object> contentDict = new() {
       { "turnComplete", turnComplete }
diff --git a/firebaseai/src/ModelContent.cs b/firebaseai/src/ModelContent.cs
index cee6cdbd..a13fafd5 100644
--- a/firebaseai/src/ModelContent.cs
+++ b/firebaseai/src/ModelContent.cs
@@ -103,8 +103,8 @@ public static ModelContent FileData(string mimeType, System.Uri uri) {
   /// `FunctionResponsePart` containing the given name and args.
   /// </summary>
   public static ModelContent FunctionResponse(
-      string name, IDictionary<string, object> response) {
-    return new ModelContent(new FunctionResponsePart(name, response));
+      string name, IDictionary<string, object> response, string id = null) {
+    return new ModelContent(new FunctionResponsePart(name, response, id));
   }
 
   // TODO: Possibly more, like Multi, Model, FunctionResponses, System (only on Dart?)
@@ -236,20 +236,26 @@ Dictionary<string, object> Part.ToJson() {
     /// The function parameters and values, matching the registered schema.
     /// </summary>
     public IReadOnlyDictionary<string, object> Args { get; }
+    /// <summary>
+    /// An identifier that should be passed along in the FunctionResponsePart.
+    /// </summary>
+    public string Id { get; }
     
     /// <summary>
     /// Intended for internal use only.
     /// </summary>
-    internal FunctionCallPart(string name, IDictionary<string, object> args) {
+    internal FunctionCallPart(string name, IDictionary<string, object> args, string id) {
       Name = name;
       Args = new Dictionary<string, object>(args);
+      Id = id;
     }
 
     Dictionary<string, object> Part.ToJson() {
       return new Dictionary<string, object>() {
         { "functionCall", new Dictionary<string, object>() {
             { "name", Name },
-            { "args", Args }
+            { "args", Args },
+            { "id", Id }
           }
         }
       };
@@ -272,24 +278,33 @@ Dictionary<string, object> Part.ToJson() {
     /// The function's response or return value.
     /// </summary>
     public IReadOnlyDictionary<string, object> Response { get; }
+    /// <summary>
+    /// The id from the FunctionCallPart this is in response to.
+    /// </summary>
+    public string Id { get; }
 
     /// <summary>
     /// Constructs a new `FunctionResponsePart`.
     /// </summary>
     /// <param name="name">The name of the function that was called.</param>
     /// <param name="response">The function's response.</param>
-    public FunctionResponsePart(string name, IDictionary<string, object> response) {
+    /// <param name="id">The id from the FunctionCallPart this is in response to.</param>
+    public FunctionResponsePart(string name, IDictionary<string, object> response, string id = null) {
       Name = name;
       Response = new Dictionary<string, object>(response);
+      Id = id;
     }
 
     Dictionary<string, object> Part.ToJson() {
+      var result = new Dictionary<string, object>() {
+        { "name", Name },
+        { "response", Response }
+      };
+      if (!string.IsNullOrEmpty(Id)) {
+        result["id"] = Id;
+      }
       return new Dictionary<string, object>() {
-        { "functionResponse", new Dictionary<string, object>() {
-            { "name", Name },
-            { "response", Response }
-          }
-        }
+        { "functionResponse", result }
       };
     }
   }
@@ -350,7 +365,8 @@ internal static class ModelContentJsonParsers {
   internal static ModelContent.FunctionCallPart FunctionCallPartFromJson(Dictionary<string, object> jsonDict) {
     return new ModelContent.FunctionCallPart(
       jsonDict.ParseValue<string>("name", JsonParseOptions.ThrowEverything),
-      jsonDict.ParseValue<Dictionary<string, object>>("args", JsonParseOptions.ThrowEverything));
+      jsonDict.ParseValue<Dictionary<string, object>>("args", JsonParseOptions.ThrowEverything),
+      jsonDict.ParseValue<string>("id"));
   }
 }
 

From 37b8fad3591587aa686b026587e2a482c833cf3c Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Fri, 8 Aug 2025 17:02:39 -0700
Subject: [PATCH 2/2] Update ModelContent.cs

---
 firebaseai/src/ModelContent.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/firebaseai/src/ModelContent.cs b/firebaseai/src/ModelContent.cs
index a13fafd5..4c152142 100644
--- a/firebaseai/src/ModelContent.cs
+++ b/firebaseai/src/ModelContent.cs
@@ -251,13 +251,16 @@ internal FunctionCallPart(string name, IDictionary<string, object> args, string
     }
 
     Dictionary<string, object> Part.ToJson() {
+      var jsonDict = new Dictionary<string, object>() {
+        { "name", Name },
+        { "args", Args }
+      };
+      if (!string.IsNullOrEmpty(Id)) {
+        jsonDict["id"] = Id;
+      }
+
       return new Dictionary<string, object>() {
-        { "functionCall", new Dictionary<string, object>() {
-            { "name", Name },
-            { "args", Args },
-            { "id", Id }
-          }
-        }
+        { "functionCall", jsonDict }
       };
     }
   }