@google/genai 1.3.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');
@@ -1980,16 +1981,16 @@ function flattenTypeArrayToAnyOf(typeList, resultingSchema) {
     }
     const listWithoutNull = typeList.filter((type) => type !== 'null');
     if (listWithoutNull.length === 1) {
-        resultingSchema['type'] = Object.keys(exports.Type).includes(listWithoutNull[0].toUpperCase())
-            ? exports.Type[listWithoutNull[0].toUpperCase()]
+        resultingSchema['type'] = Object.values(exports.Type).includes(listWithoutNull[0].toUpperCase())
+            ? listWithoutNull[0].toUpperCase()
             : exports.Type.TYPE_UNSPECIFIED;
     }
     else {
         resultingSchema['anyOf'] = [];
         for (const i of listWithoutNull) {
             resultingSchema['anyOf'].push({
-                'type': Object.keys(exports.Type).includes(i.toUpperCase())
-                    ? exports.Type[i.toUpperCase()]
+                'type': Object.values(exports.Type).includes(i.toUpperCase())
+                    ? i.toUpperCase()
                     : exports.Type.TYPE_UNSPECIFIED,
             });
         }
@@ -2073,7 +2074,7 @@ function processJsonSchema(_jsonSchema) {
                 // beginning of this function.
                 continue;
             }
-            genAISchema['type'] = Object.keys(exports.Type).includes(fieldValue.toUpperCase())
+            genAISchema['type'] = Object.values(exports.Type).includes(fieldValue.toUpperCase())
                 ? fieldValue.toUpperCase()
                 : exports.Type.TYPE_UNSPECIFIED;
         }
@@ -2432,7 +2433,7 @@ function filterToJsonSchema(schema) {
         }
         else if (fieldName === 'type') {
             const typeValue = fieldValue.toUpperCase();
-            filteredSchema[fieldName] = Object.keys(exports.Type).includes(typeValue)
+            filteredSchema[fieldName] = Object.values(exports.Type).includes(typeValue)
                 ? typeValue
                 : exports.Type.TYPE_UNSPECIFIED;
         }
