@@ -76,7 +76,7 @@ internal constructor(
76
76
public suspend fun generateImages (prompt : String ): ImagenGenerationResponse <ImagenInlineImage > =
77
77
try {
78
78
controller
79
- .generateImage(constructGenerationRequest(prompt, null , generationConfig))
79
+ .generateImage(constructGenerationRequest(prompt, generationConfig))
80
80
.validate()
81
81
.toPublicInline()
82
82
} catch (e: Throwable ) {
@@ -88,31 +88,27 @@ internal constructor(
88
88
config : ImagenEditingConfig
89
89
): ImagenGenerationResponse <ImagenInlineImage > =
90
90
try {
91
- controller
92
- .generateImage(constructEditRequest(prompt, null , config))
93
- .validate()
94
- .toPublicInline()
91
+ controller.generateImage(constructEditRequest(prompt, config)).validate().toPublicInline()
95
92
} catch (e: Throwable ) {
96
93
throw FirebaseAIException .from(e)
97
94
}
98
95
99
96
private fun constructGenerationRequest (
100
97
prompt : String ,
101
- gcsUri : String? = null,
102
98
generationConfig : ImagenGenerationConfig ? = null,
103
99
): GenerateImageRequest {
104
100
return GenerateImageRequest (
105
101
listOf (GenerateImageRequest .ImagenPrompt (prompt)),
106
102
GenerateImageRequest .ImagenParameters (
107
103
sampleCount = generationConfig?.numberOfImages ? : 1 ,
108
104
includeRaiReason = true ,
109
- addWatermark = this . generationConfig?.addWatermark,
105
+ addWatermark = generationConfig?.addWatermark,
110
106
personGeneration = safetySettings?.personFilterLevel?.internalVal,
111
107
negativePrompt = generationConfig?.negativePrompt,
112
108
safetySetting = safetySettings?.safetyFilterLevel?.internalVal,
113
- storageUri = gcsUri ,
109
+ storageUri = null ,
114
110
aspectRatio = generationConfig?.aspectRatio?.internalVal,
115
- imageOutputOptions = this . generationConfig?.imageFormat?.toInternal(),
111
+ imageOutputOptions = generationConfig?.imageFormat?.toInternal(),
116
112
editMode = null ,
117
113
editConfig = null
118
114
),
@@ -121,7 +117,6 @@ internal constructor(
121
117
122
118
private fun constructEditRequest (
123
119
prompt : String ,
124
- gcsUri : String? = null,
125
120
editConfig : ImagenEditingConfig ,
126
121
): GenerateImageRequest {
127
122
return GenerateImageRequest (
@@ -158,13 +153,13 @@ internal constructor(
158
153
GenerateImageRequest .ImagenParameters (
159
154
sampleCount = generationConfig?.numberOfImages ? : 1 ,
160
155
includeRaiReason = true ,
161
- addWatermark = this . generationConfig?.addWatermark,
156
+ addWatermark = generationConfig?.addWatermark,
162
157
personGeneration = safetySettings?.personFilterLevel?.internalVal,
163
158
negativePrompt = generationConfig?.negativePrompt,
164
159
safetySetting = safetySettings?.safetyFilterLevel?.internalVal,
165
- storageUri = gcsUri ,
160
+ storageUri = null ,
166
161
aspectRatio = generationConfig?.aspectRatio?.internalVal,
167
- imageOutputOptions = this . generationConfig?.imageFormat?.toInternal(),
162
+ imageOutputOptions = generationConfig?.imageFormat?.toInternal(),
168
163
editMode = editConfig.editMode.value,
169
164
editConfig = editConfig.toInternal()
170
165
),
0 commit comments