@google/genai 0.15.0 → 1.0.0

package/dist/node/index.mjs

@@ -5973,7 +5973,7 @@ function weightedPromptToMldev(apiClient, fromObject) {
     }
     return toObject;
 }
-function liveMusicSetClientContentParametersToMldev(apiClient, fromObject) {
+function liveMusicSetWeightedPromptsParametersToMldev(apiClient, fromObject) {
     const toObject = {};
     const fromWeightedPrompts = getValueByPath(fromObject, [
         'weightedPrompts',
@@ -10214,7 +10214,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.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';
@@ -10749,7 +10749,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.
@@ -10793,7 +10797,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 {
@@ -10888,7 +10892,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) {
@@ -10922,7 +10926,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);
@@ -11033,13 +11043,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 }));
     }
     /**
@@ -11187,7 +11197,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
@@ -11643,25 +11653,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);
@@ -11742,19 +11741,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 {
@@ -11907,10 +11895,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;
@@ -11928,6 +11917,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) {
@@ -11965,7 +11965,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 = [];