Skip to content

[Vertex AI] Optional CountTokensResponse.totalBillableCharacters #13721

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 25, 2024
Merged

[Vertex AI] Optional CountTokensResponse.totalBillableCharacters #13721

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
a02d1e2
[Vertex AI] Make `CountTokensResponse.totalBillableCharacters` optional
andrewheard Sep 25, 2024
de2af36
Fixed test
andrewheard Sep 25, 2024
dde4598
Add CHANGELOG PR#
andrewheard Sep 25, 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
4 changes: 4 additions & 0 deletions FirebaseVertexAI/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
accepts an array of *optional* parameters instead of a list of *required*
parameters; if a parameter is not listed as optional it is assumed to be
required. (#13616)
- [changed] **Breaking Change**: `CountTokensResponse.totalBillableCharacters`
is now optional (`Int?`); it may be `null` in cases such as when a
`GenerateContentRequest` contains only images or other non-text content.
(#13721)

# 11.3.0
- [added] Added `Decodable` conformance for `FunctionResponse`. (#13606)
Expand Down
18 changes: 2 additions & 16 deletions FirebaseVertexAI/Sources/CountTokensRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public struct CountTokensResponse {
///
/// > Important: This does not include billable image, video or other non-text input. See
/// [Vertex AI pricing](https://cloud.google.com/vertex-ai/generative-ai/pricing) for details.
public let totalBillableCharacters: Int
public let totalBillableCharacters: Int?
}

// MARK: - Codable Conformances
Expand All @@ -53,18 +53,4 @@ extension CountTokensRequest: Encodable {
}

@available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
extension CountTokensResponse: Decodable {
enum CodingKeys: CodingKey {
case totalTokens
case totalBillableCharacters
}

public init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
totalTokens = try container.decode(Int.self, forKey: .totalTokens)
totalBillableCharacters = try container.decodeIfPresent(
Int.self,
forKey: .totalBillableCharacters
) ?? 0
}
}
extension CountTokensResponse: Decodable {}
2 changes: 1 addition & 1 deletion FirebaseVertexAI/Tests/Unit/GenerativeModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ final class GenerativeModelTests: XCTestCase {
))

XCTAssertEqual(response.totalTokens, 258)
XCTAssertEqual(response.totalBillableCharacters, 0)
XCTAssertNil(response.totalBillableCharacters)
}

func testCountTokens_modelNotFound() async throws {
Expand Down
Loading