Move ImagenPrompt and ImagenParameters into their request class

Author: David Motsonashvili

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

@@ -22,8 +22,6 @@ import com.google.firebase.vertexai.common.APIController
 import com.google.firebase.vertexai.common.AppCheckHeaderProvider
 import com.google.firebase.vertexai.common.ContentBlockedException
 import com.google.firebase.vertexai.common.GenerateImageRequest
-import com.google.firebase.vertexai.common.ImagenParameters
-import com.google.firebase.vertexai.common.ImagenPromptInstance
 import com.google.firebase.vertexai.type.FirebaseVertexAIException
 import com.google.firebase.vertexai.type.ImagenGCSImage
 import com.google.firebase.vertexai.type.ImagenGenerationConfig
@@ -106,8 +104,8 @@ internal constructor(
     config: ImagenGenerationConfig?,
   ): GenerateImageRequest {
     return GenerateImageRequest(
-      listOf(ImagenPromptInstance(prompt)),
-      ImagenParameters(
+      listOf(GenerateImageRequest.ImagenPrompt(prompt)),
+      GenerateImageRequest.ImagenParameters(
         sampleCount = config?.numberOfImages ?: 1,
         includeRaiReason = true,
         addWatermark = generationConfig?.addWatermark,

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

@@ -69,21 +69,21 @@ internal data class CountTokensRequest(
 
 @Serializable
 internal data class GenerateImageRequest(
-  val instances: List<ImagenPromptInstance>,
+  val instances: List<ImagenPrompt>,
   val parameters: ImagenParameters,
-) : Request {}
-
-@Serializable internal data class ImagenPromptInstance(val prompt: String)
+) : Request {
+  @Serializable internal data class ImagenPrompt(val prompt: String)
 
-@Serializable
-internal data class ImagenParameters(
-  val sampleCount: Int = 1,
-  val includeRaiReason: Boolean = true,
-  val storageUri: String?,
-  val negativePrompt: String?,
-  val aspectRatio: String?,
-  val safetySetting: String?,
-  val personGeneration: String?,
-  val addWatermark: Boolean?,
-  val imageOutputOptions: ImagenImageFormat.Internal?,
-)
+  @Serializable
+  internal data class ImagenParameters(
+    val sampleCount: Int = 1,
+    val includeRaiReason: Boolean = true,
+    val storageUri: String?,
+    val negativePrompt: String?,
+    val aspectRatio: String?,
+    val safetySetting: String?,
+    val personGeneration: String?,
+    val addWatermark: Boolean?,
+    val imageOutputOptions: ImagenImageFormat.Internal?,
+  )
+}