Merge branch 'main' into rl.storage.fix

Author: rlazo

.github/workflows/check-vertexai-responses.yml renamed to .github/workflows/check-firebaseai-responses.yml

@@ -1,4 +1,4 @@
-name: Check Vertex AI Responses
+name: Check Firebase AI Responses
 
 on: pull_request
 
@@ -10,30 +10,30 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Clone mock responses
-        run: firebase-vertexai/update_responses.sh
+        run: firebase-ai/update_responses.sh
       - name: Find cloned and latest versions
         run: |
           CLONED=$(git describe --tags)
           LATEST=$(git tag --sort=v:refname | tail -n1)
           echo "cloned_tag=$CLONED" >> $GITHUB_ENV
           echo "latest_tag=$LATEST" >> $GITHUB_ENV
-        working-directory: firebase-vertexai/src/test/resources/vertexai-sdk-test-data
+        working-directory: firebase-ai/src/test/resources/vertexai-sdk-test-data
       - name: Find comment from previous run if exists
         uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
         id: fc
         with:
           issue-number: ${{github.event.number}}
-          body-includes: Vertex AI Mock Responses Check
+          body-includes: Firebase AI Mock Responses Check
       - name: Comment on PR if newer version is available
         if: ${{env.cloned_tag != env.latest_tag && !steps.fc.outputs.comment-id}}
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
         with:
           issue-number: ${{github.event.number}}
           body: >
-            ### Vertex AI Mock Responses Check :warning:
+            ### Firebase AI Mock Responses Check :warning:
 
-            A newer major version of the mock responses for Vertex AI unit tests is available.
-            [update_responses.sh](https://github.com/firebase/firebase-android-sdk/blob/main/firebase-vertexai/update_responses.sh)
+            A newer major version of the mock responses for Firebase AI unit tests is available.
+            [update_responses.sh](https://github.com/firebase/firebase-android-sdk/blob/main/firebase-ai/update_responses.sh)
             should be updated to clone the latest version of the responses: `${{env.latest_tag}}`
       - name: Delete comment when version gets updated
         if: ${{env.cloned_tag == env.latest_tag && steps.fc.outputs.comment-id}}

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

@@ -165,6 +165,7 @@ internal constructor(
 
   suspend fun getWebSocketSession(location: String): ClientWebSocketSession =
     client.webSocketSession(getBidiEndpoint(location))
+
   fun generateContentStream(
     request: GenerateContentRequest
   ): Flow<GenerateContentResponse.Internal> =

firebase-ai/src/test/java/com/google/firebase/ai/DevAPIStreamingSnapshotTests.kt

@@ -42,9 +42,10 @@ internal class DevAPIStreamingSnapshotTests {
       withTimeout(testTimeout) {
         val responseList = responses.toList()
         responseList.isEmpty() shouldBe false
-        responseList.first().candidates.first().finishReason shouldBe FinishReason.STOP
-        responseList.first().candidates.first().content.parts.isEmpty() shouldBe false
-        responseList.first().candidates.first().safetyRatings.isEmpty() shouldBe false
+        responseList.last().candidates.first().apply {
+          finishReason shouldBe FinishReason.STOP
+          content.parts.isEmpty() shouldBe false
+        }
       }
     }
 
@@ -56,10 +57,9 @@ internal class DevAPIStreamingSnapshotTests {
       withTimeout(testTimeout) {
         val responseList = responses.toList()
         responseList.isEmpty() shouldBe false
-        responseList.forEach {
-          it.candidates.first().finishReason shouldBe FinishReason.STOP
-          it.candidates.first().content.parts.isEmpty() shouldBe false
-          it.candidates.first().safetyRatings.isEmpty() shouldBe false
+        responseList.last().candidates.first().apply {
+          finishReason shouldBe FinishReason.STOP
+          content.parts.isEmpty() shouldBe false
         }
       }
     }

firebase-ai/src/test/java/com/google/firebase/ai/VertexAIStreamingSnapshotTests.kt

@@ -51,9 +51,11 @@ internal class VertexAIStreamingSnapshotTests {
       withTimeout(testTimeout) {
         val responseList = responses.toList()
         responseList.isEmpty() shouldBe false
-        responseList.first().candidates.first().finishReason shouldBe FinishReason.STOP
-        responseList.first().candidates.first().content.parts.isEmpty() shouldBe false
-        responseList.first().candidates.first().safetyRatings.isEmpty() shouldBe false
+        responseList.last().candidates.first().apply {
+          finishReason shouldBe FinishReason.STOP
+          content.parts.isEmpty() shouldBe false
+          safetyRatings.isEmpty() shouldBe false
+        }
       }
     }
 
@@ -65,10 +67,9 @@ internal class VertexAIStreamingSnapshotTests {
       withTimeout(testTimeout) {
         val responseList = responses.toList()
         responseList.isEmpty() shouldBe false
-        responseList.forEach {
-          it.candidates.first().finishReason shouldBe FinishReason.STOP
-          it.candidates.first().content.parts.isEmpty() shouldBe false
-          it.candidates.first().safetyRatings.isEmpty() shouldBe false
+        responseList.last().candidates.first().apply {
+          finishReason shouldBe FinishReason.STOP
+          content.parts.isEmpty() shouldBe false
         }
       }
     }

firebase-ai/src/test/java/com/google/firebase/ai/util/tests.kt

@@ -39,7 +39,7 @@ import java.io.File
 import kotlinx.coroutines.launch
 import org.mockito.Mockito
 
-private val TEST_CLIENT_ID = "firebase-vertexai-android/test"
+private val TEST_CLIENT_ID = "firebase-ai-android/test"
 private val TEST_APP_ID = "1:android:12345"
 private val TEST_VERSION = 1
 
@@ -193,7 +193,7 @@ internal fun goldenDevAPIStreamingFile(
   name: String,
   httpStatusCode: HttpStatusCode = HttpStatusCode.OK,
   block: CommonTest,
-) = goldenStreamingFile("vertexai/$name", httpStatusCode, GenerativeBackend.googleAI(), block)
+) = goldenStreamingFile("googleai/$name", httpStatusCode, GenerativeBackend.googleAI(), block)
 
 /**
  * A variant of [commonTest] for performing snapshot tests.

firebase-ai/update_responses.sh

@@ -17,7 +17,7 @@
 # This script replaces mock response files for Vertex AI unit tests with a fresh
 # clone of the shared repository of Vertex AI test data.
 
-RESPONSES_VERSION='v11.*' # The major version of mock responses to use
+RESPONSES_VERSION='v13.*' # The major version of mock responses to use
 REPO_NAME="vertexai-sdk-test-data"
 REPO_LINK="https://github.com/FirebaseExtended/$REPO_NAME.git"