Format, changelog, and minor fix

Author: emilypgoogle

firebase-vertexai/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [changed] Merged core networking code into VertexAI from a separate library
 * [feature] added support for `responseSchema` in `GenerationConfig`.
 
 # 16.0.0-beta03

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

@@ -65,7 +65,10 @@ internal class InvalidAPIKeyException(message: String, cause: Throwable? = null)
  *
  * @property response the full server response for the request.
  */
-internal class PromptBlockedException(val response: GenerateContentResponse, cause: Throwable? = null) :
+internal class PromptBlockedException(
+  val response: GenerateContentResponse,
+  cause: Throwable? = null
+) :
   GoogleGenerativeAIException(
     "Prompt was blocked: ${response.promptFeedback?.blockReason?.name}",
     cause,
@@ -94,7 +97,10 @@ internal class InvalidStateException(message: String, cause: Throwable? = null)
  *
  * @property response the full server response for the request
  */
-internal class ResponseStoppedException(val response: GenerateContentResponse, cause: Throwable? = null) :
+internal class ResponseStoppedException(
+  val response: GenerateContentResponse,
+  cause: Throwable? = null
+) :
   GoogleGenerativeAIException(
     "Content generation stopped. Reason: ${response.candidates?.first()?.finishReason?.name}",
     cause,

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

@@ -31,8 +31,10 @@ internal data class GenerateContentResponse(
 ) : Response
 
 @Serializable
-internal data class CountTokensResponse(val totalTokens: Int, val totalBillableCharacters: Int? = null) :
-  Response
+internal data class CountTokensResponse(
+  val totalTokens: Int,
+  val totalBillableCharacters: Int? = null
+) : Response
 
 @Serializable internal data class GRpcErrorResponse(val error: GRpcError) : Response
 

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

@@ -58,7 +58,11 @@ internal data class FunctionCallingConfig(val mode: Mode) {
 }
 
 @Serializable
-internal data class FunctionDeclaration(val name: String, val description: String, val parameters: Schema)
+internal data class FunctionDeclaration(
+  val name: String,
+  val description: String,
+  val parameters: Schema
+)
 
 @Serializable
 internal data class Schema(

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

@@ -138,6 +138,10 @@ internal enum class FinishReason {
 }
 
 @Serializable
-internal data class GRpcError(val code: Int, val message: String, val details: List<GRpcErrorDetails>)
+internal data class GRpcError(
+  val code: Int,
+  val message: String,
+  val details: List<GRpcErrorDetails>
+)
 
 @Serializable internal data class GRpcErrorDetails(val reason: String? = null)

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

@@ -55,7 +55,8 @@ internal data class Content(@EncodeDefault val role: String? = "user", val parts
 
 @Serializable internal data class FunctionCallPart(val functionCall: FunctionCall) : Part
 
-@Serializable internal data class FunctionResponsePart(val functionResponse: FunctionResponse) : Part
+@Serializable
+internal data class FunctionResponsePart(val functionResponse: FunctionResponse) : Part
 
 @Serializable internal data class ExecutableCodePart(val executableCode: ExecutableCode) : Part
 
@@ -64,17 +65,20 @@ internal data class CodeExecutionResultPart(val codeExecutionResult: CodeExecuti
 
 @Serializable internal data class FunctionResponse(val name: String, val response: JsonObject)
 
-@Serializable internal  data class FunctionCall(val name: String, val args: Map<String, String?>? = null)
+@Serializable
+internal data class FunctionCall(val name: String, val args: Map<String, String?>? = null)
 
-@Serializable internal data class FileDataPart(@SerialName("file_data") val fileData: FileData) : Part
+@Serializable
+internal data class FileDataPart(@SerialName("file_data") val fileData: FileData) : Part
 
 @Serializable
 internal data class FileData(
   @SerialName("mime_type") val mimeType: String,
   @SerialName("file_uri") val fileUri: String,
 )
 
-@Serializable internal data class Blob(@SerialName("mime_type") val mimeType: String, val data: Base64)
+@Serializable
+internal data class Blob(@SerialName("mime_type") val mimeType: String, val data: Base64)
 
 @Serializable internal data class ExecutableCode(val language: String, val code: String)
 

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

@@ -34,7 +34,8 @@ import kotlinx.serialization.encoding.Encoder
  * When an unknown enum value is found, the enum itself will be logged to stderr with a message
  * about opening an issue on GitHub regarding the new enum value.
  */
-internal class FirstOrdinalSerializer<T : Enum<T>>(private val enumClass: KClass<T>) : KSerializer<T> {
+internal class FirstOrdinalSerializer<T : Enum<T>>(private val enumClass: KClass<T>) :
+  KSerializer<T> {
   override val descriptor: SerialDescriptor = buildClassSerialDescriptor("FirstOrdinalSerializer")
 
   override fun deserialize(decoder: Decoder): T {

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

@@ -21,4 +21,5 @@ package com.google.firebase.vertexai.common.util
  *
  * Models must be prepended with the `models/` prefix when communicating with the backend.
  */
-internal fun fullModelName(name: String): String = name.takeIf { it.contains("/") } ?: "models/$name"
+internal fun fullModelName(name: String): String =
+  name.takeIf { it.contains("/") } ?: "models/$name"

firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/APIControllerTests.kt

@@ -343,11 +343,11 @@ internal class ModelNamingTests(private val modelName: String, private val actua
   }
 }
 
-fun textGenerateContentRequest(prompt: String) =
+internal fun textGenerateContentRequest(prompt: String) =
   GenerateContentRequest(
     model = "unused",
     contents = listOf(Content(parts = listOf(TextPart(prompt)))),
   )
 
-fun textCountTokenRequest(prompt: String) =
+internal fun textCountTokenRequest(prompt: String) =
   CountTokensRequest(generateContentRequest = textGenerateContentRequest(prompt))

firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/StreamingSnapshotTests.kt

@@ -26,11 +26,11 @@ import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import io.ktor.http.HttpStatusCode
+import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.withTimeout
 import org.junit.Test
-import kotlin.time.Duration.Companion.seconds
 
 internal class StreamingSnapshotTests {
   private val testTimeout = 5.seconds
@@ -76,7 +76,8 @@ internal class StreamingSnapshotTests {
         responseList.any {
           it.candidates?.any {
             it.safetyRatings?.any { it.category == HarmCategory.UNKNOWN } ?: false
-          } ?: false
+          }
+            ?: false
         } shouldBe true
       }
     }

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

@@ -38,10 +38,10 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.ktor.http.HttpStatusCode
+import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
 import org.junit.Test
-import kotlin.time.Duration.Companion.seconds
 
 @Serializable internal data class MountainColors(val name: String, val colors: List<String>)