Skip to content

Commit c100854

Browse files
author
David Motsonashvili
committed
ktfmt
1 parent fd5ceea commit c100854

File tree

6 files changed

+40
-41
lines changed

6 files changed

+40
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import android.graphics.Bitmap
2020
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
2121
import com.google.firebase.auth.internal.InternalAuthProvider
2222
import com.google.firebase.vertexai.common.APIController
23+
import com.google.firebase.vertexai.common.AppCheckHeaderProvider
2324
import com.google.firebase.vertexai.common.CountTokensRequest
2425
import com.google.firebase.vertexai.common.GenerateContentRequest
25-
import com.google.firebase.vertexai.common.AppCheckHeaderProvider
2626
import com.google.firebase.vertexai.type.Content
2727
import com.google.firebase.vertexai.type.CountTokensResponse
2828
import com.google.firebase.vertexai.type.FinishReason

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package com.google.firebase.vertexai
1919
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
2020
import com.google.firebase.auth.internal.InternalAuthProvider
2121
import com.google.firebase.vertexai.common.APIController
22-
import com.google.firebase.vertexai.common.ContentBlockedException
2322
import com.google.firebase.vertexai.common.AppCheckHeaderProvider
23+
import com.google.firebase.vertexai.common.ContentBlockedException
2424
import com.google.firebase.vertexai.common.GenerateImageRequest
2525
import com.google.firebase.vertexai.common.ImagenParameters
2626
import com.google.firebase.vertexai.common.ImagenPromptInstance

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import kotlinx.coroutines.flow.catch
5858
import kotlinx.coroutines.flow.channelFlow
5959
import kotlinx.coroutines.flow.map
6060
import kotlinx.coroutines.launch
61-
import kotlinx.coroutines.tasks.await
6261
import kotlinx.coroutines.withTimeout
6362
import kotlinx.serialization.ExperimentalSerializationApi
6463
import kotlinx.serialization.json.Json
@@ -318,4 +317,4 @@ private fun GenerateContentResponse.Internal.validate() = apply {
318317
?.mapNotNull { it.finishReason }
319318
?.firstOrNull { it != FinishReason.Internal.STOP }
320319
?.let { throw ResponseStoppedException(this) }
321-
}
320+
}

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,46 @@ package com.google.firebase.vertexai.common
1919
import android.util.Log
2020
import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
2121
import com.google.firebase.auth.internal.InternalAuthProvider
22-
import kotlinx.coroutines.tasks.await
2322
import kotlin.time.Duration
2423
import kotlin.time.Duration.Companion.seconds
24+
import kotlinx.coroutines.tasks.await
2525

2626
internal class AppCheckHeaderProvider(
27-
private val logTag: String,
28-
private val appCheckTokenProvider: InteropAppCheckTokenProvider? = null,
29-
private val internalAuthProvider: InternalAuthProvider? = null,
27+
private val logTag: String,
28+
private val appCheckTokenProvider: InteropAppCheckTokenProvider? = null,
29+
private val internalAuthProvider: InternalAuthProvider? = null,
3030
) : HeaderProvider {
31-
override val timeout: Duration
32-
get() = 10.seconds
33-
34-
override suspend fun generateHeaders(): Map<String, String> {
35-
val headers = mutableMapOf<String, String>()
36-
if (appCheckTokenProvider == null) {
37-
Log.w(logTag, "AppCheck not registered, skipping")
38-
} else {
39-
val token = appCheckTokenProvider.getToken(false).await()
31+
override val timeout: Duration
32+
get() = 10.seconds
4033

41-
if (token.error != null) {
42-
Log.w(logTag, "Error obtaining AppCheck token", token.error)
43-
}
44-
// The Firebase App Check backend can differentiate between apps without App Check, and
45-
// wrongly configured apps by verifying the value of the token, so it always needs to be
46-
// included.
47-
headers["X-Firebase-AppCheck"] = token.token
48-
}
34+
override suspend fun generateHeaders(): Map<String, String> {
35+
val headers = mutableMapOf<String, String>()
36+
if (appCheckTokenProvider == null) {
37+
Log.w(logTag, "AppCheck not registered, skipping")
38+
} else {
39+
val token = appCheckTokenProvider.getToken(false).await()
4940

50-
if (internalAuthProvider == null) {
51-
Log.w(logTag, "Auth not registered, skipping")
52-
} else {
53-
try {
54-
val token = internalAuthProvider.getAccessToken(false).await()
41+
if (token.error != null) {
42+
Log.w(logTag, "Error obtaining AppCheck token", token.error)
43+
}
44+
// The Firebase App Check backend can differentiate between apps without App Check, and
45+
// wrongly configured apps by verifying the value of the token, so it always needs to be
46+
// included.
47+
headers["X-Firebase-AppCheck"] = token.token
48+
}
5549

56-
headers["Authorization"] = "Firebase ${token.token!!}"
57-
} catch (e: Exception) {
58-
Log.w(logTag, "Error getting Auth token ", e)
59-
}
60-
}
50+
if (internalAuthProvider == null) {
51+
Log.w(logTag, "Auth not registered, skipping")
52+
} else {
53+
try {
54+
val token = internalAuthProvider.getAccessToken(false).await()
6155

62-
return headers
56+
headers["Authorization"] = "Firebase ${token.token!!}"
57+
} catch (e: Exception) {
58+
Log.w(logTag, "Error getting Auth token ", e)
59+
}
6360
}
64-
}
61+
62+
return headers
63+
}
64+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import kotlinx.serialization.Serializable
2323
*
2424
* @param images contains the generated images
2525
* @param filteredReason if fewer images were generated than were requested, this field will contain
26-
* the reason they were filtered out.
26+
* the reason they were filtered out.
2727
*/
2828
public class ImagenGenerationResponse<T>
2929
internal constructor(public val images: List<T>, public val filteredReason: String?) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import kotlinx.serialization.Serializable
2323
*
2424
* @param mimeType A string (like `"image/jpeg"`) specifying the encoding MIME type of the image.
2525
* @param compressionQuality an int (1-100) representing the quality of the image; a lower number
26-
* means the image is permitted to be lower quality to reduce size. This parameter is not relevant
27-
* for every MIME type.
26+
* means the image is permitted to be lower quality to reduce size. This parameter is not relevant
27+
* for every MIME type.
2828
*/
2929
public class ImagenImageFormat
3030
private constructor(public val mimeType: String, public val compressionQuality: Int?) {
@@ -38,7 +38,7 @@ private constructor(public val mimeType: String, public val compressionQuality:
3838
* An [ImagenImageFormat] representing a JPEG image.
3939
*
4040
* @param compressionQuality an int (1-100) representing the quality of the image; a lower
41-
* number means the image is permitted to be lower quality to reduce size.
41+
* number means the image is permitted to be lower quality to reduce size.
4242
*/
4343
public fun jpeg(compressionQuality: Int? = null): ImagenImageFormat {
4444
return ImagenImageFormat("image/jpeg", compressionQuality)

0 commit comments

Comments
 (0)