@google/genai 1.39.0 → 1.41.0

package/dist/genai.d.ts

@@ -763,6 +763,7 @@ declare class BaseGeminiNextGenAPIClient {
         timeout: number;
     }>;
     private buildHeaders;
+    private _makeAbort;
     private buildBody;
     static DEFAULT_TIMEOUT: number;
 }
@@ -777,7 +778,7 @@ declare class BaseInteractions extends APIResource {
      * const interaction = await client.interactions.create({
      *   api_version: 'api_version',
      *   input: 'string',
-     *   model: 'gemini-2.5-pro',
+     *   model: 'gemini-2.5-flash',
      * });
      * ```
      */
@@ -1827,11 +1828,11 @@ declare namespace ContentDelta {
         /**
          * Tool call result delta.
          */
-        result?: FunctionResultDelta.Items | string;
+        result?: FunctionResultDelta.Items | unknown | string;
     }
     namespace FunctionResultDelta {
         interface Items {
-            items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent | unknown>;
+            items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent>;
         }
     }
     interface CodeExecutionCallDelta {
@@ -1919,12 +1920,12 @@ declare namespace ContentDelta {
         /**
          * Tool call result delta.
          */
-        result?: MCPServerToolResultDelta.Items | string;
+        result?: MCPServerToolResultDelta.Items | unknown | string;
         server_name?: string;
     }
     namespace MCPServerToolResultDelta {
         interface Items {
-            items?: Array<string | InteractionsAPI.ImageContent | unknown>;
+            items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent>;
         }
     }
     interface FileSearchCallDelta {
@@ -2484,6 +2485,8 @@ export declare interface CreateTuningJobConfig {
     sftLossWeightMultiplier?: number;
     /** The Google Cloud Storage location where the tuning job outputs are written. */
     outputUri?: string;
+    /** The encryption spec of the tuning job. Customer-managed encryption key options for a TuningJob. If this is set, then all resources created by the TuningJob will be encrypted with provided encryption key. */
+    encryptionSpec?: EncryptionSpec;
 }
 
 /** Fine-tuning job creation parameters - optional fields. */
@@ -3962,7 +3965,7 @@ declare interface FunctionResultContent {
 
 declare namespace FunctionResultContent {
     interface Items {
-        items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent | unknown>;
+        items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent>;
     }
 }
 
@@ -5429,6 +5432,8 @@ export declare interface HttpOptions {
      - VertexAI backend API docs: https://cloud.google.com/vertex-ai/docs/reference/rest
      - GeminiAPI backend API docs: https://ai.google.dev/api/rest */
     extraBody?: Record<string, unknown>;
+    /** HTTP retry options for the request. */
+    retryOptions?: HttpRetryOptions;
 }
 
 /**
@@ -5492,6 +5497,13 @@ export declare class HttpResponse {
     json(): Promise<unknown>;
 }
 
+/** HTTP retry options to be used in each of the requests. */
+export declare interface HttpRetryOptions {
+    /** Maximum number of attempts, including the original request.
+     If 0 or 1, it means no retries. If not specified, default to 5. */
+    attempts?: number;
+}
+
 /** An image. */
 declare interface Image_2 {
     /** The Cloud Storage URI of the image. ``Image`` can contain a value
@@ -5704,7 +5716,7 @@ declare interface Interaction {
     /**
      * Output only. The status of the interaction.
      */
-    status: 'in_progress' | 'requires_action' | 'completed' | 'failed' | 'cancelled';
+    status: 'in_progress' | 'requires_action' | 'completed' | 'failed' | 'cancelled' | 'incomplete';
     /**
      * The name of the `Agent` used for generating the interaction.
      */
@@ -5913,7 +5925,7 @@ declare interface InteractionStatusUpdate {
     event_id?: string;
     event_type?: 'interaction.status_update';
     interaction_id?: string;
-    status?: 'in_progress' | 'requires_action' | 'completed' | 'failed' | 'cancelled';
+    status?: 'in_progress' | 'requires_action' | 'completed' | 'failed' | 'cancelled' | 'incomplete';
 }
 
 /** Parameters for the private _Register method. */
@@ -7133,7 +7145,7 @@ declare interface MCPServerToolResultContent {
 
 declare namespace MCPServerToolResultContent {
     interface Items {
-        items?: Array<string | InteractionsAPI.ImageContent | unknown>;
+        items?: Array<InteractionsAPI.TextContent | InteractionsAPI.ImageContent>;
     }
 }
 
@@ -7291,7 +7303,7 @@ export declare interface Model {
 /**
  * The model that will complete your prompt.\n\nSee [models](https://ai.google.dev/gemini-api/docs/models) for additional details.
  */
-declare type Model_2 = 'gemini-2.5-pro' | 'gemini-2.5-flash' | 'gemini-2.5-flash-preview-09-2025' | 'gemini-2.5-flash-lite' | 'gemini-2.5-flash-lite-preview-09-2025' | 'gemini-2.5-flash-preview-native-audio-dialog' | 'gemini-2.5-flash-image-preview' | 'gemini-2.5-pro-preview-tts' | 'gemini-3-pro-preview' | 'gemini-3-flash-preview' | (string & {});
+declare type Model_2 = 'gemini-2.5-flash' | 'gemini-2.5-flash-image' | 'gemini-2.5-flash-lite' | 'gemini-2.5-flash-lite-preview-09-2025' | 'gemini-2.5-flash-native-audio-preview-12-2025' | 'gemini-2.5-flash-preview-09-2025' | 'gemini-2.5-flash-preview-tts' | 'gemini-2.5-pro' | 'gemini-2.5-pro-preview-tts' | 'gemini-3-flash-preview' | 'gemini-3-pro-image-preview' | 'gemini-3-pro-preview' | (string & {});
 
 /** Configuration for Model Armor integrations of prompt and responses. This data type is not supported in Gemini API. */
 export declare interface ModelArmorConfig {
@@ -10047,6 +10059,7 @@ declare namespace types {
         VideoMetadata,
         Part,
         Content,
+        HttpRetryOptions,
         HttpOptions,
         Schema,
         ModelSelectionConfig,

package/dist/index.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+var pRetry = require('p-retry');
+
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -6931,10 +6933,22 @@ const CONTENT_TYPE_HEADER = 'Content-Type';
 const SERVER_TIMEOUT_HEADER = 'X-Server-Timeout';
 const USER_AGENT_HEADER = 'User-Agent';
 const GOOGLE_API_CLIENT_HEADER = 'x-goog-api-client';
-const SDK_VERSION = '1.39.0'; // x-release-please-version
+const SDK_VERSION = '1.41.0'; // x-release-please-version
 const LIBRARY_LABEL = `google-genai-sdk/${SDK_VERSION}`;
 const VERTEX_AI_API_DEFAULT_VERSION = 'v1beta1';
 const GOOGLE_AI_API_DEFAULT_VERSION = 'v1beta';
+// Default retry options.
+// The config is based on https://cloud.google.com/storage/docs/retry-strategy.
+const DEFAULT_RETRY_ATTEMPTS = 5; // Including the initial call
+// LINT.IfChange
+const DEFAULT_RETRY_HTTP_STATUS_CODES = [
+    408, // Request timeout
+    429, // Too many requests
+    500, // Internal server error
+    502, // Bad gateway
+    503, // Service unavailable
+    504, // Gateway timeout
+];
 /**
  * The ApiClient class is used to send requests to the Gemini API or Vertex AI
  * endpoints.
@@ -7319,8 +7333,25 @@ class ApiClient {
         });
     }
     async apiCall(url, requestInit) {
-        return fetch(url, requestInit).catch((e) => {
-            throw new Error(`exception ${e} sending request`);
+        var _a;
+        if (!this.clientOptions.httpOptions ||
+            !this.clientOptions.httpOptions.retryOptions) {
+            return fetch(url, requestInit);
+        }
+        const retryOptions = this.clientOptions.httpOptions.retryOptions;
+        const runFetch = async () => {
+            const response = await fetch(url, requestInit);
+            if (response.ok) {
+                return response;
+            }
+            if (DEFAULT_RETRY_HTTP_STATUS_CODES.includes(response.status)) {
+                throw new Error(`Retryable HTTP Error: ${response.statusText}`);
+            }
+            throw new pRetry.AbortError(`Non-retryable exception ${response.statusText} sending request`);
+        };
+        return pRetry(runFetch, {
+            // Retry attempts is one less than the number of total attempts.
+            retries: ((_a = retryOptions.attempts) !== null && _a !== void 0 ? _a : DEFAULT_RETRY_ATTEMPTS) - 1,
         });
     }
     getDefaultHeaders() {
@@ -10017,6 +10048,11 @@ async function defaultParseResponse(client, props) {
         const mediaType = (_a = contentType === null || contentType === void 0 ? void 0 : contentType.split(';')[0]) === null || _a === void 0 ? void 0 : _a.trim();
         const isJSON = (mediaType === null || mediaType === void 0 ? void 0 : mediaType.includes('application/json')) || (mediaType === null || mediaType === void 0 ? void 0 : mediaType.endsWith('+json'));
         if (isJSON) {
+            const contentLength = response.headers.get('content-length');
+            if (contentLength === '0') {
+                // if there is no content we can't do anything
+                return undefined;
+            }
             const json = await response.json();
             return json;
         }
@@ -10476,9 +10512,10 @@ class BaseGeminiNextGenAPIClient {
     }
     async fetchWithTimeout(url, init, ms, controller) {
         const _b = init || {}, { signal, method } = _b, options = __rest(_b, ["signal", "method"]);
+        const abort = this._makeAbort(controller);
         if (signal)
-            signal.addEventListener('abort', () => controller.abort());
-        const timeout = setTimeout(() => controller.abort(), ms);
+            signal.addEventListener('abort', abort, { once: true });
+        const timeout = setTimeout(abort, ms);
         const isReadableBody = (globalThis.ReadableStream && options.body instanceof globalThis.ReadableStream) ||
             (typeof options.body === 'object' && options.body !== null && Symbol.asyncIterator in options.body);
         const fetchOptions = Object.assign(Object.assign(Object.assign({ signal: controller.signal }, (isReadableBody ? { duplex: 'half' } : {})), { method: 'GET' }), options);
@@ -10591,6 +10628,11 @@ class BaseGeminiNextGenAPIClient {
         this.validateHeaders(headers);
         return headers.values;
     }
+    _makeAbort(controller) {
+        // note: we can't just inline this method inside `fetchWithTimeout()` because then the closure
+        //       would capture all request options, and cause a memory leak.
+        return () => controller.abort();
+    }
     buildBody({ options: { body, headers: rawHeaders } }) {
         if (!body) {
             return { bodyHeaders: undefined, body: undefined };
@@ -18245,6 +18287,9 @@ function createTuningJobConfigToMldev(fromObject, parentObject, _rootObject) {
     if (getValueByPath(fromObject, ['outputUri']) !== undefined) {
         throw new Error('outputUri parameter is not supported in Gemini API.');
     }
+    if (getValueByPath(fromObject, ['encryptionSpec']) !== undefined) {
+        throw new Error('encryptionSpec parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function createTuningJobConfigToVertex(fromObject, parentObject, rootObject) {
@@ -18480,6 +18525,12 @@ function createTuningJobConfigToVertex(fromObject, parentObject, rootObject) {
     if (parentObject !== undefined && fromOutputUri != null) {
         setValueByPath(parentObject, ['outputUri'], fromOutputUri);
     }
+    const fromEncryptionSpec = getValueByPath(fromObject, [
+        'encryptionSpec',
+    ]);
+    if (parentObject !== undefined && fromEncryptionSpec != null) {
+        setValueByPath(parentObject, ['encryptionSpec'], fromEncryptionSpec);
+    }
     return toObject;
 }
 function createTuningJobParametersPrivateToMldev(fromObject, rootObject) {
@@ -19407,6 +19458,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     get interactions() {
+        var _a;
         if (this._interactions !== undefined) {
             return this._interactions;
         }
@@ -19426,6 +19478,7 @@ class GoogleGenAI {
             clientAdapter: this.apiClient,
             defaultHeaders: this.apiClient.getDefaultHeaders(),
             timeout: httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.timeout,
+            maxRetries: (_a = httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.retryOptions) === null || _a === void 0 ? void 0 : _a.attempts,
         });
         this._interactions = nextGenClient.interactions;
         return this._interactions;

package/dist/index.mjs

@@ -1,3 +1,5 @@
+import pRetry, { AbortError } from 'p-retry';
+
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -6929,10 +6931,22 @@ const CONTENT_TYPE_HEADER = 'Content-Type';
 const SERVER_TIMEOUT_HEADER = 'X-Server-Timeout';
 const USER_AGENT_HEADER = 'User-Agent';
 const GOOGLE_API_CLIENT_HEADER = 'x-goog-api-client';
-const SDK_VERSION = '1.39.0'; // x-release-please-version
+const SDK_VERSION = '1.41.0'; // x-release-please-version
 const LIBRARY_LABEL = `google-genai-sdk/${SDK_VERSION}`;
 const VERTEX_AI_API_DEFAULT_VERSION = 'v1beta1';
 const GOOGLE_AI_API_DEFAULT_VERSION = 'v1beta';
+// Default retry options.
+// The config is based on https://cloud.google.com/storage/docs/retry-strategy.
+const DEFAULT_RETRY_ATTEMPTS = 5; // Including the initial call
+// LINT.IfChange
+const DEFAULT_RETRY_HTTP_STATUS_CODES = [
+    408, // Request timeout
+    429, // Too many requests
+    500, // Internal server error
+    502, // Bad gateway
+    503, // Service unavailable
+    504, // Gateway timeout
+];
 /**
  * The ApiClient class is used to send requests to the Gemini API or Vertex AI
  * endpoints.
@@ -7317,8 +7331,25 @@ class ApiClient {
         });
     }
     async apiCall(url, requestInit) {
-        return fetch(url, requestInit).catch((e) => {
-            throw new Error(`exception ${e} sending request`);
+        var _a;
+        if (!this.clientOptions.httpOptions ||
+            !this.clientOptions.httpOptions.retryOptions) {
+            return fetch(url, requestInit);
+        }
+        const retryOptions = this.clientOptions.httpOptions.retryOptions;
+        const runFetch = async () => {
+            const response = await fetch(url, requestInit);
+            if (response.ok) {
+                return response;
+            }
+            if (DEFAULT_RETRY_HTTP_STATUS_CODES.includes(response.status)) {
+                throw new Error(`Retryable HTTP Error: ${response.statusText}`);
+            }
+            throw new AbortError(`Non-retryable exception ${response.statusText} sending request`);
+        };
+        return pRetry(runFetch, {
+            // Retry attempts is one less than the number of total attempts.
+            retries: ((_a = retryOptions.attempts) !== null && _a !== void 0 ? _a : DEFAULT_RETRY_ATTEMPTS) - 1,
         });
     }
     getDefaultHeaders() {
@@ -10015,6 +10046,11 @@ async function defaultParseResponse(client, props) {
         const mediaType = (_a = contentType === null || contentType === void 0 ? void 0 : contentType.split(';')[0]) === null || _a === void 0 ? void 0 : _a.trim();
         const isJSON = (mediaType === null || mediaType === void 0 ? void 0 : mediaType.includes('application/json')) || (mediaType === null || mediaType === void 0 ? void 0 : mediaType.endsWith('+json'));
         if (isJSON) {
+            const contentLength = response.headers.get('content-length');
+            if (contentLength === '0') {
+                // if there is no content we can't do anything
+                return undefined;
+            }
             const json = await response.json();
             return json;
         }
@@ -10474,9 +10510,10 @@ class BaseGeminiNextGenAPIClient {
     }
     async fetchWithTimeout(url, init, ms, controller) {
         const _b = init || {}, { signal, method } = _b, options = __rest(_b, ["signal", "method"]);
+        const abort = this._makeAbort(controller);
         if (signal)
-            signal.addEventListener('abort', () => controller.abort());
-        const timeout = setTimeout(() => controller.abort(), ms);
+            signal.addEventListener('abort', abort, { once: true });
+        const timeout = setTimeout(abort, ms);
         const isReadableBody = (globalThis.ReadableStream && options.body instanceof globalThis.ReadableStream) ||
             (typeof options.body === 'object' && options.body !== null && Symbol.asyncIterator in options.body);
         const fetchOptions = Object.assign(Object.assign(Object.assign({ signal: controller.signal }, (isReadableBody ? { duplex: 'half' } : {})), { method: 'GET' }), options);
@@ -10589,6 +10626,11 @@ class BaseGeminiNextGenAPIClient {
         this.validateHeaders(headers);
         return headers.values;
     }
+    _makeAbort(controller) {
+        // note: we can't just inline this method inside `fetchWithTimeout()` because then the closure
+        //       would capture all request options, and cause a memory leak.
+        return () => controller.abort();
+    }
     buildBody({ options: { body, headers: rawHeaders } }) {
         if (!body) {
             return { bodyHeaders: undefined, body: undefined };
@@ -18243,6 +18285,9 @@ function createTuningJobConfigToMldev(fromObject, parentObject, _rootObject) {
     if (getValueByPath(fromObject, ['outputUri']) !== undefined) {
         throw new Error('outputUri parameter is not supported in Gemini API.');
     }
+    if (getValueByPath(fromObject, ['encryptionSpec']) !== undefined) {
+        throw new Error('encryptionSpec parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function createTuningJobConfigToVertex(fromObject, parentObject, rootObject) {
@@ -18478,6 +18523,12 @@ function createTuningJobConfigToVertex(fromObject, parentObject, rootObject) {
     if (parentObject !== undefined && fromOutputUri != null) {
         setValueByPath(parentObject, ['outputUri'], fromOutputUri);
     }
+    const fromEncryptionSpec = getValueByPath(fromObject, [
+        'encryptionSpec',
+    ]);
+    if (parentObject !== undefined && fromEncryptionSpec != null) {
+        setValueByPath(parentObject, ['encryptionSpec'], fromEncryptionSpec);
+    }
     return toObject;
 }
 function createTuningJobParametersPrivateToMldev(fromObject, rootObject) {
@@ -19405,6 +19456,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     get interactions() {
+        var _a;
         if (this._interactions !== undefined) {
             return this._interactions;
         }
@@ -19424,6 +19476,7 @@ class GoogleGenAI {
             clientAdapter: this.apiClient,
             defaultHeaders: this.apiClient.getDefaultHeaders(),
             timeout: httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.timeout,
+            maxRetries: (_a = httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.retryOptions) === null || _a === void 0 ? void 0 : _a.attempts,
         });
         this._interactions = nextGenClient.interactions;
         return this._interactions;