@google/genai 1.4.0 → 1.5.0

package/dist/node/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var zod = require('zod');
+var types_js = require('@modelcontextprotocol/sdk/types.js');
 var googleAuthLibrary = require('google-auth-library');
 var fs = require('fs');
 var node_stream = require('node:stream');
@@ -3663,7 +3664,7 @@ class Caches extends BaseModule {
          * @example
          * ```ts
          * const cachedContents = await ai.caches.list({config: {'pageSize': 2}});
-         * for (const cachedContent of cachedContents) {
+         * for await (const cachedContent of cachedContents) {
          *   console.log(cachedContent);
          * }
          * ```
@@ -8149,6 +8150,9 @@ function generateVideosConfigToMldev(apiClient, fromObject, parentObject) {
     if (getValueByPath(fromObject, ['generateAudio']) !== undefined) {
         throw new Error('generateAudio parameter is not supported in Gemini API.');
     }
+    if (getValueByPath(fromObject, ['lastFrame']) !== undefined) {
+        throw new Error('lastFrame parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function generateVideosParametersToMldev(apiClient, fromObject) {
@@ -8165,6 +8169,9 @@ function generateVideosParametersToMldev(apiClient, fromObject) {
     if (fromImage != null) {
         setValueByPath(toObject, ['instances[0]', 'image'], imageToMldev(apiClient, fromImage));
     }
+    if (getValueByPath(fromObject, ['video']) !== undefined) {
+        throw new Error('video parameter is not supported in Gemini API.');
+    }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         setValueByPath(toObject, ['config'], generateVideosConfigToMldev(apiClient, fromConfig, toObject));
@@ -9443,6 +9450,22 @@ function computeTokensParametersToVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function videoToVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromUri = getValueByPath(fromObject, ['uri']);
+    if (fromUri != null) {
+        setValueByPath(toObject, ['gcsUri'], fromUri);
+    }
+    const fromVideoBytes = getValueByPath(fromObject, ['videoBytes']);
+    if (fromVideoBytes != null) {
+        setValueByPath(toObject, ['bytesBase64Encoded'], tBytes(apiClient, fromVideoBytes));
+    }
+    const fromMimeType = getValueByPath(fromObject, ['mimeType']);
+    if (fromMimeType != null) {
+        setValueByPath(toObject, ['mimeType'], fromMimeType);
+    }
+    return toObject;
+}
 function generateVideosConfigToVertex(apiClient, fromObject, parentObject) {
     const toObject = {};
     const fromNumberOfVideos = getValueByPath(fromObject, [
@@ -9505,6 +9528,10 @@ function generateVideosConfigToVertex(apiClient, fromObject, parentObject) {
     if (parentObject !== undefined && fromGenerateAudio != null) {
         setValueByPath(parentObject, ['parameters', 'generateAudio'], fromGenerateAudio);
     }
+    const fromLastFrame = getValueByPath(fromObject, ['lastFrame']);
+    if (parentObject !== undefined && fromLastFrame != null) {
+        setValueByPath(parentObject, ['instances[0]', 'lastFrame'], imageToVertex(apiClient, fromLastFrame));
+    }
     return toObject;
 }
 function generateVideosParametersToVertex(apiClient, fromObject) {
@@ -9521,6 +9548,10 @@ function generateVideosParametersToVertex(apiClient, fromObject) {
     if (fromImage != null) {
         setValueByPath(toObject, ['instances[0]', 'image'], imageToVertex(apiClient, fromImage));
     }
+    const fromVideo = getValueByPath(fromObject, ['video']);
+    if (fromVideo != null) {
+        setValueByPath(toObject, ['instances[0]', 'video'], videoToVertex(apiClient, fromVideo));
+    }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         setValueByPath(toObject, ['config'], generateVideosConfigToVertex(apiClient, fromConfig, toObject));
@@ -10693,7 +10724,7 @@ 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.4.0'; // x-release-please-version
+const SDK_VERSION = '1.5.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';
@@ -11336,9 +11367,18 @@ class McpCallableTool {
         for (const functionCall of functionCalls) {
             if (functionCall.name in this.functionNameToMcpClient) {
                 const mcpClient = this.functionNameToMcpClient[functionCall.name];
+                let requestOptions = undefined;
+                // TODO: b/424238654 - Add support for finer grained timeout control.
+                if (this.config.timeout) {
+                    requestOptions = {
+                        timeout: this.config.timeout,
+                    };
+                }
                 const callToolResponse = await mcpClient.callTool({
                     name: functionCall.name,
                     arguments: functionCall.args,
+                    CallToolResultSchema: types_js.CallToolResultSchema,
+                    requestOptions,
                 });
                 functionCallResponseParts.push({
                     functionResponse: {
@@ -15783,7 +15823,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     constructor(options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // Validate explicitly set initializer values.
         if ((options.project || options.location) && options.apiKey) {
             throw new Error('Project/location and API key are mutually exclusive in the client initializer.');
@@ -15798,6 +15838,12 @@ class GoogleGenAI {
         this.location = (_e = options.location) !== null && _e !== void 0 ? _e : envLocation;
         // Handle when to use Vertex AI in express mode (api key)
         if (options.vertexai) {
+            if ((_f = options.googleAuthOptions) === null || _f === void 0 ? void 0 : _f.credentials) {
+                // Explicit credentials take precedence over implicit api_key.
+                console.debug('The user provided Google Cloud credentials will take precedence' +
+                    ' over the API key from the environment variable.');
+                this.apiKey = undefined;
+            }
             // Explicit api_key and explicit project/location already handled above.
             if ((envProject || envLocation) && options.apiKey) {
                 // Explicit api_key takes precedence over implicit project/location.

package/dist/node/index.mjs

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import { GoogleAuth } from 'google-auth-library';
 import { createWriteStream, writeFile } from 'fs';
 import { Readable } from 'node:stream';
@@ -3641,7 +3642,7 @@ class Caches extends BaseModule {
          * @example
          * ```ts
          * const cachedContents = await ai.caches.list({config: {'pageSize': 2}});
-         * for (const cachedContent of cachedContents) {
+         * for await (const cachedContent of cachedContents) {
          *   console.log(cachedContent);
          * }
          * ```
@@ -8127,6 +8128,9 @@ function generateVideosConfigToMldev(apiClient, fromObject, parentObject) {
     if (getValueByPath(fromObject, ['generateAudio']) !== undefined) {
         throw new Error('generateAudio parameter is not supported in Gemini API.');
     }
+    if (getValueByPath(fromObject, ['lastFrame']) !== undefined) {
+        throw new Error('lastFrame parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function generateVideosParametersToMldev(apiClient, fromObject) {
@@ -8143,6 +8147,9 @@ function generateVideosParametersToMldev(apiClient, fromObject) {
     if (fromImage != null) {
         setValueByPath(toObject, ['instances[0]', 'image'], imageToMldev(apiClient, fromImage));
     }
+    if (getValueByPath(fromObject, ['video']) !== undefined) {
+        throw new Error('video parameter is not supported in Gemini API.');
+    }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         setValueByPath(toObject, ['config'], generateVideosConfigToMldev(apiClient, fromConfig, toObject));
@@ -9421,6 +9428,22 @@ function computeTokensParametersToVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function videoToVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromUri = getValueByPath(fromObject, ['uri']);
+    if (fromUri != null) {
+        setValueByPath(toObject, ['gcsUri'], fromUri);
+    }
+    const fromVideoBytes = getValueByPath(fromObject, ['videoBytes']);
+    if (fromVideoBytes != null) {
+        setValueByPath(toObject, ['bytesBase64Encoded'], tBytes(apiClient, fromVideoBytes));
+    }
+    const fromMimeType = getValueByPath(fromObject, ['mimeType']);
+    if (fromMimeType != null) {
+        setValueByPath(toObject, ['mimeType'], fromMimeType);
+    }
+    return toObject;
+}
 function generateVideosConfigToVertex(apiClient, fromObject, parentObject) {
     const toObject = {};
     const fromNumberOfVideos = getValueByPath(fromObject, [
@@ -9483,6 +9506,10 @@ function generateVideosConfigToVertex(apiClient, fromObject, parentObject) {
     if (parentObject !== undefined && fromGenerateAudio != null) {
         setValueByPath(parentObject, ['parameters', 'generateAudio'], fromGenerateAudio);
     }
+    const fromLastFrame = getValueByPath(fromObject, ['lastFrame']);
+    if (parentObject !== undefined && fromLastFrame != null) {
+        setValueByPath(parentObject, ['instances[0]', 'lastFrame'], imageToVertex(apiClient, fromLastFrame));
+    }
     return toObject;
 }
 function generateVideosParametersToVertex(apiClient, fromObject) {
@@ -9499,6 +9526,10 @@ function generateVideosParametersToVertex(apiClient, fromObject) {
     if (fromImage != null) {
         setValueByPath(toObject, ['instances[0]', 'image'], imageToVertex(apiClient, fromImage));
     }
+    const fromVideo = getValueByPath(fromObject, ['video']);
+    if (fromVideo != null) {
+        setValueByPath(toObject, ['instances[0]', 'video'], videoToVertex(apiClient, fromVideo));
+    }
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         setValueByPath(toObject, ['config'], generateVideosConfigToVertex(apiClient, fromConfig, toObject));
@@ -10671,7 +10702,7 @@ 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.4.0'; // x-release-please-version
+const SDK_VERSION = '1.5.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';
@@ -11314,9 +11345,18 @@ class McpCallableTool {
         for (const functionCall of functionCalls) {
             if (functionCall.name in this.functionNameToMcpClient) {
                 const mcpClient = this.functionNameToMcpClient[functionCall.name];
+                let requestOptions = undefined;
+                // TODO: b/424238654 - Add support for finer grained timeout control.
+                if (this.config.timeout) {
+                    requestOptions = {
+                        timeout: this.config.timeout,
+                    };
+                }
                 const callToolResponse = await mcpClient.callTool({
                     name: functionCall.name,
                     arguments: functionCall.args,
+                    CallToolResultSchema,
+                    requestOptions,
                 });
                 functionCallResponseParts.push({
                     functionResponse: {
@@ -15761,7 +15801,7 @@ const LANGUAGE_LABEL_PREFIX = 'gl-node/';
  */
 class GoogleGenAI {
     constructor(options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // Validate explicitly set initializer values.
         if ((options.project || options.location) && options.apiKey) {
             throw new Error('Project/location and API key are mutually exclusive in the client initializer.');
@@ -15776,6 +15816,12 @@ class GoogleGenAI {
         this.location = (_e = options.location) !== null && _e !== void 0 ? _e : envLocation;
         // Handle when to use Vertex AI in express mode (api key)
         if (options.vertexai) {
+            if ((_f = options.googleAuthOptions) === null || _f === void 0 ? void 0 : _f.credentials) {
+                // Explicit credentials take precedence over implicit api_key.
+                console.debug('The user provided Google Cloud credentials will take precedence' +
+                    ' over the API key from the environment variable.');
+                this.apiKey = undefined;
+            }
             // Explicit api_key and explicit project/location already handled above.
             if ((envProject || envLocation) && options.apiKey) {
                 // Explicit api_key takes precedence over implicit project/location.