Skip to content

Fix incorrect model name in count token requests to the developer API backend #7011

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
Jun 4, 2025
Merged

Fix incorrect model name in count token requests to the developer API backend #7011

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
bebd6c9
Fix incorrect model name in count token requests to the developer API…
Jun 3, 2025
f5e59e1
add changelog
Jun 3, 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
1 change: 1 addition & 0 deletions firebase-ai/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* [changed] Introduced the `Voice` class, which accepts a voice name, and deprecated the `Voices` class.
* [changed] **Breaking Change**: Updated `SpeechConfig` to take in `Voice` class instead of `Voices` class.
* **Action Required:** Update all references of `SpeechConfig` initialization to use `Voice` class.
* [fixed] Fix incorrect model name in count token requests to the developer API backend


# 16.0.0
Expand Down
3 changes: 2 additions & 1 deletion firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Request.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.google.firebase.ai.common

import com.google.firebase.ai.common.util.fullModelName
import com.google.firebase.ai.common.util.trimmedModelName
import com.google.firebase.ai.type.Content
import com.google.firebase.ai.type.GenerationConfig
import com.google.firebase.ai.type.ImagenImageFormat
Expand Down Expand Up @@ -57,7 +58,7 @@ internal data class CountTokensRequest(
CountTokensRequest(
generateContentRequest =
generateContentRequest.model?.let {
generateContentRequest.copy(model = fullModelName(it))
generateContentRequest.copy(model = fullModelName(trimmedModelName(it)))
}
?: generateContentRequest
)
Expand Down
2 changes: 2 additions & 0 deletions firebase-ai/src/main/kotlin/com/google/firebase/ai/common/util/util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ package com.google.firebase.ai.common.util
*/
internal fun fullModelName(name: String): String =
name.takeIf { it.contains("/") } ?: "models/$name"

internal fun trimmedModelName(name: String): String = name.split("/").last()
Loading