Skip to content

Commit fc40c3b

Browse files
author
David Motsonashvili
committed
remove unneeded class heirarchy
1 parent 087c34a commit fc40c3b

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ public class FunctionDeclaration(
6767
internal data class Internal(
6868
val name: String,
6969
val description: String,
70-
val parameters: Schema.Internal
70+
val parameters: Schema.InternalOpenAPI
7171
)
7272
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private constructor(
216216
@SerialName("response_mime_type") val responseMimeType: String? = null,
217217
@SerialName("presence_penalty") val presencePenalty: Float? = null,
218218
@SerialName("frequency_penalty") val frequencyPenalty: Float? = null,
219-
@SerialName("response_schema") val responseSchema: Schema.Internal? = null,
219+
@SerialName("response_schema") val responseSchema: Schema.InternalOpenAPI? = null,
220220
@SerialName("response_modalities") val responseModalities: List<String>? = null,
221221
@SerialName("thinking_config") val thinkingConfig: ThinkingConfig.Internal? = null
222222
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ internal constructor(
417417
val type: String? = null,
418418
val description: String? = null,
419419
val format: String? = null,
420-
val nullable: Boolean? = fals"e,
420+
val nullable: Boolean? = false,
421421
val enum: List<String>? = null,
422422
val properties: Map<String, InternalOpenAPI>? = null,
423423
val required: List<String>? = null,

firebase-ai/src/test/java/com/google/firebase/ai/type/FunctionDeclarationTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ package com.google.firebase.ai.type
1818

1919
import io.kotest.assertions.json.shouldEqualJson
2020
import kotlinx.serialization.encodeToString
21-
import kotlinx.serialization.json.ClassDiscriminatorMode
2221
import kotlinx.serialization.json.Json
2322
import org.junit.Test
2423

2524
internal class FunctionDeclarationTest {
26-
internal val JSON = Json { classDiscriminatorMode = ClassDiscriminatorMode.NONE }
2725

2826
@Test
2927
fun `Basic FunctionDeclaration with name, description and parameters`() {
@@ -55,7 +53,7 @@ internal class FunctionDeclarationTest {
5553
"""
5654
.trimIndent()
5755

58-
JSON.encodeToString(functionDeclaration.toInternal()).shouldEqualJson(expectedJson)
56+
Json.encodeToString(functionDeclaration.toInternal()).shouldEqualJson(expectedJson)
5957
}
6058

6159
@Test
@@ -97,6 +95,6 @@ internal class FunctionDeclarationTest {
9795
"""
9896
.trimIndent()
9997

100-
JSON.encodeToString(functionDeclaration.toInternal()).shouldEqualJson(expectedJson)
98+
Json.encodeToString(functionDeclaration.toInternal()).shouldEqualJson(expectedJson)
10199
}
102100
}

0 commit comments

Comments
 (0)