@google/genai 1.37.0 → 1.38.0

package/dist/web/index.mjs

@@ -1324,6 +1324,18 @@ var PartMediaResolutionLevel;
      */
     PartMediaResolutionLevel["MEDIA_RESOLUTION_ULTRA_HIGH"] = "MEDIA_RESOLUTION_ULTRA_HIGH";
 })(PartMediaResolutionLevel || (PartMediaResolutionLevel = {}));
+/** Resource scope. */
+var ResourceScope;
+(function (ResourceScope) {
+    /**
+     * When setting base_url, this value configures resource scope to be the collection.
+        The resource name will not include api version, project, or location.
+        For example, if base_url is set to "https://aiplatform.googleapis.com",
+        then the resource name for a Model would be
+        "https://aiplatform.googleapis.com/publishers/google/models/gemini-3-pro-preview
+     */
+    ResourceScope["COLLECTION"] = "COLLECTION";
+})(ResourceScope || (ResourceScope = {}));
 /** Options for feature selection preference. */
 var FeatureSelectionPreference;
 (function (FeatureSelectionPreference) {
@@ -4160,6 +4172,9 @@ function generateContentConfigToMldev$1(apiClient, fromObject, parentObject) {
     if (fromEnableEnhancedCivicAnswers != null) {
         setValueByPath(toObject, ['enableEnhancedCivicAnswers'], fromEnableEnhancedCivicAnswers);
     }
+    if (getValueByPath(fromObject, ['modelArmorConfig']) !== undefined) {
+        throw new Error('modelArmorConfig parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function generateContentResponseFromMldev$1(fromObject) {
@@ -8917,6 +8932,9 @@ function generateContentConfigToMldev(apiClient, fromObject, parentObject) {
     if (fromEnableEnhancedCivicAnswers != null) {
         setValueByPath(toObject, ['enableEnhancedCivicAnswers'], fromEnableEnhancedCivicAnswers);
     }
+    if (getValueByPath(fromObject, ['modelArmorConfig']) !== undefined) {
+        throw new Error('modelArmorConfig parameter is not supported in Gemini API.');
+    }
     return toObject;
 }
 function generateContentConfigToVertex(apiClient, fromObject, parentObject) {
@@ -9085,6 +9103,12 @@ function generateContentConfigToVertex(apiClient, fromObject, parentObject) {
         undefined) {
         throw new Error('enableEnhancedCivicAnswers parameter is not supported in Vertex AI.');
     }
+    const fromModelArmorConfig = getValueByPath(fromObject, [
+        'modelArmorConfig',
+    ]);
+    if (parentObject !== undefined && fromModelArmorConfig != null) {
+        setValueByPath(parentObject, ['modelArmorConfig'], fromModelArmorConfig);
+    }
     return toObject;
 }
 function generateContentParametersToMldev(apiClient, fromObject) {
@@ -11501,7 +11525,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.37.0'; // x-release-please-version
+const SDK_VERSION = '1.38.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';
@@ -11511,19 +11535,57 @@ const GOOGLE_AI_API_DEFAULT_VERSION = 'v1beta';
  */
 class ApiClient {
     constructor(opts) {
-        var _a, _b;
-        this.clientOptions = Object.assign(Object.assign({}, opts), { project: opts.project, location: opts.location, apiKey: opts.apiKey, vertexai: opts.vertexai });
+        var _a, _b, _c;
+        this.clientOptions = Object.assign({}, opts);
+        this.customBaseUrl = (_a = opts.httpOptions) === null || _a === void 0 ? void 0 : _a.baseUrl;
+        if (this.clientOptions.vertexai) {
+            if (this.clientOptions.project && this.clientOptions.location) {
+                this.clientOptions.apiKey = undefined;
+            }
+            else if (this.clientOptions.apiKey) {
+                this.clientOptions.project = undefined;
+                this.clientOptions.location = undefined;
+            }
+        }
         const initHttpOptions = {};
         if (this.clientOptions.vertexai) {
+            if (!this.clientOptions.location &&
+                !this.clientOptions.apiKey &&
+                !this.customBaseUrl) {
+                this.clientOptions.location = 'global';
+            }
+            const hasSufficientAuth = (this.clientOptions.project && this.clientOptions.location) ||
+                this.clientOptions.apiKey;
+            if (!hasSufficientAuth && !this.customBaseUrl) {
+                throw new Error('Authentication is not set up. Please provide either a project and location, or an API key, or a custom base URL.');
+            }
+            const hasConstructorAuth = (opts.project && opts.location) || !!opts.apiKey;
+            if (this.customBaseUrl && !hasConstructorAuth) {
+                initHttpOptions.baseUrl = this.customBaseUrl;
+                this.clientOptions.project = undefined;
+                this.clientOptions.location = undefined;
+            }
+            else if (this.clientOptions.apiKey ||
+                this.clientOptions.location === 'global') {
+                // Vertex Express or global endpoint case.
+                initHttpOptions.baseUrl = 'https://aiplatform.googleapis.com/';
+            }
+            else if (this.clientOptions.project && this.clientOptions.location) {
+                initHttpOptions.baseUrl = `https://${this.clientOptions.location}-aiplatform.googleapis.com/`;
+            }
             initHttpOptions.apiVersion =
-                (_a = this.clientOptions.apiVersion) !== null && _a !== void 0 ? _a : VERTEX_AI_API_DEFAULT_VERSION;
-            initHttpOptions.baseUrl = this.baseUrlFromProjectLocation();
-            this.normalizeAuthParameters();
+                (_b = this.clientOptions.apiVersion) !== null && _b !== void 0 ? _b : VERTEX_AI_API_DEFAULT_VERSION;
         }
         else {
             // Gemini API
+            if (!this.clientOptions.apiKey) {
+                throw new ApiError({
+                    message: 'API key must be set when using the Gemini API.',
+                    status: 403,
+                });
+            }
             initHttpOptions.apiVersion =
-                (_b = this.clientOptions.apiVersion) !== null && _b !== void 0 ? _b : GOOGLE_AI_API_DEFAULT_VERSION;
+                (_c = this.clientOptions.apiVersion) !== null && _c !== void 0 ? _c : GOOGLE_AI_API_DEFAULT_VERSION;
             initHttpOptions.baseUrl = `https://generativelanguage.googleapis.com/`;
         }
         initHttpOptions.headers = this.getDefaultHeaders();
@@ -11532,39 +11594,6 @@ class ApiClient {
             this.clientOptions.httpOptions = this.patchHttpOptions(initHttpOptions, opts.httpOptions);
         }
     }
-    /**
-     * Determines the base URL for Vertex AI based on project and location.
-     * Uses the global endpoint if location is 'global' or if project/location
-     * are not specified (implying API key usage).
-     * @private
-     */
-    baseUrlFromProjectLocation() {
-        if (this.clientOptions.project &&
-            this.clientOptions.location &&
-            this.clientOptions.location !== 'global') {
-            // Regional endpoint
-            return `https://${this.clientOptions.location}-aiplatform.googleapis.com/`;
-        }
-        // Global endpoint (covers 'global' location and API key usage)
-        return `https://aiplatform.googleapis.com/`;
-    }
-    /**
-     * Normalizes authentication parameters for Vertex AI.
-     * If project and location are provided, API key is cleared.
-     * If project and location are not provided (implying API key usage),
-     * project and location are cleared.
-     * @private
-     */
-    normalizeAuthParameters() {
-        if (this.clientOptions.project && this.clientOptions.location) {
-            // Using project/location for auth, clear potential API key
-            this.clientOptions.apiKey = undefined;
-            return;
-        }
-        // Using API key for auth (or no auth provided yet), clear project/location
-        this.clientOptions.project = undefined;
-        this.clientOptions.location = undefined;
-    }
     isVertexAI() {
         var _a;
         return (_a = this.clientOptions.vertexai) !== null && _a !== void 0 ? _a : false;
@@ -11575,6 +11604,9 @@ class ApiClient {
     getLocation() {
         return this.clientOptions.location;
     }
+    getCustomBaseUrl() {
+        return this.customBaseUrl;
+    }
     async getAuthHeaders() {
         const headers = new Headers();
         await this.clientOptions.auth.addAuthHeaders(headers);
@@ -11652,7 +11684,11 @@ class ApiClient {
         const url = new URL(`${urlElement.join('/')}`);
         return url;
     }
-    shouldPrependVertexProjectPath(request) {
+    shouldPrependVertexProjectPath(request, httpOptions) {
+        if (httpOptions.baseUrl &&
+            httpOptions.baseUrlResourceScope === ResourceScope.COLLECTION) {
+            return false;
+        }
         if (this.clientOptions.apiKey) {
             return false;
         }
@@ -11678,7 +11714,7 @@ class ApiClient {
         if (request.httpOptions) {
             patchedHttpOptions = this.patchHttpOptions(this.clientOptions.httpOptions, request.httpOptions);
         }
-        const prependProjectLocation = this.shouldPrependVertexProjectPath(request);
+        const prependProjectLocation = this.shouldPrependVertexProjectPath(request, patchedHttpOptions);
         const url = this.constructUrl(request.path, patchedHttpOptions, prependProjectLocation);
         if (request.queryParams) {
             for (const [key, value] of Object.entries(request.queryParams)) {
@@ -11721,7 +11757,7 @@ class ApiClient {
         if (request.httpOptions) {
             patchedHttpOptions = this.patchHttpOptions(this.clientOptions.httpOptions, request.httpOptions);
         }
-        const prependProjectLocation = this.shouldPrependVertexProjectPath(request);
+        const prependProjectLocation = this.shouldPrependVertexProjectPath(request, patchedHttpOptions);
         const url = this.constructUrl(request.path, patchedHttpOptions, prependProjectLocation);
         if (!url.searchParams.has('alt') || url.searchParams.get('alt') !== 'sse') {
             url.searchParams.set('alt', 'sse');
@@ -12648,8 +12684,19 @@ class Live {
         }
         const headers = mapToHeaders(clientHeaders);
         if (this.apiClient.isVertexAI()) {
-            url = `${websocketBaseUrl}/ws/google.cloud.aiplatform.${apiVersion}.LlmBidiService/BidiGenerateContent`;
-            await this.auth.addAuthHeaders(headers, url);
+            const project = this.apiClient.getProject();
+            const location = this.apiClient.getLocation();
+            const apiKey = this.apiClient.getApiKey();
+            const hasStandardAuth = (!!project && !!location) || !!apiKey;
+            if (this.apiClient.getCustomBaseUrl() && !hasStandardAuth) {
+                // Custom base URL without standard auth (e.g., proxy).
+                url = websocketBaseUrl;
+                // Auth headers are assumed to be in `clientHeaders` from httpOptions.
+            }
+            else {
+                url = `${websocketBaseUrl}/ws/google.cloud.aiplatform.${apiVersion}.LlmBidiService/BidiGenerateContent`;
+                await this.auth.addAuthHeaders(headers, url);
+            }
         }
         else {
             const apiKey = this.apiClient.getApiKey();
@@ -12695,8 +12742,10 @@ class Live {
             transformedModel.startsWith('publishers/')) {
             const project = this.apiClient.getProject();
             const location = this.apiClient.getLocation();
-            transformedModel =
-                `projects/${project}/locations/${location}/` + transformedModel;
+            if (project && location) {
+                transformedModel =
+                    `projects/${project}/locations/${location}/` + transformedModel;
+            }
         }
         let clientMessage = {};
         if (this.apiClient.isVertexAI() &&
@@ -19243,5 +19292,5 @@ class GoogleGenAI {
     }
 }
 
-export { ActivityHandling, AdapterSize, ApiError, ApiSpec, AuthType, Batches, Behavior, BlockedReason, Caches, CancelTuningJobResponse, Chat, Chats, ComputeTokensResponse, ContentReferenceImage, ControlReferenceImage, ControlReferenceType, CountTokensResponse, CreateFileResponse, DeleteCachedContentResponse, DeleteFileResponse, DeleteModelResponse, DocumentState, DynamicRetrievalConfigMode, EditImageResponse, EditMode, EmbedContentResponse, EndSensitivity, Environment, FeatureSelectionPreference, FileSource, FileState, Files, FinishReason, FunctionCallingConfigMode, FunctionResponse, FunctionResponseBlob, FunctionResponseFileData, FunctionResponsePart, FunctionResponseScheduling, GenerateContentResponse, GenerateContentResponsePromptFeedback, GenerateContentResponseUsageMetadata, GenerateImagesResponse, GenerateVideosOperation, GenerateVideosResponse, GoogleGenAI, HarmBlockMethod, HarmBlockThreshold, HarmCategory, HarmProbability, HarmSeverity, HttpElementLocation, HttpResponse, ImagePromptLanguage, ImportFileOperation, ImportFileResponse, InlinedEmbedContentResponse, InlinedResponse, JobState, Language, ListBatchJobsResponse, ListCachedContentsResponse, ListDocumentsResponse, ListFileSearchStoresResponse, ListFilesResponse, ListModelsResponse, ListTuningJobsResponse, Live, LiveClientToolResponse, LiveMusicPlaybackControl, LiveMusicServerMessage, LiveSendToolResponseParameters, LiveServerMessage, MaskReferenceImage, MaskReferenceMode, MediaModality, MediaResolution, Modality, Models, MusicGenerationMode, Operations, Outcome, PagedItem, Pager, PartMediaResolutionLevel, PersonGeneration, PhishBlockThreshold, RawReferenceImage, RecontextImageResponse, ReplayResponse, SafetyFilterLevel, Scale, SegmentImageResponse, SegmentMode, Session, SingleEmbedContentResponse, StartSensitivity, StyleReferenceImage, SubjectReferenceImage, SubjectReferenceType, ThinkingLevel, Tokens, TrafficType, TuningMethod, TuningMode, TuningTask, TurnCompleteReason, TurnCoverage, Type, UploadToFileSearchStoreOperation, UploadToFileSearchStoreResponse, UploadToFileSearchStoreResumableResponse, UpscaleImageResponse, UrlRetrievalStatus, VadSignalType, VideoCompressionQuality, VideoGenerationMaskMode, VideoGenerationReferenceType, VoiceActivityType, createFunctionResponsePartFromBase64, createFunctionResponsePartFromUri, createModelContent, createPartFromBase64, createPartFromCodeExecutionResult, createPartFromExecutableCode, createPartFromFunctionCall, createPartFromFunctionResponse, createPartFromText, createPartFromUri, createUserContent, mcpToTool, setDefaultBaseUrls };
+export { ActivityHandling, AdapterSize, ApiError, ApiSpec, AuthType, Batches, Behavior, BlockedReason, Caches, CancelTuningJobResponse, Chat, Chats, ComputeTokensResponse, ContentReferenceImage, ControlReferenceImage, ControlReferenceType, CountTokensResponse, CreateFileResponse, DeleteCachedContentResponse, DeleteFileResponse, DeleteModelResponse, DocumentState, DynamicRetrievalConfigMode, EditImageResponse, EditMode, EmbedContentResponse, EndSensitivity, Environment, FeatureSelectionPreference, FileSource, FileState, Files, FinishReason, FunctionCallingConfigMode, FunctionResponse, FunctionResponseBlob, FunctionResponseFileData, FunctionResponsePart, FunctionResponseScheduling, GenerateContentResponse, GenerateContentResponsePromptFeedback, GenerateContentResponseUsageMetadata, GenerateImagesResponse, GenerateVideosOperation, GenerateVideosResponse, GoogleGenAI, HarmBlockMethod, HarmBlockThreshold, HarmCategory, HarmProbability, HarmSeverity, HttpElementLocation, HttpResponse, ImagePromptLanguage, ImportFileOperation, ImportFileResponse, InlinedEmbedContentResponse, InlinedResponse, JobState, Language, ListBatchJobsResponse, ListCachedContentsResponse, ListDocumentsResponse, ListFileSearchStoresResponse, ListFilesResponse, ListModelsResponse, ListTuningJobsResponse, Live, LiveClientToolResponse, LiveMusicPlaybackControl, LiveMusicServerMessage, LiveSendToolResponseParameters, LiveServerMessage, MaskReferenceImage, MaskReferenceMode, MediaModality, MediaResolution, Modality, Models, MusicGenerationMode, Operations, Outcome, PagedItem, Pager, PartMediaResolutionLevel, PersonGeneration, PhishBlockThreshold, RawReferenceImage, RecontextImageResponse, ReplayResponse, ResourceScope, SafetyFilterLevel, Scale, SegmentImageResponse, SegmentMode, Session, SingleEmbedContentResponse, StartSensitivity, StyleReferenceImage, SubjectReferenceImage, SubjectReferenceType, ThinkingLevel, Tokens, TrafficType, TuningMethod, TuningMode, TuningTask, TurnCompleteReason, TurnCoverage, Type, UploadToFileSearchStoreOperation, UploadToFileSearchStoreResponse, UploadToFileSearchStoreResumableResponse, UpscaleImageResponse, UrlRetrievalStatus, VadSignalType, VideoCompressionQuality, VideoGenerationMaskMode, VideoGenerationReferenceType, VoiceActivityType, createFunctionResponsePartFromBase64, createFunctionResponsePartFromUri, createModelContent, createPartFromBase64, createPartFromCodeExecutionResult, createPartFromExecutableCode, createPartFromFunctionCall, createPartFromFunctionResponse, createPartFromText, createPartFromUri, createUserContent, mcpToTool, setDefaultBaseUrls };
 //# sourceMappingURL=index.mjs.map