Skip to content

Commit 6f23349

Browse files
committed
Merge remote-tracking branch 'origin/main' into TestModernization4
2 parents 24a3c50 + 57e64e7 commit 6f23349

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

.github/workflows/ci_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167

168168
steps:
169169
- name: Download Artifacts
170-
uses: actions/[email protected].5
170+
uses: actions/[email protected].7
171171
with:
172172
path: artifacts
173173

firebase-vertexai/CHANGELOG.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Unreleased
2-
* [changed] Breaking Change: refactored enum classes to be normal classes (#6340).
2+
* [feature] Added support for `title` and `publicationDate` in citations. (#6309)
3+
* [feature] Added support for `frequencyPenalty`, `presencePenalty`, and `HarmBlockMethod`. (#6309)
4+
* [changed] **Breaking Change**: Introduced `Citations` class. Now `CitationMetadata` wraps that type. (#6276)
5+
* [changed] **Breaking Change**: Introduced `FunctionCall` and `FunctionResponse` types. Now `FunctionCallPart` and `FunctionResponsePart` wrap those types, respectively. (#6311)
6+
* [changed] **Breaking Change**: Reworked `Schema` declaration mechanism. (#6258)
7+
* [changed] **Breaking Change**: Reworked function calling mechanism to use the new `Schema` format. Function calls no longer use native types, nor include references to the actual executable code. (#6258)
8+
* [changed] **Breaking Change**: Made `totalBillableCharacters` field in `CountTokens` nullable and optional. (#6294)
9+
* [changed] **Breaking Change**: Removed `UNKNOWN` option for the `HarmBlockThreshold` enum. (#6294)
10+
* [changed] **Breaking Change**: Removed `UNSPECIFIED` option for the `HarmBlockThreshold`, `HarmProbability`, `HarmSeverity`, and `BlockReason` enums. (#6294)
11+
* [changed] **Breaking Change**: Renamed `BlockThreshold` as `HarmBlockThreshold`. (#6262)
12+
* [changed] **Breaking Change**: Renamed all types and methods starting with `blob` to start with `inlineData`. (#6309)
13+
* [changed] **Breaking Change**: Changed the order of arguments in `InlineDataPart` to match `ImagePart`. (#6340)
14+
* [changed] **Breaking Change**: Changed `RequestOption` to accept only `long` timeout values. (#6289)
15+
* [changed] **Breaking Change**: Moved `requestOptions` to the last positional argument in the `generativeModel` argument list. (#6292)
16+
* [changed] **Breaking Change**: Replaced sealed classes with abstract classes for `StringFormat`. (#6334)
17+
* [changed] **Breaking Change**: Refactored enum classes to be normal classes. (#6340)
18+
* [changed] **Breaking Change**: Marked `GenerativeModel` properties as private. (#6309)
319

420

521
# 16.0.0-beta05
@@ -17,4 +33,3 @@
1733
* [feature] Added support for `responseMimeType` in `GenerationConfig`.
1834
* [changed] Renamed `GoogleGenerativeAIException` to `FirebaseVertexAIException`.
1935
* [changed] Updated the KDocs for various classes and functions.
20-

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ internal constructor(
3636
public companion object {
3737
/** Returns a schema for a boolean */
3838
@JvmStatic
39+
@JvmOverloads
3940
public fun boolean(description: String? = null, nullable: Boolean = false): Schema =
4041
Schema(
4142
description = description,
@@ -51,6 +52,7 @@ internal constructor(
5152
*/
5253
@JvmStatic
5354
@JvmName("numInt")
55+
@JvmOverloads
5456
public fun integer(description: String? = null, nullable: Boolean = false): Schema =
5557
Schema(
5658
description = description,
@@ -67,6 +69,7 @@ internal constructor(
6769
*/
6870
@JvmStatic
6971
@JvmName("numLong")
72+
@JvmOverloads
7073
public fun long(description: String? = null, nullable: Boolean = false): Schema =
7174
Schema(
7275
description = description,
@@ -82,6 +85,7 @@ internal constructor(
8285
*/
8386
@JvmStatic
8487
@JvmName("numDouble")
88+
@JvmOverloads
8589
public fun double(description: String? = null, nullable: Boolean = false): Schema =
8690
Schema(description = description, nullable = nullable, type = "NUMBER", format = "double")
8791

@@ -93,6 +97,7 @@ internal constructor(
9397
*/
9498
@JvmStatic
9599
@JvmName("numFloat")
100+
@JvmOverloads
96101
public fun float(description: String? = null, nullable: Boolean = false): Schema =
97102
Schema(description = description, nullable = nullable, type = "NUMBER", format = "float")
98103

@@ -105,6 +110,7 @@ internal constructor(
105110
*/
106111
@JvmStatic
107112
@JvmName("str")
113+
@JvmOverloads
108114
public fun string(
109115
description: String? = null,
110116
nullable: Boolean = false,
@@ -125,6 +131,7 @@ internal constructor(
125131
* @param nullable: Whether null is a valid value for this schema
126132
*/
127133
@JvmStatic
134+
@JvmOverloads
128135
public fun obj(
129136
properties: Map<String, Schema>,
130137
optionalProperties: List<String> = emptyList(),
@@ -153,6 +160,7 @@ internal constructor(
153160
* @param nullable: Whether null is a valid value for this schema
154161
*/
155162
@JvmStatic
163+
@JvmOverloads
156164
public fun array(
157165
items: Schema,
158166
description: String? = null,
@@ -173,6 +181,7 @@ internal constructor(
173181
* @param nullable: Whether null is a valid value for this schema
174182
*/
175183
@JvmStatic
184+
@JvmOverloads
176185
public fun enumeration(
177186
values: List<String>,
178187
description: String? = null,

0 commit comments

Comments
 (0)