Review changes

Author: emilypgoogle

firebase-vertexai/consumer-rules.pro

@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+-keep class com.google.firebase.vertexai.type.** { *; }
 -keep class com.google.firebase.vertexai.common.** { *; }

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/GenerativeModel.kt

@@ -24,8 +24,6 @@ import com.google.firebase.vertexai.common.APIController
 import com.google.firebase.vertexai.common.CountTokensRequest
 import com.google.firebase.vertexai.common.GenerateContentRequest
 import com.google.firebase.vertexai.common.HeaderProvider
-import com.google.firebase.vertexai.internal.util.toInternal
-import com.google.firebase.vertexai.internal.util.toPublic
 import com.google.firebase.vertexai.type.Content
 import com.google.firebase.vertexai.type.CountTokensResponse
 import com.google.firebase.vertexai.type.FinishReason

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/Exceptions.kt

@@ -126,3 +126,18 @@ internal class ServiceDisabledException(message: String, cause: Throwable? = nul
 /** Catch all case for exceptions not explicitly expected. */
 internal class UnknownException(message: String, cause: Throwable? = null) :
   FirebaseCommonAIException(message, cause)
+
+internal fun makeMissingCaseException(
+  source: String,
+  ordinal: Int
+): com.google.firebase.vertexai.type.SerializationException {
+  return com.google.firebase.vertexai.type.SerializationException(
+    """
+    |Missing case for a $source: $ordinal
+    |This error indicates that one of the `toInternal` conversions needs updating.
+    |If you're a developer seeing this exception, please file an issue on our GitHub repo:
+    |https://github.com/firebase/firebase-android-sdk
+  """
+      .trimMargin()
+  )
+}

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

@@ -18,7 +18,6 @@ package com.google.firebase.vertexai.type
 
 import com.google.firebase.vertexai.FirebaseVertexAI
 import com.google.firebase.vertexai.common.FirebaseCommonAIException
-import com.google.firebase.vertexai.internal.util.toPublic
 import kotlinx.coroutines.TimeoutCancellationException
 
 /** Parent class for any errors that occur from the [FirebaseVertexAI] SDK. */

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

@@ -16,7 +16,7 @@
 
 package com.google.firebase.vertexai.type
 
-import com.google.firebase.vertexai.internal.util.makeMissingCaseException
+import com.google.firebase.vertexai.common.makeMissingCaseException
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

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

@@ -16,7 +16,7 @@
 
 package com.google.firebase.vertexai.type
 
-import com.google.firebase.vertexai.internal.util.makeMissingCaseException
+import com.google.firebase.vertexai.common.makeMissingCaseException
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

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

@@ -16,8 +16,8 @@
 
 package com.google.firebase.vertexai.type
 
+import com.google.firebase.vertexai.common.makeMissingCaseException
 import com.google.firebase.vertexai.common.util.FirstOrdinalSerializer
-import com.google.firebase.vertexai.internal.util.makeMissingCaseException
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

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

@@ -18,7 +18,6 @@ package com.google.firebase.vertexai.type
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import com.google.firebase.vertexai.internal.util.BASE_64_FLAGS
 import java.io.ByteArrayOutputStream
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerialName
@@ -133,6 +132,8 @@ public fun Part.asFileDataOrNull(): FileDataPart? = this as? FileDataPart
 
 internal typealias Base64 = String
 
+internal const val BASE_64_FLAGS = android.util.Base64.NO_WRAP
+
 @Serializable(PartSerializer::class) internal sealed interface InternalPart
 
 internal object PartSerializer :

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

@@ -17,6 +17,9 @@
 package com.google.firebase.vertexai.type
 
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import org.json.JSONObject
 
 internal sealed interface Response
 
@@ -38,3 +41,7 @@ internal data class GRpcErrorResponse(val error: GRpcError) : Response {
     )
   }
 }
+
+internal fun JSONObject.toInternal() = Json.decodeFromString<JsonObject>(toString())
+
+internal fun JsonObject.toPublic() = JSONObject(toString())