Skip to content

Add missing FirstOrdinalSerializer to enum #6301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Add missing FirstOrdinalSerializer to enum #6301

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b4a572
Add missing `FirstOrdinalSerializer` to enum
rlazo Sep 24, 2024
4a99ec3
Fix formatting
rlazo Sep 24, 2024
93a0382
Remove unused code
rlazo Sep 24, 2024
afd9c71
Merge branch 'main' into rl.missing.serializer.enum
rlazo Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/server/Types.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ internal object BlockReasonSerializer :
internal object HarmProbabilitySerializer :
KSerializer<HarmProbability> by FirstOrdinalSerializer(HarmProbability::class)

internal object HarmSeveritySerializer :
KSerializer<HarmSeverity> by FirstOrdinalSerializer(HarmSeverity::class)

internal object FinishReasonSerializer :
KSerializer<FinishReason> by FirstOrdinalSerializer(FinishReason::class)

Expand Down Expand Up @@ -117,7 +120,7 @@ internal enum class HarmProbability {
HIGH
}

@Serializable
@Serializable(HarmSeveritySerializer::class)
internal enum class HarmSeverity {
UNKNOWN,
@SerialName("HARM_SEVERITY_UNSPECIFIED") UNSPECIFIED,
Expand Down
4 changes: 3 additions & 1 deletion firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/shared/Types.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import kotlinx.serialization.json.jsonObject
internal object HarmCategorySerializer :
KSerializer<HarmCategory> by FirstOrdinalSerializer(HarmCategory::class)

internal object OutcomeSerializer : KSerializer<Outcome> by FirstOrdinalSerializer(Outcome::class)

@Serializable(HarmCategorySerializer::class)
internal enum class HarmCategory {
UNKNOWN,
Expand Down Expand Up @@ -84,7 +86,7 @@ internal data class Blob(@SerialName("mime_type") val mimeType: String, val data

@Serializable internal data class CodeExecutionResult(val outcome: Outcome, val output: String)

@Serializable
@Serializable(OutcomeSerializer::class)
internal enum class Outcome {
@SerialName("OUTCOME_UNSPECIFIED") UNSPECIFIED,
OUTCOME_OK,
Expand Down
Loading