@google/genai 1.45.0 → 1.46.0

package/dist/vertex_internal/index.cjs

@@ -403,6 +403,18 @@ function uploadToFileSearchStoreResponseFromMldev(fromObject) {
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+/** Programming language of the `code`. */
+var Language;
+(function (Language) {
+    /**
+     * Unspecified language. This value should not be used.
+     */
+    Language["LANGUAGE_UNSPECIFIED"] = "LANGUAGE_UNSPECIFIED";
+    /**
+     * Python >= 3.10, with numpy and simpy available.
+     */
+    Language["PYTHON"] = "PYTHON";
+})(Language || (Language = {}));
 /** Outcome of the code execution. */
 var Outcome;
 (function (Outcome) {
@@ -423,18 +435,6 @@ var Outcome;
      */
     Outcome["OUTCOME_DEADLINE_EXCEEDED"] = "OUTCOME_DEADLINE_EXCEEDED";
 })(Outcome || (Outcome = {}));
-/** Programming language of the `code`. */
-var Language;
-(function (Language) {
-    /**
-     * Unspecified language. This value should not be used.
-     */
-    Language["LANGUAGE_UNSPECIFIED"] = "LANGUAGE_UNSPECIFIED";
-    /**
-     * Python >= 3.10, with numpy and simpy available.
-     */
-    Language["PYTHON"] = "PYTHON";
-})(Language || (Language = {}));
 /** Specifies how the response should be scheduled in the conversation. */
 var FunctionResponseScheduling;
 (function (FunctionResponseScheduling) {
@@ -1263,6 +1263,34 @@ var PartMediaResolutionLevel;
      */
     PartMediaResolutionLevel["MEDIA_RESOLUTION_ULTRA_HIGH"] = "MEDIA_RESOLUTION_ULTRA_HIGH";
 })(PartMediaResolutionLevel || (PartMediaResolutionLevel = {}));
+/** The type of tool in the function call. */
+var ToolType;
+(function (ToolType) {
+    /**
+     * Unspecified tool type.
+     */
+    ToolType["TOOL_TYPE_UNSPECIFIED"] = "TOOL_TYPE_UNSPECIFIED";
+    /**
+     * Google search tool, maps to Tool.google_search.search_types.web_search.
+     */
+    ToolType["GOOGLE_SEARCH_WEB"] = "GOOGLE_SEARCH_WEB";
+    /**
+     * Image search tool, maps to Tool.google_search.search_types.image_search.
+     */
+    ToolType["GOOGLE_SEARCH_IMAGE"] = "GOOGLE_SEARCH_IMAGE";
+    /**
+     * URL context tool, maps to Tool.url_context.
+     */
+    ToolType["URL_CONTEXT"] = "URL_CONTEXT";
+    /**
+     * Google maps tool, maps to Tool.google_maps.
+     */
+    ToolType["GOOGLE_MAPS"] = "GOOGLE_MAPS";
+    /**
+     * File search tool, maps to Tool.file_search.
+     */
+    ToolType["FILE_SEARCH"] = "FILE_SEARCH";
+})(ToolType || (ToolType = {}));
 /** Resource scope. */
 var ResourceScope;
 (function (ResourceScope) {
@@ -1798,7 +1826,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.45.0'; // x-release-please-version
+const SDK_VERSION = '1.46.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';
@@ -2672,18 +2700,18 @@ const MAX_RETRY_COUNT = 3;
 const INITIAL_RETRY_DELAY_MS = 1000;
 const DELAY_MULTIPLIER = 2;
 const X_GOOG_UPLOAD_STATUS_HEADER_FIELD = 'x-goog-upload-status';
-async function uploadBlob(file, uploadUrl, apiClient) {
+async function uploadBlob(file, uploadUrl, apiClient, httpOptions) {
     var _a;
-    const response = await uploadBlobInternal(file, uploadUrl, apiClient);
+    const response = await uploadBlobInternal(file, uploadUrl, apiClient, httpOptions);
     const responseJson = (await (response === null || response === void 0 ? void 0 : response.json()));
     if (((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'final') {
         throw new Error('Failed to upload file: Upload status is not finalized.');
     }
     return responseJson['file'];
 }
-async function uploadBlobToFileSearchStore(file, uploadUrl, apiClient) {
+async function uploadBlobToFileSearchStore(file, uploadUrl, apiClient, httpOptions) {
     var _a;
-    const response = await uploadBlobInternal(file, uploadUrl, apiClient);
+    const response = await uploadBlobInternal(file, uploadUrl, apiClient, httpOptions);
     const responseJson = (await (response === null || response === void 0 ? void 0 : response.json()));
     if (((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'final') {
         throw new Error('Failed to upload file: Upload status is not finalized.');
@@ -2693,8 +2721,18 @@ async function uploadBlobToFileSearchStore(file, uploadUrl, apiClient) {
     Object.assign(typedResp, resp);
     return typedResp;
 }
-async function uploadBlobInternal(file, uploadUrl, apiClient) {
-    var _a, _b;
+async function uploadBlobInternal(file, uploadUrl, apiClient, httpOptions) {
+    var _a, _b, _c;
+    let finalUrl = uploadUrl;
+    const effectiveBaseUrl = (httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.baseUrl) || ((_a = apiClient.clientOptions.httpOptions) === null || _a === void 0 ? void 0 : _a.baseUrl);
+    if (effectiveBaseUrl) {
+        const baseUri = new URL(effectiveBaseUrl);
+        const uploadUri = new URL(uploadUrl);
+        uploadUri.protocol = baseUri.protocol;
+        uploadUri.host = baseUri.host;
+        uploadUri.port = baseUri.port;
+        finalUrl = uploadUri.toString();
+    }
     let fileSize = 0;
     let offset = 0;
     let response = new HttpResponse(new Response());
@@ -2709,21 +2747,14 @@ async function uploadBlobInternal(file, uploadUrl, apiClient) {
         let retryCount = 0;
         let currentDelayMs = INITIAL_RETRY_DELAY_MS;
         while (retryCount < MAX_RETRY_COUNT) {
+            const mergedHeaders = Object.assign(Object.assign({}, ((httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.headers) || {})), { 'X-Goog-Upload-Command': uploadCommand, 'X-Goog-Upload-Offset': String(offset), 'Content-Length': String(chunkSize) });
             response = await apiClient.request({
                 path: '',
                 body: chunk,
                 httpMethod: 'POST',
-                httpOptions: {
-                    apiVersion: '',
-                    baseUrl: uploadUrl,
-                    headers: {
-                        'X-Goog-Upload-Command': uploadCommand,
-                        'X-Goog-Upload-Offset': String(offset),
-                        'Content-Length': String(chunkSize),
-                    },
-                },
+                httpOptions: Object.assign(Object.assign({}, httpOptions), { apiVersion: '', baseUrl: finalUrl, headers: mergedHeaders }),
             });
-            if ((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) {
+            if ((_b = response === null || response === void 0 ? void 0 : response.headers) === null || _b === void 0 ? void 0 : _b[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) {
                 break;
             }
             retryCount++;
@@ -2733,7 +2764,7 @@ async function uploadBlobInternal(file, uploadUrl, apiClient) {
         offset += chunkSize;
         // The `x-goog-upload-status` header field can be `active`, `final` and
         //`cancelled` in resposne.
-        if (((_b = response === null || response === void 0 ? void 0 : response.headers) === null || _b === void 0 ? void 0 : _b[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'active') {
+        if (((_c = response === null || response === void 0 ? void 0 : response.headers) === null || _c === void 0 ? void 0 : _c[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'active') {
             break;
         }
         // TODO(b/401391430) Investigate why the upload status is not finalized
@@ -2770,20 +2801,20 @@ class NodeUploader {
             return await getBlobStat(file);
         }
     }
-    async upload(file, uploadUrl, apiClient) {
+    async upload(file, uploadUrl, apiClient, httpOptions) {
         if (typeof file === 'string') {
-            return await this.uploadFileFromPath(file, uploadUrl, apiClient);
+            return await this.uploadFileFromPath(file, uploadUrl, apiClient, httpOptions);
         }
         else {
-            return uploadBlob(file, uploadUrl, apiClient);
+            return uploadBlob(file, uploadUrl, apiClient, httpOptions);
         }
     }
-    async uploadToFileSearchStore(file, uploadUrl, apiClient) {
+    async uploadToFileSearchStore(file, uploadUrl, apiClient, httpOptions) {
         if (typeof file === 'string') {
-            return await this.uploadFileToFileSearchStoreFromPath(file, uploadUrl, apiClient);
+            return await this.uploadFileToFileSearchStoreFromPath(file, uploadUrl, apiClient, httpOptions);
         }
         else {
-            return uploadBlobToFileSearchStore(file, uploadUrl, apiClient);
+            return uploadBlobToFileSearchStore(file, uploadUrl, apiClient, httpOptions);
         }
     }
     /**
@@ -2876,18 +2907,18 @@ class NodeUploader {
         // Return the MIME type.
         return mimeType;
     }
-    async uploadFileFromPath(file, uploadUrl, apiClient) {
+    async uploadFileFromPath(file, uploadUrl, apiClient, httpOptions) {
         var _a;
-        const response = await this.uploadFileFromPathInternal(file, uploadUrl, apiClient);
+        const response = await this.uploadFileFromPathInternal(file, uploadUrl, apiClient, httpOptions);
         const responseJson = (await (response === null || response === void 0 ? void 0 : response.json()));
         if (((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'final') {
             throw new Error('Failed to upload file: Upload status is not finalized.');
         }
         return responseJson['file'];
     }
-    async uploadFileToFileSearchStoreFromPath(file, uploadUrl, apiClient) {
+    async uploadFileToFileSearchStoreFromPath(file, uploadUrl, apiClient, httpOptions) {
         var _a;
-        const response = await this.uploadFileFromPathInternal(file, uploadUrl, apiClient);
+        const response = await this.uploadFileFromPathInternal(file, uploadUrl, apiClient, httpOptions);
         const responseJson = (await (response === null || response === void 0 ? void 0 : response.json()));
         if (((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'final') {
             throw new Error('Failed to upload file: Upload status is not finalized.');
@@ -2897,8 +2928,18 @@ class NodeUploader {
         Object.assign(typedResp, resp);
         return typedResp;
     }
-    async uploadFileFromPathInternal(file, uploadUrl, apiClient) {
-        var _a, _b;
+    async uploadFileFromPathInternal(file, uploadUrl, apiClient, httpOptions) {
+        var _a, _b, _c;
+        let finalUrl = uploadUrl;
+        const effectiveBaseUrl = (httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.baseUrl) || ((_a = apiClient.clientOptions.httpOptions) === null || _a === void 0 ? void 0 : _a.baseUrl);
+        if (effectiveBaseUrl) {
+            const baseUri = new URL(effectiveBaseUrl);
+            const uploadUri = new URL(uploadUrl);
+            uploadUri.protocol = baseUri.protocol;
+            uploadUri.host = baseUri.host;
+            uploadUri.port = baseUri.port;
+            finalUrl = uploadUri.toString();
+        }
         let fileSize = 0;
         let offset = 0;
         let response = new HttpResponse(new Response());
@@ -2925,22 +2966,14 @@ class NodeUploader {
                 let retryCount = 0;
                 let currentDelayMs = INITIAL_RETRY_DELAY_MS;
                 while (retryCount < MAX_RETRY_COUNT) {
+                    const mergedHeaders = Object.assign(Object.assign({}, ((httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.headers) || {})), { 'X-Goog-Upload-Command': uploadCommand, 'X-Goog-Upload-Offset': String(offset), 'Content-Length': String(bytesRead), 'X-Goog-Upload-File-Name': fileName });
                     response = await apiClient.request({
                         path: '',
                         body: chunk,
                         httpMethod: 'POST',
-                        httpOptions: {
-                            apiVersion: '',
-                            baseUrl: uploadUrl,
-                            headers: {
-                                'X-Goog-Upload-Command': uploadCommand,
-                                'X-Goog-Upload-Offset': String(offset),
-                                'Content-Length': String(bytesRead),
-                                'X-Goog-Upload-File-Name': fileName,
-                            },
-                        },
+                        httpOptions: Object.assign(Object.assign({}, httpOptions), { apiVersion: '', baseUrl: finalUrl, headers: mergedHeaders }),
                     });
-                    if ((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) {
+                    if ((_b = response === null || response === void 0 ? void 0 : response.headers) === null || _b === void 0 ? void 0 : _b[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) {
                         break;
                     }
                     retryCount++;
@@ -2950,7 +2983,7 @@ class NodeUploader {
                 offset += bytesRead;
                 // The `x-goog-upload-status` header field can be `active`, `final` and
                 //`cancelled` in resposne.
-                if (((_b = response === null || response === void 0 ? void 0 : response.headers) === null || _b === void 0 ? void 0 : _b[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'active') {
+                if (((_c = response === null || response === void 0 ? void 0 : response.headers) === null || _c === void 0 ? void 0 : _c[X_GOOG_UPLOAD_STATUS_HEADER_FIELD]) !== 'active') {
                     break;
                 }
                 if (fileSize <= offset) {