update to match API doc

Author: David Motsonashvili

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

@@ -24,7 +24,8 @@ import com.google.firebase.auth.internal.InternalAuthProvider
 import com.google.firebase.inject.Provider
 import com.google.firebase.vertexai.type.Content
 import com.google.firebase.vertexai.type.GenerationConfig
-import com.google.firebase.vertexai.type.ImageSafetySettings
+import com.google.firebase.vertexai.type.ImagenGenerationConfig
+import com.google.firebase.vertexai.type.ImagenSafetySettings
 import com.google.firebase.vertexai.type.ImagenModelConfig
 import com.google.firebase.vertexai.type.InvalidLocationException
 import com.google.firebase.vertexai.type.RequestOptions
@@ -84,8 +85,8 @@ internal constructor(
   @JvmOverloads
   public fun imageModel(
     modelName: String,
-    generationConfig: ImagenModelConfig? = null,
-    safetySettings: ImageSafetySettings? = null,
+    generationConfig: ImagenGenerationConfig? = null,
+    safetySettings: ImagenSafetySettings? = null,
     requestOptions: RequestOptions = RequestOptions(),
   ): ImageModel {
     if (location.trim().isEmpty() || location.contains("/")) {

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

@@ -12,11 +12,10 @@ import com.google.firebase.vertexai.internal.util.toInternal
 import com.google.firebase.vertexai.internal.util.toPublicGCS
 import com.google.firebase.vertexai.internal.util.toPublicInline
 import com.google.firebase.vertexai.type.FirebaseVertexAIException
-import com.google.firebase.vertexai.type.ImageSafetySettings
+import com.google.firebase.vertexai.type.ImagenSafetySettings
 import com.google.firebase.vertexai.type.ImagenGCSImage
 import com.google.firebase.vertexai.type.ImagenGenerationConfig
 import com.google.firebase.vertexai.type.ImagenGenerationResponse
-import com.google.firebase.vertexai.type.ImagenImageRepresentible
 import com.google.firebase.vertexai.type.ImagenInlineImage
 import com.google.firebase.vertexai.type.ImagenModelConfig
 import com.google.firebase.vertexai.type.PromptBlockedException
@@ -28,16 +27,16 @@ import kotlin.time.Duration.Companion.seconds
 public class ImageModel
 internal constructor(
   private val modelName: String,
-  private val generationConfig: ImagenModelConfig? = null,
-  private val safetySettings: ImageSafetySettings? = null,
+  private val generationConfig: ImagenGenerationConfig? = null,
+  private val safetySettings: ImagenSafetySettings? = null,
   private val controller: APIController,
 ) {
   @JvmOverloads
   internal constructor(
     modelName: String,
     apiKey: String,
-    generationConfig: ImagenModelConfig? = null,
-    safetySettings: ImageSafetySettings? = null,
+    generationConfig: ImagenGenerationConfig? = null,
+    safetySettings: ImagenSafetySettings? = null,
     requestOptions: RequestOptions = RequestOptions(),
     appCheckTokenProvider: InteropAppCheckTokenProvider? = null,
     internalAuthProvider: InternalAuthProvider? = null,
@@ -90,21 +89,19 @@ internal constructor(
 
   public suspend fun generateImage(
     prompt: String,
-    config: ImagenGenerationConfig?,
   ): ImagenGenerationResponse<ImagenInlineImage> =
     try {
-      controller.generateImage(constructRequest(prompt, null, config)).toPublicInline().validate()
+      controller.generateImage(constructRequest(prompt, null, generationConfig)).toPublicInline().validate()
     } catch (e: Throwable) {
       throw FirebaseVertexAIException.from(e)
     }
 
   public suspend fun generateImage(
     prompt: String,
     gcsUri: String,
-    config: ImagenGenerationConfig?,
   ): ImagenGenerationResponse<ImagenGCSImage> =
     try {
-      controller.generateImage(constructRequest(prompt, gcsUri, config)).toPublicGCS().validate()
+      controller.generateImage(constructRequest(prompt, gcsUri, generationConfig)).toPublicGCS().validate()
     } catch (e: Throwable) {
       throw FirebaseVertexAIException.from(e)
     }
@@ -136,7 +133,7 @@ internal constructor(
   }
 }
 
-private fun <T : ImagenImageRepresentible> ImagenGenerationResponse<T>.validate():
+private fun <T> ImagenGenerationResponse<T>.validate():
   ImagenGenerationResponse<T> {
   if (images.isEmpty()) {
     throw PromptBlockedException(message = filteredReason ?: ImageModel.DEFAULT_FILTERED_ERROR)

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

@@ -7,7 +7,7 @@ internal data class GenerateImageResponse(val predictions: List<ImagenImageRespo
 
 @Serializable
 internal data class ImagenImageResponse(
-  val bytesBase64Encoded: String?,
-  val gcsUri: String?,
+  val bytesBase64Encoded: String? = null,
+  val gcsUri: String? = null,
   val mimeType: String,
 )

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

@@ -205,7 +205,7 @@ internal fun com.google.firebase.vertexai.type.Schema.toInternal(): Schema =
     items?.toInternal(),
   )
 
-internal fun com.google.firebase.vertexai.type.ImageFormat.toInternal(): ImageOutputOptions =
+internal fun com.google.firebase.vertexai.type.ImagenImageFormat.toInternal(): ImageOutputOptions =
   ImageOutputOptions(mimeType, compressionQuality)
 
 internal fun JSONObject.toInternal() = Json.decodeFromString<JsonObject>(toString())

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

@@ -1,5 +1,6 @@
 package com.google.firebase.vertexai.type
 
+@Suppress("EnumEntryName")
 public enum class ImagenAspectRatio(internal val internalVal: String) {
     SQUARE_1x1("1:1"),
     PORTRAIT_3x4("3:4"),

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

@@ -1,9 +1,3 @@
 package com.google.firebase.vertexai.type
 
-public class ImagenGCSImage(public val gcsUri: String, public val mimeType: String) :
-  ImagenImageRepresentible {
-
-  override fun asImagenImage(): ImagenImage {
-    return ImagenImage(null, gcsUri, mimeType)
-  }
-}
+public class ImagenGCSImage(public val gcsUri: String, public val mimeType: String) {}

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

@@ -2,6 +2,8 @@ package com.google.firebase.vertexai.type
 
 public class ImagenGenerationConfig(
     public val negativePrompt: String? = null,
-    public val numberOfImages: Int = 1,
+    public val numberOfImages: Int? = 1,
     public val aspectRatio: ImagenAspectRatio? = null,
+    public val imageFormat: ImagenImageFormat? = null,
+    public val addWatermark: Boolean? = null
 ) {}

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

@@ -1,6 +1,6 @@
 package com.google.firebase.vertexai.type
 
-public class ImagenGenerationResponse<T : ImagenImageRepresentible>(
+public class ImagenGenerationResponse<T>(
   public val images: List<T>,
   public val filteredReason: String?,
 ) {}

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

@@ -0,0 +1,15 @@
+package com.google.firebase.vertexai.type
+
+public class ImagenImageFormat
+private constructor(public val mimeType: String, public val compressionQuality: Int?) {
+
+  public companion object {
+    public fun jpeg(compressionQuality: Int? = null): ImagenImageFormat {
+      return ImagenImageFormat("image/jpeg", compressionQuality)
+    }
+
+    public fun png(): ImagenImageFormat {
+      return ImagenImageFormat("image/png", null)
+    }
+  }
+}