@google/genai 0.15.0 → 1.0.1

package/dist/node/node.d.ts

@@ -909,6 +909,40 @@ export declare class CountTokensResponse {
     cachedContentTokenCount?: number;
 }
 
+/** Optional parameters. */
+export declare interface CreateAuthTokenConfig {
+    /** Used to override HTTP request options. */
+    httpOptions?: HttpOptions;
+    /** Abort signal which can be used to cancel the request.
+
+     NOTE: AbortSignal is a client-only operation. Using it to cancel an
+     operation will not cancel the request in the service. You will still
+     be charged usage for any applicable operations.
+     */
+    abortSignal?: AbortSignal;
+    /** An optional time after which, when using the resulting token,
+     messages in Live API sessions will be rejected. (Gemini may
+     preemptively close the session after this time.)
+
+     If not set then this defaults to 30 minutes in the future. If set, this
+     value must be less than 20 hours in the future. */
+    expireTime?: string;
+    /** The time after which new Live API sessions using the token
+     resulting from this request will be rejected.
+
+     If not set this defaults to 60 seconds in the future. If set, this value
+     must be less than 20 hours in the future. */
+    newSessionExpireTime?: string;
+    /** The number of times the token can be used. If this value is zero
+     then no limit is applied. Default is 1. Resuming a Live API session does
+     not count as a use. */
+    uses?: number;
+    /** Configuration specific to Live API connections created using this token. */
+    liveEphemeralParameters?: LiveEphemeralParameters;
+    /** Additional fields to lock in the effective LiveConnectParameters. */
+    lockAdditionalFields?: string[];
+}
+
 /** Optional configuration for cached content creation. */
 export declare interface CreateCachedContentConfig {
     /** Used to override HTTP request options. */
@@ -3224,7 +3258,7 @@ export declare class Live {
      Establishes a connection to the specified model with the given
      configuration and returns a Session object representing that connection.
 
-     @experimental Built-in MCP support is a preview feature, may change in
+     @experimental Built-in MCP support is an experimental feature, may change in
      future versions.
 
      @remarks
@@ -3419,6 +3453,15 @@ export declare class LiveClientToolResponse {
 
 /** Session config for the API connection. */
 export declare interface LiveConnectConfig {
+    /** Used to override HTTP request options. */
+    httpOptions?: HttpOptions;
+    /** Abort signal which can be used to cancel the request.
+
+     NOTE: AbortSignal is a client-only operation. Using it to cancel an
+     operation will not cancel the request in the service. You will still
+     be charged usage for any applicable operations.
+     */
+    abortSignal?: AbortSignal;
     /** The generation configuration for the session. */
     generationConfig?: GenerationConfig;
     /** The requested modalities of the response. Represents the set of
@@ -3503,6 +3546,16 @@ export declare interface LiveConnectParameters {
     config?: LiveConnectConfig;
 }
 
+/** Config for LiveEphemeralParameters for Auth Token creation. */
+export declare interface LiveEphemeralParameters {
+    /** ID of the model to configure in the ephemeral token for Live API.
+     For a list of models, see `Gemini models
+     <https://ai.google.dev/gemini-api/docs/models>`. */
+    model?: string;
+    /** Configuration specific to Live API connections created using this token. */
+    config?: LiveConnectConfig;
+}
+
 /**
  LiveMusic class encapsulates the configuration for live music
  generation via Lyria Live models.
@@ -3701,7 +3754,7 @@ export declare interface LiveMusicServerSetupComplete {
 
  @experimental
  */
-declare class LiveMusicSession {
+export declare class LiveMusicSession {
     readonly conn: WebSocket_2;
     private readonly apiClient;
     constructor(conn: WebSocket_2, apiClient: ApiClient);
@@ -3716,7 +3769,7 @@ declare class LiveMusicSession {
 
      @experimental
      */
-    setClientContent(params: types.LiveMusicSetClientContentParameters): Promise<void>;
+    setWeightedPrompts(params: types.LiveMusicSetWeightedPromptsParameters): Promise<void>;
     /**
      Sets a configuration to the model. Updates the session's current
      music generation config.
@@ -3765,18 +3818,18 @@ declare class LiveMusicSession {
     close(): void;
 }
 
-/** Parameters for setting client content for the live API. */
-export declare interface LiveMusicSetClientContentParameters {
-    /** A map of text prompts to weights to use for the generation request. */
-    weightedPrompts: WeightedPrompt[];
-}
-
-/** Parameters for setting config for the live API. */
+/** Parameters for setting config for the live music API. */
 export declare interface LiveMusicSetConfigParameters {
     /** Configuration for music generation. */
     musicGenerationConfig: LiveMusicGenerationConfig;
 }
 
+/** Parameters for setting weighted prompts for the live music API. */
+export declare interface LiveMusicSetWeightedPromptsParameters {
+    /** A map of text prompts to weights to use for the generation request. */
+    weightedPrompts: WeightedPrompt[];
+}
+
 /** Prompts and config used for generating this audio chunk. */
 export declare interface LiveMusicSourceMetadata {
     /** Weighted prompts for generating this audio chunk. */
@@ -4017,7 +4070,7 @@ export declare enum MaskReferenceMode {
  * arguments. (often for automatic function calling).
  * Use the config to modify tool parameters such as behavior.
  *
- * @experimental Built-in MCP support is a preview feature, may change in future
+ * @experimental Built-in MCP support is an experimental feature, may change in future
  * versions.
  */
 export declare function mcpToTool(...args: [...Client[], CallableToolConfig | Client]): CallableTool;
@@ -4230,9 +4283,10 @@ export declare class Models extends BaseModule {
     /**
      * Transforms the CallableTools in the parameters to be simply Tools, it
      * copies the params into a new object and replaces the tools, it does not
-     * modify the original params.
+     * modify the original params. Also sets the MCP usage header if there are
+     * MCP tools in the parameters.
      */
-    private transformCallableTools;
+    private processParamsForMcpUsage;
     private initAfcToolsMap;
     private processAfcStream;
     /**
@@ -6020,7 +6074,9 @@ declare namespace types {
         CallableToolConfig,
         LiveMusicConnectParameters,
         LiveMusicSetConfigParameters,
-        LiveMusicSetClientContentParameters,
+        LiveMusicSetWeightedPromptsParameters,
+        LiveEphemeralParameters,
+        CreateAuthTokenConfig,
         OperationGetParameters,
         BlobImageUnion,
         PartUnion,

package/dist/web/index.mjs

@@ -4200,7 +4200,10 @@ class Chat {
             this.recordHistory(inputContent, modelOutput, automaticFunctionCallingHistory);
             return;
         })();
-        await this.sendPromise;
+        await this.sendPromise.catch(() => {
+            // Resets sendPromise to avoid subsequent calls failing
+            this.sendPromise = Promise.resolve();
+        });
         return responsePromise;
     }
     /**
@@ -5968,7 +5971,7 @@ function weightedPromptToMldev(apiClient, fromObject) {
     }
     return toObject;
 }
-function liveMusicSetClientContentParametersToMldev(apiClient, fromObject) {
+function liveMusicSetWeightedPromptsParametersToMldev(apiClient, fromObject) {
     const toObject = {};
     const fromWeightedPrompts = getValueByPath(fromObject, [
         'weightedPrompts',
@@ -10209,7 +10212,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 = '0.15.0'; // x-release-please-version
+const SDK_VERSION = '1.0.1'; // 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';
@@ -10744,7 +10747,11 @@ function hasMcpToolUsage(tools) {
 // Sets the MCP version label in the Google API client header.
 function setMcpUsageHeader(headers) {
     var _a;
-    headers[GOOGLE_API_CLIENT_HEADER] = (((_a = headers[GOOGLE_API_CLIENT_HEADER]) !== null && _a !== void 0 ? _a : '') + ` ${MCP_LABEL}`).trimStart();
+    const existingHeader = (_a = headers[GOOGLE_API_CLIENT_HEADER]) !== null && _a !== void 0 ? _a : '';
+    if (existingHeader.includes(MCP_LABEL)) {
+        return;
+    }
+    headers[GOOGLE_API_CLIENT_HEADER] = (existingHeader + ` ${MCP_LABEL}`).trimStart();
 }
 // Checks whether the list of tools contains any MCP clients. Will return true
 // if there is at least one MCP client.
@@ -10788,7 +10795,7 @@ function listAllTools(mcpClient, maxTools = 100) {
  * McpCallableTool can be used for model inference and invoking MCP clients with
  * given function call arguments.
  *
- * @experimental Built-in MCP support is a preview feature, may change in future
+ * @experimental Built-in MCP support is an experimental feature, may change in future
  * versions.
  */
 class McpCallableTool {
@@ -10883,7 +10890,7 @@ function isMcpClient(client) {
  * arguments. (often for automatic function calling).
  * Use the config to modify tool parameters such as behavior.
  *
- * @experimental Built-in MCP support is a preview feature, may change in future
+ * @experimental Built-in MCP support is an experimental feature, may change in future
  * versions.
  */
 function mcpToTool(...args) {
@@ -10917,7 +10924,13 @@ function mcpToTool(...args) {
  */
 async function handleWebSocketMessage$1(apiClient, onmessage, event) {
     const serverMessage = new LiveMusicServerMessage();
-    const data = JSON.parse(event.data);
+    let data;
+    if (event.data instanceof Blob) {
+        data = JSON.parse(await event.data.text());
+    }
+    else {
+        data = JSON.parse(event.data);
+    }
     const response = liveMusicServerMessageFromMldev(apiClient, data);
     Object.assign(serverMessage, response);
     onmessage(serverMessage);
@@ -11028,13 +11041,13 @@ class LiveMusicSession {
   
       @experimental
      */
-    async setClientContent(params) {
+    async setWeightedPrompts(params) {
         if (!params.weightedPrompts ||
             Object.keys(params.weightedPrompts).length === 0) {
             throw new Error('Weighted prompts must be set and contain at least one entry.');
         }
-        const setClientContentParameters = liveMusicSetClientContentParametersToMldev(this.apiClient, params);
-        const clientContent = liveMusicClientContentToMldev(this.apiClient, setClientContentParameters);
+        const setWeightedPromptsParameters = liveMusicSetWeightedPromptsParametersToMldev(this.apiClient, params);
+        const clientContent = liveMusicClientContentToMldev(this.apiClient, setWeightedPromptsParameters);
         this.conn.send(JSON.stringify({ clientContent }));
     }
     /**
@@ -11182,7 +11195,7 @@ class Live {
        Establishes a connection to the specified model with the given
        configuration and returns a Session object representing that connection.
   
-       @experimental Built-in MCP support is a preview feature, may change in
+       @experimental Built-in MCP support is an experimental feature, may change in
        future versions.
   
        @remarks
@@ -11638,25 +11651,14 @@ class Models extends BaseModule {
          */
         this.generateContent = async (params) => {
             var _a, _b, _c, _d, _e;
-            if (params.config &&
-                params.config.tools &&
-                hasMcpToolUsage(params.config.tools)) {
-                if (!params.config.httpOptions) {
-                    params.config.httpOptions = {};
-                }
-                if (!params.config.httpOptions.headers) {
-                    params.config.httpOptions.headers = this.apiClient.getDefaultHeaders();
-                }
-                setMcpUsageHeader(params.config.httpOptions.headers);
-            }
+            const transformedParams = await this.processParamsForMcpUsage(params);
             if (!hasMcpClientTools(params) || shouldDisableAfc(params.config)) {
-                return await this.generateContentInternal(params);
+                return await this.generateContentInternal(transformedParams);
             }
             // TODO: b/418266406 - Improve the check for CallableTools and Tools.
             if (hasNonMcpTools(params)) {
                 throw new Error('Automatic function calling with CallableTools and Tools is not yet supported.');
             }
-            const transformedParams = await this.transformCallableTools(params);
             let response;
             let functionResponseContent;
             const automaticFunctionCallingHistory = tContents(this.apiClient, transformedParams.contents);
@@ -11737,19 +11739,8 @@ class Models extends BaseModule {
          * ```
          */
         this.generateContentStream = async (params) => {
-            if (params.config &&
-                params.config.tools &&
-                hasMcpToolUsage(params.config.tools)) {
-                if (!params.config.httpOptions) {
-                    params.config.httpOptions = {};
-                }
-                if (!params.config.httpOptions.headers) {
-                    params.config.httpOptions.headers = this.apiClient.getDefaultHeaders();
-                }
-                setMcpUsageHeader(params.config.httpOptions.headers);
-            }
             if (shouldDisableAfc(params.config)) {
-                const transformedParams = await this.transformCallableTools(params);
+                const transformedParams = await this.processParamsForMcpUsage(params);
                 return await this.generateContentStreamInternal(transformedParams);
             }
             else {
@@ -11902,10 +11893,11 @@ class Models extends BaseModule {
     /**
      * Transforms the CallableTools in the parameters to be simply Tools, it
      * copies the params into a new object and replaces the tools, it does not
-     * modify the original params.
+     * modify the original params. Also sets the MCP usage header if there are
+     * MCP tools in the parameters.
      */
-    async transformCallableTools(params) {
-        var _a;
+    async processParamsForMcpUsage(params) {
+        var _a, _b, _c;
         const tools = (_a = params.config) === null || _a === void 0 ? void 0 : _a.tools;
         if (!tools) {
             return params;
@@ -11923,6 +11915,17 @@ class Models extends BaseModule {
             config: Object.assign(Object.assign({}, params.config), { tools: transformedTools }),
         };
         newParams.config.tools = transformedTools;
+        if (params.config &&
+            params.config.tools &&
+            hasMcpToolUsage(params.config.tools)) {
+            const headers = (_c = (_b = params.config.httpOptions) === null || _b === void 0 ? void 0 : _b.headers) !== null && _c !== void 0 ? _c : {};
+            let newHeaders = Object.assign({}, headers);
+            if (Object.keys(newHeaders).length === 0) {
+                newHeaders = this.apiClient.getDefaultHeaders();
+            }
+            setMcpUsageHeader(newHeaders);
+            newParams.config.httpOptions = Object.assign(Object.assign({}, params.config.httpOptions), { headers: newHeaders });
+        }
         return newParams;
     }
     async initAfcToolsMap(params) {
@@ -11960,7 +11963,7 @@ class Models extends BaseModule {
                         remoteCallCount++;
                         wereFunctionsCalled = false;
                     }
-                    const transformedParams = yield __await(models.transformCallableTools(params));
+                    const transformedParams = yield __await(models.processParamsForMcpUsage(params));
                     const response = yield __await(models.generateContentStreamInternal(transformedParams));
                     const functionResponses = [];
                     const responseContents = [];