Skip to content

Create the function declaration schema at construction time #6302

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 3 commits into from
Sep 24, 2024
Merged

Create the function declaration schema at construction time #6302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9506f0e
Create the function declaration schema at construction time
rlazo Sep 24, 2024
16b86f4
Use `schema` instead of `parameters`
rlazo Sep 24, 2024
5b2494f
Merge branch 'main' into rl.function.declaration.early
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
11 changes: 1 addition & 10 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,7 @@ internal fun Tool.toInternal() =
com.google.firebase.vertexai.common.client.Tool(functionDeclarations.map { it.toInternal() })

internal fun FunctionDeclaration.toInternal() =
com.google.firebase.vertexai.common.client.FunctionDeclaration(
name,
description,
Schema(
properties = parameters.mapValues { it.value.toInternal() },
required = parameters.keys.minus(optionalParameters.toSet()).toList(),
type = "OBJECT",
nullable = false,
),
)
com.google.firebase.vertexai.common.client.FunctionDeclaration(name, "", schema.toInternal())

internal fun com.google.firebase.vertexai.type.Schema.toInternal(): Schema =
Schema(
Expand Down
5 changes: 4 additions & 1 deletion firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclaration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ class FunctionDeclaration(
val description: String,
val parameters: Map<String, Schema>,
val optionalParameters: List<String> = emptyList(),
)
) {
internal val schema: Schema =
Schema.obj(properties = parameters, optionalProperties = optionalParameters, nullable = false)
}
10 changes: 8 additions & 2 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Schema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,20 @@ internal constructor(
optionalProperties: List<String> = emptyList(),
description: String? = null,
nullable: Boolean = false,
) =
Schema(
): Schema {
if (!properties.keys.containsAll(optionalProperties)) {
throw IllegalArgumentException(
"All optional properties must be present in properties. Missing: ${optionalProperties.minus(properties.keys)}"
)
}
return Schema(
description = description,
nullable = nullable,
properties = properties,
required = properties.keys.minus(optionalProperties.toSet()).toList(),
type = "OBJECT",
)
}

/**
* Returns a schema for an array.
Expand Down
Loading