Merge branch 'main' into davidmotson.extra_schema

Author: David Motsonashvili

firebase-ai/CHANGELOG.md

@@ -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
 * [feature] Added support for extra schema properties like `title`, `minItems`, `maxItems`, `minimum`
  and `maximum`. As well as support for the `anyOf` schema. 
 

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Request.kt

@@ -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
@@ -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
       )

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/util/util.kt

@@ -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()