Merge branch 'main' into dl/vertex-integration

Author: dlarocque

.changeset/three-singers-wonder.md

@@ -17,7 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "firebase": "11.3.0"
+    "firebase": "^11.8.0-20250512211235"
   },
   "devDependencies": {
     "@babel/core": "7.26.8",

e2e/package.json

@@ -58,7 +58,7 @@ import {
   onValue,
   off
 } from 'firebase/database';
-import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
+import { getGenerativeModel, getAI, VertexAIBackend } from 'firebase/ai';
 import { getDataConnect, DataConnect } from 'firebase/data-connect';
 
 /**
@@ -307,15 +307,15 @@ function callPerformance(app) {
 }
 
 /**
- * VertexAI smoke test.
+ * AI smoke test.
  * Just make sure some functions can be called without obvious errors.
  */
-async function callVertexAI(app) {
-  console.log('[VERTEXAI] start');
-  const vertexAI = getVertexAI(app);
-  const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
+async function callAI(app) {
+  console.log('[AI] start');
+  const ai = getAI(app, { backend: new VertexAIBackend() });
+  const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
   const result = await model.countTokens('abcdefg');
-  console.log(`[VERTEXAI] counted tokens: ${result.totalTokens}`);
+  console.log(`[AI] counted tokens: ${result.totalTokens}`);
 }
 
 /**
@@ -350,7 +350,7 @@ async function main() {
   callAnalytics(app);
   callPerformance(app);
   await callFunctions(app);
-  await callVertexAI(app);
+  await callAI(app);
   callDataConnect(app);
   await authLogout(app);
   console.log('DONE');

e2e/sample-apps/modular.js

@@ -86,7 +86,12 @@ import {
   StorageReference,
   deleteObject
 } from 'firebase/storage';
-import { getGenerativeModel, getVertexAI, VertexAI } from 'firebase/vertexai';
+import {
+  getGenerativeModel,
+  getAI,
+  AI,
+  VertexAIBackend
+} from 'firebase/vertexai';
 import { getDataConnect, DataConnect } from 'firebase/data-connect';
 import { config, testAccount } from '../firebase-config';
 import 'jest';
@@ -307,13 +312,13 @@ describe('MODULAR', () => {
     });
   });
 
-  describe('VERTEXAI', () => {
-    let vertexAI: VertexAI;
+  describe('AI', () => {
+    let ai: AI;
     it('getVertexAI()', () => {
-      vertexAI = getVertexAI(app);
+      ai = getAI(app, { backend: new VertexAIBackend() });
     });
     it('getGenerativeModel() and countTokens()', async () => {
-      const model = getGenerativeModel(vertexAI, { model: 'gemini-1.5-flash' });
+      const model = getGenerativeModel(ai, { model: 'gemini-1.5-flash' });
       expect(model.model).toMatch(/gemini-1.5-flash$/);
       const result = await model.countTokens('abcdefg');
       expect(result.totalTokens).toBeTruthy;

e2e/tests/modular.test.ts

@@ -8,20 +8,20 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.12.1",
-    "@firebase/app-compat": "0.3.1",
-    "@firebase/analytics": "0.10.13",
-    "@firebase/analytics-compat": "0.2.19",
-    "@firebase/auth": "1.10.2",
-    "@firebase/auth-compat": "0.5.22",
-    "@firebase/functions": "0.12.4",
-    "@firebase/functions-compat": "0.3.21",
-    "@firebase/messaging": "0.12.18",
-    "@firebase/messaging-compat": "0.2.18",
-    "@firebase/performance": "0.7.3",
-    "@firebase/performance-compat": "0.2.16",
-    "@firebase/remote-config": "0.6.1",
-    "@firebase/remote-config-compat": "0.2.14"
+    "@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"
   },
   "devDependencies": {
     "typescript": "5.5.4"

e2e/yarn.lock

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

integration/compat-interop/package.json

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

integration/firestore/package.json

@@ -1,5 +1,21 @@
 # @firebase/ai
 
+## 1.2.4
+
+### Patch Changes
+
+- Updated dependencies [[`9bcd1ea`](https://github.com/firebase/firebase-js-sdk/commit/9bcd1ea9b8cc5b55692765d40df000da8ddef02b)]:
+  - @firebase/util@1.11.3
+  - @firebase/component@0.6.16
+
+## 1.2.3
+
+### Patch Changes
+
+- Updated dependencies [[`8593fa0`](https://github.com/firebase/firebase-js-sdk/commit/8593fa05bd884c2f1f6f3b4ae062efa48af93d24)]:
+  - @firebase/util@1.11.2
+  - @firebase/component@0.6.15
+
 ## 1.2.2
 
 ### Patch Changes

integration/messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/ai",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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.14",
+    "@firebase/component": "0.6.16",
     "@firebase/logger": "0.4.4",
-    "@firebase/util": "1.11.1",
+    "@firebase/util": "1.11.3",
     "tslib": "^2.1.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.12.1",
+    "@firebase/app": "0.12.3",
     "@rollup/plugin-json": "6.1.0",
     "rollup": "2.79.2",
     "rollup-plugin-replace": "2.2.0",