@google/genai 1.39.0 → 1.41.0

package/dist/node/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var pRetry = require('p-retry');
 var googleAuthLibrary = require('google-auth-library');
 var fs = require('fs');
 var fs$1 = require('fs/promises');
@@ -11639,10 +11640,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.
@@ -12027,8 +12040,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() {
@@ -17412,6 +17442,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;
         }
@@ -17871,9 +17906,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);
@@ -17986,6 +18022,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 };
@@ -18335,6 +18376,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) {
@@ -18570,6 +18614,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) {
@@ -19822,6 +19872,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     get interactions() {
+        var _a;
         if (this._interactions !== undefined) {
             return this._interactions;
         }
@@ -19838,6 +19889,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/node/index.mjs

@@ -1,3 +1,4 @@
+import pRetry, { AbortError } from 'p-retry';
 import { GoogleAuth } from 'google-auth-library';
 import { createWriteStream } from 'fs';
 import * as fs from 'fs/promises';
@@ -11617,10 +11618,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.
@@ -12005,8 +12018,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() {
@@ -17390,6 +17420,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;
         }
@@ -17849,9 +17884,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);
@@ -17964,6 +18000,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 };
@@ -18313,6 +18354,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) {
@@ -18548,6 +18592,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) {
@@ -19800,6 +19850,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     get interactions() {
+        var _a;
         if (this._interactions !== undefined) {
             return this._interactions;
         }
@@ -19816,6 +19867,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;