@google/genai 1.40.0 → 1.42.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');
@@ -1387,6 +1388,18 @@ exports.Environment = void 0;
      */
     Environment["ENVIRONMENT_BROWSER"] = "ENVIRONMENT_BROWSER";
 })(exports.Environment || (exports.Environment = {}));
+/** Enum representing the Vertex embedding API to use. */
+exports.EmbeddingApiType = void 0;
+(function (EmbeddingApiType) {
+    /**
+     * predict API endpoint (default)
+     */
+    EmbeddingApiType["PREDICT"] = "PREDICT";
+    /**
+     * embedContent API Endpoint
+     */
+    EmbeddingApiType["EMBED_CONTENT"] = "EMBED_CONTENT";
+})(exports.EmbeddingApiType || (exports.EmbeddingApiType = {}));
 /** Enum that controls the safety filter level for objectionable content. */
 exports.SafetyFilterLevel = void 0;
 (function (SafetyFilterLevel) {
@@ -3418,6 +3431,10 @@ function tJobState(state) {
         return stateString;
     }
 }
+function tIsVertexEmbedContentModel(model) {
+    return ((model.includes('gemini') && model !== 'gemini-embedding-001') ||
+        model.includes('maas'));
+}
 
 /**
  * @license
@@ -8659,33 +8676,103 @@ function embedContentConfigToMldev(fromObject, parentObject, _rootObject) {
     }
     return toObject;
 }
-function embedContentConfigToVertex(fromObject, parentObject, _rootObject) {
+function embedContentConfigToVertex(fromObject, parentObject, rootObject) {
     const toObject = {};
-    const fromTaskType = getValueByPath(fromObject, ['taskType']);
-    if (parentObject !== undefined && fromTaskType != null) {
-        setValueByPath(parentObject, ['instances[]', 'task_type'], fromTaskType);
+    let discriminatorTaskType = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorTaskType === undefined) {
+        discriminatorTaskType = 'PREDICT';
     }
-    const fromTitle = getValueByPath(fromObject, ['title']);
-    if (parentObject !== undefined && fromTitle != null) {
-        setValueByPath(parentObject, ['instances[]', 'title'], fromTitle);
+    if (discriminatorTaskType === 'PREDICT') {
+        const fromTaskType = getValueByPath(fromObject, ['taskType']);
+        if (parentObject !== undefined && fromTaskType != null) {
+            setValueByPath(parentObject, ['instances[]', 'task_type'], fromTaskType);
+        }
     }
-    const fromOutputDimensionality = getValueByPath(fromObject, [
-        'outputDimensionality',
+    else if (discriminatorTaskType === 'EMBED_CONTENT') {
+        const fromTaskType = getValueByPath(fromObject, ['taskType']);
+        if (parentObject !== undefined && fromTaskType != null) {
+            setValueByPath(parentObject, ['taskType'], fromTaskType);
+        }
+    }
+    let discriminatorTitle = getValueByPath(rootObject, [
+        'embeddingApiType',
     ]);
-    if (parentObject !== undefined && fromOutputDimensionality != null) {
-        setValueByPath(parentObject, ['parameters', 'outputDimensionality'], fromOutputDimensionality);
+    if (discriminatorTitle === undefined) {
+        discriminatorTitle = 'PREDICT';
     }
-    const fromMimeType = getValueByPath(fromObject, ['mimeType']);
-    if (parentObject !== undefined && fromMimeType != null) {
-        setValueByPath(parentObject, ['instances[]', 'mimeType'], fromMimeType);
+    if (discriminatorTitle === 'PREDICT') {
+        const fromTitle = getValueByPath(fromObject, ['title']);
+        if (parentObject !== undefined && fromTitle != null) {
+            setValueByPath(parentObject, ['instances[]', 'title'], fromTitle);
+        }
     }
-    const fromAutoTruncate = getValueByPath(fromObject, ['autoTruncate']);
-    if (parentObject !== undefined && fromAutoTruncate != null) {
-        setValueByPath(parentObject, ['parameters', 'autoTruncate'], fromAutoTruncate);
+    else if (discriminatorTitle === 'EMBED_CONTENT') {
+        const fromTitle = getValueByPath(fromObject, ['title']);
+        if (parentObject !== undefined && fromTitle != null) {
+            setValueByPath(parentObject, ['title'], fromTitle);
+        }
+    }
+    let discriminatorOutputDimensionality = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorOutputDimensionality === undefined) {
+        discriminatorOutputDimensionality = 'PREDICT';
+    }
+    if (discriminatorOutputDimensionality === 'PREDICT') {
+        const fromOutputDimensionality = getValueByPath(fromObject, [
+            'outputDimensionality',
+        ]);
+        if (parentObject !== undefined && fromOutputDimensionality != null) {
+            setValueByPath(parentObject, ['parameters', 'outputDimensionality'], fromOutputDimensionality);
+        }
+    }
+    else if (discriminatorOutputDimensionality === 'EMBED_CONTENT') {
+        const fromOutputDimensionality = getValueByPath(fromObject, [
+            'outputDimensionality',
+        ]);
+        if (parentObject !== undefined && fromOutputDimensionality != null) {
+            setValueByPath(parentObject, ['outputDimensionality'], fromOutputDimensionality);
+        }
+    }
+    let discriminatorMimeType = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorMimeType === undefined) {
+        discriminatorMimeType = 'PREDICT';
+    }
+    if (discriminatorMimeType === 'PREDICT') {
+        const fromMimeType = getValueByPath(fromObject, ['mimeType']);
+        if (parentObject !== undefined && fromMimeType != null) {
+            setValueByPath(parentObject, ['instances[]', 'mimeType'], fromMimeType);
+        }
+    }
+    let discriminatorAutoTruncate = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorAutoTruncate === undefined) {
+        discriminatorAutoTruncate = 'PREDICT';
+    }
+    if (discriminatorAutoTruncate === 'PREDICT') {
+        const fromAutoTruncate = getValueByPath(fromObject, [
+            'autoTruncate',
+        ]);
+        if (parentObject !== undefined && fromAutoTruncate != null) {
+            setValueByPath(parentObject, ['parameters', 'autoTruncate'], fromAutoTruncate);
+        }
+    }
+    else if (discriminatorAutoTruncate === 'EMBED_CONTENT') {
+        const fromAutoTruncate = getValueByPath(fromObject, [
+            'autoTruncate',
+        ]);
+        if (parentObject !== undefined && fromAutoTruncate != null) {
+            setValueByPath(parentObject, ['autoTruncate'], fromAutoTruncate);
+        }
     }
     return toObject;
 }
-function embedContentParametersToMldev(apiClient, fromObject, rootObject) {
+function embedContentParametersPrivateToMldev(apiClient, fromObject, rootObject) {
     const toObject = {};
     const fromModel = getValueByPath(fromObject, ['model']);
     if (fromModel != null) {
@@ -8701,6 +8788,10 @@ function embedContentParametersToMldev(apiClient, fromObject, rootObject) {
         }
         setValueByPath(toObject, ['requests[]', 'content'], transformedList);
     }
+    const fromContent = getValueByPath(fromObject, ['content']);
+    if (fromContent != null) {
+        contentToMldev$1(tContent(fromContent));
+    }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         embedContentConfigToMldev(fromConfig, toObject);
@@ -8711,25 +8802,45 @@ function embedContentParametersToMldev(apiClient, fromObject, rootObject) {
     }
     return toObject;
 }
-function embedContentParametersToVertex(apiClient, fromObject, rootObject) {
+function embedContentParametersPrivateToVertex(apiClient, fromObject, rootObject) {
     const toObject = {};
     const fromModel = getValueByPath(fromObject, ['model']);
     if (fromModel != null) {
         setValueByPath(toObject, ['_url', 'model'], tModel(apiClient, fromModel));
     }
-    const fromContents = getValueByPath(fromObject, ['contents']);
-    if (fromContents != null) {
-        let transformedList = tContentsForEmbed(apiClient, fromContents);
-        if (Array.isArray(transformedList)) {
-            transformedList = transformedList.map((item) => {
-                return item;
-            });
+    let discriminatorContents = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorContents === undefined) {
+        discriminatorContents = 'PREDICT';
+    }
+    if (discriminatorContents === 'PREDICT') {
+        const fromContents = getValueByPath(fromObject, ['contents']);
+        if (fromContents != null) {
+            let transformedList = tContentsForEmbed(apiClient, fromContents);
+            if (Array.isArray(transformedList)) {
+                transformedList = transformedList.map((item) => {
+                    return item;
+                });
+            }
+            setValueByPath(toObject, ['instances[]', 'content'], transformedList);
+        }
+    }
+    let discriminatorContent = getValueByPath(rootObject, [
+        'embeddingApiType',
+    ]);
+    if (discriminatorContent === undefined) {
+        discriminatorContent = 'PREDICT';
+    }
+    if (discriminatorContent === 'EMBED_CONTENT') {
+        const fromContent = getValueByPath(fromObject, ['content']);
+        if (fromContent != null) {
+            setValueByPath(toObject, ['content'], tContent(fromContent));
         }
-        setValueByPath(toObject, ['instances[]', 'content'], transformedList);
     }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
-        embedContentConfigToVertex(fromConfig, toObject);
+        embedContentConfigToVertex(fromConfig, toObject, rootObject);
     }
     return toObject;
 }
@@ -8782,6 +8893,24 @@ function embedContentResponseFromVertex(fromObject, rootObject) {
     if (fromMetadata != null) {
         setValueByPath(toObject, ['metadata'], fromMetadata);
     }
+    if (rootObject &&
+        getValueByPath(rootObject, ['embeddingApiType']) === 'EMBED_CONTENT') {
+        const embedding = getValueByPath(fromObject, ['embedding']);
+        const usageMetadata = getValueByPath(fromObject, ['usageMetadata']);
+        const truncated = getValueByPath(fromObject, ['truncated']);
+        if (embedding) {
+            const stats = {};
+            if (usageMetadata &&
+                usageMetadata['promptTokenCount']) {
+                stats.tokenCount = usageMetadata['promptTokenCount'];
+            }
+            if (truncated) {
+                stats.truncated = truncated;
+            }
+            embedding.statistics = stats;
+            setValueByPath(toObject, ['embeddings'], [embedding]);
+        }
+    }
     return toObject;
 }
 function endpointFromVertex(fromObject, _rootObject) {
@@ -11639,10 +11768,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.40.0'; // x-release-please-version
+const SDK_VERSION = '1.42.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 +12168,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() {
@@ -13211,6 +13369,47 @@ class Models extends BaseModule {
     constructor(apiClient) {
         super();
         this.apiClient = apiClient;
+        /**
+         * Calculates embeddings for the given contents.
+         *
+         * @param params - The parameters for embedding contents.
+         * @return The response from the API.
+         *
+         * @example
+         * ```ts
+         * const response = await ai.models.embedContent({
+         *  model: 'text-embedding-004',
+         *  contents: [
+         *    'What is your name?',
+         *    'What is your favorite color?',
+         *  ],
+         *  config: {
+         *    outputDimensionality: 64,
+         *  },
+         * });
+         * console.log(response);
+         * ```
+         */
+        this.embedContent = async (params) => {
+            if (!this.apiClient.isVertexAI()) {
+                return await this.embedContentInternal(params);
+            }
+            const isVertexEmbedContentModel = (params.model.includes('gemini') &&
+                params.model !== 'gemini-embedding-001') ||
+                params.model.includes('maas');
+            if (isVertexEmbedContentModel) {
+                const contents = tContents(params.contents);
+                if (contents.length > 1) {
+                    throw new Error('The embedContent API for this model only supports one content at a time.');
+                }
+                const paramsPrivate = Object.assign(Object.assign({}, params), { content: contents[0], embeddingApiType: exports.EmbeddingApiType.EMBED_CONTENT });
+                return await this.embedContentInternal(paramsPrivate);
+            }
+            else {
+                const paramsPrivate = Object.assign(Object.assign({}, params), { embeddingApiType: exports.EmbeddingApiType.PREDICT });
+                return await this.embedContentInternal(paramsPrivate);
+            }
+        };
         /**
          * Makes an API request to generate content with a given model.
          *
@@ -13898,14 +14097,17 @@ class Models extends BaseModule {
      * console.log(response);
      * ```
      */
-    async embedContent(params) {
+    async embedContentInternal(params) {
         var _a, _b, _c, _d;
         let response;
         let path = '';
         let queryParams = {};
         if (this.apiClient.isVertexAI()) {
-            const body = embedContentParametersToVertex(this.apiClient, params);
-            path = formatMap('{model}:predict', body['_url']);
+            const body = embedContentParametersPrivateToVertex(this.apiClient, params, params);
+            const endpointUrl = tIsVertexEmbedContentModel(params.model)
+                ? '{model}:embedContent'
+                : '{model}:predict';
+            path = formatMap(endpointUrl, body['_url']);
             queryParams = body['_query'];
             delete body['_url'];
             delete body['_query'];
@@ -13928,14 +14130,14 @@ class Models extends BaseModule {
                 });
             });
             return response.then((apiResponse) => {
-                const resp = embedContentResponseFromVertex(apiResponse);
+                const resp = embedContentResponseFromVertex(apiResponse, params);
                 const typedResp = new EmbedContentResponse();
                 Object.assign(typedResp, resp);
                 return typedResp;
             });
         }
         else {
-            const body = embedContentParametersToMldev(this.apiClient, params);
+            const body = embedContentParametersPrivateToMldev(this.apiClient, params);
             path = formatMap('{model}:batchEmbedContents', body['_url']);
             queryParams = body['_query'];
             delete body['_url'];
@@ -17876,7 +18078,7 @@ class BaseGeminiNextGenAPIClient {
     }
     async fetchWithTimeout(url, init, ms, controller) {
         const _b = init || {}, { signal, method } = _b, options = __rest(_b, ["signal", "method"]);
-        const abort = controller.abort.bind(controller);
+        const abort = this._makeAbort(controller);
         if (signal)
             signal.addEventListener('abort', abort, { once: true });
         const timeout = setTimeout(abort, ms);
@@ -17992,6 +18194,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 };
@@ -18020,6 +18227,13 @@ class BaseGeminiNextGenAPIClient {
                 (Symbol.iterator in body && 'next' in body && typeof body.next === 'function'))) {
             return { bodyHeaders: undefined, body: ReadableStreamFrom(body) };
         }
+        else if (typeof body === 'object' &&
+            headers.values.get('content-type') === 'application/x-www-form-urlencoded') {
+            return {
+                bodyHeaders: { 'content-type': 'application/x-www-form-urlencoded' },
+                body: this.stringifyQuery(body),
+            };
+        }
         else {
             return this.encoder({ body, headers });
         }
@@ -18341,6 +18555,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) {
@@ -18576,6 +18793,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) {
@@ -19828,6 +20051,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     get interactions() {
+        var _a;
         if (this._interactions !== undefined) {
             return this._interactions;
         }
@@ -19844,6 +20068,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;