@google/genai 1.33.0 → 1.34.0

package/dist/index.cjs

@@ -758,21 +758,29 @@ exports.PhishBlockThreshold = void 0;
      */
     PhishBlockThreshold["BLOCK_ONLY_EXTREMELY_HIGH"] = "BLOCK_ONLY_EXTREMELY_HIGH";
 })(exports.PhishBlockThreshold || (exports.PhishBlockThreshold = {}));
-/** The level of thoughts tokens that the model should generate. */
+/** The number of thoughts tokens that the model should generate. */
 exports.ThinkingLevel = void 0;
 (function (ThinkingLevel) {
     /**
-     * Default value.
+     * Unspecified thinking level.
      */
     ThinkingLevel["THINKING_LEVEL_UNSPECIFIED"] = "THINKING_LEVEL_UNSPECIFIED";
     /**
      * Low thinking level.
      */
     ThinkingLevel["LOW"] = "LOW";
+    /**
+     * Medium thinking level.
+     */
+    ThinkingLevel["MEDIUM"] = "MEDIUM";
     /**
      * High thinking level.
      */
     ThinkingLevel["HIGH"] = "HIGH";
+    /**
+     * MINIMAL thinking level.
+     */
+    ThinkingLevel["MINIMAL"] = "MINIMAL";
 })(exports.ThinkingLevel || (exports.ThinkingLevel = {}));
 /** Harm category. */
 exports.HarmCategory = void 0;
@@ -1243,6 +1251,10 @@ exports.PartMediaResolutionLevel = void 0;
      * Media resolution set to high.
      */
     PartMediaResolutionLevel["MEDIA_RESOLUTION_HIGH"] = "MEDIA_RESOLUTION_HIGH";
+    /**
+     * Media resolution set to ultra high.
+     */
+    PartMediaResolutionLevel["MEDIA_RESOLUTION_ULTRA_HIGH"] = "MEDIA_RESOLUTION_ULTRA_HIGH";
 })(exports.PartMediaResolutionLevel || (exports.PartMediaResolutionLevel = {}));
 /** Options for feature selection preference. */
 exports.FeatureSelectionPreference = void 0;
