@google/genai 1.3.0 → 1.5.0

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
 
 /**
  * @license
@@ -1923,16 +1924,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,
             });
         }
@@ -2016,7 +2017,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;
         }
@@ -2375,7 +2376,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;
         }
@@ -3052,6 +3053,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, [
@@ -3090,8 +3095,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',
@@ -3601,7 +3607,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);
          * }
          * ```
@@ -4346,7 +4352,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';
@@ -6040,6 +6046,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, [
@@ -6123,8 +6133,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',
@@ -8720,12 +8731,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) {
@@ -8742,6 +8759,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));
@@ -9113,6 +9133,10 @@ function googleMapsToVertex(apiClient, fromObject) {
     }
     return toObject;
 }
+function urlContextToVertex() {
+    const toObject = {};
+    return toObject;
+}
 function toolToVertex(apiClient, fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -9151,8 +9175,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',
@@ -10015,6 +10040,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, [
@@ -10077,6 +10118,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) {
@@ -10093,6 +10138,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));
@@ -10743,6 +10792,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']);
@@ -10765,6 +10842,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);
@@ -11352,9 +11435,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: {