Merge remote-tracking branch 'origin/main' into DbDeletedListener

Author: dconeybe

.changeset/brave-boats-arrive.md

@@ -0,0 +1,7 @@
+---
+'@firebase/remote-config': patch
+'@firebase/analytics': patch
+'firebase': patch
+---
+
+Add rollup config to generate modular typings for google3

.changeset/old-candles-confess.md

@@ -0,0 +1,5 @@
+---
+'@firebase/ai': patch
+---
+
+Add deprecation label to `totalBillableCharacters`. `totalTokens` should be used instead.

common/api-review/ai.api.md

@@ -164,6 +164,7 @@ export interface CountTokensRequest {
 // @public
 export interface CountTokensResponse {
     promptTokensDetails?: ModalityTokenCount[];
+    // @deprecated (undocumented)
     totalBillableCharacters?: number;
     totalTokens: number;
 }

docs-devsite/ai.counttokensresponse.md

@@ -23,7 +23,7 @@ export interface CountTokensResponse
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [promptTokensDetails](./ai.counttokensresponse.md#counttokensresponseprompttokensdetails) | [ModalityTokenCount](./ai.modalitytokencount.md#modalitytokencount_interface)<!-- -->\[\] | The breakdown, by modality, of how many tokens are consumed by the prompt. |
-|  [totalBillableCharacters](./ai.counttokensresponse.md#counttokensresponsetotalbillablecharacters) | number | The total number of billable characters counted across all instances from the request.<!-- -->This property is only supported when using the Vertex AI Gemini API ([VertexAIBackend](./ai.vertexaibackend.md#vertexaibackend_class)<!-- -->). When using the Gemini Developer API ([GoogleAIBackend](./ai.googleaibackend.md#googleaibackend_class)<!-- -->), this property is not supported and will default to 0. |
+|  [totalBillableCharacters](./ai.counttokensresponse.md#counttokensresponsetotalbillablecharacters) | number |  |
 |  [totalTokens](./ai.counttokensresponse.md#counttokensresponsetotaltokens) | number | The total number of tokens counted across all instances from the request. |
 
 ## CountTokensResponse.promptTokensDetails
@@ -38,9 +38,12 @@ promptTokensDetails?: ModalityTokenCount[];
 
 ## CountTokensResponse.totalBillableCharacters
 
-The total number of billable characters counted across all instances from the request.
-
-This property is only supported when using the Vertex AI Gemini API ([VertexAIBackend](./ai.vertexaibackend.md#vertexaibackend_class)<!-- -->). When using the Gemini Developer API ([GoogleAIBackend](./ai.googleaibackend.md#googleaibackend_class)<!-- -->), this property is not supported and will default to 0.
+> Warning: This API is now obsolete.
+> 
+> Use `totalTokens` instead. This property is undefined when using models greater than `gemini-1.5-*`<!-- -->.
+> 
+> The total number of billable characters counted across all instances from the request.
+> 
 
 <b>Signature:</b>
 

packages/ai/src/requests/stream-reader.test.ts

@@ -102,8 +102,8 @@ describe('processStream', () => {
       expect(response.text()).to.not.be.empty;
     }
     const aggregatedResponse = await result.response;
-    expect(aggregatedResponse.text()).to.include('**Cats:**');
-    expect(aggregatedResponse.text()).to.include('to their owners.');
+    expect(aggregatedResponse.text()).to.include('Okay');
+    expect(aggregatedResponse.text()).to.include('brewing delicious coffee');
   });
   it('streaming response - long - big chunk', async () => {
     const fakeResponse = getMockResponseStreaming(
@@ -116,8 +116,8 @@ describe('processStream', () => {
       expect(response.text()).to.not.be.empty;
     }
     const aggregatedResponse = await result.response;
-    expect(aggregatedResponse.text()).to.include('**Cats:**');
-    expect(aggregatedResponse.text()).to.include('to their owners.');
+    expect(aggregatedResponse.text()).to.include('Okay');
+    expect(aggregatedResponse.text()).to.include('brewing delicious coffee');
   });
   it('streaming response - utf8', async () => {
     const fakeResponse = getMockResponseStreaming(

packages/ai/src/types/responses.ts

@@ -270,11 +270,10 @@ export interface CountTokensResponse {
    */
   totalTokens: number;
   /**
+   * @deprecated Use `totalTokens` instead. This property is undefined when using models greater than `gemini-1.5-*`.
+   *
    * The total number of billable characters counted across all instances
    * from the request.
-   *
-   * This property is only supported when using the Vertex AI Gemini API ({@link VertexAIBackend}).
-   * When using the Gemini Developer API ({@link GoogleAIBackend}), this property is not supported and will default to 0.
    */
   totalBillableCharacters?: number;
   /**

packages/analytics/package.json

@@ -49,6 +49,7 @@
   "devDependencies": {
     "@firebase/app": "0.13.1",
     "rollup": "2.79.2",
+    "rollup-plugin-dts": "5.3.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "16.0.0",

packages/analytics/rollup.config.js

@@ -19,6 +19,7 @@ import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
 import typescript from 'typescript';
+import dts from 'rollup-plugin-dts';
 import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target';
 import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
@@ -77,4 +78,17 @@ const cjsBuilds = [
   }
 ];
 
-export default [...esmBuilds, ...cjsBuilds];
+const google3TypingsBuild = {
+  input: 'dist/src/index.d.ts',
+  output: {
+    file: 'dist/src/global_index.d.ts',
+    format: 'es'
+  },
+  plugins: [
+    dts({
+      respectExternal: true
+    })
+  ]
+};
+
+export default [...esmBuilds, ...cjsBuilds, google3TypingsBuild];

packages/remote-config/package.json

@@ -50,6 +50,7 @@
   "devDependencies": {
     "@firebase/app": "0.13.1",
     "rollup": "2.79.2",
+    "rollup-plugin-dts": "5.3.1",
     "rollup-plugin-typescript2": "0.36.0",
     "typescript": "5.5.4"
   },

packages/remote-config/rollup.config.js

@@ -19,6 +19,7 @@ import json from '@rollup/plugin-json'; // Enables package.json import in TypeSc
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
 import typescript from 'typescript';
+import dts from 'rollup-plugin-dts';
 import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target';
 import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
@@ -70,4 +71,17 @@ const cjsBuild = {
   ]
 };
 
-export default [esmBuild, cjsBuild];
+const google3TypingsBuild = {
+  input: 'dist/src/index.d.ts',
+  output: {
+    file: 'dist/src/global_index.d.ts',
+    format: 'es'
+  },
+  plugins: [
+    dts({
+      respectExternal: true
+    })
+  ]
+};
+
+export default [esmBuild, cjsBuild, google3TypingsBuild];