@@ -3109,6 +3110,10 @@ function googleMapsToVertex$2(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlContextToVertex$2() {
+    const toObject = {};
+    return toObject;
+}
 function toolToVertex$2(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -3147,8 +3152,9 @@ function toolToVertex$2(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex$2(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex$2());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -3658,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);
          * }
          * ```
@@ -5450,6 +5456,10 @@ function urlContextToMldev$2() {
     const toObject = {};
     return toObject;
 }
+function urlContextToVertex$1() {
+    const toObject = {};
+    return toObject;
+}
 function toolToMldev$2(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -5533,8 +5543,9 @@ function toolToVertex$1(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex$1(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex$1());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -8130,12 +8141,18 @@ function generateVideosConfigToMldev(apiClient, fromObject, parentObject) {
     if (parentObject !== undefined && fromNegativePrompt != null) {
         setValueByPath(parentObject, ['parameters', 'negativePrompt'], fromNegativePrompt);
     }
-    if (getValueByPath(fromObject, ['enhancePrompt']) !== undefined) {
-        throw new Error('enhancePrompt parameter is not supported in Gemini API.');
+    const fromEnhancePrompt = getValueByPath(fromObject, [
+        'enhancePrompt',
+    ]);
+    if (parentObject !== undefined && fromEnhancePrompt != null) {
+        setValueByPath(parentObject, ['parameters', 'enhancePrompt'], fromEnhancePrompt);
     }
     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) {
@@ -8152,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));
@@ -8523,6 +8543,10 @@ function googleMapsToVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlContextToVertex() {
+    const toObject = {};
+    return toObject;
+}
 function toolToVertex(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -8561,8 +8585,9 @@ function toolToVertex(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -9425,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, [
@@ -9487,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) {
@@ -9503,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));
@@ -10153,6 +10202,34 @@ function citationMetadataFromVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlMetadataFromVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromRetrievedUrl = getValueByPath(fromObject, ['retrievedUrl']);
+    if (fromRetrievedUrl != null) {
+        setValueByPath(toObject, ['retrievedUrl'], fromRetrievedUrl);
+    }
+    const fromUrlRetrievalStatus = getValueByPath(fromObject, [
+        'urlRetrievalStatus',
+    ]);
+    if (fromUrlRetrievalStatus != null) {
+        setValueByPath(toObject, ['urlRetrievalStatus'], fromUrlRetrievalStatus);
+    }
+    return toObject;
+}
+function urlContextMetadataFromVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromUrlMetadata = getValueByPath(fromObject, ['urlMetadata']);
+    if (fromUrlMetadata != null) {
+        let transformedList = fromUrlMetadata;
+        if (Array.isArray(transformedList)) {
+            transformedList = transformedList.map((item) => {
+                return urlMetadataFromVertex(apiClient, item);
+            });
+        }
+        setValueByPath(toObject, ['urlMetadata'], transformedList);
+    }
+    return toObject;
+}
 function candidateFromVertex(apiClient, fromObject) {
     const toObject = {};
     const fromContent = getValueByPath(fromObject, ['content']);
@@ -10175,6 +10252,12 @@ function candidateFromVertex(apiClient, fromObject) {
     if (fromFinishReason != null) {
         setValueByPath(toObject, ['finishReason'], fromFinishReason);
     }
+    const fromUrlContextMetadata = getValueByPath(fromObject, [
+        'urlContextMetadata',
+    ]);
+    if (fromUrlContextMetadata != null) {
+        setValueByPath(toObject, ['urlContextMetadata'], urlContextMetadataFromVertex(apiClient, fromUrlContextMetadata));
+    }
     const fromAvgLogprobs = getValueByPath(fromObject, ['avgLogprobs']);
     if (fromAvgLogprobs != null) {
         setValueByPath(toObject, ['avgLogprobs'], fromAvgLogprobs);
@@ -10641,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.3.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';
@@ -11284,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: {
@@ -15731,14 +15823,14 @@ 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.');
         }
         this.vertexai =
             (_b = (_a = options.vertexai) !== null && _a !== void 0 ? _a : getBooleanEnv('GOOGLE_GENAI_USE_VERTEXAI')) !== null && _b !== void 0 ? _b : false;
-        const envApiKey = getEnv('GOOGLE_API_KEY');
+        const envApiKey = getApiKeyFromEnv();
         const envProject = getEnv('GOOGLE_CLOUD_PROJECT');
         const envLocation = getEnv('GOOGLE_CLOUD_LOCATION');
         this.apiKey = (_c = options.apiKey) !== null && _c !== void 0 ? _c : envApiKey;
@@ -15746,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.
@@ -15816,6 +15914,14 @@ function stringToBoolean(str) {
     }
     return str.toLowerCase() === 'true';
 }
+function getApiKeyFromEnv() {
+    const envGoogleApiKey = getEnv('GOOGLE_API_KEY');
+    const envGeminiApiKey = getEnv('GEMINI_API_KEY');
+    if (envGoogleApiKey && envGeminiApiKey) {
+        console.warn('Both GOOGLE_API_KEY and GEMINI_API_KEY are set. Using GOOGLE_API_KEY.');
+    }
+    return envGoogleApiKey || envGeminiApiKey;
+}
 
 exports.Caches = Caches;
 exports.Chat = Chat;

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';
@@ -1958,16 +1959,16 @@ function flattenTypeArrayToAnyOf(typeList, resultingSchema) {
     }
     const listWithoutNull = typeList.filter((type) => type !== 'null');
     if (listWithoutNull.length === 1) {
-        resultingSchema['type'] = Object.keys(Type).includes(listWithoutNull[0].toUpperCase())
-            ? Type[listWithoutNull[0].toUpperCase()]
+        resultingSchema['type'] = Object.values(Type).includes(listWithoutNull[0].toUpperCase())
+            ? listWithoutNull[0].toUpperCase()
             : Type.TYPE_UNSPECIFIED;
     }
     else {
         resultingSchema['anyOf'] = [];
         for (const i of listWithoutNull) {
             resultingSchema['anyOf'].push({
-                'type': Object.keys(Type).includes(i.toUpperCase())
-                    ? Type[i.toUpperCase()]
+                'type': Object.values(Type).includes(i.toUpperCase())
+                    ? i.toUpperCase()
                     : Type.TYPE_UNSPECIFIED,
             });
         }
@@ -2051,7 +2052,7 @@ function processJsonSchema(_jsonSchema) {
                 // beginning of this function.
                 continue;
             }
-            genAISchema['type'] = Object.keys(Type).includes(fieldValue.toUpperCase())
+            genAISchema['type'] = Object.values(Type).includes(fieldValue.toUpperCase())
                 ? fieldValue.toUpperCase()
                 : Type.TYPE_UNSPECIFIED;
         }
@@ -2410,7 +2411,7 @@ function filterToJsonSchema(schema) {
         }
         else if (fieldName === 'type') {
             const typeValue = fieldValue.toUpperCase();
-            filteredSchema[fieldName] = Object.keys(Type).includes(typeValue)
+            filteredSchema[fieldName] = Object.values(Type).includes(typeValue)
                 ? typeValue
                 : Type.TYPE_UNSPECIFIED;
         }
@@ -3087,6 +3088,10 @@ function googleMapsToVertex$2(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlContextToVertex$2() {
+    const toObject = {};
+    return toObject;
+}
 function toolToVertex$2(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -3125,8 +3130,9 @@ function toolToVertex$2(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex$2(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex$2());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -3636,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);
          * }
          * ```
@@ -5428,6 +5434,10 @@ function urlContextToMldev$2() {
     const toObject = {};
     return toObject;
 }
+function urlContextToVertex$1() {
+    const toObject = {};
+    return toObject;
+}
 function toolToMldev$2(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -5511,8 +5521,9 @@ function toolToVertex$1(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex$1(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex$1());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -8108,12 +8119,18 @@ function generateVideosConfigToMldev(apiClient, fromObject, parentObject) {
     if (parentObject !== undefined && fromNegativePrompt != null) {
         setValueByPath(parentObject, ['parameters', 'negativePrompt'], fromNegativePrompt);
     }
-    if (getValueByPath(fromObject, ['enhancePrompt']) !== undefined) {
-        throw new Error('enhancePrompt parameter is not supported in Gemini API.');
+    const fromEnhancePrompt = getValueByPath(fromObject, [
+        'enhancePrompt',
+    ]);
+    if (parentObject !== undefined && fromEnhancePrompt != null) {
+        setValueByPath(parentObject, ['parameters', 'enhancePrompt'], fromEnhancePrompt);
     }
     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) {
@@ -8130,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));
@@ -8501,6 +8521,10 @@ function googleMapsToVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlContextToVertex() {
+    const toObject = {};
+    return toObject;
+}
 function toolToVertex(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -8539,8 +8563,9 @@ function toolToVertex(apiClient, fromObject) {
     if (fromGoogleMaps != null) {
         setValueByPath(toObject, ['googleMaps'], googleMapsToVertex(apiClient, fromGoogleMaps));
     }
-    if (getValueByPath(fromObject, ['urlContext']) !== undefined) {
-        throw new Error('urlContext parameter is not supported in Vertex AI.');
+    const fromUrlContext = getValueByPath(fromObject, ['urlContext']);
+    if (fromUrlContext != null) {
+        setValueByPath(toObject, ['urlContext'], urlContextToVertex());
     }
     const fromCodeExecution = getValueByPath(fromObject, [
         'codeExecution',
@@ -9403,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, [
@@ -9465,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) {
@@ -9481,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));
@@ -10131,6 +10180,34 @@ function citationMetadataFromVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlMetadataFromVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromRetrievedUrl = getValueByPath(fromObject, ['retrievedUrl']);
+    if (fromRetrievedUrl != null) {
+        setValueByPath(toObject, ['retrievedUrl'], fromRetrievedUrl);
+    }
+    const fromUrlRetrievalStatus = getValueByPath(fromObject, [
+        'urlRetrievalStatus',
+    ]);
+    if (fromUrlRetrievalStatus != null) {
+        setValueByPath(toObject, ['urlRetrievalStatus'], fromUrlRetrievalStatus);
+    }
+    return toObject;
+}
+function urlContextMetadataFromVertex(apiClient, fromObject) {
+    const toObject = {};
+    const fromUrlMetadata = getValueByPath(fromObject, ['urlMetadata']);
+    if (fromUrlMetadata != null) {
+        let transformedList = fromUrlMetadata;
+        if (Array.isArray(transformedList)) {
+            transformedList = transformedList.map((item) => {
+                return urlMetadataFromVertex(apiClient, item);
+            });
+        }
+        setValueByPath(toObject, ['urlMetadata'], transformedList);
+    }
+    return toObject;
+}
 function candidateFromVertex(apiClient, fromObject) {
     const toObject = {};
     const fromContent = getValueByPath(fromObject, ['content']);
@@ -10153,6 +10230,12 @@ function candidateFromVertex(apiClient, fromObject) {
     if (fromFinishReason != null) {
         setValueByPath(toObject, ['finishReason'], fromFinishReason);
     }
+    const fromUrlContextMetadata = getValueByPath(fromObject, [
+        'urlContextMetadata',
+    ]);
+    if (fromUrlContextMetadata != null) {
+        setValueByPath(toObject, ['urlContextMetadata'], urlContextMetadataFromVertex(apiClient, fromUrlContextMetadata));
+    }
     const fromAvgLogprobs = getValueByPath(fromObject, ['avgLogprobs']);
     if (fromAvgLogprobs != null) {
         setValueByPath(toObject, ['avgLogprobs'], fromAvgLogprobs);
@@ -10619,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.3.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';
@@ -11262,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: {
@@ -15709,14 +15801,14 @@ 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.');
         }
         this.vertexai =
             (_b = (_a = options.vertexai) !== null && _a !== void 0 ? _a : getBooleanEnv('GOOGLE_GENAI_USE_VERTEXAI')) !== null && _b !== void 0 ? _b : false;
-        const envApiKey = getEnv('GOOGLE_API_KEY');
+        const envApiKey = getApiKeyFromEnv();
         const envProject = getEnv('GOOGLE_CLOUD_PROJECT');
         const envLocation = getEnv('GOOGLE_CLOUD_LOCATION');
         this.apiKey = (_c = options.apiKey) !== null && _c !== void 0 ? _c : envApiKey;
@@ -15724,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.
@@ -15794,6 +15892,14 @@ function stringToBoolean(str) {
     }
     return str.toLowerCase() === 'true';
 }
+function getApiKeyFromEnv() {
+    const envGoogleApiKey = getEnv('GOOGLE_API_KEY');
+    const envGeminiApiKey = getEnv('GEMINI_API_KEY');
+    if (envGoogleApiKey && envGeminiApiKey) {
+        console.warn('Both GOOGLE_API_KEY and GEMINI_API_KEY are set. Using GOOGLE_API_KEY.');
+    }
+    return envGoogleApiKey || envGeminiApiKey;
+}
 
 export { ActivityHandling, AdapterSize, AuthType, Behavior, BlockedReason, Caches, Chat, Chats, ComputeTokensResponse, ControlReferenceImage, ControlReferenceType, CountTokensResponse, CreateFileResponse, DeleteCachedContentResponse, DeleteFileResponse, DeleteModelResponse, DynamicRetrievalConfigMode, EditImageResponse, EditMode, EmbedContentResponse, EndSensitivity, FeatureSelectionPreference, FileSource, FileState, Files, FinishReason, FunctionCallingConfigMode, FunctionResponse, FunctionResponseScheduling, GenerateContentResponse, GenerateContentResponsePromptFeedback, GenerateContentResponseUsageMetadata, GenerateImagesResponse, GenerateVideosResponse, GoogleGenAI, HarmBlockMethod, HarmBlockThreshold, HarmCategory, HarmProbability, HarmSeverity, HttpResponse, ImagePromptLanguage, JobState, Language, ListCachedContentsResponse, ListFilesResponse, ListModelsResponse, ListTuningJobsResponse, Live, LiveClientToolResponse, LiveMusicPlaybackControl, LiveMusicServerMessage, LiveSendToolResponseParameters, LiveServerMessage, MaskReferenceImage, MaskReferenceMode, MediaModality, MediaResolution, Modality, Mode, Models, Operations, Outcome, PagedItem, Pager, PersonGeneration, RawReferenceImage, ReplayResponse, SafetyFilterLevel, Scale, Session, StartSensitivity, StyleReferenceImage, SubjectReferenceImage, SubjectReferenceType, Tokens, TrafficType, TurnCoverage, Type, UpscaleImageResponse, UrlRetrievalStatus, createModelContent, createPartFromBase64, createPartFromCodeExecutionResult, createPartFromExecutableCode, createPartFromFunctionCall, createPartFromFunctionResponse, createPartFromText, createPartFromUri, createUserContent, mcpToTool, setDefaultBaseUrls };
 //# sourceMappingURL=index.mjs.map