Merge branch 'main' into dl/vertex-integration

Author: dlarocque

.changeset/dirty-crews-cross.md

@@ -0,0 +1,9 @@
+---
+"@firebase/auth": patch
+"@firebase/database": patch
+"@firebase/firestore": patch
+"@firebase/functions": patch
+"@firebase/storage": patch
+---
+
+Revert "Fixed scroll behavior (#9043)"

.changeset/eighty-starfishes-listen.md

@@ -9,7 +9,7 @@
       "type": "node",
       "request": "launch",
       "program": "${workspaceFolder}/node_modules/.bin/_mocha",
-      "cwd": "${workspaceRoot}/packages/vertexai",
+      "cwd": "${workspaceRoot}/packages/ai",
       "args": [
         "--require",
         "ts-node/register",
@@ -24,6 +24,26 @@
       },
       "sourceMaps": true
     },
+    {
+      "name": "AI Integration Tests (node)",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/.bin/_mocha",
+      "cwd": "${workspaceRoot}/packages/ai",
+      "args": [
+        "--require",
+        "ts-node/register",
+        "--require",
+        "src/index.node.ts",
+        "--timeout",
+        "5000",
+        "integration/**/*.test.ts"
+      ],
+      "env": {
+        "TS_NODE_COMPILER_OPTIONS": "{\"module\":\"commonjs\"}"
+      },
+      "sourceMaps": true
+    },
     {
       "type": "node",
       "request": "launch",

.changeset/fast-mangos-chew.md

@@ -8,20 +8,20 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.12.3",
-    "@firebase/app-compat": "0.3.3",
-    "@firebase/analytics": "0.10.15",
-    "@firebase/analytics-compat": "0.2.21",
-    "@firebase/auth": "1.10.4",
-    "@firebase/auth-compat": "0.5.24",
-    "@firebase/functions": "0.12.6",
-    "@firebase/functions-compat": "0.3.23",
-    "@firebase/messaging": "0.12.20",
-    "@firebase/messaging-compat": "0.2.20",
-    "@firebase/performance": "0.7.5",
-    "@firebase/performance-compat": "0.2.18",
-    "@firebase/remote-config": "0.6.3",
-    "@firebase/remote-config-compat": "0.2.16"
+    "@firebase/app": "0.13.0",
+    "@firebase/app-compat": "0.4.0",
+    "@firebase/analytics": "0.10.16",
+    "@firebase/analytics-compat": "0.2.22",
+    "@firebase/auth": "1.10.5",
+    "@firebase/auth-compat": "0.5.25",
+    "@firebase/functions": "0.12.7",
+    "@firebase/functions-compat": "0.3.24",
+    "@firebase/messaging": "0.12.21",
+    "@firebase/messaging-compat": "0.2.21",
+    "@firebase/performance": "0.7.6",
+    "@firebase/performance-compat": "0.2.19",
+    "@firebase/remote-config": "0.6.4",
+    "@firebase/remote-config-compat": "0.2.17"
   },
   "devDependencies": {
     "typescript": "5.5.4"

.changeset/ninety-ways-dress.md

@@ -14,8 +14,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.12.3",
-    "@firebase/firestore": "4.7.14"
+    "@firebase/app": "0.13.0",
+    "@firebase/firestore": "4.7.15"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

.changeset/perfect-camels-try.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "11.7.3",
+    "firebase": "11.8.0",
     "chai": "4.5.0",
     "chromedriver": "119.0.1",
     "express": "4.21.2",

.changeset/tall-zoos-stare.md

@@ -1,5 +1,21 @@
 # @firebase/ai
 
+## 1.3.0
+
+### Minor Changes
+
+- [`e99683b`](https://github.com/firebase/firebase-js-sdk/commit/e99683b17cf75c581bd362a1d7cb85f0b9c110ba) [#8922](https://github.com/firebase/firebase-js-sdk/pull/8922) - Add support for Gemini multimodal output
+
+- [`d5082f9`](https://github.com/firebase/firebase-js-sdk/commit/d5082f9f2fc4de98a6bfd1c6a5af4571af4d0bc6) [#8931](https://github.com/firebase/firebase-js-sdk/pull/8931) - Add support for the Gemini Developer API, enabling usage in a free tier, and add new `AI` API to accomodate new product naming.
+
+### Patch Changes
+
+- [`050c1b6`](https://github.com/firebase/firebase-js-sdk/commit/050c1b6a099b87be1488b9207e4fad4da9f8f64b) [#8972](https://github.com/firebase/firebase-js-sdk/pull/8972) - Pass `GenerativeModel`'s `BaseParams` to created chat sessions. This fixes an issue where `GenerationConfig` would not be inherited from `ChatSession`.
+
+- Updated dependencies [[`8a03143`](https://github.com/firebase/firebase-js-sdk/commit/8a03143b9217effdd86d68bdf195493c0979aa27)]:
+  - @firebase/util@1.12.0
+  - @firebase/component@0.6.17
+
 ## 1.2.4
 
 ### Patch Changes

.vscode/launch.json

@@ -16,7 +16,7 @@
  */
 
 import { initializeApp } from '@firebase/app';
-import { AI, Backend, BackendType, VertexAIBackend, getAI } from '../src';
+import { AI, Backend, BackendType, GoogleAIBackend, VertexAIBackend, getAI } from '../src';
 import { FIREBASE_CONFIG } from './firebase-config';
 
 const app = initializeApp(FIREBASE_CONFIG);
@@ -36,7 +36,7 @@ function formatConfigAsString(config: { ai: AI; model: string }): string {
 }
 
 const backends: readonly Backend[] = [
-  // new GoogleAIBackend(), TODO: activate once live
+  new GoogleAIBackend(),
   new VertexAIBackend()
 ];
 

integration/compat-interop/package.json

@@ -28,7 +28,8 @@ import {
   Part,
   CountTokensRequest,
   InlineDataPart,
-  FileDataPart
+  FileDataPart,
+  BackendType
 } from '../src';
 import {
   AUDIO_MIME_TYPE,
@@ -87,14 +88,21 @@ describe('Count Tokens', () => {
 
         const response = await model.countTokens('Why is the sky blue?');
 
-        expect(response.totalTokens).to.equal(6);
-        expect(response.totalBillableCharacters).to.equal(16);
         expect(response.promptTokensDetails).to.not.be.null;
         expect(response.promptTokensDetails!.length).to.equal(1);
         expect(response.promptTokensDetails![0].modality).to.equal(
           Modality.TEXT
         );
-        expect(response.promptTokensDetails![0].tokenCount).to.equal(6);
+
+        if (testConfig.ai.backend.backendType === BackendType.GOOGLE_AI) {
+          expect(response.totalTokens).to.equal(7);
+          expect(response.totalBillableCharacters).to.be.undefined;
+          expect(response.promptTokensDetails![0].tokenCount).to.equal(7);
+        } else if (testConfig.ai.backend.backendType === BackendType.VERTEX_AI) {
+          expect(response.totalTokens).to.equal(6);
+          expect(response.totalBillableCharacters).to.equal(16);
+          expect(response.promptTokensDetails![0].tokenCount).to.equal(6);
+        }
       });
 
       it('image input', async () => {
@@ -108,28 +116,25 @@ describe('Count Tokens', () => {
           }
         };
         const response = await model.countTokens([imagePart]);
-
-        const expectedImageTokens = 258;
-        expect(
-          response.totalTokens,
-          'totalTokens should have correct token count'
-        ).to.equal(expectedImageTokens);
-        expect(
-          response.totalBillableCharacters,
-          'totalBillableCharacters should be undefined'
-        ).to.be.undefined; // Incorrect behavior
-        expect(
-          response.promptTokensDetails!.length,
-          'promptTokensDetails should have one entry'
-        ).to.equal(1);
-        expect(
-          response.promptTokensDetails![0].modality,
-          'modality should be IMAGE'
-        ).to.equal(Modality.IMAGE);
-        expect(
-          response.promptTokensDetails![0].tokenCount,
-          'promptTokenDetails tokenCount should be correct'
-        ).to.equal(expectedImageTokens);
+        console.log(JSON.stringify(response));
+
+        if (testConfig.ai.backend.backendType === BackendType.GOOGLE_AI) {
+          const expectedImageTokens = 259;
+
+        } else if (testConfig.ai.backend.backendType === BackendType.VERTEX_AI) {
+          const expectedImageTokens = 258;
+          expect(response.totalTokens).to.equal(expectedImageTokens);
+          expect(
+            response.totalBillableCharacters,
+          ).to.be.undefined; // Incorrect behavior
+          expect(
+            response.promptTokensDetails!.length,
+          ).to.equal(1);
+          expect(
+            response.promptTokensDetails![0].modality,
+          ).to.equal(Modality.IMAGE);
+          expect(response.promptTokensDetails![0].tokenCount).to.equal(expectedImageTokens);
+        }
       });
 
       it('audio input', async () => {
@@ -144,25 +149,19 @@ describe('Count Tokens', () => {
         };
 
         const response = await model.countTokens([audioPart]);
+        console.log(JSON.stringify(response));
         // This may be different on Google AI
-        expect(response.totalTokens, 'totalTokens is expected to be undefined')
-          .to.be.undefined;
+        expect(response.totalTokens).to.be.undefined;
         expect(
           response.totalBillableCharacters,
-          'totalBillableCharacters should be undefined'
         ).to.be.undefined; // Incorrect behavior
         expect(
           response.promptTokensDetails!.length,
-          'promptTokensDetails should have one entry'
         ).to.equal(1);
         expect(
           response.promptTokensDetails![0].modality,
-          'modality should be AUDIO'
         ).to.equal(Modality.AUDIO);
-        expect(
-          response.promptTokensDetails![0].tokenCount,
-          'promptTokenDetails tokenCount is expected to be undefined'
-        ).to.be.undefined;
+        expect(response.promptTokensDetails![0].tokenCount).to.be.undefined;
       });
 
       it('text, image, and audio input', async () => {
@@ -181,20 +180,14 @@ describe('Count Tokens', () => {
           contents: [{ role: 'user', parts: [textPart, imagePart, audioPart] }]
         };
         const response = await model.countTokens(request);
+        console.log(JSON.stringify(response));
 
-        expect(
-          response.totalTokens,
-          'totalTokens should have correct token count'
-        ).to.equal(261);
+        expect(response.totalTokens).to.equal(261);
         expect(
           response.totalBillableCharacters,
-          'totalBillableCharacters should have correct count'
         ).to.equal('Describe these:'.length - 1); // For some reason it's the length-1
 
-        expect(
-          response.promptTokensDetails!.length,
-          'promptTokensDetails should have three entries'
-        ).to.equal(3);
+        expect(response.promptTokensDetails!.length).to.equal(3);
 
         const textDetails = response.promptTokensDetails!.find(
           d => d.modality === Modality.TEXT
@@ -228,16 +221,11 @@ describe('Count Tokens', () => {
           }
         };
         const response = await model.countTokens([filePart]);
+        console.log(JSON.stringify(response));
 
         const expectedFileTokens = 258;
-        expect(
-          response.totalTokens,
-          'totalTokens should have correct token count'
-        ).to.equal(expectedFileTokens);
-        expect(
-          response.totalBillableCharacters,
-          'totalBillableCharacters should be undefined'
-        ).to.be.undefined;
+        expect(response.totalTokens).to.equal(expectedFileTokens);
+        expect(response.totalBillableCharacters).to.be.undefined;
         expect(response.promptTokensDetails).to.not.be.null;
         expect(response.promptTokensDetails!.length).to.equal(1);
         expect(response.promptTokensDetails![0].modality).to.equal(

integration/firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/ai",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "The Firebase AI SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "engines": {
@@ -50,14 +50,14 @@
   },
   "dependencies": {
     "@firebase/app-check-interop-types": "0.3.3",
-    "@firebase/component": "0.6.16",
+    "@firebase/component": "0.6.17",
     "@firebase/logger": "0.4.4",
-    "@firebase/util": "1.11.3",
+    "@firebase/util": "1.12.0",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.12.3",
+    "@firebase/app": "0.13.0",
     "@rollup/plugin-json": "6.1.0",
     "rollup": "2.79.2",
     "rollup-plugin-replace": "2.2.0",

integration/messaging/package.json

@@ -1,5 +1,14 @@
 # @firebase/analytics-compat
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies [[`8a03143`](https://github.com/firebase/firebase-js-sdk/commit/8a03143b9217effdd86d68bdf195493c0979aa27)]:
+  - @firebase/util@1.12.0
+  - @firebase/analytics@0.10.16
+  - @firebase/component@0.6.17
+
 ## 0.2.21
 
 ### Patch Changes