Skip to content

Make token count details fields non-nullable #6695

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 2 commits into from
Feb 11, 2025
Merged

Make token count details fields non-nullable #6695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39276ad
Make token count details fields non-nullable
rlazo Feb 11, 2025
b287a27
Update api.txt file
rlazo Feb 11, 2025
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
16 changes: 8 additions & 8 deletions firebase-vertexai/api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,14 @@ package com.google.firebase.vertexai.type {
}

public final class CountTokensResponse {
ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? promptTokensDetails = null);
ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails = emptyList());
method public operator int component1();
method public operator Integer? component2();
method public operator java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? component3();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? getPromptTokensDetails();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getPromptTokensDetails();
method public Integer? getTotalBillableCharacters();
method public int getTotalTokens();
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? promptTokensDetails;
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails;
property public final Integer? totalBillableCharacters;
property public final int totalTokens;
}
Expand Down Expand Up @@ -582,16 +582,16 @@ package com.google.firebase.vertexai.type {
}

public final class UsageMetadata {
ctor public UsageMetadata(int promptTokenCount, Integer? candidatesTokenCount, int totalTokenCount, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? promptTokensDetails, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? candidatesTokensDetails);
ctor public UsageMetadata(int promptTokenCount, Integer? candidatesTokenCount, int totalTokenCount, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails, java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> candidatesTokensDetails);
method public Integer? getCandidatesTokenCount();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? getCandidatesTokensDetails();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getCandidatesTokensDetails();
method public int getPromptTokenCount();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? getPromptTokensDetails();
method public java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> getPromptTokensDetails();
method public int getTotalTokenCount();
property public final Integer? candidatesTokenCount;
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? candidatesTokensDetails;
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> candidatesTokensDetails;
property public final int promptTokenCount;
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount>? promptTokensDetails;
property public final java.util.List<com.google.firebase.vertexai.type.ModalityTokenCount> promptTokensDetails;
property public final int totalTokenCount;
}

Expand Down
4 changes: 2 additions & 2 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/CountTokensResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import kotlinx.serialization.Serializable
public class CountTokensResponse(
public val totalTokens: Int,
public val totalBillableCharacters: Int? = null,
public val promptTokensDetails: List<ModalityTokenCount>? = null,
public val promptTokensDetails: List<ModalityTokenCount> = emptyList(),
) {
public operator fun component1(): Int = totalTokens

Expand All @@ -55,7 +55,7 @@ public class CountTokensResponse(
return CountTokensResponse(
totalTokens,
totalBillableCharacters ?: 0,
promptTokensDetails?.map { it.toPublic() }
promptTokensDetails?.map { it.toPublic() } ?: emptyList()
)
}
}
Expand Down
8 changes: 4 additions & 4 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/UsageMetadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public class UsageMetadata(
public val promptTokenCount: Int,
public val candidatesTokenCount: Int?,
public val totalTokenCount: Int,
public val promptTokensDetails: List<ModalityTokenCount>?,
public val candidatesTokensDetails: List<ModalityTokenCount>?,
public val promptTokensDetails: List<ModalityTokenCount>,
public val candidatesTokensDetails: List<ModalityTokenCount>,
) {

@Serializable
Expand All @@ -51,8 +51,8 @@ public class UsageMetadata(
promptTokenCount ?: 0,
candidatesTokenCount ?: 0,
totalTokenCount ?: 0,
promptTokensDetails = promptTokensDetails?.map { it.toPublic() },
candidatesTokensDetails = candidatesTokensDetails?.map { it.toPublic() }
promptTokensDetails = promptTokensDetails?.map { it.toPublic() } ?: emptyList(),
candidatesTokensDetails = candidatesTokensDetails?.map { it.toPublic() } ?: emptyList()
)
}
}
2 changes: 2 additions & 0 deletions firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ internal class UnarySnapshotTests {
response.candidates.first().finishReason shouldBe FinishReason.STOP
response.usageMetadata shouldNotBe null
response.usageMetadata?.totalTokenCount shouldBe 363
response.usageMetadata?.promptTokensDetails?.isEmpty() shouldBe true
}
}

Expand Down Expand Up @@ -478,6 +479,7 @@ internal class UnarySnapshotTests {

response.totalTokens shouldBe 6
response.totalBillableCharacters shouldBe 16
response.promptTokensDetails.isEmpty() shouldBe true
}
}

Expand Down
Loading