From 2687e6890b968439b902b83908ec4c811db5f4f5 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Tue, 17 Sep 2024 01:02:20 -0400 Subject: [PATCH 1/3] Rename BlockThreshold to HarmBlockThreshold This better matches the backend API. --- .../vertexai/internal/util/conversions.kt | 20 +++++++++++-------- ...lockThreshold.kt => HarmBlockThreshold.kt} | 2 +- .../firebase/vertexai/type/SafetySetting.kt | 5 +++-- 3 files changed, 16 insertions(+), 11 deletions(-) rename firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/{BlockThreshold.kt => HarmBlockThreshold.kt} (97%) diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt index b16d5ffad36..98477aa623e 100644 --- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt +++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt @@ -27,10 +27,8 @@ import com.google.firebase.vertexai.common.shared.FunctionCall import com.google.firebase.vertexai.common.shared.FunctionCallPart import com.google.firebase.vertexai.common.shared.FunctionResponse import com.google.firebase.vertexai.common.shared.FunctionResponsePart -import com.google.firebase.vertexai.common.shared.HarmBlockThreshold import com.google.firebase.vertexai.type.BlobPart import com.google.firebase.vertexai.type.BlockReason -import com.google.firebase.vertexai.type.BlockThreshold import com.google.firebase.vertexai.type.Candidate import com.google.firebase.vertexai.type.CitationMetadata import com.google.firebase.vertexai.type.Content @@ -41,6 +39,7 @@ import com.google.firebase.vertexai.type.FunctionCallingConfig import com.google.firebase.vertexai.type.FunctionDeclaration import com.google.firebase.vertexai.type.GenerateContentResponse import com.google.firebase.vertexai.type.GenerationConfig +import com.google.firebase.vertexai.type.HarmBlockThreshold import com.google.firebase.vertexai.type.HarmCategory import com.google.firebase.vertexai.type.HarmProbability import com.google.firebase.vertexai.type.HarmSeverity @@ -141,13 +140,18 @@ internal fun ToolConfig.toInternal() = ) ) -internal fun BlockThreshold.toInternal() = +internal fun HarmBlockThreshold.toInternal() = when (this) { - BlockThreshold.NONE -> HarmBlockThreshold.BLOCK_NONE - BlockThreshold.ONLY_HIGH -> HarmBlockThreshold.BLOCK_ONLY_HIGH - BlockThreshold.MEDIUM_AND_ABOVE -> HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE - BlockThreshold.LOW_AND_ABOVE -> HarmBlockThreshold.BLOCK_LOW_AND_ABOVE - BlockThreshold.UNSPECIFIED -> HarmBlockThreshold.UNSPECIFIED + HarmBlockThreshold.NONE -> + com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_NONE + HarmBlockThreshold.ONLY_HIGH -> + com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_ONLY_HIGH + HarmBlockThreshold.MEDIUM_AND_ABOVE -> + com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE + HarmBlockThreshold.LOW_AND_ABOVE -> + com.google.firebase.vertexai.common.shared.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE + HarmBlockThreshold.UNSPECIFIED -> + com.google.firebase.vertexai.common.shared.HarmBlockThreshold.UNSPECIFIED } internal fun Tool.toInternal() = diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/BlockThreshold.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt similarity index 97% rename from firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/BlockThreshold.kt rename to firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt index 4d22d03981d..45483890f0a 100644 --- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/BlockThreshold.kt +++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt @@ -19,7 +19,7 @@ package com.google.firebase.vertexai.type /** * Represents the threshold for some [HarmCategory] that is allowed and blocked by [SafetySetting]. */ -enum class BlockThreshold { +enum class HarmBlockThreshold { /** The threshold was not specified. */ UNSPECIFIED, diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt index 2ca039c46bf..afc881cd033 100644 --- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt +++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/SafetySetting.kt @@ -17,9 +17,10 @@ package com.google.firebase.vertexai.type /** - * A configuration for a [BlockThreshold] of some [HarmCategory] allowed and blocked in responses. + * A configuration for a [HarmBlockThreshold] of some [HarmCategory] allowed and blocked in + * responses. * * @param harmCategory The relevant [HarmCategory]. * @param threshold The threshold form harm allowable. */ -class SafetySetting(val harmCategory: HarmCategory, val threshold: BlockThreshold) {} +class SafetySetting(val harmCategory: HarmCategory, val threshold: HarmBlockThreshold) {} From 49aca9b8bdda32e34d947b50effef998573ea1d7 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Mon, 30 Sep 2024 12:14:54 -0400 Subject: [PATCH 2/3] Update refdoc wording --- .../com/google/firebase/vertexai/type/HarmBlockThreshold.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt index 162ec2a7a1f..627010764ae 100644 --- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt +++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt @@ -17,7 +17,7 @@ package com.google.firebase.vertexai.type /** - * Represents the threshold for some [HarmCategory] that is allowed and blocked by [SafetySetting]. + * Represents the threshold for a [HarmCategory] to be allowed by [SafetySetting]. */ public enum class HarmBlockThreshold { /** Content with negligible harm is allowed. */ From 9ea0808bca6dc52c8f75854e977fb0e4b2a2d3f4 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Mon, 30 Sep 2024 12:19:10 -0400 Subject: [PATCH 3/3] Format fix --- .../com/google/firebase/vertexai/type/HarmBlockThreshold.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt index 627010764ae..16376034615 100644 --- a/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt +++ b/firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.kt @@ -16,9 +16,7 @@ package com.google.firebase.vertexai.type -/** - * Represents the threshold for a [HarmCategory] to be allowed by [SafetySetting]. - */ +/** Represents the threshold for a [HarmCategory] to be allowed by [SafetySetting]. */ public enum class HarmBlockThreshold { /** Content with negligible harm is allowed. */ LOW_AND_ABOVE,