@@ -6885,7 +6897,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.33.0'; // x-release-please-version
+const SDK_VERSION = '1.34.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';
@@ -6959,6 +6971,11 @@ class ApiClient {
     getLocation() {
         return this.clientOptions.location;
     }
+    async getAuthHeaders() {
+        const headers = new Headers();
+        await this.clientOptions.auth.addAuthHeaders(headers);
+        return headers;
+    }
     getApiVersion() {
         if (this.clientOptions.httpOptions &&
             this.clientOptions.httpOptions.apiVersion !== undefined) {
@@ -10085,7 +10102,7 @@ class BaseGeminiNextGenAPIClient {
      */
     constructor(_b) {
         var _c, _d, _e, _f, _g, _h, _j;
-        var _k = _b === void 0 ? {} : _b, { baseURL = readEnv('GEMINI_NEXT_GEN_API_BASE_URL'), apiKey = (_c = readEnv('GEMINI_API_KEY')) !== null && _c !== void 0 ? _c : null, apiVersion = 'v1beta' } = _k, opts = __rest(_k, ["baseURL", "apiKey", "apiVersion"]);
+        var { baseURL = readEnv('GEMINI_NEXT_GEN_API_BASE_URL'), apiKey = (_c = readEnv('GEMINI_API_KEY')) !== null && _c !== void 0 ? _c : null, apiVersion = 'v1beta' } = _b, opts = __rest(_b, ["baseURL", "apiKey", "apiVersion"]);
         const options = Object.assign(Object.assign({ apiKey,
             apiVersion }, opts), { baseURL: baseURL || `https://generativelanguage.googleapis.com` });
         this.baseURL = options.baseURL;
@@ -10103,6 +10120,7 @@ class BaseGeminiNextGenAPIClient {
         this._options = options;
         this.apiKey = apiKey;
         this.apiVersion = apiVersion;
+        this.clientAdapter = options.clientAdapter;
     }
     /**
      * Create a new client instance re-using the same options given to the current client with optional overriding.
@@ -10121,6 +10139,10 @@ class BaseGeminiNextGenAPIClient {
         return this._options.defaultQuery;
     }
     validateHeaders({ values, nulls }) {
+        // The headers object handles case insensitivity.
+        if (values.has('authorization') || values.has('x-goog-api-key')) {
+            return;
+        }
         if (this.apiKey && values.get('x-goog-api-key')) {
             return;
         }
@@ -10130,10 +10152,17 @@ class BaseGeminiNextGenAPIClient {
         throw new Error('Could not resolve authentication method. Expected the apiKey to be set. Or for the "x-goog-api-key" headers to be explicitly omitted');
     }
     async authHeaders(opts) {
-        if (this.apiKey == null) {
+        const existingHeaders = buildHeaders([opts.headers]);
+        if (existingHeaders.values.has('authorization') || existingHeaders.values.has('x-goog-api-key')) {
             return undefined;
         }
-        return buildHeaders([{ 'x-goog-api-key': this.apiKey }]);
+        if (this.apiKey) {
+            return buildHeaders([{ 'x-goog-api-key': this.apiKey }]);
+        }
+        if (this.clientAdapter.isVertexAI()) {
+            return buildHeaders([await this.clientAdapter.getAuthHeaders()]);
+        }
+        return undefined;
     }
     /**
      * Basic re-implementation of `qs.stringify` for primitive types.
@@ -10177,8 +10206,16 @@ class BaseGeminiNextGenAPIClient {
     }
     /**
      * Used as a callback for mutating the given `FinalRequestOptions` object.
+  
      */
-    async prepareOptions(options) { }
+    async prepareOptions(options) {
+        if (this.clientAdapter &&
+            this.clientAdapter.isVertexAI() &&
+            !options.path.startsWith(`/${this.apiVersion}/projects/`)) {
+            const oldPath = options.path.slice(this.apiVersion.length + 1);
+            options.path = `/${this.apiVersion}/projects/${this.clientAdapter.getProject()}/locations/${this.clientAdapter.getLocation()}${oldPath}`;
+        }
+    }
     /**
      * Used as a callback for mutating the given `RequestInit` object.
      *
@@ -10420,13 +10457,14 @@ class BaseGeminiNextGenAPIClient {
                 options.idempotencyKey = this.defaultIdempotencyKey();
             idempotencyHeaders[this.idempotencyHeader] = options.idempotencyKey;
         }
-        const headers = buildHeaders([
+        const authHeaders = await this.authHeaders(options);
+        let headers = buildHeaders([
             idempotencyHeaders,
             Object.assign(Object.assign({ Accept: 'application/json', 'User-Agent': this.getUserAgent(), 'X-Stainless-Retry-Count': String(retryCount) }, (options.timeout ? { 'X-Stainless-Timeout': String(Math.trunc(options.timeout / 1000)) } : {})), getPlatformHeaders()),
-            await this.authHeaders(options),
             this._options.defaultHeaders,
             bodyHeaders,
             options.headers,
+            authHeaders,
         ]);
         this.validateHeaders(headers);
         return headers.values;
@@ -10698,7 +10736,7 @@ function generationConfigToVertex$1(fromObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex$1(fromSpeechConfig));
+        setValueByPath(toObject, ['speechConfig'], fromSpeechConfig);
     }
     const fromStopSequences = getValueByPath(fromObject, [
         'stopSequences',
@@ -10914,7 +10952,7 @@ function liveConnectConfigToVertex(fromObject, parentObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (parentObject !== undefined && fromSpeechConfig != null) {
-        setValueByPath(parentObject, ['setup', 'generationConfig', 'speechConfig'], speechConfigToVertex$1(tLiveSpeechConfig(fromSpeechConfig)));
+        setValueByPath(parentObject, ['setup', 'generationConfig', 'speechConfig'], tLiveSpeechConfig(fromSpeechConfig));
     }
     const fromThinkingConfig = getValueByPath(fromObject, [
         'thinkingConfig',
@@ -11239,21 +11277,6 @@ function sessionResumptionConfigToMldev$1(fromObject) {
     }
     return toObject;
 }
-function speechConfigToVertex$1(fromObject) {
-    const toObject = {};
-    const fromVoiceConfig = getValueByPath(fromObject, ['voiceConfig']);
-    if (fromVoiceConfig != null) {
-        setValueByPath(toObject, ['voiceConfig'], fromVoiceConfig);
-    }
-    const fromLanguageCode = getValueByPath(fromObject, ['languageCode']);
-    if (fromLanguageCode != null) {
-        setValueByPath(toObject, ['languageCode'], fromLanguageCode);
-    }
-    if (getValueByPath(fromObject, ['multiSpeakerVoiceConfig']) !== undefined) {
-        throw new Error('multiSpeakerVoiceConfig parameter is not supported in Vertex AI.');
-    }
-    return toObject;
-}
 function toolToMldev$2(fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -12496,7 +12519,7 @@ function generateContentConfigToVertex(apiClient, fromObject, parentObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex(tSpeechConfig(fromSpeechConfig)));
+        setValueByPath(toObject, ['speechConfig'], tSpeechConfig(fromSpeechConfig));
     }
     const fromAudioTimestamp = getValueByPath(fromObject, [
         'audioTimestamp',
@@ -13442,7 +13465,7 @@ function generationConfigToVertex(fromObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex(fromSpeechConfig));
+        setValueByPath(toObject, ['speechConfig'], fromSpeechConfig);
     }
     const fromStopSequences = getValueByPath(fromObject, [
         'stopSequences',
@@ -14244,21 +14267,6 @@ function segmentImageSourceToVertex(fromObject, parentObject) {
     }
     return toObject;
 }
-function speechConfigToVertex(fromObject) {
-    const toObject = {};
-    const fromVoiceConfig = getValueByPath(fromObject, ['voiceConfig']);
-    if (fromVoiceConfig != null) {
-        setValueByPath(toObject, ['voiceConfig'], fromVoiceConfig);
-    }
-    const fromLanguageCode = getValueByPath(fromObject, ['languageCode']);
-    if (fromLanguageCode != null) {
-        setValueByPath(toObject, ['languageCode'], fromLanguageCode);
-    }
-    if (getValueByPath(fromObject, ['multiSpeakerVoiceConfig']) !== undefined) {
-        throw new Error('multiSpeakerVoiceConfig parameter is not supported in Vertex AI.');
-    }
-    return toObject;
-}
 function toolConfigToMldev(fromObject) {
     const toObject = {};
     const fromFunctionCallingConfig = getValueByPath(fromObject, [
@@ -19110,6 +19118,8 @@ class GoogleGenAI {
         const nextGenClient = new GeminiNextGenAPIClient({
             baseURL: this.apiClient.getBaseUrl(),
             apiKey: this.apiKey,
+            apiVersion: this.apiClient.getApiVersion(),
+            clientAdapter: this.apiClient,
             defaultHeaders: this.apiClient.getDefaultHeaders(),
             timeout: httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.timeout,
         });

package/dist/index.mjs

@@ -756,21 +756,29 @@ var PhishBlockThreshold;
      */
     PhishBlockThreshold["BLOCK_ONLY_EXTREMELY_HIGH"] = "BLOCK_ONLY_EXTREMELY_HIGH";
 })(PhishBlockThreshold || (PhishBlockThreshold = {}));
-/** The level of thoughts tokens that the model should generate. */
+/** The number of thoughts tokens that the model should generate. */
 var ThinkingLevel;
 (function (ThinkingLevel) {
     /**
-     * Default value.
+     * Unspecified thinking level.
      */
     ThinkingLevel["THINKING_LEVEL_UNSPECIFIED"] = "THINKING_LEVEL_UNSPECIFIED";
     /**
      * Low thinking level.
      */
     ThinkingLevel["LOW"] = "LOW";
+    /**
+     * Medium thinking level.
+     */
+    ThinkingLevel["MEDIUM"] = "MEDIUM";
     /**
      * High thinking level.
      */
     ThinkingLevel["HIGH"] = "HIGH";
+    /**
+     * MINIMAL thinking level.
+     */
+    ThinkingLevel["MINIMAL"] = "MINIMAL";
 })(ThinkingLevel || (ThinkingLevel = {}));
 /** Harm category. */
 var HarmCategory;
@@ -1241,6 +1249,10 @@ var PartMediaResolutionLevel;
      * Media resolution set to high.
      */
     PartMediaResolutionLevel["MEDIA_RESOLUTION_HIGH"] = "MEDIA_RESOLUTION_HIGH";
+    /**
+     * Media resolution set to ultra high.
+     */
+    PartMediaResolutionLevel["MEDIA_RESOLUTION_ULTRA_HIGH"] = "MEDIA_RESOLUTION_ULTRA_HIGH";
 })(PartMediaResolutionLevel || (PartMediaResolutionLevel = {}));
 /** Options for feature selection preference. */
 var FeatureSelectionPreference;
@@ -6883,7 +6895,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.33.0'; // x-release-please-version
+const SDK_VERSION = '1.34.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';
@@ -6957,6 +6969,11 @@ class ApiClient {
     getLocation() {
         return this.clientOptions.location;
     }
+    async getAuthHeaders() {
+        const headers = new Headers();
+        await this.clientOptions.auth.addAuthHeaders(headers);
+        return headers;
+    }
     getApiVersion() {
         if (this.clientOptions.httpOptions &&
             this.clientOptions.httpOptions.apiVersion !== undefined) {
@@ -10083,7 +10100,7 @@ class BaseGeminiNextGenAPIClient {
      */
     constructor(_b) {
         var _c, _d, _e, _f, _g, _h, _j;
-        var _k = _b === void 0 ? {} : _b, { baseURL = readEnv('GEMINI_NEXT_GEN_API_BASE_URL'), apiKey = (_c = readEnv('GEMINI_API_KEY')) !== null && _c !== void 0 ? _c : null, apiVersion = 'v1beta' } = _k, opts = __rest(_k, ["baseURL", "apiKey", "apiVersion"]);
+        var { baseURL = readEnv('GEMINI_NEXT_GEN_API_BASE_URL'), apiKey = (_c = readEnv('GEMINI_API_KEY')) !== null && _c !== void 0 ? _c : null, apiVersion = 'v1beta' } = _b, opts = __rest(_b, ["baseURL", "apiKey", "apiVersion"]);
         const options = Object.assign(Object.assign({ apiKey,
             apiVersion }, opts), { baseURL: baseURL || `https://generativelanguage.googleapis.com` });
         this.baseURL = options.baseURL;
@@ -10101,6 +10118,7 @@ class BaseGeminiNextGenAPIClient {
         this._options = options;
         this.apiKey = apiKey;
         this.apiVersion = apiVersion;
+        this.clientAdapter = options.clientAdapter;
     }
     /**
      * Create a new client instance re-using the same options given to the current client with optional overriding.
@@ -10119,6 +10137,10 @@ class BaseGeminiNextGenAPIClient {
         return this._options.defaultQuery;
     }
     validateHeaders({ values, nulls }) {
+        // The headers object handles case insensitivity.
+        if (values.has('authorization') || values.has('x-goog-api-key')) {
+            return;
+        }
         if (this.apiKey && values.get('x-goog-api-key')) {
             return;
         }
@@ -10128,10 +10150,17 @@ class BaseGeminiNextGenAPIClient {
         throw new Error('Could not resolve authentication method. Expected the apiKey to be set. Or for the "x-goog-api-key" headers to be explicitly omitted');
     }
     async authHeaders(opts) {
-        if (this.apiKey == null) {
+        const existingHeaders = buildHeaders([opts.headers]);
+        if (existingHeaders.values.has('authorization') || existingHeaders.values.has('x-goog-api-key')) {
             return undefined;
         }
-        return buildHeaders([{ 'x-goog-api-key': this.apiKey }]);
+        if (this.apiKey) {
+            return buildHeaders([{ 'x-goog-api-key': this.apiKey }]);
+        }
+        if (this.clientAdapter.isVertexAI()) {
+            return buildHeaders([await this.clientAdapter.getAuthHeaders()]);
+        }
+        return undefined;
     }
     /**
      * Basic re-implementation of `qs.stringify` for primitive types.
@@ -10175,8 +10204,16 @@ class BaseGeminiNextGenAPIClient {
     }
     /**
      * Used as a callback for mutating the given `FinalRequestOptions` object.
+  
      */
-    async prepareOptions(options) { }
+    async prepareOptions(options) {
+        if (this.clientAdapter &&
+            this.clientAdapter.isVertexAI() &&
+            !options.path.startsWith(`/${this.apiVersion}/projects/`)) {
+            const oldPath = options.path.slice(this.apiVersion.length + 1);
+            options.path = `/${this.apiVersion}/projects/${this.clientAdapter.getProject()}/locations/${this.clientAdapter.getLocation()}${oldPath}`;
+        }
+    }
     /**
      * Used as a callback for mutating the given `RequestInit` object.
      *
@@ -10418,13 +10455,14 @@ class BaseGeminiNextGenAPIClient {
                 options.idempotencyKey = this.defaultIdempotencyKey();
             idempotencyHeaders[this.idempotencyHeader] = options.idempotencyKey;
         }
-        const headers = buildHeaders([
+        const authHeaders = await this.authHeaders(options);
+        let headers = buildHeaders([
             idempotencyHeaders,
             Object.assign(Object.assign({ Accept: 'application/json', 'User-Agent': this.getUserAgent(), 'X-Stainless-Retry-Count': String(retryCount) }, (options.timeout ? { 'X-Stainless-Timeout': String(Math.trunc(options.timeout / 1000)) } : {})), getPlatformHeaders()),
-            await this.authHeaders(options),
             this._options.defaultHeaders,
             bodyHeaders,
             options.headers,
+            authHeaders,
         ]);
         this.validateHeaders(headers);
         return headers.values;
@@ -10696,7 +10734,7 @@ function generationConfigToVertex$1(fromObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex$1(fromSpeechConfig));
+        setValueByPath(toObject, ['speechConfig'], fromSpeechConfig);
     }
     const fromStopSequences = getValueByPath(fromObject, [
         'stopSequences',
@@ -10912,7 +10950,7 @@ function liveConnectConfigToVertex(fromObject, parentObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (parentObject !== undefined && fromSpeechConfig != null) {
-        setValueByPath(parentObject, ['setup', 'generationConfig', 'speechConfig'], speechConfigToVertex$1(tLiveSpeechConfig(fromSpeechConfig)));
+        setValueByPath(parentObject, ['setup', 'generationConfig', 'speechConfig'], tLiveSpeechConfig(fromSpeechConfig));
     }
     const fromThinkingConfig = getValueByPath(fromObject, [
         'thinkingConfig',
@@ -11237,21 +11275,6 @@ function sessionResumptionConfigToMldev$1(fromObject) {
     }
     return toObject;
 }
-function speechConfigToVertex$1(fromObject) {
-    const toObject = {};
-    const fromVoiceConfig = getValueByPath(fromObject, ['voiceConfig']);
-    if (fromVoiceConfig != null) {
-        setValueByPath(toObject, ['voiceConfig'], fromVoiceConfig);
-    }
-    const fromLanguageCode = getValueByPath(fromObject, ['languageCode']);
-    if (fromLanguageCode != null) {
-        setValueByPath(toObject, ['languageCode'], fromLanguageCode);
-    }
-    if (getValueByPath(fromObject, ['multiSpeakerVoiceConfig']) !== undefined) {
-        throw new Error('multiSpeakerVoiceConfig parameter is not supported in Vertex AI.');
-    }
-    return toObject;
-}
 function toolToMldev$2(fromObject) {
     const toObject = {};
     const fromFunctionDeclarations = getValueByPath(fromObject, [
@@ -12494,7 +12517,7 @@ function generateContentConfigToVertex(apiClient, fromObject, parentObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex(tSpeechConfig(fromSpeechConfig)));
+        setValueByPath(toObject, ['speechConfig'], tSpeechConfig(fromSpeechConfig));
     }
     const fromAudioTimestamp = getValueByPath(fromObject, [
         'audioTimestamp',
@@ -13440,7 +13463,7 @@ function generationConfigToVertex(fromObject) {
     }
     const fromSpeechConfig = getValueByPath(fromObject, ['speechConfig']);
     if (fromSpeechConfig != null) {
-        setValueByPath(toObject, ['speechConfig'], speechConfigToVertex(fromSpeechConfig));
+        setValueByPath(toObject, ['speechConfig'], fromSpeechConfig);
     }
     const fromStopSequences = getValueByPath(fromObject, [
         'stopSequences',
@@ -14242,21 +14265,6 @@ function segmentImageSourceToVertex(fromObject, parentObject) {
     }
     return toObject;
 }
-function speechConfigToVertex(fromObject) {
-    const toObject = {};
-    const fromVoiceConfig = getValueByPath(fromObject, ['voiceConfig']);
-    if (fromVoiceConfig != null) {
-        setValueByPath(toObject, ['voiceConfig'], fromVoiceConfig);
-    }
-    const fromLanguageCode = getValueByPath(fromObject, ['languageCode']);
-    if (fromLanguageCode != null) {
-        setValueByPath(toObject, ['languageCode'], fromLanguageCode);
-    }
-    if (getValueByPath(fromObject, ['multiSpeakerVoiceConfig']) !== undefined) {
-        throw new Error('multiSpeakerVoiceConfig parameter is not supported in Vertex AI.');
-    }
-    return toObject;
-}
 function toolConfigToMldev(fromObject) {
     const toObject = {};
     const fromFunctionCallingConfig = getValueByPath(fromObject, [
@@ -19108,6 +19116,8 @@ class GoogleGenAI {
         const nextGenClient = new GeminiNextGenAPIClient({
             baseURL: this.apiClient.getBaseUrl(),
             apiKey: this.apiKey,
+            apiVersion: this.apiClient.getApiVersion(),
+            clientAdapter: this.apiClient,
             defaultHeaders: this.apiClient.getDefaultHeaders(),
             timeout: httpOpts === null || httpOpts === void 0 ? void 0 : httpOpts.timeout,
         });