Merge branch 'main' into dconeybe/dataconnect/CiParseErrorsFromLogcat

Author: dconeybe

.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}}

.github/workflows/ci_tests.yml

@@ -56,10 +56,14 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Clone mock responses
+      - name: Clone vertexai mock responses
         if: matrix.module == ':firebase-vertexai'
         run: firebase-vertexai/update_responses.sh
 
+      - name: Clone ai mock responses
+        if: matrix.module == ':firebase-ai'
+        run: firebase-ai/update_responses.sh
+
       - name: Add google-services.json
         env:
           INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}

firebase-ai/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Unreleased
+* [fixed] **Breaking Change**: Fixed missing builder methods and return types in builders.
+* [changed] **Breaking Change**: `LiveModelFutures.connect` now returns `ListenableFuture<LiveSessionFutures>` instead of `ListenableFuture<LiveSession>`.
+    * **Action Required:** Remove any transformations from LiveSession object to LiveSessionFutures object.
+    * **Action Required:** Change type of variable handling `LiveModelFutures.connect` to `ListenableFuture<LiveSessionsFutures>`
+* [changed] **Breaking Change**: Removed `UNSPECIFIED` value for enum class `ResponseModality`
+    * **Action Required:** Remove all references to `ResponseModality.UNSPECIFIED`
+* [changed] **Breaking Change**: Renamed `LiveGenerationConfig.setResponseModalities` to `LiveGenerationConfig.setResponseModality`
+    * **Action Required:** Replace all references of `LiveGenerationConfig.setResponseModalities` with `LiveGenerationConfig.setResponseModality`
+* [feature] Added support for `HarmBlockThreshold.OFF`. See the
+  [model documentation](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/configure-safety-filters#how_to_configure_content_filters){: .external}
+  for more information.
+* [fixed] Improved thread usage when using a `LiveGenerativeModel`. (#6870)
+* [fixed] Fixed an issue with `LiveContentResponse` audio data not being present when the model was
+  interrupted or the turn completed. (#6870)
+* [fixed] Fixed an issue with `LiveSession` not converting exceptions to `FirebaseVertexAIException`. (#6870)
+* * [changed] **Breaking Change**: Removed the `LiveContentResponse.Status` class, and instead have nested the status
+  fields as properties of `LiveContentResponse`. (#6906)
+* [changed] **Breaking Change**: Removed the `LiveContentResponse` class, and instead have provided subclasses
+  of `LiveServerMessage` that match the responses from the model. (#6910)
+* [feature] Added support for the `id` field on `FunctionResponsePart` and `FunctionCallPart`. (#6910)
+* [feature] Add support for specifying response modalities in `GenerationConfig`. (#6921)
+* [feature] Added a helper field for getting all the `InlineDataPart` from a `GenerateContentResponse`. (#6922)
+

firebase-ai/README.md

@@ -0,0 +1,32 @@
+# Firebase AI SDK
+
+For developer documentation, please visit https://firebase.google.com/docs/vertex-ai.
+This README is for contributors building and running tests for the SDK.
+
+## Building
+
+All Gradle commands should be run from the root of this repository.
+
+`./gradlew :firebase-ai:publishToMavenLocal`
+
+## Running Tests
+
+> [!IMPORTANT]
+> These unit tests require mock response files, which can be downloaded by running
+`./firebase-ai/update_responses.sh` from the root of this repository.
+
+Unit tests:
+
+`./gradlew :firebase-ai:check`
+
+Integration tests, requiring a running and connected device (emulator or real):
+
+`./gradlew :firebase-ai:deviceCheck`
+
+## Code Formatting
+
+Format Kotlin code in this SDK in Android Studio using
+the [spotless plugin]([https://plugins.jetbrains.com/plugin/14912-ktfmt](https://github.com/diffplug/spotless)
+by running:
+
+`./gradlew firebase-ai:spotlessApply`