Merge branch 'main' into ddb-maps-grounding

Author: DellaBitta

.changeset/four-vans-mix.md

@@ -0,0 +1,5 @@
+---
+'@firebase/auth': minor
+---
+
+Upgraded react-native-async-storage peerDependency to v2+.

.changeset/gorgeous-rice-carry.md

@@ -0,0 +1,5 @@
+---
+'@firebase/ai': patch
+---
+
+Fix `generateContentStream` returning wrong `inferenceSource`.

packages/ai/integration/chat.test.ts

@@ -26,7 +26,8 @@ import {
 } from '../src';
 import { testConfigs } from './constants';
 
-describe('Chat Session', () => {
+describe('Chat Session', function () {
+  this.timeout(20_000);
   testConfigs.forEach(testConfig => {
     describe(`${testConfig.toString()}`, () => {
       const commonGenerationConfig: GenerationConfig = {

packages/ai/integration/constants.ts

@@ -52,7 +52,14 @@ const backendNames: Map<BackendType, string> = new Map([
   [BackendType.VERTEX_AI, 'Vertex AI']
 ]);
 
-const modelNames: readonly string[] = ['gemini-2.0-flash', 'gemini-2.5-flash'];
+const modelNames: readonly string[] = [
+  'gemini-2.0-flash-001',
+  'gemini-2.0-flash-lite-001',
+  'gemini-2.5-flash',
+  'gemini-2.5-flash-lite',
+  'gemini-2.5-pro',
+  'gemini-3-pro-preview'
+];
 
 // The Live API requires a different set of models, and they're different for each backend.
 const liveModelNames: Map<BackendType, string[]> = new Map([

packages/ai/integration/count-tokens.test.ts

@@ -118,9 +118,18 @@ describe('Count Tokens', () => {
         };
         const response = await model.countTokens([imagePart]);
 
+        let expectedImageTokens: number;
+        if (testConfig.model === 'gemini-3-pro-preview') {
+          expectedImageTokens =
+            testConfig.ai.backend.backendType === BackendType.GOOGLE_AI
+              ? 1089
+              : 1120;
+        } else {
+          expectedImageTokens = 258;
+        }
+
         if (testConfig.ai.backend.backendType === BackendType.GOOGLE_AI) {
-          const expectedImageTokens = 259;
-          expect(response.totalTokens).to.equal(expectedImageTokens);
+          expect(response.totalTokens).to.equal(expectedImageTokens + 1); // There will be 1 unexpected text token
           expect(response.totalBillableCharacters).to.be.undefined; // Incorrect behavior
           expect(response.promptTokensDetails!.length).to.equal(2);
           expect(response.promptTokensDetails![0]).to.deep.equal({
@@ -129,19 +138,18 @@ describe('Count Tokens', () => {
           });
           expect(response.promptTokensDetails![1]).to.deep.equal({
             modality: Modality.IMAGE,
-            tokenCount: 258
+            tokenCount: expectedImageTokens
           });
         } 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);
           // Note: No text tokens are present for Vertex AI with image-only input.
           expect(response.promptTokensDetails![0]).to.deep.equal({
             modality: Modality.IMAGE,
-            tokenCount: 258
+            tokenCount: expectedImageTokens
           });
           expect(response.promptTokensDetails![0].tokenCount).to.equal(
             expectedImageTokens
@@ -220,13 +228,23 @@ describe('Count Tokens', () => {
         expect(response.promptTokensDetails).to.exist;
         expect(response.promptTokensDetails!.length).to.equal(3);
 
+        let expectedImageTokenCount;
+        if (testConfig.model === 'gemini-3-pro-preview') {
+          expectedImageTokenCount =
+            testConfig.ai.backend.backendType === BackendType.GOOGLE_AI
+              ? 1089
+              : 1120;
+        } else {
+          expectedImageTokenCount = 258;
+        }
+
         expect(imageDetails).to.deep.equal({
           modality: Modality.IMAGE,
-          tokenCount: 258
+          tokenCount: expectedImageTokenCount
         });
 
         if (testConfig.ai.backend.backendType === BackendType.GOOGLE_AI) {
-          expect(response.totalTokens).to.equal(267);
+          expect(response.totalTokens).to.equal(expectedImageTokenCount + 9);
           expect(response.totalBillableCharacters).to.be.undefined;
           expect(textDetails).to.deep.equal({
             modality: Modality.TEXT,
@@ -239,7 +257,7 @@ describe('Count Tokens', () => {
         } else if (
           testConfig.ai.backend.backendType === BackendType.VERTEX_AI
         ) {
-          expect(response.totalTokens).to.equal(261);
+          expect(response.totalTokens).to.equal(expectedImageTokenCount + 3);
           expect(textDetails).to.deep.equal({
             modality: Modality.TEXT,
             tokenCount: 3
@@ -269,7 +287,12 @@ describe('Count Tokens', () => {
 
         const response = await model.countTokens([filePart]);
 
-        const expectedFileTokens = 258;
+        let expectedFileTokens: number;
+        if (testConfig.model === 'gemini-3-pro-preview') {
+          expectedFileTokens = 1120;
+        } else {
+          expectedFileTokens = 258;
+        }
         expect(response.totalTokens).to.equal(expectedFileTokens);
         expect(response.totalBillableCharacters).to.be.undefined;
         expect(response.promptTokensDetails).to.exist;

packages/ai/integration/generate-content.test.ts

@@ -32,7 +32,7 @@ import {
 import { testConfigs } from './constants';
 
 describe('Generate Content', function () {
-  this.timeout(20_000);
+  this.timeout(90_000); // gemini 3 requests take a long time, especially when using google search and url context.
   testConfigs.forEach(testConfig => {
     describe(`${testConfig.toString()}`, () => {
       const commonGenerationConfig: GenerationConfig = {
@@ -381,8 +381,9 @@ describe('Generate Content', function () {
       describe('URL Context', async () => {
         // URL Context is not supported in Google AI for gemini-2.0-flash
         if (
-          testConfig.ai.backend.backendType === BackendType.GOOGLE_AI &&
-          testConfig.model === 'gemini-2.0-flash'
+          ['gemini-2.0-flash-001', 'gemini-2.0-flash-lite-001'].includes(
+            testConfig.model
+          ) // Models that don't support URL Context
         ) {
           return;
         }
@@ -438,9 +439,7 @@ describe('Generate Content', function () {
           const urlContextMetadata =
             response.candidates?.[0].urlContextMetadata;
           const groundingMetadata = response.candidates?.[0].groundingMetadata;
-          expect(trimmedText).to.contain(
-            'hypermedia information retrieval initiative'
-          );
+          expect(trimmedText.length).to.be.greaterThan(0);
           expect(urlContextMetadata?.urlMetadata).to.exist;
           expect(
             urlContextMetadata?.urlMetadata.length
@@ -508,6 +507,10 @@ describe('Generate Content', function () {
       });
 
       it('generateContent: code execution', async () => {
+        if (testConfig.model === 'gemini-2.0-flash-lite-001') {
+          // This model does not support code execution
+          return;
+        }
         const model = getGenerativeModel(testConfig.ai, {
           model: testConfig.model,
           generationConfig: commonGenerationConfig,

packages/ai/src/methods/generate-content.test.ts

@@ -26,6 +26,7 @@ import {
 import * as request from '../requests/request';
 import {
   generateContent,
+  generateContentStream,
   templateGenerateContent,
   templateGenerateContentStream
 } from './generate-content';
@@ -35,6 +36,7 @@ import {
   HarmBlockMethod,
   HarmBlockThreshold,
   HarmCategory,
+  InferenceSource,
   Language,
   Outcome
 } from '../types';
@@ -548,8 +550,7 @@ describe('generateContent()', () => {
       );
     });
   });
-  // TODO: define a similar test for generateContentStream
-  it('on-device', async () => {
+  it('generateContent on-device', async () => {
     const chromeAdapter = fakeChromeAdapter;
     const isAvailableStub = stub(chromeAdapter, 'isAvailable').resolves(true);
     const mockResponse = getMockResponse(
@@ -566,9 +567,35 @@ describe('generateContent()', () => {
       chromeAdapter
     );
     expect(result.response.text()).to.include('Mountain View, California');
+    expect(result.response.inferenceSource).to.equal(InferenceSource.ON_DEVICE);
     expect(isAvailableStub).to.be.called;
     expect(generateContentStub).to.be.calledWith(fakeRequestParams);
   });
+  it('generateContentStream on-device', async () => {
+    const chromeAdapter = fakeChromeAdapter;
+    const isAvailableStub = stub(chromeAdapter, 'isAvailable').resolves(true);
+    const mockResponse = getMockResponseStreaming(
+      'vertexAI',
+      'streaming-success-basic-reply-short.txt'
+    );
+    const generateContentStreamStub = stub(
+      chromeAdapter,
+      'generateContentStream'
+    ).resolves(mockResponse as Response);
+    const result = await generateContentStream(
+      fakeApiSettings,
+      'model',
+      fakeRequestParams,
+      chromeAdapter
+    );
+    const aggregatedResponse = await result.response;
+    expect(aggregatedResponse.text()).to.include('Cheyenne');
+    expect(aggregatedResponse.inferenceSource).to.equal(
+      InferenceSource.ON_DEVICE
+    );
+    expect(isAvailableStub).to.be.called;
+    expect(generateContentStreamStub).to.be.calledWith(fakeRequestParams);
+  });
 });
 
 describe('templateGenerateContent', () => {

packages/ai/src/methods/generate-content.ts

@@ -70,7 +70,11 @@ export async function generateContentStream(
     () =>
       generateContentStreamOnCloud(apiSettings, model, params, requestOptions)
   );
-  return processStream(callResult.response, apiSettings); // TODO: Map streaming responses
+  return processStream(
+    callResult.response,
+    apiSettings,
+    callResult.inferenceSource
+  );
 }
 
 async function generateContentOnCloud(

packages/auth/package.json

@@ -116,7 +116,7 @@
   },
   "peerDependencies": {
     "@firebase/app": "0.x",
-    "@react-native-async-storage/async-storage": "^1.18.1"
+    "@react-native-async-storage/async-storage": "^2.2.0"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {