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 all 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
19 changes: 0 additions & 19 deletions 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 @@ -58,11 +58,6 @@ internal data class Content(@EncodeDefault val role: String? = "user", val parts
@Serializable
internal data class FunctionResponsePart(val functionResponse: FunctionResponse) : Part

@Serializable internal data class ExecutableCodePart(val executableCode: ExecutableCode) : Part

@Serializable
internal data class CodeExecutionResultPart(val codeExecutionResult: CodeExecutionResult) : Part

@Serializable internal data class FunctionResponse(val name: String, val response: JsonObject)

@Serializable
Expand All @@ -80,18 +75,6 @@ internal data class FileData(
@Serializable
internal data class Blob(@SerialName("mime_type") val mimeType: String, val data: Base64)

@Serializable internal data class ExecutableCode(val language: String, val code: String)

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

@Serializable
internal enum class Outcome {
@SerialName("OUTCOME_UNSPECIFIED") UNSPECIFIED,
OUTCOME_OK,
OUTCOME_FAILED,
OUTCOME_DEADLINE_EXCEEDED,
}

@Serializable
internal data class SafetySetting(
val category: HarmCategory,
Expand Down Expand Up @@ -124,8 +107,6 @@ internal object PartSerializer : JsonContentPolymorphicSerializer<Part>(Part::cl
"functionResponse" in jsonObject -> FunctionResponsePart.serializer()
"inlineData" in jsonObject -> BlobPart.serializer()
"fileData" in jsonObject -> FileDataPart.serializer()
"executableCode" in jsonObject -> ExecutableCodePart.serializer()
"codeExecutionResult" in jsonObject -> CodeExecutionResultPart.serializer()
else -> throw SerializationException("Unknown Part type")
}
}
Expand Down
24 changes: 0 additions & 24 deletions firebase-vertexai/src/test/java/com/google/firebase/vertexai/common/UnarySnapshotTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@ import com.google.firebase.vertexai.common.server.BlockReason
import com.google.firebase.vertexai.common.server.FinishReason
import com.google.firebase.vertexai.common.server.HarmProbability
import com.google.firebase.vertexai.common.server.HarmSeverity
import com.google.firebase.vertexai.common.shared.CodeExecutionResult
import com.google.firebase.vertexai.common.shared.CodeExecutionResultPart
import com.google.firebase.vertexai.common.shared.ExecutableCode
import com.google.firebase.vertexai.common.shared.ExecutableCodePart
import com.google.firebase.vertexai.common.shared.FunctionCallPart
import com.google.firebase.vertexai.common.shared.HarmCategory
import com.google.firebase.vertexai.common.shared.Outcome
import com.google.firebase.vertexai.common.shared.TextPart
import com.google.firebase.vertexai.common.util.goldenUnaryFile
import com.google.firebase.vertexai.common.util.shouldNotBeNullOrEmpty
Expand Down Expand Up @@ -352,23 +347,4 @@ internal class UnarySnapshotTests {
callPart.functionCall.args shouldBe null
}
}

@Test
fun `code execution parses correctly`() =
goldenUnaryFile("success-code-execution.json") {
withTimeout(testTimeout) {
val response = apiController.generateContent(textGenerateContentRequest("prompt"))
val content = response.candidates.shouldNotBeNullOrEmpty().first().content
content.shouldNotBeNull()
val executableCodePart = content.parts[0]
val codeExecutionResult = content.parts[1]

executableCodePart.shouldBe(
ExecutableCodePart(ExecutableCode("PYTHON", "print(\"Hello World\")"))
)
codeExecutionResult.shouldBe(
CodeExecutionResultPart(CodeExecutionResult(Outcome.OUTCOME_OK, "Hello World"))
)
}
}
}
Loading