Fix issues from revert call

Author: rlazo

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt

@@ -82,9 +82,9 @@ internal fun Part.toInternal(): com.google.firebase.vertexai.common.shared.Part
         InlineData(mimeType, Base64.encodeToString(inlineData, BASE_64_FLAGS))
       )
     is com.google.firebase.vertexai.type.FunctionCallPart ->
-      FunctionCallPart(FunctionCall(name, args.orEmpty()))
+      FunctionCallPart(FunctionCall(name, args))
     is com.google.firebase.vertexai.type.FunctionResponsePart ->
-      FunctionResponsePart(FunctionResponse(name, response.toInternal()))
+      FunctionResponsePart(FunctionResponse(name, response))
     is FileDataPart ->
       com.google.firebase.vertexai.common.shared.FileDataPart(
         FileData(mimeType = mimeType, fileUri = uri)
@@ -232,12 +232,12 @@ internal fun com.google.firebase.vertexai.common.shared.Part.toPublic(): Part {
     is FunctionCallPart ->
       com.google.firebase.vertexai.type.FunctionCallPart(
         functionCall.name,
-        functionCall.args.orEmpty(),
+        functionCall.args.orEmpty().mapValues { it.value ?: JsonNull }
       )
     is FunctionResponsePart ->
       com.google.firebase.vertexai.type.FunctionResponsePart(
         functionResponse.name,
-        functionResponse.response.toPublic(),
+        functionResponse.response,
       )
     is com.google.firebase.vertexai.common.shared.FileDataPart ->
       FileDataPart(fileData.mimeType, fileData.fileUri)

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

@@ -17,6 +17,8 @@
 package com.google.firebase.vertexai.type
 
 import android.graphics.Bitmap
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
 import org.json.JSONObject
 
 /** Interface representing data sent to and received from requests. */
@@ -48,15 +50,16 @@ public class InlineDataPart(public val inlineData: ByteArray, public val mimeTyp
  * @param name the name of the function to call
  * @param args the function parameters and values as a [Map]
  */
-class FunctionCallPart(val name: String, val args: Map<String, JsonElement>) : Part
+public class FunctionCallPart(public val name: String, public val args: Map<String, JsonElement>) :
+  Part
 
 /**
  * Represents function call output to be returned to the model when it requests a function call.
  *
  * @param name the name of the called function
  * @param response the response produced by the function as a [JSONObject]
  */
-class FunctionResponsePart(val name: String, val response: JsonObject) : Part
+public class FunctionResponsePart(public val name: String, public val response: JsonObject) : Part
 
 /**
  * Represents file data stored in Cloud Storage for Firebase, referenced by URI.

firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt

@@ -353,7 +353,7 @@ internal class UnarySnapshotTests {
         val response = model.generateContent("prompt")
         val callPart = (response.candidates.first().content.parts.first() as FunctionCallPart)
 
-        callPart.args["season"] shouldBe null
+        callPart.args["season"] shouldBe JsonPrimitive(null)
       }
     }
 
@@ -370,7 +370,7 @@ internal class UnarySnapshotTests {
             it.parts.first().shouldBeInstanceOf<FunctionCallPart>()
           }
 
-        callPart.args["current"] shouldBe "true"
+        callPart.args["current"] shouldBe JsonPrimitive(true)
       }
     }
 
@@ -387,11 +387,9 @@ internal class UnarySnapshotTests {
             it.parts.first().shouldBeInstanceOf<FunctionCallPart>()
           }
 
-        callPart.functionCall.args["current"] shouldBe JsonPrimitive(true)
-        callPart.functionCall.args["testObject"]!!
-          .jsonObject["testProperty"]!!
-          .jsonPrimitive
-          .content shouldBe "string property"
+        callPart.args["current"] shouldBe JsonPrimitive(true)
+        callPart.args["testObject"]!!.jsonObject["testProperty"]!!.jsonPrimitive.content shouldBe
+          "string property"
       }
     }
 
@@ -415,8 +413,8 @@ internal class UnarySnapshotTests {
         val callPart = response.functionCalls.shouldNotBeEmpty().first()
 
         callPart.name shouldBe "sum"
-        callPart.args["x"] shouldBe "4"
-        callPart.args["y"] shouldBe "5"
+        callPart.args["x"] shouldBe JsonPrimitive(4)
+        callPart.args["y"] shouldBe JsonPrimitive(5)
       }
     }