Merge branch 'main' into rl.fix.vertex.tests

Author: rlazo

.github/workflows/create_releases.yml

@@ -15,6 +15,9 @@ on:
 jobs:
   create-branches:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -25,6 +28,9 @@ jobs:
 
   create-pull-request:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/[email protected]
         with:

firebase-vertexai/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 * [changed] Added new exception type for quota exceeded scenarios.
+* [feature] `CountTokenRequest` now includes `GenerationConfig` from the model.
+
 
 # 16.2.0
 * [fixed] Added support for new values sent by the server for `FinishReason` and `BlockReason`.
@@ -69,4 +71,3 @@
 * [feature] Added support for `responseMimeType` in `GenerationConfig`.
 * [changed] Renamed `GoogleGenerativeAIException` to `FirebaseVertexAIException`.
 * [changed] Updated the KDocs for various classes and functions.
-

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

@@ -49,6 +49,7 @@ internal data class CountTokensRequest(
   val contents: List<Content.Internal>? = null,
   val tools: List<Tool.Internal>? = null,
   @SerialName("system_instruction") val systemInstruction: Content.Internal? = null,
+  val generationConfig: GenerationConfig.Internal? = null
 ) : Request {
   companion object {
 
@@ -58,6 +59,7 @@ internal data class CountTokensRequest(
         contents = generateContentRequest.contents,
         tools = generateContentRequest.tools,
         systemInstruction = generateContentRequest.systemInstruction,
+        generationConfig = generateContentRequest.generationConfig,
       )
   }
 }

gradle/libs.versions.toml

@@ -23,7 +23,7 @@ dexmaker = "2.28.1"
 dexmakerVersion = "1.2"
 espressoCore = "3.6.1"
 featureDelivery = "2.1.0"
-firebaseAppdistributionGradle = "5.0.0"
+firebaseAppdistributionGradle = "5.1.1"
 firebaseCommon = "21.0.0"
 firebaseComponents = "18.0.0"
 firebaseCrashlyticsGradle = "3.0.2"