From 4e033fdde19fcbc14c6edb37581b2f2b42ecd96b Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Tue, 7 May 2024 14:57:11 -0400
Subject: [PATCH 01/28] Add RequestOptions to FileManager

---
 packages/main/src/files/file-manager.ts | 56 +++++++++++++++++++++----
 packages/main/src/files/request.ts      | 22 +++++++---
 packages/main/types/requests.ts         |  5 +++
 3 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index e8577d68..6b83e907 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -39,10 +39,14 @@ export interface UploadMetadata {
  * @public
  */
 export class GoogleAIFileManager {
+  private _requestOptions: RequestOptions;
   constructor(
     public apiKey: string,
-    private _requestOptions?: RequestOptions,
-  ) {}
+    requestOptions?: RequestOptions,
+  ) {
+    Object.assign(this._requestOptions, requestOptions);
+    delete this._requestOptions.abortSignal;
+  }
 
   /**
    * Upload a file
@@ -50,12 +54,19 @@ export class GoogleAIFileManager {
   async uploadFile(
     filePath: string,
     fileMetadata: FileMetadata,
+    requestOptions?: RequestOptions,
   ): Promise<UploadFileResponse> {
     const file = readFileSync(filePath);
+    let filesRequestOptions = {};
+    Object.assign(
+      filesRequestOptions,
+      this._requestOptions || {},
+      requestOptions || {},
+    );
     const url = new FilesRequestUrl(
       FilesTask.UPLOAD,
       this.apiKey,
-      this._requestOptions,
+      filesRequestOptions,
     );
 
     const uploadHeaders = getHeaders(url);
@@ -98,11 +109,20 @@ export class GoogleAIFileManager {
   /**
    * List all uploaded files
    */
-  async listFiles(listParams?: ListParams): Promise<ListFilesResponse> {
+  async listFiles(
+    listParams?: ListParams,
+    requestOptions?: RequestOptions,
+  ): Promise<ListFilesResponse> {
+    let filesRequestOptions = {};
+    Object.assign(
+      filesRequestOptions,
+      this._requestOptions || {},
+      requestOptions || {},
+    );
     const url = new FilesRequestUrl(
       FilesTask.LIST,
       this.apiKey,
-      this._requestOptions,
+      filesRequestOptions,
     );
     if (listParams?.pageSize) {
       url.appendParam("pageSize", listParams.pageSize.toString());
@@ -118,11 +138,20 @@ export class GoogleAIFileManager {
   /**
    * Get metadata for file with given ID
    */
-  async getFile(fileId: string): Promise<FileMetadataResponse> {
+  async getFile(
+    fileId: string,
+    requestOptions?: RequestOptions,
+  ): Promise<FileMetadataResponse> {
+    let filesRequestOptions = {};
+    Object.assign(
+      filesRequestOptions,
+      this._requestOptions || {},
+      requestOptions || {},
+    );
     const url = new FilesRequestUrl(
       FilesTask.GET,
       this.apiKey,
-      this._requestOptions,
+      filesRequestOptions,
     );
     url.appendPath(parseFileId(fileId));
     const uploadHeaders = getHeaders(url);
@@ -133,11 +162,20 @@ export class GoogleAIFileManager {
   /**
    * Delete file with given ID
    */
-  async deleteFile(fileId: string): Promise<void> {
+  async deleteFile(
+    fileId: string,
+    requestOptions?: RequestOptions,
+  ): Promise<void> {
+    let filesRequestOptions = {};
+    Object.assign(
+      filesRequestOptions,
+      this._requestOptions || {},
+      requestOptions || {},
+    );
     const url = new FilesRequestUrl(
       FilesTask.DELETE,
       this.apiKey,
-      this._requestOptions,
+      filesRequestOptions,
     );
     url.appendPath(parseFileId(fileId));
     const uploadHeaders = getHeaders(url);
diff --git a/packages/main/src/files/request.ts b/packages/main/src/files/request.ts
index 489a1022..4f3db960 100644
--- a/packages/main/src/files/request.ts
+++ b/packages/main/src/files/request.ts
@@ -131,13 +131,23 @@ export async function makeFilesRequest(
 }
 
 /**
- * Get AbortSignal if timeout is specified
+ * Create an AbortSignal based on the timeout and abortSignal in the
+ * RequestOptions.
  */
 function getSignal(requestOptions?: RequestOptions): AbortSignal | null {
-  if (requestOptions?.timeout >= 0) {
-    const abortController = new AbortController();
-    const signal = abortController.signal;
-    setTimeout(() => abortController.abort(), requestOptions.timeout);
-    return signal;
+  if (
+    requestOptions.abortSignal !== undefined ||
+    requestOptions?.timeout >= 0
+  ) {
+    const controller = new AbortController();
+    if (requestOptions?.timeout >= 0) {
+      setTimeout(() => controller.abort(), requestOptions.timeout);
+    }
+    if (requestOptions.abortSignal) {
+      requestOptions.abortSignal.addEventListener("abort", () => {
+        controller.abort();
+      });
+    }
+    return controller.signal;
   }
 }
diff --git a/packages/main/types/requests.ts b/packages/main/types/requests.ts
index eefa3825..e63a1e6b 100644
--- a/packages/main/types/requests.ts
+++ b/packages/main/types/requests.ts
@@ -140,6 +140,11 @@ export interface RequestOptions {
    * Custom HTTP request headers.
    */
   customHeaders?: Headers | Record<string, string>;
+  /**
+   * An object that may be used to abort aynchronous requests. This is only available on
+   * a per request basis, and is ignored by models constructed with a RequestOptions object.
+   */
+  abortSignal?: AbortSignal;
 }
 
 /**

From a9440aed9acef4e3d99ac774f4e3d2d34fe51946 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 15 May 2024 14:49:29 -0400
Subject: [PATCH 02/28] Added RequestOptions to FileManager operations.

---
 packages/main/src/files/file-manager.ts | 50 ++++++++++++-------------
 packages/main/src/files/request.ts      |  2 +-
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index 36056d02..f444743e 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -47,8 +47,11 @@ export class GoogleAIFileManager {
     public apiKey: string,
     requestOptions?: RequestOptions,
   ) {
-    Object.assign(this._requestOptions, requestOptions);
-    delete this._requestOptions.abortSignal;
+    this._requestOptions = { };
+    if (requestOptions) {
+      Object.assign(this._requestOptions, requestOptions);
+      delete this._requestOptions.abortSignal;
+    }
   }
 
   /**
@@ -60,12 +63,13 @@ export class GoogleAIFileManager {
     requestOptions?: RequestOptions,
   ): Promise<UploadFileResponse> {
     const file = readFileSync(filePath);
-    let filesRequestOptions = {};
-    Object.assign(
-      filesRequestOptions,
-      this._requestOptions || {},
-      requestOptions || {},
-    );
+    const filesRequestOptions = Object.create(this._requestOptions);
+    if (requestOptions) {
+      Object.assign(filesRequestOptions, requestOptions);
+    }
+
+    console.error("DEDB requestOptions: ", filesRequestOptions);
+
     const url = new FilesRequestUrl(
       FilesTask.UPLOAD,
       this.apiKey,
@@ -110,12 +114,10 @@ export class GoogleAIFileManager {
     listParams?: ListParams,
     requestOptions?: RequestOptions,
   ): Promise<ListFilesResponse> {
-    let filesRequestOptions = {};
-    Object.assign(
-      filesRequestOptions,
-      this._requestOptions || {},
-      requestOptions || {},
-    );
+    const filesRequestOptions = Object.create(this._requestOptions);
+    if (requestOptions) {
+      Object.assign(filesRequestOptions, requestOptions);
+    }
     const url = new FilesRequestUrl(
       FilesTask.LIST,
       this.apiKey,
@@ -139,12 +141,10 @@ export class GoogleAIFileManager {
     fileId: string,
     requestOptions?: RequestOptions,
   ): Promise<FileMetadataResponse> {
-    let filesRequestOptions = {};
-    Object.assign(
-      filesRequestOptions,
-      this._requestOptions || {},
-      requestOptions || {},
-    );
+    const filesRequestOptions = Object.create(this._requestOptions);
+    if (requestOptions) {
+      Object.assign(filesRequestOptions, requestOptions);
+    }
     const url = new FilesRequestUrl(
       FilesTask.GET,
       this.apiKey,
@@ -163,12 +163,10 @@ export class GoogleAIFileManager {
     fileId: string,
     requestOptions?: RequestOptions,
   ): Promise<void> {
-    let filesRequestOptions = {};
-    Object.assign(
-      filesRequestOptions,
-      this._requestOptions || {},
-      requestOptions || {},
-    );
+    const filesRequestOptions = Object.create(this._requestOptions);
+    if (requestOptions) {
+      Object.assign(filesRequestOptions, requestOptions);
+    }
     const url = new FilesRequestUrl(
       FilesTask.DELETE,
       this.apiKey,
diff --git a/packages/main/src/files/request.ts b/packages/main/src/files/request.ts
index 4f3db960..0bfc5587 100644
--- a/packages/main/src/files/request.ts
+++ b/packages/main/src/files/request.ts
@@ -136,7 +136,7 @@ export async function makeFilesRequest(
  */
 function getSignal(requestOptions?: RequestOptions): AbortSignal | null {
   if (
-    requestOptions.abortSignal !== undefined ||
+    requestOptions?.abortSignal !== undefined ||
     requestOptions?.timeout >= 0
   ) {
     const controller = new AbortController();

From 58bdc31c9ec913c87d45f6883fe3662d9a4a862d Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 15 May 2024 15:46:28 -0400
Subject: [PATCH 03/28] format

---
 packages/main/src/files/file-manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index f444743e..f7d932be 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -47,7 +47,7 @@ export class GoogleAIFileManager {
     public apiKey: string,
     requestOptions?: RequestOptions,
   ) {
-    this._requestOptions = { };
+    this._requestOptions = {};
     if (requestOptions) {
       Object.assign(this._requestOptions, requestOptions);
       delete this._requestOptions.abortSignal;

From 291f5bc2bd86c061ddb5992029a4eb60bbdeadfd Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 10:48:47 -0400
Subject: [PATCH 04/28] remove debug output

---
 packages/main/src/files/file-manager.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index f7d932be..dc3ff994 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -68,8 +68,6 @@ export class GoogleAIFileManager {
       Object.assign(filesRequestOptions, requestOptions);
     }
 
-    console.error("DEDB requestOptions: ", filesRequestOptions);
-
     const url = new FilesRequestUrl(
       FilesTask.UPLOAD,
       this.apiKey,

From 2d19db5e502e701ed1638a6551f14d828830fec9 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 11:45:17 -0400
Subject: [PATCH 05/28] Added FileManager abort integration tests.

---
 .../node/abort-signal.test.ts                 |  75 ++++++++++++++++++
 .../main/test-integration/resources/cat.jpg   | Bin 0 -> 17858 bytes
 2 files changed, 75 insertions(+)
 create mode 100644 packages/main/test-integration/node/abort-signal.test.ts
 create mode 100644 packages/main/test-integration/resources/cat.jpg

diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
new file mode 100644
index 00000000..8f335550
--- /dev/null
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { expect, use } from "chai";
+import * as chaiAsPromised from "chai-as-promised";
+import { RequestOptions } from "../..";
+import { GoogleAIFileManager } from "../../dist/files";
+
+use(chaiAsPromised);
+
+/**
+ * Integration tests against live backend.
+ */
+describe("abortSignal", function () {
+  this.timeout(60e3);
+  this.slow(10e3);
+  it("file manager uploadFile abort test", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const filePathInService = "abortsignal.jpg";
+
+    // This delete step should cleanup the state of the service for this and
+    // future executions.
+    try {
+      await fileManager.deleteFile("files/abortsignal");
+    } catch (error) {}
+
+    const abortSignal = AbortSignal.timeout(1);
+    const promise = fileManager.uploadFile(
+      "test-integration/resources/cat.jpg",
+      {
+        mimeType: "image/jpeg",
+        name: filePathInService,
+      },
+      {
+        abortSignal,
+      },
+    );
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("file manager listFiles abort test", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const abortSignal = AbortSignal.timeout(1);
+    const requestOptions: RequestOptions = { abortSignal };
+    const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("file manager getFile abort test", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const abortSignal = AbortSignal.timeout(1);
+    const requestOptions: RequestOptions = { abortSignal };
+    const promise = fileManager.getFile("abortSignal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("file manager deleteFile abort test", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const abortSignal = AbortSignal.timeout(1);
+    const requestOptions: RequestOptions = { abortSignal };
+    const promise = fileManager.deleteFile("abortSignal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+});
diff --git a/packages/main/test-integration/resources/cat.jpg b/packages/main/test-integration/resources/cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8d2069e6c979ef6fe4fb52e7873e1019f008d2e1
GIT binary patch
literal 17858
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
A-~a#s

literal 0
HcmV?d00001


From 2f6753933dbe45ab2407c05be034b978a6d330d3 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 11:49:36 -0400
Subject: [PATCH 06/28] docs

---
 ...nerative-ai.googleaifilemanager._constructor_.md |  4 ++--
 .../generative-ai.googleaifilemanager.deletefile.md |  3 ++-
 .../generative-ai.googleaifilemanager.getfile.md    |  3 ++-
 .../generative-ai.googleaifilemanager.listfiles.md  |  3 ++-
 .../files/generative-ai.googleaifilemanager.md      | 10 +++++-----
 .../generative-ai.googleaifilemanager.uploadfile.md |  3 ++-
 .../generative-ai.requestoptions.abortsignal.md     | 13 +++++++++++++
 .../reference/files/generative-ai.requestoptions.md |  1 +
 .../generative-ai.requestoptions.abortsignal.md     | 13 +++++++++++++
 docs/reference/main/generative-ai.requestoptions.md |  1 +
 .../main/test-integration/node/count-tokens.test.ts |  1 -
 11 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 docs/reference/files/generative-ai.requestoptions.abortsignal.md
 create mode 100644 docs/reference/main/generative-ai.requestoptions.abortsignal.md

diff --git a/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md b/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
index 5c49872e..471ab1ec 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `GoogleAIFileManager` class
 **Signature:**
 
 ```typescript
-constructor(apiKey: string, _requestOptions?: RequestOptions);
+constructor(apiKey: string, requestOptions?: RequestOptions);
 ```
 
 ## Parameters
@@ -17,5 +17,5 @@ constructor(apiKey: string, _requestOptions?: RequestOptions);
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  apiKey | string |  |
-|  \_requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
index e5ecfdad..7efa89b4 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
@@ -9,7 +9,7 @@ Delete file with given ID
 **Signature:**
 
 ```typescript
-deleteFile(fileId: string): Promise<void>;
+deleteFile(fileId: string, requestOptions?: RequestOptions): Promise<void>;
 ```
 
 ## Parameters
@@ -17,6 +17,7 @@ deleteFile(fileId: string): Promise<void>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  fileId | string |  |
+|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
index 613d6b6c..59570d68 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
@@ -9,7 +9,7 @@ Get metadata for file with given ID
 **Signature:**
 
 ```typescript
-getFile(fileId: string): Promise<FileMetadataResponse>;
+getFile(fileId: string, requestOptions?: RequestOptions): Promise<FileMetadataResponse>;
 ```
 
 ## Parameters
@@ -17,6 +17,7 @@ getFile(fileId: string): Promise<FileMetadataResponse>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  fileId | string |  |
+|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
index ef116fb6..8f868b75 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
@@ -9,7 +9,7 @@ List all uploaded files
 **Signature:**
 
 ```typescript
-listFiles(listParams?: ListParams): Promise<ListFilesResponse>;
+listFiles(listParams?: ListParams, requestOptions?: RequestOptions): Promise<ListFilesResponse>;
 ```
 
 ## Parameters
@@ -17,6 +17,7 @@ listFiles(listParams?: ListParams): Promise<ListFilesResponse>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  listParams | [ListParams](./generative-ai.listparams.md) | _(Optional)_ |
+|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.md b/docs/reference/files/generative-ai.googleaifilemanager.md
index 655c8d0c..f088cee4 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.md
@@ -16,7 +16,7 @@ export declare class GoogleAIFileManager
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(apiKey, \_requestOptions)](./generative-ai.googleaifilemanager._constructor_.md) |  | Constructs a new instance of the <code>GoogleAIFileManager</code> class |
+|  [(constructor)(apiKey, requestOptions)](./generative-ai.googleaifilemanager._constructor_.md) |  | Constructs a new instance of the <code>GoogleAIFileManager</code> class |
 
 ## Properties
 
@@ -28,8 +28,8 @@ export declare class GoogleAIFileManager
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [deleteFile(fileId)](./generative-ai.googleaifilemanager.deletefile.md) |  | Delete file with given ID |
-|  [getFile(fileId)](./generative-ai.googleaifilemanager.getfile.md) |  | Get metadata for file with given ID |
-|  [listFiles(listParams)](./generative-ai.googleaifilemanager.listfiles.md) |  | List all uploaded files |
-|  [uploadFile(filePath, fileMetadata)](./generative-ai.googleaifilemanager.uploadfile.md) |  | Upload a file |
+|  [deleteFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.deletefile.md) |  | Delete file with given ID |
+|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | Get metadata for file with given ID |
+|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | List all uploaded files |
+|  [uploadFile(filePath, fileMetadata, requestOptions)](./generative-ai.googleaifilemanager.uploadfile.md) |  | Upload a file |
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
index 90648e90..6b7f9c35 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
@@ -9,7 +9,7 @@ Upload a file
 **Signature:**
 
 ```typescript
-uploadFile(filePath: string, fileMetadata: FileMetadata): Promise<UploadFileResponse>;
+uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: RequestOptions): Promise<UploadFileResponse>;
 ```
 
 ## Parameters
@@ -18,6 +18,7 @@ uploadFile(filePath: string, fileMetadata: FileMetadata): Promise<UploadFileResp
 |  --- | --- | --- |
 |  filePath | string |  |
 |  fileMetadata | [FileMetadata](./generative-ai.filemetadata.md) |  |
+|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.requestoptions.abortsignal.md b/docs/reference/files/generative-ai.requestoptions.abortsignal.md
new file mode 100644
index 00000000..cc36a185
--- /dev/null
+++ b/docs/reference/files/generative-ai.requestoptions.abortsignal.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [RequestOptions](./generative-ai.requestoptions.md) &gt; [abortSignal](./generative-ai.requestoptions.abortsignal.md)
+
+## RequestOptions.abortSignal property
+
+An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object.
+
+**Signature:**
+
+```typescript
+abortSignal?: AbortSignal;
+```
diff --git a/docs/reference/files/generative-ai.requestoptions.md b/docs/reference/files/generative-ai.requestoptions.md
index 44aba7de..2b9d7c8d 100644
--- a/docs/reference/files/generative-ai.requestoptions.md
+++ b/docs/reference/files/generative-ai.requestoptions.md
@@ -16,6 +16,7 @@ export interface RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
+|  [abortSignal?](./generative-ai.requestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object. |
 |  [apiClient?](./generative-ai.requestoptions.apiclient.md) |  | string | _(Optional)_ Additional attribution information to include in the x-goog-api-client header. Used by wrapper SDKs. |
 |  [apiVersion?](./generative-ai.requestoptions.apiversion.md) |  | string | _(Optional)_ Version of API endpoint to call (e.g. "v1" or "v1beta"). If not specified, defaults to latest stable version. |
 |  [baseUrl?](./generative-ai.requestoptions.baseurl.md) |  | string | _(Optional)_ Base endpoint url. Defaults to "https://generativelanguage.googleapis.com" |
diff --git a/docs/reference/main/generative-ai.requestoptions.abortsignal.md b/docs/reference/main/generative-ai.requestoptions.abortsignal.md
new file mode 100644
index 00000000..cc36a185
--- /dev/null
+++ b/docs/reference/main/generative-ai.requestoptions.abortsignal.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [RequestOptions](./generative-ai.requestoptions.md) &gt; [abortSignal](./generative-ai.requestoptions.abortsignal.md)
+
+## RequestOptions.abortSignal property
+
+An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object.
+
+**Signature:**
+
+```typescript
+abortSignal?: AbortSignal;
+```
diff --git a/docs/reference/main/generative-ai.requestoptions.md b/docs/reference/main/generative-ai.requestoptions.md
index 44aba7de..2b9d7c8d 100644
--- a/docs/reference/main/generative-ai.requestoptions.md
+++ b/docs/reference/main/generative-ai.requestoptions.md
@@ -16,6 +16,7 @@ export interface RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
+|  [abortSignal?](./generative-ai.requestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object. |
 |  [apiClient?](./generative-ai.requestoptions.apiclient.md) |  | string | _(Optional)_ Additional attribution information to include in the x-goog-api-client header. Used by wrapper SDKs. |
 |  [apiVersion?](./generative-ai.requestoptions.apiversion.md) |  | string | _(Optional)_ Version of API endpoint to call (e.g. "v1" or "v1beta"). If not specified, defaults to latest stable version. |
 |  [baseUrl?](./generative-ai.requestoptions.baseurl.md) |  | string | _(Optional)_ Base endpoint url. Defaults to "https://generativelanguage.googleapis.com" |
diff --git a/packages/main/test-integration/node/count-tokens.test.ts b/packages/main/test-integration/node/count-tokens.test.ts
index cdf46889..18b30260 100644
--- a/packages/main/test-integration/node/count-tokens.test.ts
+++ b/packages/main/test-integration/node/count-tokens.test.ts
@@ -40,7 +40,6 @@ describe("countTokens", function () {
       ],
     });
     const response1 = await model.countTokens("count me");
-    const response2 = await model.countTokens({
       contents: [{ role: "user", parts: [{ text: "count me" }] }],
     });
     expect(response1.totalTokens).to.equal(3);

From c1f6ddf4cf96378eb1810b644ea4c4e15ccf3970 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 11:52:50 -0400
Subject: [PATCH 07/28] Update count-tokens.test.ts

---
 packages/main/test-integration/node/count-tokens.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/main/test-integration/node/count-tokens.test.ts b/packages/main/test-integration/node/count-tokens.test.ts
index 18b30260..cdf46889 100644
--- a/packages/main/test-integration/node/count-tokens.test.ts
+++ b/packages/main/test-integration/node/count-tokens.test.ts
@@ -40,6 +40,7 @@ describe("countTokens", function () {
       ],
     });
     const response1 = await model.countTokens("count me");
+    const response2 = await model.countTokens({
       contents: [{ role: "user", parts: [{ text: "count me" }] }],
     });
     expect(response1.totalTokens).to.equal(3);

From c5e8b37da2883932a0e61337882dc7585a68d079 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 13:59:43 -0400
Subject: [PATCH 08/28] RequestOptions parameter changes. Removal of a cat.

---
 packages/main/src/files/file-manager.ts       |  28 +++++-------------
 .../node/abort-signal.test.ts                 |   2 +-
 .../main/test-integration/resources/cat.jpg   | Bin 17858 -> 0 bytes
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 packages/main/test-integration/resources/cat.jpg

diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index dc3ff994..22c18a33 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -60,13 +60,10 @@ export class GoogleAIFileManager {
   async uploadFile(
     filePath: string,
     fileMetadata: FileMetadata,
-    requestOptions?: RequestOptions,
+    requestOptions: RequestOptions = {},
   ): Promise<UploadFileResponse> {
     const file = readFileSync(filePath);
-    const filesRequestOptions = Object.create(this._requestOptions);
-    if (requestOptions) {
-      Object.assign(filesRequestOptions, requestOptions);
-    }
+    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
 
     const url = new FilesRequestUrl(
       FilesTask.UPLOAD,
@@ -110,12 +107,9 @@ export class GoogleAIFileManager {
    */
   async listFiles(
     listParams?: ListParams,
-    requestOptions?: RequestOptions,
+    requestOptions: RequestOptions = {},
   ): Promise<ListFilesResponse> {
-    const filesRequestOptions = Object.create(this._requestOptions);
-    if (requestOptions) {
-      Object.assign(filesRequestOptions, requestOptions);
-    }
+    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
     const url = new FilesRequestUrl(
       FilesTask.LIST,
       this.apiKey,
@@ -137,12 +131,9 @@ export class GoogleAIFileManager {
    */
   async getFile(
     fileId: string,
-    requestOptions?: RequestOptions,
+    requestOptions: RequestOptions = {},
   ): Promise<FileMetadataResponse> {
-    const filesRequestOptions = Object.create(this._requestOptions);
-    if (requestOptions) {
-      Object.assign(filesRequestOptions, requestOptions);
-    }
+    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
     const url = new FilesRequestUrl(
       FilesTask.GET,
       this.apiKey,
@@ -159,12 +150,9 @@ export class GoogleAIFileManager {
    */
   async deleteFile(
     fileId: string,
-    requestOptions?: RequestOptions,
+    requestOptions: RequestOptions = {},
   ): Promise<void> {
-    const filesRequestOptions = Object.create(this._requestOptions);
-    if (requestOptions) {
-      Object.assign(filesRequestOptions, requestOptions);
-    }
+    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
     const url = new FilesRequestUrl(
       FilesTask.DELETE,
       this.apiKey,
diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 8f335550..f7ca7af2 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -40,7 +40,7 @@ describe("abortSignal", function () {
 
     const abortSignal = AbortSignal.timeout(1);
     const promise = fileManager.uploadFile(
-      "test-integration/resources/cat.jpg",
+      "test-utils/cat.jpeg",
       {
         mimeType: "image/jpeg",
         name: filePathInService,
diff --git a/packages/main/test-integration/resources/cat.jpg b/packages/main/test-integration/resources/cat.jpg
deleted file mode 100644
index 8d2069e6c979ef6fe4fb52e7873e1019f008d2e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17858
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
A-~a#s


From 95083e1141d0e546bd3b0c88470501197d7b3661 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 16:50:17 -0400
Subject: [PATCH 09/28] Created SingleRequestOptions sub interface

---
 ...ve-ai.googleaifilemanager._constructor_.md |  4 +-
 ...ative-ai.googleaifilemanager.deletefile.md |  8 ++-
 ...nerative-ai.googleaifilemanager.getfile.md |  8 ++-
 ...rative-ai.googleaifilemanager.listfiles.md |  8 ++-
 .../generative-ai.googleaifilemanager.md      | 10 +--
 ...ative-ai.googleaifilemanager.uploadfile.md |  8 ++-
 docs/reference/files/generative-ai.md         |  1 +
 ...enerative-ai.requestoptions.abortsignal.md | 13 ----
 .../files/generative-ai.requestoptions.md     |  1 -
 ...ive-ai.singlerequestoptions.abortsignal.md | 13 ++++
 .../generative-ai.singlerequestoptions.md     | 21 ++++++
 docs/reference/main/generative-ai.md          |  1 +
 ...enerative-ai.requestoptions.abortsignal.md | 13 ----
 .../main/generative-ai.requestoptions.md      |  1 -
 ...ive-ai.singlerequestoptions.abortsignal.md | 13 ++++
 .../generative-ai.singlerequestoptions.md     | 21 ++++++
 packages/main/src/files/file-manager.ts       | 65 ++++++++++++-------
 packages/main/src/files/index.ts              |  2 +-
 packages/main/src/files/request.ts            |  6 +-
 .../node/abort-signal.test.ts                 |  8 +--
 packages/main/types/requests.ts               | 12 +++-
 21 files changed, 158 insertions(+), 79 deletions(-)
 delete mode 100644 docs/reference/files/generative-ai.requestoptions.abortsignal.md
 create mode 100644 docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
 create mode 100644 docs/reference/files/generative-ai.singlerequestoptions.md
 delete mode 100644 docs/reference/main/generative-ai.requestoptions.abortsignal.md
 create mode 100644 docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
 create mode 100644 docs/reference/main/generative-ai.singlerequestoptions.md

diff --git a/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md b/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
index 471ab1ec..5c49872e 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `GoogleAIFileManager` class
 **Signature:**
 
 ```typescript
-constructor(apiKey: string, requestOptions?: RequestOptions);
+constructor(apiKey: string, _requestOptions?: RequestOptions);
 ```
 
 ## Parameters
@@ -17,5 +17,5 @@ constructor(apiKey: string, requestOptions?: RequestOptions);
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  apiKey | string |  |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  \_requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
index 7efa89b4..209ff4a7 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.deleteFile() method
 
-Delete file with given ID
+Delete file with given ID.
+
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-deleteFile(fileId: string, requestOptions?: RequestOptions): Promise<void>;
+deleteFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<void>;
 ```
 
 ## Parameters
@@ -17,7 +19,7 @@ deleteFile(fileId: string, requestOptions?: RequestOptions): Promise<void>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  fileId | string |  |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
index 59570d68..21d23c70 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.getFile() method
 
-Get metadata for file with given ID
+Get metadata for file with given ID.
+
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-getFile(fileId: string, requestOptions?: RequestOptions): Promise<FileMetadataResponse>;
+getFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<FileMetadataResponse>;
 ```
 
 ## Parameters
@@ -17,7 +19,7 @@ getFile(fileId: string, requestOptions?: RequestOptions): Promise<FileMetadataRe
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  fileId | string |  |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
index 8f868b75..a80e44ee 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.listFiles() method
 
-List all uploaded files
+List all uploaded files.
+
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-listFiles(listParams?: ListParams, requestOptions?: RequestOptions): Promise<ListFilesResponse>;
+listFiles(listParams?: ListParams, requestOptions?: SingleRequestOptions): Promise<ListFilesResponse>;
 ```
 
 ## Parameters
@@ -17,7 +19,7 @@ listFiles(listParams?: ListParams, requestOptions?: RequestOptions): Promise<Lis
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  listParams | [ListParams](./generative-ai.listparams.md) | _(Optional)_ |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.md b/docs/reference/files/generative-ai.googleaifilemanager.md
index f088cee4..8aa09f16 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.md
@@ -16,7 +16,7 @@ export declare class GoogleAIFileManager
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(apiKey, requestOptions)](./generative-ai.googleaifilemanager._constructor_.md) |  | Constructs a new instance of the <code>GoogleAIFileManager</code> class |
+|  [(constructor)(apiKey, \_requestOptions)](./generative-ai.googleaifilemanager._constructor_.md) |  | Constructs a new instance of the <code>GoogleAIFileManager</code> class |
 
 ## Properties
 
@@ -28,8 +28,8 @@ export declare class GoogleAIFileManager
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [deleteFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.deletefile.md) |  | Delete file with given ID |
-|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | Get metadata for file with given ID |
-|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | List all uploaded files |
-|  [uploadFile(filePath, fileMetadata, requestOptions)](./generative-ai.googleaifilemanager.uploadfile.md) |  | Upload a file |
+|  [deleteFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.deletefile.md) |  | <p>Delete file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | <p>Get metadata for file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | <p>List all uploaded files.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [uploadFile(filePath, fileMetadata, requestOptions)](./generative-ai.googleaifilemanager.uploadfile.md) |  | <p>Upload a file.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
index 6b7f9c35..2b12f245 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.uploadFile() method
 
-Upload a file
+Upload a file.
+
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: RequestOptions): Promise<UploadFileResponse>;
+uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: SingleRequestOptions): Promise<UploadFileResponse>;
 ```
 
 ## Parameters
@@ -18,7 +20,7 @@ uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: Reques
 |  --- | --- | --- |
 |  filePath | string |  |
 |  fileMetadata | [FileMetadata](./generative-ai.filemetadata.md) |  |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/files/generative-ai.md b/docs/reference/files/generative-ai.md
index d23363cb..e2a167dd 100644
--- a/docs/reference/files/generative-ai.md
+++ b/docs/reference/files/generative-ai.md
@@ -25,5 +25,6 @@
 |  [ListFilesResponse](./generative-ai.listfilesresponse.md) | Response from calling [GoogleAIFileManager.listFiles()](./generative-ai.googleaifilemanager.listfiles.md) |
 |  [ListParams](./generative-ai.listparams.md) | Params to pass to [GoogleAIFileManager.listFiles()](./generative-ai.googleaifilemanager.listfiles.md) |
 |  [RequestOptions](./generative-ai.requestoptions.md) | Params passed to getGenerativeModel() or GoogleAIFileManager(). |
+|  [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | Params passed to atomic asynchronous operations. |
 |  [UploadFileResponse](./generative-ai.uploadfileresponse.md) | Response from calling [GoogleAIFileManager.uploadFile()](./generative-ai.googleaifilemanager.uploadfile.md) |
 
diff --git a/docs/reference/files/generative-ai.requestoptions.abortsignal.md b/docs/reference/files/generative-ai.requestoptions.abortsignal.md
deleted file mode 100644
index cc36a185..00000000
--- a/docs/reference/files/generative-ai.requestoptions.abortsignal.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [RequestOptions](./generative-ai.requestoptions.md) &gt; [abortSignal](./generative-ai.requestoptions.abortsignal.md)
-
-## RequestOptions.abortSignal property
-
-An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object.
-
-**Signature:**
-
-```typescript
-abortSignal?: AbortSignal;
-```
diff --git a/docs/reference/files/generative-ai.requestoptions.md b/docs/reference/files/generative-ai.requestoptions.md
index 2b9d7c8d..44aba7de 100644
--- a/docs/reference/files/generative-ai.requestoptions.md
+++ b/docs/reference/files/generative-ai.requestoptions.md
@@ -16,7 +16,6 @@ export interface RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.requestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object. |
 |  [apiClient?](./generative-ai.requestoptions.apiclient.md) |  | string | _(Optional)_ Additional attribution information to include in the x-goog-api-client header. Used by wrapper SDKs. |
 |  [apiVersion?](./generative-ai.requestoptions.apiversion.md) |  | string | _(Optional)_ Version of API endpoint to call (e.g. "v1" or "v1beta"). If not specified, defaults to latest stable version. |
 |  [baseUrl?](./generative-ai.requestoptions.baseurl.md) |  | string | _(Optional)_ Base endpoint url. Defaults to "https://generativelanguage.googleapis.com" |
diff --git a/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
new file mode 100644
index 00000000..68d671cc
--- /dev/null
+++ b/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [abortSignal](./generative-ai.singlerequestoptions.abortsignal.md)
+
+## SingleRequestOptions.abortSignal property
+
+An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
+
+**Signature:**
+
+```typescript
+abortSignal?: AbortSignal;
+```
diff --git a/docs/reference/files/generative-ai.singlerequestoptions.md b/docs/reference/files/generative-ai.singlerequestoptions.md
new file mode 100644
index 00000000..f85ecb65
--- /dev/null
+++ b/docs/reference/files/generative-ai.singlerequestoptions.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md)
+
+## SingleRequestOptions interface
+
+Params passed to atomic asynchronous operations.
+
+**Signature:**
+
+```typescript
+export interface SingleRequestOptions extends RequestOptions 
+```
+**Extends:** [RequestOptions](./generative-ai.requestoptions.md)
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+
diff --git a/docs/reference/main/generative-ai.md b/docs/reference/main/generative-ai.md
index ec5a3a7c..78f92de8 100644
--- a/docs/reference/main/generative-ai.md
+++ b/docs/reference/main/generative-ai.md
@@ -69,6 +69,7 @@
 |  [RequestOptions](./generative-ai.requestoptions.md) | Params passed to getGenerativeModel() or GoogleAIFileManager(). |
 |  [SafetyRating](./generative-ai.safetyrating.md) | A safety rating associated with a [GenerateContentCandidate](./generative-ai.generatecontentcandidate.md) |
 |  [SafetySetting](./generative-ai.safetysetting.md) | Safety setting that can be sent as part of request parameters. |
+|  [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | Params passed to atomic asynchronous operations. |
 |  [StartChatParams](./generative-ai.startchatparams.md) | Params for [GenerativeModel.startChat()](./generative-ai.generativemodel.startchat.md)<!-- -->. |
 |  [TextPart](./generative-ai.textpart.md) | Content part interface if the part represents a text string. |
 |  [ToolConfig](./generative-ai.toolconfig.md) | Tool config. This config is shared for all tools provided in the request. |
diff --git a/docs/reference/main/generative-ai.requestoptions.abortsignal.md b/docs/reference/main/generative-ai.requestoptions.abortsignal.md
deleted file mode 100644
index cc36a185..00000000
--- a/docs/reference/main/generative-ai.requestoptions.abortsignal.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [RequestOptions](./generative-ai.requestoptions.md) &gt; [abortSignal](./generative-ai.requestoptions.abortsignal.md)
-
-## RequestOptions.abortSignal property
-
-An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object.
-
-**Signature:**
-
-```typescript
-abortSignal?: AbortSignal;
-```
diff --git a/docs/reference/main/generative-ai.requestoptions.md b/docs/reference/main/generative-ai.requestoptions.md
index 2b9d7c8d..44aba7de 100644
--- a/docs/reference/main/generative-ai.requestoptions.md
+++ b/docs/reference/main/generative-ai.requestoptions.md
@@ -16,7 +16,6 @@ export interface RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.requestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. This is only available on a per request basis, and is ignored by models constructed with a RequestOptions object. |
 |  [apiClient?](./generative-ai.requestoptions.apiclient.md) |  | string | _(Optional)_ Additional attribution information to include in the x-goog-api-client header. Used by wrapper SDKs. |
 |  [apiVersion?](./generative-ai.requestoptions.apiversion.md) |  | string | _(Optional)_ Version of API endpoint to call (e.g. "v1" or "v1beta"). If not specified, defaults to latest stable version. |
 |  [baseUrl?](./generative-ai.requestoptions.baseurl.md) |  | string | _(Optional)_ Base endpoint url. Defaults to "https://generativelanguage.googleapis.com" |
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
new file mode 100644
index 00000000..68d671cc
--- /dev/null
+++ b/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [abortSignal](./generative-ai.singlerequestoptions.abortsignal.md)
+
+## SingleRequestOptions.abortSignal property
+
+An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
+
+**Signature:**
+
+```typescript
+abortSignal?: AbortSignal;
+```
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.md b/docs/reference/main/generative-ai.singlerequestoptions.md
new file mode 100644
index 00000000..f85ecb65
--- /dev/null
+++ b/docs/reference/main/generative-ai.singlerequestoptions.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md)
+
+## SingleRequestOptions interface
+
+Params passed to atomic asynchronous operations.
+
+**Signature:**
+
+```typescript
+export interface SingleRequestOptions extends RequestOptions 
+```
+**Extends:** [RequestOptions](./generative-ai.requestoptions.md)
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+
diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index 22c18a33..3da25e2a 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { RequestOptions } from "../../types";
+import { RequestOptions, SingleRequestOptions } from "../../types";
 import { readFileSync } from "fs";
 import { FilesRequestUrl, getHeaders, makeFilesRequest } from "./request";
 import {
@@ -42,28 +42,28 @@ export interface UploadMetadata {
  * @public
  */
 export class GoogleAIFileManager {
-  private _requestOptions: RequestOptions;
   constructor(
     public apiKey: string,
-    requestOptions?: RequestOptions,
-  ) {
-    this._requestOptions = {};
-    if (requestOptions) {
-      Object.assign(this._requestOptions, requestOptions);
-      delete this._requestOptions.abortSignal;
-    }
-  }
+    private _requestOptions: RequestOptions = {},
+  ) {}
 
   /**
-   * Upload a file
+   * Upload a file.
+   *
+   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
+   * predendence over the {@link RequestOptions} values provided at the time of the
+   * {@link GoogleAIFileManager} initialization.
    */
   async uploadFile(
     filePath: string,
     fileMetadata: FileMetadata,
-    requestOptions: RequestOptions = {},
+    requestOptions: SingleRequestOptions = {},
   ): Promise<UploadFileResponse> {
     const file = readFileSync(filePath);
-    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
+    const filesRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
 
     const url = new FilesRequestUrl(
       FilesTask.UPLOAD,
@@ -103,13 +103,20 @@ export class GoogleAIFileManager {
   }
 
   /**
-   * List all uploaded files
+   * List all uploaded files.
+   *
+   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
+   * predendence over the {@link RequestOptions} values provided at the time of the
+   * {@link GoogleAIFileManager} initialization.
    */
   async listFiles(
     listParams?: ListParams,
-    requestOptions: RequestOptions = {},
+    requestOptions: SingleRequestOptions = {},
   ): Promise<ListFilesResponse> {
-    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
+    const filesRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     const url = new FilesRequestUrl(
       FilesTask.LIST,
       this.apiKey,
@@ -127,13 +134,20 @@ export class GoogleAIFileManager {
   }
 
   /**
-   * Get metadata for file with given ID
+   * Get metadata for file with given ID.
+   *
+   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
+   * predendence over the {@link RequestOptions} values provided at the time of the
+   * {@link GoogleAIFileManager} initialization.
    */
   async getFile(
     fileId: string,
-    requestOptions: RequestOptions = {},
+    requestOptions: SingleRequestOptions = {},
   ): Promise<FileMetadataResponse> {
-    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
+    const filesRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     const url = new FilesRequestUrl(
       FilesTask.GET,
       this.apiKey,
@@ -146,13 +160,20 @@ export class GoogleAIFileManager {
   }
 
   /**
-   * Delete file with given ID
+   * Delete file with given ID.
+   *
+   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
+   * predendence over the {@link RequestOptions} values provided at the time of the
+   * {@link GoogleAIFileManager} initialization.
    */
   async deleteFile(
     fileId: string,
-    requestOptions: RequestOptions = {},
+    requestOptions: SingleRequestOptions = {},
   ): Promise<void> {
-    const filesRequestOptions = { ...this._requestOptions, ...requestOptions };
+    const filesRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     const url = new FilesRequestUrl(
       FilesTask.DELETE,
       this.apiKey,
diff --git a/packages/main/src/files/index.ts b/packages/main/src/files/index.ts
index 6d89670f..e7c0d26f 100644
--- a/packages/main/src/files/index.ts
+++ b/packages/main/src/files/index.ts
@@ -17,4 +17,4 @@
 
 export { GoogleAIFileManager } from "./file-manager";
 export * from "./types";
-export { RequestOptions } from "../../types";
+export { RequestOptions, SingleRequestOptions } from "../../types";
diff --git a/packages/main/src/files/request.ts b/packages/main/src/files/request.ts
index 0bfc5587..08ac80d5 100644
--- a/packages/main/src/files/request.ts
+++ b/packages/main/src/files/request.ts
@@ -24,7 +24,7 @@ import {
   DEFAULT_BASE_URL,
   getClientHeaders,
 } from "../requests/request";
-import { RequestOptions } from "../../types";
+import { SingleRequestOptions } from "../../types";
 import { FilesTask } from "./constants";
 
 const taskToMethod = {
@@ -40,7 +40,7 @@ export class FilesRequestUrl {
   constructor(
     public task: FilesTask,
     public apiKey: string,
-    public requestOptions?: RequestOptions,
+    public requestOptions?: SingleRequestOptions,
   ) {
     const apiVersion = this.requestOptions?.apiVersion || DEFAULT_API_VERSION;
     const baseUrl = this.requestOptions?.baseUrl || DEFAULT_BASE_URL;
@@ -134,7 +134,7 @@ export async function makeFilesRequest(
  * Create an AbortSignal based on the timeout and abortSignal in the
  * RequestOptions.
  */
-function getSignal(requestOptions?: RequestOptions): AbortSignal | null {
+function getSignal(requestOptions?: SingleRequestOptions): AbortSignal | null {
   if (
     requestOptions?.abortSignal !== undefined ||
     requestOptions?.timeout >= 0
diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index f7ca7af2..812d27be 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -17,7 +17,7 @@
 
 import { expect, use } from "chai";
 import * as chaiAsPromised from "chai-as-promised";
-import { RequestOptions } from "../..";
+import { SingleRequestOptions } from "../..";
 import { GoogleAIFileManager } from "../../dist/files";
 
 use(chaiAsPromised);
@@ -54,21 +54,21 @@ describe("abortSignal", function () {
   it("file manager listFiles abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: RequestOptions = { abortSignal };
+    const requestOptions: SingleRequestOptions = { abortSignal };
     const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
   it("file manager getFile abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: RequestOptions = { abortSignal };
+    const requestOptions: SingleRequestOptions = { abortSignal };
     const promise = fileManager.getFile("abortSignal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
   it("file manager deleteFile abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: RequestOptions = { abortSignal };
+    const requestOptions: SingleRequestOptions = { abortSignal };
     const promise = fileManager.deleteFile("abortSignal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
diff --git a/packages/main/types/requests.ts b/packages/main/types/requests.ts
index c0459f38..e7af3940 100644
--- a/packages/main/types/requests.ts
+++ b/packages/main/types/requests.ts
@@ -147,9 +147,17 @@ export interface RequestOptions {
    * Custom HTTP request headers.
    */
   customHeaders?: Headers | Record<string, string>;
+}
+
+/**
+ * Params passed to atomic asynchronous operations.
+ * @public
+ */
+export interface SingleRequestOptions extends RequestOptions {
   /**
-   * An object that may be used to abort aynchronous requests. This is only available on
-   * a per request basis, and is ignored by models constructed with a RequestOptions object.
+   * An object that may be used to abort aynchronous requests. The request may
+   * also be aborted due to the expiration of the timeout value, if provided,
+   * and if the timeout occurs first.
    */
   abortSignal?: AbortSignal;
 }

From f4f168c1bbeb783f38be3da271c8ff748e572b6e Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Mon, 20 May 2024 16:57:40 -0400
Subject: [PATCH 10/28] asynchronous typo.

---
 .../files/generative-ai.singlerequestoptions.abortsignal.md     | 2 +-
 docs/reference/files/generative-ai.singlerequestoptions.md      | 2 +-
 .../main/generative-ai.singlerequestoptions.abortsignal.md      | 2 +-
 docs/reference/main/generative-ai.singlerequestoptions.md       | 2 +-
 packages/main/types/requests.ts                                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
index 68d671cc..a88614fd 100644
--- a/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
+++ b/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
@@ -4,7 +4,7 @@
 
 ## SingleRequestOptions.abortSignal property
 
-An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
+An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
 
 **Signature:**
 
diff --git a/docs/reference/files/generative-ai.singlerequestoptions.md b/docs/reference/files/generative-ai.singlerequestoptions.md
index f85ecb65..96a382ed 100644
--- a/docs/reference/files/generative-ai.singlerequestoptions.md
+++ b/docs/reference/files/generative-ai.singlerequestoptions.md
@@ -17,5 +17,5 @@ export interface SingleRequestOptions extends RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
 
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
index 68d671cc..a88614fd 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
@@ -4,7 +4,7 @@
 
 ## SingleRequestOptions.abortSignal property
 
-An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
+An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
 
 **Signature:**
 
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.md b/docs/reference/main/generative-ai.singlerequestoptions.md
index f85ecb65..96a382ed 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.md
@@ -17,5 +17,5 @@ export interface SingleRequestOptions extends RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort aynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
 
diff --git a/packages/main/types/requests.ts b/packages/main/types/requests.ts
index e7af3940..2b04fdbb 100644
--- a/packages/main/types/requests.ts
+++ b/packages/main/types/requests.ts
@@ -155,7 +155,7 @@ export interface RequestOptions {
  */
 export interface SingleRequestOptions extends RequestOptions {
   /**
-   * An object that may be used to abort aynchronous requests. The request may
+   * An object that may be used to abort asynchronous requests. The request may
    * also be aborted due to the expiration of the timeout value, if provided,
    * and if the timeout occurs first.
    */

From 2b30a9eec757ac75a2bfb31c89a501f737fd8be6 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Tue, 21 May 2024 10:42:08 -0400
Subject: [PATCH 11/28] Rename abortSignal to signal.

---
 packages/main/src/files/request.ts            | 11 +++-----
 .../node/abort-signal.test.ts                 | 26 +++++++++----------
 packages/main/types/requests.ts               |  2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/packages/main/src/files/request.ts b/packages/main/src/files/request.ts
index 08ac80d5..2a355ea8 100644
--- a/packages/main/src/files/request.ts
+++ b/packages/main/src/files/request.ts
@@ -131,20 +131,17 @@ export async function makeFilesRequest(
 }
 
 /**
- * Create an AbortSignal based on the timeout and abortSignal in the
+ * Create an AbortSignal based on the timeout and signal in the
  * RequestOptions.
  */
 function getSignal(requestOptions?: SingleRequestOptions): AbortSignal | null {
-  if (
-    requestOptions?.abortSignal !== undefined ||
-    requestOptions?.timeout >= 0
-  ) {
+  if (requestOptions?.signal !== undefined || requestOptions?.timeout >= 0) {
     const controller = new AbortController();
     if (requestOptions?.timeout >= 0) {
       setTimeout(() => controller.abort(), requestOptions.timeout);
     }
-    if (requestOptions.abortSignal) {
-      requestOptions.abortSignal.addEventListener("abort", () => {
+    if (requestOptions.signal) {
+      requestOptions.signal.addEventListener("abort", () => {
         controller.abort();
       });
     }
diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 812d27be..b30d2d52 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -25,20 +25,20 @@ use(chaiAsPromised);
 /**
  * Integration tests against live backend.
  */
-describe("abortSignal", function () {
+describe("signal", function () {
   this.timeout(60e3);
   this.slow(10e3);
   it("file manager uploadFile abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    const filePathInService = "abortsignal.jpg";
+    const filePathInService = "signal.jpg";
 
     // This delete step should cleanup the state of the service for this and
     // future executions.
     try {
-      await fileManager.deleteFile("files/abortsignal");
+      await fileManager.deleteFile("files/signal");
     } catch (error) {}
 
-    const abortSignal = AbortSignal.timeout(1);
+    const signal = AbortSignal.timeout(1);
     const promise = fileManager.uploadFile(
       "test-utils/cat.jpeg",
       {
@@ -46,30 +46,30 @@ describe("abortSignal", function () {
         name: filePathInService,
       },
       {
-        abortSignal,
+        signal,
       },
     );
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
   it("file manager listFiles abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: SingleRequestOptions = { abortSignal };
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
     const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
   it("file manager getFile abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: SingleRequestOptions = { abortSignal };
-    const promise = fileManager.getFile("abortSignal.jpg", requestOptions);
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = fileManager.getFile("signal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
   it("file manager deleteFile abort test", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    const abortSignal = AbortSignal.timeout(1);
-    const requestOptions: SingleRequestOptions = { abortSignal };
-    const promise = fileManager.deleteFile("abortSignal.jpg", requestOptions);
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = fileManager.deleteFile("signal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
 });
diff --git a/packages/main/types/requests.ts b/packages/main/types/requests.ts
index 2b04fdbb..a3d626ef 100644
--- a/packages/main/types/requests.ts
+++ b/packages/main/types/requests.ts
@@ -159,7 +159,7 @@ export interface SingleRequestOptions extends RequestOptions {
    * also be aborted due to the expiration of the timeout value, if provided,
    * and if the timeout occurs first.
    */
-  abortSignal?: AbortSignal;
+  signal?: AbortSignal;
 }
 
 /**

From b125380c57a977b2a21b576730442c66660d7769 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Tue, 21 May 2024 11:10:05 -0400
Subject: [PATCH 12/28] docs

---
 docs/reference/files/generative-ai.singlerequestoptions.md  | 2 +-
 ...gnal.md => generative-ai.singlerequestoptions.signal.md} | 6 +++---
 docs/reference/main/generative-ai.singlerequestoptions.md   | 2 +-
 ...gnal.md => generative-ai.singlerequestoptions.signal.md} | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename docs/reference/files/{generative-ai.singlerequestoptions.abortsignal.md => generative-ai.singlerequestoptions.signal.md} (72%)
 rename docs/reference/main/{generative-ai.singlerequestoptions.abortsignal.md => generative-ai.singlerequestoptions.signal.md} (72%)

diff --git a/docs/reference/files/generative-ai.singlerequestoptions.md b/docs/reference/files/generative-ai.singlerequestoptions.md
index 96a382ed..2cbda55f 100644
--- a/docs/reference/files/generative-ai.singlerequestoptions.md
+++ b/docs/reference/files/generative-ai.singlerequestoptions.md
@@ -17,5 +17,5 @@ export interface SingleRequestOptions extends RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+|  [signal?](./generative-ai.singlerequestoptions.signal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
 
diff --git a/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/files/generative-ai.singlerequestoptions.signal.md
similarity index 72%
rename from docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
rename to docs/reference/files/generative-ai.singlerequestoptions.signal.md
index a88614fd..9f0672b7 100644
--- a/docs/reference/files/generative-ai.singlerequestoptions.abortsignal.md
+++ b/docs/reference/files/generative-ai.singlerequestoptions.signal.md
@@ -1,13 +1,13 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [abortSignal](./generative-ai.singlerequestoptions.abortsignal.md)
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [signal](./generative-ai.singlerequestoptions.signal.md)
 
-## SingleRequestOptions.abortSignal property
+## SingleRequestOptions.signal property
 
 An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
 
 **Signature:**
 
 ```typescript
-abortSignal?: AbortSignal;
+signal?: AbortSignal;
 ```
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.md b/docs/reference/main/generative-ai.singlerequestoptions.md
index 96a382ed..2cbda55f 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.md
@@ -17,5 +17,5 @@ export interface SingleRequestOptions extends RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [abortSignal?](./generative-ai.singlerequestoptions.abortsignal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+|  [signal?](./generative-ai.singlerequestoptions.signal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
 
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md b/docs/reference/main/generative-ai.singlerequestoptions.signal.md
similarity index 72%
rename from docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
rename to docs/reference/main/generative-ai.singlerequestoptions.signal.md
index a88614fd..9f0672b7 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.abortsignal.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.signal.md
@@ -1,13 +1,13 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [abortSignal](./generative-ai.singlerequestoptions.abortsignal.md)
+[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [SingleRequestOptions](./generative-ai.singlerequestoptions.md) &gt; [signal](./generative-ai.singlerequestoptions.signal.md)
 
-## SingleRequestOptions.abortSignal property
+## SingleRequestOptions.signal property
 
 An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
 
 **Signature:**
 
 ```typescript
-abortSignal?: AbortSignal;
+signal?: AbortSignal;
 ```

From f7b7b6d842e60385ec45e68fdfbea18f902f643f Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 22 May 2024 10:30:50 -0400
Subject: [PATCH 13/28] predendence -> precedence typo fix

---
 .../files/generative-ai.googleaifilemanager.deletefile.md | 2 +-
 .../files/generative-ai.googleaifilemanager.getfile.md    | 2 +-
 .../files/generative-ai.googleaifilemanager.listfiles.md  | 2 +-
 docs/reference/files/generative-ai.googleaifilemanager.md | 8 ++++----
 .../files/generative-ai.googleaifilemanager.uploadfile.md | 2 +-
 packages/main/src/files/file-manager.ts                   | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
index 209ff4a7..0fae42e6 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.deletefile.md
@@ -6,7 +6,7 @@
 
 Delete file with given ID.
 
-Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
index 21d23c70..a8a08472 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.getfile.md
@@ -6,7 +6,7 @@
 
 Get metadata for file with given ID.
 
-Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
index a80e44ee..1c229fbb 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.listfiles.md
@@ -6,7 +6,7 @@
 
 List all uploaded files.
 
-Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.md b/docs/reference/files/generative-ai.googleaifilemanager.md
index 8aa09f16..e0f3144c 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.md
@@ -28,8 +28,8 @@ export declare class GoogleAIFileManager
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [deleteFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.deletefile.md) |  | <p>Delete file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
-|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | <p>Get metadata for file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
-|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | <p>List all uploaded files.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
-|  [uploadFile(filePath, fileMetadata, requestOptions)](./generative-ai.googleaifilemanager.uploadfile.md) |  | <p>Upload a file.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [deleteFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.deletefile.md) |  | <p>Delete file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | <p>Get metadata for file with given ID.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | <p>List all uploaded files.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [uploadFile(filePath, fileMetadata, requestOptions)](./generative-ai.googleaifilemanager.uploadfile.md) |  | <p>Upload a file.</p><p>Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
 
diff --git a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
index 2b12f245..0b29cb68 100644
--- a/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
+++ b/docs/reference/files/generative-ai.googleaifilemanager.uploadfile.md
@@ -6,7 +6,7 @@
 
 Upload a file.
 
-Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take predendence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
+Any fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
diff --git a/packages/main/src/files/file-manager.ts b/packages/main/src/files/file-manager.ts
index 3da25e2a..6853dd18 100644
--- a/packages/main/src/files/file-manager.ts
+++ b/packages/main/src/files/file-manager.ts
@@ -51,7 +51,7 @@ export class GoogleAIFileManager {
    * Upload a file.
    *
    * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * predendence over the {@link RequestOptions} values provided at the time of the
+   * precedence over the {@link RequestOptions} values provided at the time of the
    * {@link GoogleAIFileManager} initialization.
    */
   async uploadFile(
@@ -106,7 +106,7 @@ export class GoogleAIFileManager {
    * List all uploaded files.
    *
    * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * predendence over the {@link RequestOptions} values provided at the time of the
+   * precedence over the {@link RequestOptions} values provided at the time of the
    * {@link GoogleAIFileManager} initialization.
    */
   async listFiles(
@@ -137,7 +137,7 @@ export class GoogleAIFileManager {
    * Get metadata for file with given ID.
    *
    * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * predendence over the {@link RequestOptions} values provided at the time of the
+   * precedence over the {@link RequestOptions} values provided at the time of the
    * {@link GoogleAIFileManager} initialization.
    */
   async getFile(
@@ -163,7 +163,7 @@ export class GoogleAIFileManager {
    * Delete file with given ID.
    *
    * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * predendence over the {@link RequestOptions} values provided at the time of the
+   * precedence over the {@link RequestOptions} values provided at the time of the
    * {@link GoogleAIFileManager} initialization.
    */
   async deleteFile(

From fbc68fd0e048d9d91e9b5714cd9c938bd0687e7c Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 22 May 2024 10:48:05 -0400
Subject: [PATCH 14/28] tests timeout config in conjunction with signal

---
 .../node/abort-signal.test.ts                 | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index b30d2d52..9283980e 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -51,25 +51,55 @@ describe("signal", function () {
     );
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager listFiles abort test", async () => {
+  it("file manager listFiles aborted", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager getFile abort test", async () => {
+  it("file manager getFile aborted", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const promise = fileManager.getFile("signal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager deleteFile abort test", async () => {
+  it("file manager deleteFile aborted", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const promise = fileManager.deleteFile("signal.jpg", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
+  it("file manager getFile timeout without abort signal", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    // Ensure the file isn't hosted on the service.
+    try {
+      await fileManager.deleteFile("files/signal");
+    } catch (error) {}
+    const requestOptions: SingleRequestOptions = { timeout: 1 };
+    // Use getFile, which should fail with a fetch error since the file
+    // doesn't exist. This should let us discern if the error was
+    // a timeout abort, or the fetch failure in our expect() below.
+    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("file manager getFile timeout before singal aborts", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    // Ensure the file isn't hosted on the service.
+    try {
+      await fileManager.deleteFile("files/signal");
+    } catch (error) {}
+    // The AbortSignal timeout is longer than the operation itself, so
+    // the expected abort should come from the timeout parameter of
+    // requestOptions. Additionally, regardless of timeouts, this operation
+    // would normally fail as the file should not be hosted in the service.
+    // If the timeouts don't work properly then we'd get a fetch error, not
+    // and abort error.
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
 });

From 1e440f4c8d8ad9db12fdab646cab33c583f51fdd Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 5 Jun 2024 15:20:46 -0400
Subject: [PATCH 15/28] docs gen

---
 docs/reference/files/generative-ai.md | 1 +
 docs/reference/main/generative-ai.md  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/reference/files/generative-ai.md b/docs/reference/files/generative-ai.md
index af005bfd..ac71b540 100644
--- a/docs/reference/files/generative-ai.md
+++ b/docs/reference/files/generative-ai.md
@@ -27,6 +27,7 @@
 |  [ListParams](./generative-ai.listparams.md) | Params to pass to [GoogleAIFileManager.listFiles()](./generative-ai.googleaifilemanager.listfiles.md) |
 |  [RequestOptions](./generative-ai.requestoptions.md) | Params passed to getGenerativeModel() or GoogleAIFileManager(). |
 |  [RpcStatus](./generative-ai.rpcstatus.md) | Standard RPC error status object. |
+|  [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | Params passed to atomic asynchronous operations. |
 |  [UploadFileResponse](./generative-ai.uploadfileresponse.md) | Response from calling [GoogleAIFileManager.uploadFile()](./generative-ai.googleaifilemanager.uploadfile.md) |
 |  [VideoMetadata](./generative-ai.videometadata.md) | Metadata populated when video has been processed. |
 
diff --git a/docs/reference/main/generative-ai.md b/docs/reference/main/generative-ai.md
index d25ff956..0a4281d2 100644
--- a/docs/reference/main/generative-ai.md
+++ b/docs/reference/main/generative-ai.md
@@ -72,6 +72,7 @@
 |  [SafetyRating](./generative-ai.safetyrating.md) | A safety rating associated with a [GenerateContentCandidate](./generative-ai.generatecontentcandidate.md) |
 |  [SafetySetting](./generative-ai.safetysetting.md) | Safety setting that can be sent as part of request parameters. |
 |  [Schema](./generative-ai.schema.md) | Schema is used to define the format of input/output data. Represents a select subset of an OpenAPI 3.0 schema object. More fields may be added in the future as needed. |
+|  [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | Params passed to atomic asynchronous operations. |
 |  [StartChatParams](./generative-ai.startchatparams.md) | Params for [GenerativeModel.startChat()](./generative-ai.generativemodel.startchat.md)<!-- -->. |
 |  [TextPart](./generative-ai.textpart.md) | Content part interface if the part represents a text string. |
 |  [ToolConfig](./generative-ai.toolconfig.md) | Tool config. This config is shared for all tools provided in the request. |

From b73cb1a9403d1784b56878a88cce656a673c846b Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Tue, 16 Jul 2024 10:49:35 -0400
Subject: [PATCH 16/28] merge main

---
 common/api-review/generative-ai-server.api.md            | 9 +++++----
 common/api-review/generative-ai.api.md                   | 5 +++++
 packages/main/test-integration/node/abort-signal.test.ts | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/api-review/generative-ai-server.api.md b/common/api-review/generative-ai-server.api.md
index ae98439c..48973bbc 100644
--- a/common/api-review/generative-ai-server.api.md
+++ b/common/api-review/generative-ai-server.api.md
@@ -354,10 +354,11 @@ export class GoogleAIFileManager {
     constructor(apiKey: string, _requestOptions?: RequestOptions);
     // (undocumented)
     apiKey: string;
-    deleteFile(fileId: string): Promise<void>;
-    getFile(fileId: string): Promise<FileMetadataResponse>;
-    listFiles(listParams?: ListParams): Promise<ListFilesResponse>;
-    uploadFile(filePath: string, fileMetadata: FileMetadata): Promise<UploadFileResponse>;
+    deleteFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<void>;
+    getFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<FileMetadataResponse>;
+    listFiles(listParams?: ListParams, requestOptions?: SingleRequestOptions): Promise<ListFilesResponse>;
+    // Warning: (ae-forgotten-export) The symbol "SingleRequestOptions" needs to be exported by the entry point index.d.ts
+    uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: SingleRequestOptions): Promise<UploadFileResponse>;
 }
 
 // @public
diff --git a/common/api-review/generative-ai.api.md b/common/api-review/generative-ai.api.md
index 83f151fc..8323c2c2 100644
--- a/common/api-review/generative-ai.api.md
+++ b/common/api-review/generative-ai.api.md
@@ -667,6 +667,11 @@ export interface Schema {
     type?: FunctionDeclarationSchemaType;
 }
 
+// @public
+export interface SingleRequestOptions extends RequestOptions {
+    signal?: AbortSignal;
+}
+
 // @public
 export interface StartChatParams extends BaseParams {
     cachedContent?: string;
diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 9283980e..80195a41 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -18,7 +18,7 @@
 import { expect, use } from "chai";
 import * as chaiAsPromised from "chai-as-promised";
 import { SingleRequestOptions } from "../..";
-import { GoogleAIFileManager } from "../../dist/files";
+import { GoogleAIFileManager } from "../../dist/server";
 
 use(chaiAsPromised);
 

From 20b16fbe09488f7d9d8d1e31205ba52562f2502a Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 10:43:47 -0400
Subject: [PATCH 17/28] ChatSession and GenerativeModel implementation

---
 common/api-review/generative-ai.api.md        | 20 +++---
 packages/main/src/methods/chat-session.ts     | 27 ++++++--
 packages/main/src/methods/count-tokens.ts     |  6 +-
 packages/main/src/methods/generate-content.ts |  6 +-
 packages/main/src/models/generative-model.ts  | 67 ++++++++++++++++---
 packages/main/src/requests/request.ts         | 20 +++---
 6 files changed, 106 insertions(+), 40 deletions(-)

diff --git a/common/api-review/generative-ai.api.md b/common/api-review/generative-ai.api.md
index 8323c2c2..2275a977 100644
--- a/common/api-review/generative-ai.api.md
+++ b/common/api-review/generative-ai.api.md
@@ -62,16 +62,14 @@ export interface CachedContentBase {
 
 // @public
 export class ChatSession {
-    constructor(apiKey: string, model: string, params?: StartChatParams, requestOptions?: RequestOptions);
+    constructor(apiKey: string, model: string, params?: StartChatParams, _requestOptions?: RequestOptions);
     getHistory(): Promise<Content[]>;
     // (undocumented)
     model: string;
     // (undocumented)
     params?: StartChatParams;
-    // (undocumented)
-    requestOptions?: RequestOptions;
-    sendMessage(request: string | Array<string | Part>): Promise<GenerateContentResult>;
-    sendMessageStream(request: string | Array<string | Part>): Promise<GenerateContentStreamResult>;
+    sendMessage(request: string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
+    sendMessageStream(request: string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
 }
 
 // @public
@@ -462,16 +460,16 @@ export interface GenerativeContentBlob {
 
 // @public
 export class GenerativeModel {
-    constructor(apiKey: string, modelParams: ModelParams, requestOptions?: RequestOptions);
+    constructor(apiKey: string, modelParams: ModelParams, _requestOptions?: RequestOptions);
     // (undocumented)
     apiKey: string;
-    batchEmbedContents(batchEmbedContentRequest: BatchEmbedContentsRequest): Promise<BatchEmbedContentsResponse>;
+    batchEmbedContents(batchEmbedContentRequest: BatchEmbedContentsRequest, requestOptions?: SingleRequestOptions): Promise<BatchEmbedContentsResponse>;
     // (undocumented)
     cachedContent: CachedContent;
-    countTokens(request: CountTokensRequest | string | Array<string | Part>): Promise<CountTokensResponse>;
-    embedContent(request: EmbedContentRequest | string | Array<string | Part>): Promise<EmbedContentResponse>;
-    generateContent(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentResult>;
-    generateContentStream(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentStreamResult>;
+    countTokens(request: CountTokensRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<CountTokensResponse>;
+    embedContent(request: EmbedContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<EmbedContentResponse>;
+    generateContent(request: GenerateContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
+    generateContentStream(request: GenerateContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
     // (undocumented)
     generationConfig: GenerationConfig;
     // (undocumented)
diff --git a/packages/main/src/methods/chat-session.ts b/packages/main/src/methods/chat-session.ts
index fd469bfe..2d1c7e6b 100644
--- a/packages/main/src/methods/chat-session.ts
+++ b/packages/main/src/methods/chat-session.ts
@@ -22,6 +22,7 @@ import {
   GenerateContentStreamResult,
   Part,
   RequestOptions,
+  SingleRequestOptions,
   StartChatParams,
 } from "../../types";
 import { formatNewContent } from "../requests/request-helpers";
@@ -49,7 +50,7 @@ export class ChatSession {
     apiKey: string,
     public model: string,
     public params?: StartChatParams,
-    public requestOptions?: RequestOptions,
+    private _requestOptions: RequestOptions = {},
   ) {
     this._apiKey = apiKey;
     if (params?.history) {
@@ -70,10 +71,15 @@ export class ChatSession {
 
   /**
    * Sends a chat message and receives a non-streaming
-   * {@link GenerateContentResult}
+   * {@link GenerateContentResult}.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async sendMessage(
     request: string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<GenerateContentResult> {
     await this._sendPromise;
     const newContent = formatNewContent(request);
@@ -86,6 +92,10 @@ export class ChatSession {
       cachedContent: this.params?.cachedContent,
       contents: [...this._history, newContent],
     };
+    const chatSessionRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     let finalResult;
     // Add onto the chain.
     this._sendPromise = this._sendPromise
@@ -94,7 +104,7 @@ export class ChatSession {
           this._apiKey,
           this.model,
           generateContentRequest,
-          this.requestOptions,
+          chatSessionRequestOptions,
         ),
       )
       .then((result) => {
@@ -128,9 +138,14 @@ export class ChatSession {
    * Sends a chat message and receives the response as a
    * {@link GenerateContentStreamResult} containing an iterable stream
    * and a response promise.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async sendMessageStream(
     request: string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<GenerateContentStreamResult> {
     await this._sendPromise;
     const newContent = formatNewContent(request);
@@ -143,11 +158,15 @@ export class ChatSession {
       cachedContent: this.params?.cachedContent,
       contents: [...this._history, newContent],
     };
+    const chatSessionRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     const streamPromise = generateContentStream(
       this._apiKey,
       this.model,
       generateContentRequest,
-      this.requestOptions,
+      chatSessionRequestOptions,
     );
 
     // Add onto the chain.
diff --git a/packages/main/src/methods/count-tokens.ts b/packages/main/src/methods/count-tokens.ts
index a8a38e93..49d5ba1c 100644
--- a/packages/main/src/methods/count-tokens.ts
+++ b/packages/main/src/methods/count-tokens.ts
@@ -18,7 +18,7 @@
 import {
   CountTokensRequest,
   CountTokensResponse,
-  RequestOptions,
+  SingleRequestOptions,
 } from "../../types";
 import { Task, makeModelRequest } from "../requests/request";
 
@@ -26,7 +26,7 @@ export async function countTokens(
   apiKey: string,
   model: string,
   params: CountTokensRequest,
-  requestOptions?: RequestOptions,
+  singleRequestOptions: SingleRequestOptions,
 ): Promise<CountTokensResponse> {
   const response = await makeModelRequest(
     model,
@@ -34,7 +34,7 @@ export async function countTokens(
     apiKey,
     false,
     JSON.stringify(params),
-    requestOptions,
+    singleRequestOptions,
   );
   return response.json();
 }
diff --git a/packages/main/src/methods/generate-content.ts b/packages/main/src/methods/generate-content.ts
index 327cd96e..8c1e1393 100644
--- a/packages/main/src/methods/generate-content.ts
+++ b/packages/main/src/methods/generate-content.ts
@@ -20,7 +20,7 @@ import {
   GenerateContentResponse,
   GenerateContentResult,
   GenerateContentStreamResult,
-  RequestOptions,
+  SingleRequestOptions,
 } from "../../types";
 import { Task, makeModelRequest } from "../requests/request";
 import { addHelpers } from "../requests/response-helpers";
@@ -30,7 +30,7 @@ export async function generateContentStream(
   apiKey: string,
   model: string,
   params: GenerateContentRequest,
-  requestOptions?: RequestOptions,
+  requestOptions: SingleRequestOptions,
 ): Promise<GenerateContentStreamResult> {
   const response = await makeModelRequest(
     model,
@@ -47,7 +47,7 @@ export async function generateContent(
   apiKey: string,
   model: string,
   params: GenerateContentRequest,
-  requestOptions?: RequestOptions,
+  requestOptions?: SingleRequestOptions,
 ): Promise<GenerateContentResult> {
   const response = await makeModelRequest(
     model,
diff --git a/packages/main/src/models/generative-model.ts b/packages/main/src/models/generative-model.ts
index bbc17601..375d9ddf 100644
--- a/packages/main/src/models/generative-model.ts
+++ b/packages/main/src/models/generative-model.ts
@@ -36,6 +36,7 @@ import {
   Part,
   RequestOptions,
   SafetySetting,
+  SingleRequestOptions,
   StartChatParams,
   Tool,
   ToolConfig,
@@ -67,7 +68,7 @@ export class GenerativeModel {
   constructor(
     public apiKey: string,
     modelParams: ModelParams,
-    requestOptions?: RequestOptions,
+    private _requestOptions: RequestOptions = {},
   ) {
     if (modelParams.model.includes("/")) {
       // Models may be named "models/model-name" or "tunedModels/model-name"
@@ -84,17 +85,25 @@ export class GenerativeModel {
       modelParams.systemInstruction,
     );
     this.cachedContent = modelParams.cachedContent;
-    this.requestOptions = requestOptions || {};
   }
 
   /**
    * Makes a single non-streaming call to the model
    * and returns an object containing a single {@link GenerateContentResponse}.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async generateContent(
     request: GenerateContentRequest | string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<GenerateContentResult> {
     const formattedParams = formatGenerateContentInput(request);
+    const generativeModelRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     return generateContent(
       this.apiKey,
       this.model,
@@ -107,20 +116,29 @@ export class GenerativeModel {
         cachedContent: this.cachedContent?.name,
         ...formattedParams,
       },
-      this.requestOptions,
+      generativeModelRequestOptions,
     );
   }
 
   /**
-   * Makes a single streaming call to the model
-   * and returns an object containing an iterable stream that iterates
-   * over all chunks in the streaming response as well as
-   * a promise that returns the final aggregated response.
+   * Makes a single streaming call to the model and returns an object
+   * containing an iterable stream that iterates over all chunks in the
+   * streaming response as well as a promise that returns the final
+   * aggregated response.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async generateContentStream(
     request: GenerateContentRequest | string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<GenerateContentStreamResult> {
     const formattedParams = formatGenerateContentInput(request);
+    const generativeModelRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     return generateContentStream(
       this.apiKey,
       this.model,
@@ -133,7 +151,7 @@ export class GenerativeModel {
         cachedContent: this.cachedContent?.name,
         ...formattedParams,
       },
-      this.requestOptions,
+      generativeModelRequestOptions,
     );
   }
 
@@ -160,9 +178,14 @@ export class GenerativeModel {
 
   /**
    * Counts the tokens in the provided request.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async countTokens(
     request: CountTokensRequest | string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<CountTokensResponse> {
     const formattedParams = formatCountTokensInput(request, {
       model: this.model,
@@ -173,40 +196,62 @@ export class GenerativeModel {
       systemInstruction: this.systemInstruction,
       cachedContent: this.cachedContent,
     });
+    const generativeModelRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     return countTokens(
       this.apiKey,
       this.model,
       formattedParams,
-      this.requestOptions,
+      generativeModelRequestOptions,
     );
   }
 
   /**
    * Embeds the provided content.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async embedContent(
     request: EmbedContentRequest | string | Array<string | Part>,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<EmbedContentResponse> {
     const formattedParams = formatEmbedContentInput(request);
+    const generativeModelRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     return embedContent(
       this.apiKey,
       this.model,
       formattedParams,
-      this.requestOptions,
+      generativeModelRequestOptions,
     );
   }
 
   /**
    * Embeds an array of {@link EmbedContentRequest}s.
+   *
+   * Fields set in the optional {@link SingleRequestOptions} parameter will
+   * take precedence over the {@link RequestOptions} values provided at the
+   * time of the {@link GoogleAIFileManager} initialization.
    */
   async batchEmbedContents(
     batchEmbedContentRequest: BatchEmbedContentsRequest,
+    requestOptions: SingleRequestOptions = {},
   ): Promise<BatchEmbedContentsResponse> {
+    const generativeModelRequestOptions: SingleRequestOptions = {
+      ...this._requestOptions,
+      ...requestOptions,
+    };
     return batchEmbedContents(
       this.apiKey,
       this.model,
       batchEmbedContentRequest,
-      this.requestOptions,
+      generativeModelRequestOptions,
     );
   }
 }
diff --git a/packages/main/src/requests/request.ts b/packages/main/src/requests/request.ts
index 9249aba0..c5d197ad 100644
--- a/packages/main/src/requests/request.ts
+++ b/packages/main/src/requests/request.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { RequestOptions } from "../../types";
+import { RequestOptions, SingleRequestOptions } from "../../types";
 import {
   GoogleGenerativeAIError,
   GoogleGenerativeAIFetchError,
@@ -116,7 +116,7 @@ export async function constructModelRequest(
   apiKey: string,
   stream: boolean,
   body: string,
-  requestOptions?: RequestOptions,
+  requestOptions: SingleRequestOptions,
 ): Promise<{ url: string; fetchOptions: RequestInit }> {
   const url = new RequestUrl(model, task, apiKey, stream, requestOptions);
   return {
@@ -136,7 +136,7 @@ export async function makeModelRequest(
   apiKey: string,
   stream: boolean,
   body: string,
-  requestOptions?: RequestOptions,
+  requestOptions: SingleRequestOptions = {},
   // Allows this to be stubbed for tests
   fetchFn = fetch,
 ): Promise<Response> {
@@ -217,13 +217,17 @@ async function handleResponseNotOk(
  * @param requestOptions - The user-defined request options.
  * @returns The generated request options.
  */
-function buildFetchOptions(requestOptions?: RequestOptions): RequestInit {
+function buildFetchOptions(requestOptions?: SingleRequestOptions): RequestInit {
   const fetchOptions = {} as RequestInit;
+  const controller = new AbortController();
   if (requestOptions?.timeout >= 0) {
-    const abortController = new AbortController();
-    const signal = abortController.signal;
-    setTimeout(() => abortController.abort(), requestOptions.timeout);
-    fetchOptions.signal = signal;
+    setTimeout(() => controller.abort(), requestOptions.timeout);
   }
+  if (requestOptions?.signal) {
+    requestOptions.signal.addEventListener("abort", () => {
+      controller.abort();
+    });
+  }
+  fetchOptions.signal = controller.signal;
   return fetchOptions;
 }

From c4c8426411382fb29da7868718a6f18bf2bcda1f Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 14:44:23 -0400
Subject: [PATCH 18/28] remove SRO from some FileManager functions

---
 packages/main/src/server/file-manager.ts | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/packages/main/src/server/file-manager.ts b/packages/main/src/server/file-manager.ts
index f760db6b..b5a7dfd3 100644
--- a/packages/main/src/server/file-manager.ts
+++ b/packages/main/src/server/file-manager.ts
@@ -49,26 +49,16 @@ export class GoogleAIFileManager {
 
   /**
    * Upload a file.
-   *
-   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * precedence over the {@link RequestOptions} values provided at the time of the
-   * {@link GoogleAIFileManager} initialization.
    */
   async uploadFile(
     filePath: string,
     fileMetadata: FileMetadata,
-    requestOptions: SingleRequestOptions = {},
   ): Promise<UploadFileResponse> {
     const file = readFileSync(filePath);
-    const filesRequestOptions: SingleRequestOptions = {
-      ...this._requestOptions,
-      ...requestOptions,
-    };
-
     const url = new FilesRequestUrl(
       RpcTask.UPLOAD,
       this.apiKey,
-      filesRequestOptions,
+      this._requestOptions,
     );
 
     const uploadHeaders = getHeaders(url);
@@ -161,23 +151,14 @@ export class GoogleAIFileManager {
 
   /**
    * Delete file with given ID.
-   *
-   * Any fields set in the optional {@link SingleRequestOptions} parameter will take
-   * precedence over the {@link RequestOptions} values provided at the time of the
-   * {@link GoogleAIFileManager} initialization.
    */
   async deleteFile(
     fileId: string,
-    requestOptions: SingleRequestOptions = {},
   ): Promise<void> {
-    const filesRequestOptions: SingleRequestOptions = {
-      ...this._requestOptions,
-      ...requestOptions,
-    };
     const url = new FilesRequestUrl(
       RpcTask.DELETE,
       this.apiKey,
-      filesRequestOptions,
+      this._requestOptions,
     );
     url.appendPath(parseFileId(fileId));
     const uploadHeaders = getHeaders(url);

From c61466af3321a7b65c421c673c3f2bd10f8f0144 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 14:55:16 -0400
Subject: [PATCH 19/28] docs

---
 common/api-review/generative-ai-server.api.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/api-review/generative-ai-server.api.md b/common/api-review/generative-ai-server.api.md
index 48973bbc..456c5273 100644
--- a/common/api-review/generative-ai-server.api.md
+++ b/common/api-review/generative-ai-server.api.md
@@ -354,11 +354,11 @@ export class GoogleAIFileManager {
     constructor(apiKey: string, _requestOptions?: RequestOptions);
     // (undocumented)
     apiKey: string;
-    deleteFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<void>;
+    deleteFile(fileId: string): Promise<void>;
     getFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<FileMetadataResponse>;
-    listFiles(listParams?: ListParams, requestOptions?: SingleRequestOptions): Promise<ListFilesResponse>;
     // Warning: (ae-forgotten-export) The symbol "SingleRequestOptions" needs to be exported by the entry point index.d.ts
-    uploadFile(filePath: string, fileMetadata: FileMetadata, requestOptions?: SingleRequestOptions): Promise<UploadFileResponse>;
+    listFiles(listParams?: ListParams, requestOptions?: SingleRequestOptions): Promise<ListFilesResponse>;
+    uploadFile(filePath: string, fileMetadata: FileMetadata): Promise<UploadFileResponse>;
 }
 
 // @public

From 6e26b0cf8a55edf9711a3babc6367c0f54343264 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 16:05:05 -0400
Subject: [PATCH 20/28] format

---
 packages/main/src/server/file-manager.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/main/src/server/file-manager.ts b/packages/main/src/server/file-manager.ts
index b5a7dfd3..c34abb2b 100644
--- a/packages/main/src/server/file-manager.ts
+++ b/packages/main/src/server/file-manager.ts
@@ -152,9 +152,7 @@ export class GoogleAIFileManager {
   /**
    * Delete file with given ID.
    */
-  async deleteFile(
-    fileId: string,
-  ): Promise<void> {
+  async deleteFile(fileId: string): Promise<void> {
     const url = new FilesRequestUrl(
       RpcTask.DELETE,
       this.apiKey,

From bec6f015864d15d0bdc2c42f527e9ebd6e6bd0e0 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 16:07:46 -0400
Subject: [PATCH 21/28] GoogleAIFileManager & GenerativeModel tests.

---
 .../node/abort-signal.test.ts                 | 185 +++++++++++++-----
 1 file changed, 139 insertions(+), 46 deletions(-)

diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 80195a41..62ea1fcc 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -17,7 +17,11 @@
 
 import { expect, use } from "chai";
 import * as chaiAsPromised from "chai-as-promised";
-import { SingleRequestOptions } from "../..";
+import {
+  GoogleGenerativeAI,
+  RequestOptions,
+  SingleRequestOptions,
+} from "../..";
 import { GoogleAIFileManager } from "../../dist/server";
 
 use(chaiAsPromised);
@@ -28,78 +32,167 @@ use(chaiAsPromised);
 describe("signal", function () {
   this.timeout(60e3);
   this.slow(10e3);
-  it("file manager uploadFile abort test", async () => {
+  /* GoogleAIFileManager */
+  it("GoogleAIFileManager getFile() SingleRequestOption timeout", async () => {
+    // Ensure SingleRequestOptions.timeout takes precendence over the value of
+    // RequestOptions.timeout configured at construction. Also, a control test
+    // to ensure that timeout still works without an AbortSignal present.
+    const requestOptions: RequestOptions = { timeout: 9000 };
+    const fileManager = new GoogleAIFileManager(
+      process.env.GEMINI_API_KEY,
+      requestOptions,
+    );
+    // Ensure the file isn't hosted on the service.
+    try {
+      await fileManager.deleteFile("files/signal");
+    } catch (error) {}
+    const singleRequestOptions: SingleRequestOptions = { timeout: 1 };
+    // Use getFile, which should fail with a fetch error since the file
+    // doesn't exist. This should let us discern if the error was
+    // a timeout abort, or the fetch failure in our expect() below.
+    const promise = fileManager.getFile("signal.jpg", singleRequestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("GoogleAIFileManager getFile() aborted", async () => {
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    const filePathInService = "signal.jpg";
-
-    // This delete step should cleanup the state of the service for this and
-    // future executions.
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("GoogleAIFileManager getFile() timeout before signal aborts", async () => {
+    // Ensure the manually configured timeout works in conjunction with the
+    // AbortSignal timeout.
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    // Ensure the file isn't hosted on the service.
     try {
       await fileManager.deleteFile("files/signal");
     } catch (error) {}
-
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("GoogleAIFileManager listFiles() aborted", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
-    const promise = fileManager.uploadFile(
-      "test-utils/cat.jpeg",
-      {
-        mimeType: "image/jpeg",
-        name: filePathInService,
-      },
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("GoogleAIFileManager listFiles() timeout before signal aborts", async () => {
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+
+  /* GenerativeModel */
+  it("GenerativeModel generateContent() SingleRequestOption timeout", async () => {
+    // Ensure SingleRequestOptions.timeout takes precendence over the value of
+    // RequestOptions.timeout configured at construction. Also, a control test
+    // to ensure that timeout still works without an AbortSignal present.
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const requestOptions: RequestOptions = {
+      timeout: 9000, // This is much longer than a generateContent request.
+    };
+    const model = genAI.getGenerativeModel(
       {
-        signal,
+        model: "gemini-1.5-flash-latest",
       },
+      requestOptions,
+    );
+    const singleRequestOptions: SingleRequestOptions = { timeout: 1 };
+    const promise = model.generateContent(
+      "This is not an image",
+      singleRequestOptions,
     );
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager listFiles aborted", async () => {
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+  it("GenerativeModel generateContent() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
-    const promise = fileManager.listFiles(/* listParams= */ {}, requestOptions);
+    const promise = model.generateContent(
+      "This is not an image",
+      requestOptions,
+    );
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("GenerativeModel generateContent() timeout before signal aborts", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
+    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = model.generateContent(
+      "This is not an image",
+      requestOptions,
+    );
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager getFile aborted", async () => {
+  it("GenerativeModel countTokens() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
-    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    const promise = model.countTokens("This is not an image", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager deleteFile aborted", async () => {
+  it("GenerativeModel embedContent() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
-    const promise = fileManager.deleteFile("signal.jpg", requestOptions);
+    const promise = model.embedContent("This is not an image", requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager getFile timeout without abort signal", async () => {
+  it("GenerativeModel batchEmbedContent() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
     const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    // Ensure the file isn't hosted on the service.
-    try {
-      await fileManager.deleteFile("files/signal");
-    } catch (error) {}
-    const requestOptions: SingleRequestOptions = { timeout: 1 };
-    // Use getFile, which should fail with a fetch error since the file
-    // doesn't exist. This should let us discern if the error was
-    // a timeout abort, or the fetch failure in our expect() below.
-    const promise = fileManager.getFile("signal.jpg", requestOptions);
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const content1 = {
+      content: { role: "user", parts: [{ text: "embed me" }] },
+    };
+    const content2 = {
+      content: { role: "user", parts: [{ text: "embed me" }] },
+    };
+    const promise = model.batchEmbedContents(
+      {
+        requests: [content1, content2],
+      },
+      requestOptions,
+    );
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
-  it("file manager getFile timeout before singal aborts", async () => {
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
-    // Ensure the file isn't hosted on the service.
-    try {
-      await fileManager.deleteFile("files/signal");
-    } catch (error) {}
-    // The AbortSignal timeout is longer than the operation itself, so
-    // the expected abort should come from the timeout parameter of
-    // requestOptions. Additionally, regardless of timeouts, this operation
-    // would normally fail as the file should not be hosted in the service.
-    // If the timeouts don't work properly then we'd get a fetch error, not
-    // and abort error.
-    const signal = AbortSignal.timeout(9000);
-    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
-    const promise = fileManager.getFile("signal.jpg", requestOptions);
+
+  /* ChatSessionManager */
+  it("ChatSession generateContent() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
+    const question1 = "What is the capital of Oregon?";
+    const chat = model.startChat();
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = chat.sendMessage(question1, requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
 });

From 5bbbcf5066f60a0bf8856e834e435d2739949904 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 16:43:56 -0400
Subject: [PATCH 22/28] ChatSessionManager tests

---
 .../node/abort-signal.test.ts                 | 62 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 62ea1fcc..497961a7 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -33,7 +33,7 @@ describe("signal", function () {
   this.timeout(60e3);
   this.slow(10e3);
   /* GoogleAIFileManager */
-  it("GoogleAIFileManager getFile() SingleRequestOption timeout", async () => {
+  it("GoogleAIFileManager getFile() SingleRequestOption.timeout", async () => {
     // Ensure SingleRequestOptions.timeout takes precendence over the value of
     // RequestOptions.timeout configured at construction. Also, a control test
     // to ensure that timeout still works without an AbortSignal present.
@@ -89,7 +89,7 @@ describe("signal", function () {
   });
 
   /* GenerativeModel */
-  it("GenerativeModel generateContent() SingleRequestOption timeout", async () => {
+  it("GenerativeModel generateContent() SingleRequestOption.timeout", async () => {
     // Ensure SingleRequestOptions.timeout takes precendence over the value of
     // RequestOptions.timeout configured at construction. Also, a control test
     // to ensure that timeout still works without an AbortSignal present.
@@ -183,7 +183,27 @@ describe("signal", function () {
   });
 
   /* ChatSessionManager */
-  it("ChatSession generateContent() aborted", async () => {
+  it("ChatSessionManager sendMessage() SingleRequestOption.timeout", async () => {
+    // Ensure SingleRequestOptions.timeout takes precendence over the value of
+    // RequestOptions.timeout configured at construction. Also, a control test
+    // to ensure that timeout still works without an AbortSignal present.
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const requestOptions: RequestOptions = {
+      timeout: 9000, // This is much longer than a generateContent request.
+    };
+    const model = genAI.getGenerativeModel(
+      {
+        model: "gemini-1.5-flash-latest",
+      },
+      requestOptions,
+    );
+    const question1 = "What is the capital of Oregon?";
+    const chat = model.startChat();
+    const singleRequestOptions: SingleRequestOptions = { timeout: 1 };
+    const promise = chat.sendMessage(question1, singleRequestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("ChatSession sendMessage() aborted", async () => {
     const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
     const model = genAI.getGenerativeModel({
       model: "gemini-1.5-flash-latest",
@@ -195,4 +215,40 @@ describe("signal", function () {
     const promise = chat.sendMessage(question1, requestOptions);
     await expect(promise).to.be.rejectedWith("This operation was aborted");
   });
+  it("ChatSession sendMessage() timeout before signal aborts", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
+    const question1 = "What is the capital of Oregon?";
+    const chat = model.startChat();
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = chat.sendMessage(question1, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("ChatSession sendMessageStream() aborted", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
+    const question1 = "What is the capital of Oregon?";
+    const chat = model.startChat();
+    const signal = AbortSignal.timeout(1);
+    const requestOptions: SingleRequestOptions = { signal };
+    const promise = chat.sendMessageStream(question1, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
+  it("ChatSession sendMessageStream() timeout before signal aborts", async () => {
+    const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY || "");
+    const model = genAI.getGenerativeModel({
+      model: "gemini-1.5-flash-latest",
+    });
+    const question1 = "What is the capital of Oregon?";
+    const chat = model.startChat();
+    const signal = AbortSignal.timeout(9000);
+    const requestOptions: SingleRequestOptions = { timeout: 1, signal };
+    const promise = chat.sendMessageStream(question1, requestOptions);
+    await expect(promise).to.be.rejectedWith("This operation was aborted");
+  });
 });

From 6abb6d44b1986eab32d3802325519ce0ebb06677 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Wed, 17 Jul 2024 16:48:45 -0400
Subject: [PATCH 23/28] extra GoogleAIFileManager variables

---
 packages/main/test-integration/node/abort-signal.test.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/main/test-integration/node/abort-signal.test.ts b/packages/main/test-integration/node/abort-signal.test.ts
index 497961a7..d540b2df 100644
--- a/packages/main/test-integration/node/abort-signal.test.ts
+++ b/packages/main/test-integration/node/abort-signal.test.ts
@@ -128,7 +128,6 @@ describe("signal", function () {
     const model = genAI.getGenerativeModel({
       model: "gemini-1.5-flash-latest",
     });
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(9000);
     const requestOptions: SingleRequestOptions = { timeout: 1, signal };
     const promise = model.generateContent(
@@ -142,7 +141,6 @@ describe("signal", function () {
     const model = genAI.getGenerativeModel({
       model: "gemini-1.5-flash-latest",
     });
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const promise = model.countTokens("This is not an image", requestOptions);
@@ -153,7 +151,6 @@ describe("signal", function () {
     const model = genAI.getGenerativeModel({
       model: "gemini-1.5-flash-latest",
     });
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const promise = model.embedContent("This is not an image", requestOptions);
@@ -164,7 +161,6 @@ describe("signal", function () {
     const model = genAI.getGenerativeModel({
       model: "gemini-1.5-flash-latest",
     });
-    const fileManager = new GoogleAIFileManager(process.env.GEMINI_API_KEY);
     const signal = AbortSignal.timeout(1);
     const requestOptions: SingleRequestOptions = { signal };
     const content1 = {

From 4d7121fc4af649e6595051c902620b1f457414d1 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Thu, 18 Jul 2024 16:25:53 -0400
Subject: [PATCH 24/28] Fix utest failure due to signal now appearing in
 requests

---
 packages/main/src/requests/request.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/main/src/requests/request.test.ts b/packages/main/src/requests/request.test.ts
index 61d39924..9cc6a237 100644
--- a/packages/main/src/requests/request.test.ts
+++ b/packages/main/src/requests/request.test.ts
@@ -225,6 +225,7 @@ describe("request methods", () => {
         method: "POST",
         headers: match.instanceOf(Headers),
         body: "",
+        signal: match.instanceOf(AbortSignal),
       });
       expect(response.ok).to.be.true;
     });

From 5e52c28126463279641bb228a3e8e8966cea6bdd Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Thu, 18 Jul 2024 16:38:30 -0400
Subject: [PATCH 25/28] yarn docs

---
 .../main/generative-ai.chatsession._constructor_.md  |  4 ++--
 docs/reference/main/generative-ai.chatsession.md     |  7 +++----
 .../main/generative-ai.chatsession.requestoptions.md | 11 -----------
 .../main/generative-ai.chatsession.sendmessage.md    |  7 +++++--
 .../generative-ai.chatsession.sendmessagestream.md   |  5 ++++-
 .../generative-ai.generativemodel._constructor_.md   |  4 ++--
 ...nerative-ai.generativemodel.batchembedcontents.md |  5 ++++-
 .../generative-ai.generativemodel.counttokens.md     |  5 ++++-
 .../generative-ai.generativemodel.embedcontent.md    |  5 ++++-
 .../generative-ai.generativemodel.generatecontent.md |  5 ++++-
 ...ative-ai.generativemodel.generatecontentstream.md |  5 ++++-
 docs/reference/main/generative-ai.generativemodel.md | 12 ++++++------
 .../generative-ai.googleaifilemanager.deletefile.md  |  2 +-
 .../generative-ai.googleaifilemanager.getfile.md     |  7 +++++--
 .../generative-ai.googleaifilemanager.listfiles.md   |  7 +++++--
 .../server/generative-ai.googleaifilemanager.md      |  8 ++++----
 .../generative-ai.googleaifilemanager.uploadfile.md  |  2 +-
 17 files changed, 58 insertions(+), 43 deletions(-)
 delete mode 100644 docs/reference/main/generative-ai.chatsession.requestoptions.md

diff --git a/docs/reference/main/generative-ai.chatsession._constructor_.md b/docs/reference/main/generative-ai.chatsession._constructor_.md
index 918fd310..8bd24a6e 100644
--- a/docs/reference/main/generative-ai.chatsession._constructor_.md
+++ b/docs/reference/main/generative-ai.chatsession._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `ChatSession` class
 **Signature:**
 
 ```typescript
-constructor(apiKey: string, model: string, params?: StartChatParams, requestOptions?: RequestOptions);
+constructor(apiKey: string, model: string, params?: StartChatParams, _requestOptions?: RequestOptions);
 ```
 
 ## Parameters
@@ -19,5 +19,5 @@ constructor(apiKey: string, model: string, params?: StartChatParams, requestOpti
 |  apiKey | string |  |
 |  model | string |  |
 |  params | [StartChatParams](./generative-ai.startchatparams.md) | _(Optional)_ |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  \_requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
diff --git a/docs/reference/main/generative-ai.chatsession.md b/docs/reference/main/generative-ai.chatsession.md
index 948cd4cd..360a0ef9 100644
--- a/docs/reference/main/generative-ai.chatsession.md
+++ b/docs/reference/main/generative-ai.chatsession.md
@@ -16,7 +16,7 @@ export declare class ChatSession
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(apiKey, model, params, requestOptions)](./generative-ai.chatsession._constructor_.md) |  | Constructs a new instance of the <code>ChatSession</code> class |
+|  [(constructor)(apiKey, model, params, \_requestOptions)](./generative-ai.chatsession._constructor_.md) |  | Constructs a new instance of the <code>ChatSession</code> class |
 
 ## Properties
 
@@ -24,13 +24,12 @@ export declare class ChatSession
 |  --- | --- | --- | --- |
 |  [model](./generative-ai.chatsession.model.md) |  | string |  |
 |  [params?](./generative-ai.chatsession.params.md) |  | [StartChatParams](./generative-ai.startchatparams.md) | _(Optional)_ |
-|  [requestOptions?](./generative-ai.chatsession.requestoptions.md) |  | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
 ## Methods
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
 |  [getHistory()](./generative-ai.chatsession.gethistory.md) |  | Gets the chat history so far. Blocked prompts are not added to history. Blocked candidates are not added to history, nor are the prompts that generated them. |
-|  [sendMessage(request)](./generative-ai.chatsession.sendmessage.md) |  | Sends a chat message and receives a non-streaming [GenerateContentResult](./generative-ai.generatecontentresult.md) |
-|  [sendMessageStream(request)](./generative-ai.chatsession.sendmessagestream.md) |  | Sends a chat message and receives the response as a [GenerateContentStreamResult](./generative-ai.generatecontentstreamresult.md) containing an iterable stream and a response promise. |
+|  [sendMessage(request, requestOptions)](./generative-ai.chatsession.sendmessage.md) |  | <p>Sends a chat message and receives a non-streaming [GenerateContentResult](./generative-ai.generatecontentresult.md)<!-- -->.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
+|  [sendMessageStream(request, requestOptions)](./generative-ai.chatsession.sendmessagestream.md) |  | <p>Sends a chat message and receives the response as a [GenerateContentStreamResult](./generative-ai.generatecontentstreamresult.md) containing an iterable stream and a response promise.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
 
diff --git a/docs/reference/main/generative-ai.chatsession.requestoptions.md b/docs/reference/main/generative-ai.chatsession.requestoptions.md
deleted file mode 100644
index bc7402c4..00000000
--- a/docs/reference/main/generative-ai.chatsession.requestoptions.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [@google/generative-ai](./generative-ai.md) &gt; [ChatSession](./generative-ai.chatsession.md) &gt; [requestOptions](./generative-ai.chatsession.requestoptions.md)
-
-## ChatSession.requestOptions property
-
-**Signature:**
-
-```typescript
-requestOptions?: RequestOptions;
-```
diff --git a/docs/reference/main/generative-ai.chatsession.sendmessage.md b/docs/reference/main/generative-ai.chatsession.sendmessage.md
index 08a5ff6c..dfa66713 100644
--- a/docs/reference/main/generative-ai.chatsession.sendmessage.md
+++ b/docs/reference/main/generative-ai.chatsession.sendmessage.md
@@ -4,12 +4,14 @@
 
 ## ChatSession.sendMessage() method
 
-Sends a chat message and receives a non-streaming [GenerateContentResult](./generative-ai.generatecontentresult.md)
+Sends a chat message and receives a non-streaming [GenerateContentResult](./generative-ai.generatecontentresult.md)<!-- -->.
+
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
 
 **Signature:**
 
 ```typescript
-sendMessage(request: string | Array<string | Part>): Promise<GenerateContentResult>;
+sendMessage(request: string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ sendMessage(request: string | Array<string | Part>): Promise<GenerateContentResu
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.chatsession.sendmessagestream.md b/docs/reference/main/generative-ai.chatsession.sendmessagestream.md
index e6f7cbe3..ac409f77 100644
--- a/docs/reference/main/generative-ai.chatsession.sendmessagestream.md
+++ b/docs/reference/main/generative-ai.chatsession.sendmessagestream.md
@@ -6,10 +6,12 @@
 
 Sends a chat message and receives the response as a [GenerateContentStreamResult](./generative-ai.generatecontentstreamresult.md) containing an iterable stream and a response promise.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-sendMessageStream(request: string | Array<string | Part>): Promise<GenerateContentStreamResult>;
+sendMessageStream(request: string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ sendMessageStream(request: string | Array<string | Part>): Promise<GenerateConte
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel._constructor_.md b/docs/reference/main/generative-ai.generativemodel._constructor_.md
index 47030ab7..1a410e65 100644
--- a/docs/reference/main/generative-ai.generativemodel._constructor_.md
+++ b/docs/reference/main/generative-ai.generativemodel._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `GenerativeModel` class
 **Signature:**
 
 ```typescript
-constructor(apiKey: string, modelParams: ModelParams, requestOptions?: RequestOptions);
+constructor(apiKey: string, modelParams: ModelParams, _requestOptions?: RequestOptions);
 ```
 
 ## Parameters
@@ -18,5 +18,5 @@ constructor(apiKey: string, modelParams: ModelParams, requestOptions?: RequestOp
 |  --- | --- | --- |
 |  apiKey | string |  |
 |  modelParams | [ModelParams](./generative-ai.modelparams.md) |  |
-|  requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
+|  \_requestOptions | [RequestOptions](./generative-ai.requestoptions.md) | _(Optional)_ |
 
diff --git a/docs/reference/main/generative-ai.generativemodel.batchembedcontents.md b/docs/reference/main/generative-ai.generativemodel.batchembedcontents.md
index cd3ccadc..76d31f98 100644
--- a/docs/reference/main/generative-ai.generativemodel.batchembedcontents.md
+++ b/docs/reference/main/generative-ai.generativemodel.batchembedcontents.md
@@ -6,10 +6,12 @@
 
 Embeds an array of [EmbedContentRequest](./generative-ai.embedcontentrequest.md)<!-- -->s.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-batchEmbedContents(batchEmbedContentRequest: BatchEmbedContentsRequest): Promise<BatchEmbedContentsResponse>;
+batchEmbedContents(batchEmbedContentRequest: BatchEmbedContentsRequest, requestOptions?: SingleRequestOptions): Promise<BatchEmbedContentsResponse>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ batchEmbedContents(batchEmbedContentRequest: BatchEmbedContentsRequest): Promise
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  batchEmbedContentRequest | [BatchEmbedContentsRequest](./generative-ai.batchembedcontentsrequest.md) |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel.counttokens.md b/docs/reference/main/generative-ai.generativemodel.counttokens.md
index 1e3b982d..d81236a2 100644
--- a/docs/reference/main/generative-ai.generativemodel.counttokens.md
+++ b/docs/reference/main/generative-ai.generativemodel.counttokens.md
@@ -6,10 +6,12 @@
 
 Counts the tokens in the provided request.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-countTokens(request: CountTokensRequest | string | Array<string | Part>): Promise<CountTokensResponse>;
+countTokens(request: CountTokensRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<CountTokensResponse>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ countTokens(request: CountTokensRequest | string | Array<string | Part>): Promis
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | [CountTokensRequest](./generative-ai.counttokensrequest.md) \| string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel.embedcontent.md b/docs/reference/main/generative-ai.generativemodel.embedcontent.md
index 445d130d..8c2105d8 100644
--- a/docs/reference/main/generative-ai.generativemodel.embedcontent.md
+++ b/docs/reference/main/generative-ai.generativemodel.embedcontent.md
@@ -6,10 +6,12 @@
 
 Embeds the provided content.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-embedContent(request: EmbedContentRequest | string | Array<string | Part>): Promise<EmbedContentResponse>;
+embedContent(request: EmbedContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<EmbedContentResponse>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ embedContent(request: EmbedContentRequest | string | Array<string | Part>): Prom
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | [EmbedContentRequest](./generative-ai.embedcontentrequest.md) \| string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel.generatecontent.md b/docs/reference/main/generative-ai.generativemodel.generatecontent.md
index 86d0ac70..8cc74496 100644
--- a/docs/reference/main/generative-ai.generativemodel.generatecontent.md
+++ b/docs/reference/main/generative-ai.generativemodel.generatecontent.md
@@ -6,10 +6,12 @@
 
 Makes a single non-streaming call to the model and returns an object containing a single [GenerateContentResponse](./generative-ai.generatecontentresponse.md)<!-- -->.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-generateContent(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentResult>;
+generateContent(request: GenerateContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ generateContent(request: GenerateContentRequest | string | Array<string | Part>)
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | [GenerateContentRequest](./generative-ai.generatecontentrequest.md) \| string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel.generatecontentstream.md b/docs/reference/main/generative-ai.generativemodel.generatecontentstream.md
index 5288ad82..6cfd125c 100644
--- a/docs/reference/main/generative-ai.generativemodel.generatecontentstream.md
+++ b/docs/reference/main/generative-ai.generativemodel.generatecontentstream.md
@@ -6,10 +6,12 @@
 
 Makes a single streaming call to the model and returns an object containing an iterable stream that iterates over all chunks in the streaming response as well as a promise that returns the final aggregated response.
 
+Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.
+
 **Signature:**
 
 ```typescript
-generateContentStream(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentStreamResult>;
+generateContentStream(request: GenerateContentRequest | string | Array<string | Part>, requestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ generateContentStream(request: GenerateContentRequest | string | Array<string |
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  request | [GenerateContentRequest](./generative-ai.generatecontentrequest.md) \| string \| Array&lt;string \| [Part](./generative-ai.part.md)<!-- -->&gt; |  |
+|  requestOptions | [SingleRequestOptions](./generative-ai.singlerequestoptions.md) | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/main/generative-ai.generativemodel.md b/docs/reference/main/generative-ai.generativemodel.md
index f78e6b8a..c822694c 100644
--- a/docs/reference/main/generative-ai.generativemodel.md
+++ b/docs/reference/main/generative-ai.generativemodel.md
@@ -16,7 +16,7 @@ export declare class GenerativeModel
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(apiKey, modelParams, requestOptions)](./generative-ai.generativemodel._constructor_.md) |  | Constructs a new instance of the <code>GenerativeModel</code> class |
+|  [(constructor)(apiKey, modelParams, \_requestOptions)](./generative-ai.generativemodel._constructor_.md) |  | Constructs a new instance of the <code>GenerativeModel</code> class |
 
 ## Properties
 
@@ -36,10 +36,10 @@ export declare class GenerativeModel
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [batchEmbedContents(batchEmbedContentRequest)](./generative-ai.generativemodel.batchembedcontents.md) |  | Embeds an array of [EmbedContentRequest](./generative-ai.embedcontentrequest.md)<!-- -->s. |
-|  [countTokens(request)](./generative-ai.generativemodel.counttokens.md) |  | Counts the tokens in the provided request. |
-|  [embedContent(request)](./generative-ai.generativemodel.embedcontent.md) |  | Embeds the provided content. |
-|  [generateContent(request)](./generative-ai.generativemodel.generatecontent.md) |  | Makes a single non-streaming call to the model and returns an object containing a single [GenerateContentResponse](./generative-ai.generatecontentresponse.md)<!-- -->. |
-|  [generateContentStream(request)](./generative-ai.generativemodel.generatecontentstream.md) |  | Makes a single streaming call to the model and returns an object containing an iterable stream that iterates over all chunks in the streaming response as well as a promise that returns the final aggregated response. |
+|  [batchEmbedContents(batchEmbedContentRequest, requestOptions)](./generative-ai.generativemodel.batchembedcontents.md) |  | <p>Embeds an array of [EmbedContentRequest](./generative-ai.embedcontentrequest.md)<!-- -->s.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
+|  [countTokens(request, requestOptions)](./generative-ai.generativemodel.counttokens.md) |  | <p>Counts the tokens in the provided request.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
+|  [embedContent(request, requestOptions)](./generative-ai.generativemodel.embedcontent.md) |  | <p>Embeds the provided content.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
+|  [generateContent(request, requestOptions)](./generative-ai.generativemodel.generatecontent.md) |  | <p>Makes a single non-streaming call to the model and returns an object containing a single [GenerateContentResponse](./generative-ai.generatecontentresponse.md)<!-- -->.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
+|  [generateContentStream(request, requestOptions)](./generative-ai.generativemodel.generatecontentstream.md) |  | <p>Makes a single streaming call to the model and returns an object containing an iterable stream that iterates over all chunks in the streaming response as well as a promise that returns the final aggregated response.</p><p>Fields set in the optional [SingleRequestOptions](./generative-ai.singlerequestoptions.md) parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the  initialization.</p> |
 |  [startChat(startChatParams)](./generative-ai.generativemodel.startchat.md) |  | Gets a new [ChatSession](./generative-ai.chatsession.md) instance which can be used for multi-turn chats. |
 
diff --git a/docs/reference/server/generative-ai.googleaifilemanager.deletefile.md b/docs/reference/server/generative-ai.googleaifilemanager.deletefile.md
index e5ecfdad..acaefb74 100644
--- a/docs/reference/server/generative-ai.googleaifilemanager.deletefile.md
+++ b/docs/reference/server/generative-ai.googleaifilemanager.deletefile.md
@@ -4,7 +4,7 @@
 
 ## GoogleAIFileManager.deleteFile() method
 
-Delete file with given ID
+Delete file with given ID.
 
 **Signature:**
 
diff --git a/docs/reference/server/generative-ai.googleaifilemanager.getfile.md b/docs/reference/server/generative-ai.googleaifilemanager.getfile.md
index 613d6b6c..79f46753 100644
--- a/docs/reference/server/generative-ai.googleaifilemanager.getfile.md
+++ b/docs/reference/server/generative-ai.googleaifilemanager.getfile.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.getFile() method
 
-Get metadata for file with given ID
+Get metadata for file with given ID.
+
+Any fields set in the optional  parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-getFile(fileId: string): Promise<FileMetadataResponse>;
+getFile(fileId: string, requestOptions?: SingleRequestOptions): Promise<FileMetadataResponse>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ getFile(fileId: string): Promise<FileMetadataResponse>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  fileId | string |  |
+|  requestOptions | SingleRequestOptions | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/server/generative-ai.googleaifilemanager.listfiles.md b/docs/reference/server/generative-ai.googleaifilemanager.listfiles.md
index ef116fb6..f8449bd0 100644
--- a/docs/reference/server/generative-ai.googleaifilemanager.listfiles.md
+++ b/docs/reference/server/generative-ai.googleaifilemanager.listfiles.md
@@ -4,12 +4,14 @@
 
 ## GoogleAIFileManager.listFiles() method
 
-List all uploaded files
+List all uploaded files.
+
+Any fields set in the optional  parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.
 
 **Signature:**
 
 ```typescript
-listFiles(listParams?: ListParams): Promise<ListFilesResponse>;
+listFiles(listParams?: ListParams, requestOptions?: SingleRequestOptions): Promise<ListFilesResponse>;
 ```
 
 ## Parameters
@@ -17,6 +19,7 @@ listFiles(listParams?: ListParams): Promise<ListFilesResponse>;
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  listParams | [ListParams](./generative-ai.listparams.md) | _(Optional)_ |
+|  requestOptions | SingleRequestOptions | _(Optional)_ |
 
 **Returns:**
 
diff --git a/docs/reference/server/generative-ai.googleaifilemanager.md b/docs/reference/server/generative-ai.googleaifilemanager.md
index 655c8d0c..04d22232 100644
--- a/docs/reference/server/generative-ai.googleaifilemanager.md
+++ b/docs/reference/server/generative-ai.googleaifilemanager.md
@@ -28,8 +28,8 @@ export declare class GoogleAIFileManager
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [deleteFile(fileId)](./generative-ai.googleaifilemanager.deletefile.md) |  | Delete file with given ID |
-|  [getFile(fileId)](./generative-ai.googleaifilemanager.getfile.md) |  | Get metadata for file with given ID |
-|  [listFiles(listParams)](./generative-ai.googleaifilemanager.listfiles.md) |  | List all uploaded files |
-|  [uploadFile(filePath, fileMetadata)](./generative-ai.googleaifilemanager.uploadfile.md) |  | Upload a file |
+|  [deleteFile(fileId)](./generative-ai.googleaifilemanager.deletefile.md) |  | Delete file with given ID. |
+|  [getFile(fileId, requestOptions)](./generative-ai.googleaifilemanager.getfile.md) |  | <p>Get metadata for file with given ID.</p><p>Any fields set in the optional  parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [listFiles(listParams, requestOptions)](./generative-ai.googleaifilemanager.listfiles.md) |  | <p>List all uploaded files.</p><p>Any fields set in the optional  parameter will take precedence over the [RequestOptions](./generative-ai.requestoptions.md) values provided at the time of the [GoogleAIFileManager](./generative-ai.googleaifilemanager.md) initialization.</p> |
+|  [uploadFile(filePath, fileMetadata)](./generative-ai.googleaifilemanager.uploadfile.md) |  | Upload a file. |
 
diff --git a/docs/reference/server/generative-ai.googleaifilemanager.uploadfile.md b/docs/reference/server/generative-ai.googleaifilemanager.uploadfile.md
index 90648e90..71e4f76b 100644
--- a/docs/reference/server/generative-ai.googleaifilemanager.uploadfile.md
+++ b/docs/reference/server/generative-ai.googleaifilemanager.uploadfile.md
@@ -4,7 +4,7 @@
 
 ## GoogleAIFileManager.uploadFile() method
 
-Upload a file
+Upload a file.
 
 **Signature:**
 

From 0edc918c4ae5bcda7d45b7c5385bf634f8a94da0 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Fri, 19 Jul 2024 10:15:01 -0400
Subject: [PATCH 26/28] AbortSignal in buildFetchOptions only if needed.

---
 packages/main/src/requests/request.test.ts |  1 -
 packages/main/src/requests/request.ts      | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/main/src/requests/request.test.ts b/packages/main/src/requests/request.test.ts
index 9cc6a237..61d39924 100644
--- a/packages/main/src/requests/request.test.ts
+++ b/packages/main/src/requests/request.test.ts
@@ -225,7 +225,6 @@ describe("request methods", () => {
         method: "POST",
         headers: match.instanceOf(Headers),
         body: "",
-        signal: match.instanceOf(AbortSignal),
       });
       expect(response.ok).to.be.true;
     });
diff --git a/packages/main/src/requests/request.ts b/packages/main/src/requests/request.ts
index c5d197ad..0828b65a 100644
--- a/packages/main/src/requests/request.ts
+++ b/packages/main/src/requests/request.ts
@@ -219,15 +219,17 @@ async function handleResponseNotOk(
  */
 function buildFetchOptions(requestOptions?: SingleRequestOptions): RequestInit {
   const fetchOptions = {} as RequestInit;
-  const controller = new AbortController();
-  if (requestOptions?.timeout >= 0) {
-    setTimeout(() => controller.abort(), requestOptions.timeout);
-  }
-  if (requestOptions?.signal) {
-    requestOptions.signal.addEventListener("abort", () => {
-      controller.abort();
-    });
+  if (requestOptions?.signal !== undefined || requestOptions?.timeout >= 0) {
+    const controller = new AbortController();
+    if (requestOptions?.timeout >= 0) {
+      setTimeout(() => controller.abort(), requestOptions.timeout);
+    }
+    if (requestOptions?.signal) {
+      requestOptions.signal.addEventListener("abort", () => {
+        controller.abort();
+      });
+    }
+    fetchOptions.signal = controller.signal;
   }
-  fetchOptions.signal = controller.signal;
   return fetchOptions;
 }

From 1444eb63be3c474639dc7f98300c7d423557bef1 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Fri, 19 Jul 2024 10:16:45 -0400
Subject: [PATCH 27/28] docs

---
 docs/reference/main/generative-ai.singlerequestoptions.md  | 2 +-
 .../main/generative-ai.singlerequestoptions.signal.md      | 4 +++-
 packages/main/types/requests.ts                            | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/reference/main/generative-ai.singlerequestoptions.md b/docs/reference/main/generative-ai.singlerequestoptions.md
index 2cbda55f..4d9a23d3 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.md
@@ -17,5 +17,5 @@ export interface SingleRequestOptions extends RequestOptions
 
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
-|  [signal?](./generative-ai.singlerequestoptions.signal.md) |  | AbortSignal | _(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first. |
+|  [signal?](./generative-ai.singlerequestoptions.signal.md) |  | AbortSignal | <p>_(Optional)_ An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided.</p><p>NOTE: AbortSignal is a client-only operation. Using it to cancel an operation will not cancel the request in the service. You will still be charged usage for any applicable operations.</p> |
 
diff --git a/docs/reference/main/generative-ai.singlerequestoptions.signal.md b/docs/reference/main/generative-ai.singlerequestoptions.signal.md
index 9f0672b7..ac064709 100644
--- a/docs/reference/main/generative-ai.singlerequestoptions.signal.md
+++ b/docs/reference/main/generative-ai.singlerequestoptions.signal.md
@@ -4,7 +4,9 @@
 
 ## SingleRequestOptions.signal property
 
-An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided, and if the timeout occurs first.
+An object that may be used to abort asynchronous requests. The request may also be aborted due to the expiration of the timeout value, if provided.
+
+NOTE: AbortSignal is a client-only operation. Using it to cancel an operation will not cancel the request in the service. You will still be charged usage for any applicable operations.
 
 **Signature:**
 
diff --git a/packages/main/types/requests.ts b/packages/main/types/requests.ts
index c266a846..4eec1e9c 100644
--- a/packages/main/types/requests.ts
+++ b/packages/main/types/requests.ts
@@ -196,8 +196,11 @@ export interface RequestOptions {
 export interface SingleRequestOptions extends RequestOptions {
   /**
    * An object that may be used to abort asynchronous requests. The request may
-   * also be aborted due to the expiration of the timeout value, if provided,
-   * and if the timeout occurs first.
+   * also be aborted due to the expiration of the timeout value, if provided.
+   *
+   * NOTE: AbortSignal is a client-only operation. Using it to cancel an
+   * operation will not cancel the request in the service. You will still
+   * be charged usage for any applicable operations.
    */
   signal?: AbortSignal;
 }

From ac4b7217f5a95a443b5607449d09f7c716bc9e82 Mon Sep 17 00:00:00 2001
From: DellaBitta <drsanta@google.com>
Date: Fri, 19 Jul 2024 18:46:08 -0400
Subject: [PATCH 28/28] changeset

---
 .changeset/tough-beds-serve.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/tough-beds-serve.md

diff --git a/.changeset/tough-beds-serve.md b/.changeset/tough-beds-serve.md
new file mode 100644
index 00000000..2b35de93
--- /dev/null
+++ b/.changeset/tough-beds-serve.md
@@ -0,0 +1,5 @@
+---
+"@google/generative-ai": minor
+---
+
+Adds `SingleRequestOptions` with `AbortSignal` support to most of the asynchronous methods of `GenerativeModel`, `GoogleAIFileManager` and `ChatSession`.