Skip to content

Commit ed5cb66

Browse files
authored
Merge c4068ae into 9babb03
2 parents 9babb03 + c4068ae commit ed5cb66

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

firebase-ai/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
have not been granted by the user.
55
- [feature] Added helper functions to `LiveSession` to allow developers to track the status of the
66
audio session and the underlying websocket connection.
7+
- [changed] Added new values to `HarmCategory` (#7324)
78

89
# 17.2.0
910

firebase-ai/api.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,10 @@ package com.google.firebase.ai.type {
531531
field public static final com.google.firebase.ai.type.HarmCategory DANGEROUS_CONTENT;
532532
field public static final com.google.firebase.ai.type.HarmCategory HARASSMENT;
533533
field public static final com.google.firebase.ai.type.HarmCategory HATE_SPEECH;
534+
field public static final com.google.firebase.ai.type.HarmCategory IMAGE_DANGEROUS_CONTENT;
535+
field public static final com.google.firebase.ai.type.HarmCategory IMAGE_HARASSMENT;
536+
field public static final com.google.firebase.ai.type.HarmCategory IMAGE_HATE;
537+
field public static final com.google.firebase.ai.type.HarmCategory IMAGE_SEXUALLY_EXPLICIT;
534538
field public static final com.google.firebase.ai.type.HarmCategory SEXUALLY_EXPLICIT;
535539
field public static final com.google.firebase.ai.type.HarmCategory UNKNOWN;
536540
}

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/HarmCategory.kt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public class HarmCategory private constructor(public val ordinal: Int) {
3131
SEXUALLY_EXPLICIT -> Internal.SEXUALLY_EXPLICIT
3232
DANGEROUS_CONTENT -> Internal.DANGEROUS_CONTENT
3333
CIVIC_INTEGRITY -> Internal.CIVIC_INTEGRITY
34+
IMAGE_HATE -> Internal.IMAGE_HATE
35+
IMAGE_DANGEROUS_CONTENT -> Internal.IMAGE_DANGEROUS_CONTENT
36+
IMAGE_HARASSMENT -> Internal.IMAGE_HARASSMENT
37+
IMAGE_SEXUALLY_EXPLICIT -> Internal.IMAGE_SEXUALLY_EXPLICIT
3438
UNKNOWN -> Internal.UNKNOWN
3539
else -> throw makeMissingCaseException("HarmCategory", ordinal)
3640
}
@@ -41,7 +45,11 @@ public class HarmCategory private constructor(public val ordinal: Int) {
4145
@SerialName("HARM_CATEGORY_HATE_SPEECH") HATE_SPEECH,
4246
@SerialName("HARM_CATEGORY_SEXUALLY_EXPLICIT") SEXUALLY_EXPLICIT,
4347
@SerialName("HARM_CATEGORY_DANGEROUS_CONTENT") DANGEROUS_CONTENT,
44-
@SerialName("HARM_CATEGORY_CIVIC_INTEGRITY") CIVIC_INTEGRITY;
48+
@SerialName("HARM_CATEGORY_CIVIC_INTEGRITY") CIVIC_INTEGRITY,
49+
@SerialName("HARM_CATEGORY_IMAGE_HATE") IMAGE_HATE,
50+
@SerialName("HARM_CATEGORY_IMAGE_DANGEROUS_CONTENT") IMAGE_DANGEROUS_CONTENT,
51+
@SerialName("HARM_CATEGORY_IMAGE_HARASSMENT") IMAGE_HARASSMENT,
52+
@SerialName("HARM_CATEGORY_IMAGE_SEXUALLY_EXPLICIT") IMAGE_SEXUALLY_EXPLICIT;
4553

4654
internal object Serializer : KSerializer<Internal> by FirstOrdinalSerializer(Internal::class)
4755

@@ -52,6 +60,10 @@ public class HarmCategory private constructor(public val ordinal: Int) {
5260
SEXUALLY_EXPLICIT -> HarmCategory.SEXUALLY_EXPLICIT
5361
DANGEROUS_CONTENT -> HarmCategory.DANGEROUS_CONTENT
5462
CIVIC_INTEGRITY -> HarmCategory.CIVIC_INTEGRITY
63+
IMAGE_HATE -> HarmCategory.IMAGE_HATE
64+
IMAGE_DANGEROUS_CONTENT -> HarmCategory.IMAGE_DANGEROUS_CONTENT
65+
IMAGE_HARASSMENT -> HarmCategory.IMAGE_HARASSMENT
66+
IMAGE_SEXUALLY_EXPLICIT -> HarmCategory.IMAGE_SEXUALLY_EXPLICIT
5567
else -> HarmCategory.UNKNOWN
5668
}
5769
}
@@ -73,5 +85,17 @@ public class HarmCategory private constructor(public val ordinal: Int) {
7385

7486
/** Content that may be used to harm civic integrity. */
7587
@JvmField public val CIVIC_INTEGRITY: HarmCategory = HarmCategory(5)
88+
89+
/** Content that is image hate. */
90+
@JvmField public val IMAGE_HATE: HarmCategory = HarmCategory(6)
91+
92+
/** Image dangerous content. */
93+
@JvmField public val IMAGE_DANGEROUS_CONTENT: HarmCategory = HarmCategory(7)
94+
95+
/** Content is image harassment. */
96+
@JvmField public val IMAGE_HARASSMENT: HarmCategory = HarmCategory(8)
97+
98+
/** Image sexually explicit content. */
99+
@JvmField public val IMAGE_SEXUALLY_EXPLICIT: HarmCategory = HarmCategory(9)
76100
}
77101
}

0 commit comments

Comments
 (0)