@@ -76,7 +76,7 @@ internal constructor(
7676 public suspend fun generateImages (prompt : String ): ImagenGenerationResponse <ImagenInlineImage > =
7777 try {
7878 controller
79- .generateImage(constructGenerationRequest(prompt, null , generationConfig))
79+ .generateImage(constructGenerationRequest(prompt, generationConfig))
8080 .validate()
8181 .toPublicInline()
8282 } catch (e: Throwable ) {
@@ -88,31 +88,27 @@ internal constructor(
8888 config : ImagenEditingConfig
8989 ): ImagenGenerationResponse <ImagenInlineImage > =
9090 try {
91- controller
92- .generateImage(constructEditRequest(prompt, null , config))
93- .validate()
94- .toPublicInline()
91+ controller.generateImage(constructEditRequest(prompt, config)).validate().toPublicInline()
9592 } catch (e: Throwable ) {
9693 throw FirebaseAIException .from(e)
9794 }
9895
9996 private fun constructGenerationRequest (
10097 prompt : String ,
101- gcsUri : String? = null,
10298 generationConfig : ImagenGenerationConfig ? = null,
10399 ): GenerateImageRequest {
104100 return GenerateImageRequest (
105101 listOf (GenerateImageRequest .ImagenPrompt (prompt)),
106102 GenerateImageRequest .ImagenParameters (
107103 sampleCount = generationConfig?.numberOfImages ? : 1 ,
108104 includeRaiReason = true ,
109- addWatermark = this . generationConfig?.addWatermark,
105+ addWatermark = generationConfig?.addWatermark,
110106 personGeneration = safetySettings?.personFilterLevel?.internalVal,
111107 negativePrompt = generationConfig?.negativePrompt,
112108 safetySetting = safetySettings?.safetyFilterLevel?.internalVal,
113- storageUri = gcsUri ,
109+ storageUri = null ,
114110 aspectRatio = generationConfig?.aspectRatio?.internalVal,
115- imageOutputOptions = this . generationConfig?.imageFormat?.toInternal(),
111+ imageOutputOptions = generationConfig?.imageFormat?.toInternal(),
116112 editMode = null ,
117113 editConfig = null
118114 ),
@@ -121,7 +117,6 @@ internal constructor(
121117
122118 private fun constructEditRequest (
123119 prompt : String ,
124- gcsUri : String? = null,
125120 editConfig : ImagenEditingConfig ,
126121 ): GenerateImageRequest {
127122 return GenerateImageRequest (
@@ -158,13 +153,13 @@ internal constructor(
158153 GenerateImageRequest .ImagenParameters (
159154 sampleCount = generationConfig?.numberOfImages ? : 1 ,
160155 includeRaiReason = true ,
161- addWatermark = this . generationConfig?.addWatermark,
156+ addWatermark = generationConfig?.addWatermark,
162157 personGeneration = safetySettings?.personFilterLevel?.internalVal,
163158 negativePrompt = generationConfig?.negativePrompt,
164159 safetySetting = safetySettings?.safetyFilterLevel?.internalVal,
165- storageUri = gcsUri ,
160+ storageUri = null ,
166161 aspectRatio = generationConfig?.aspectRatio?.internalVal,
167- imageOutputOptions = this . generationConfig?.imageFormat?.toInternal(),
162+ imageOutputOptions = generationConfig?.imageFormat?.toInternal(),
168163 editMode = editConfig.editMode.value,
169164 editConfig = editConfig.toInternal()
170165 ),
0 commit comments