@ai-sdk/google 2.0.61 → 2.0.63

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "2.0.61" : "0.0.0-test";
+var VERSION = true ? "2.0.63" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 import {
@@ -93,11 +93,15 @@ var googleGenerativeAIEmbeddingProviderOptions = lazySchema2(
         "CODE_RETRIEVAL_QUERY"
       ]).optional(),
       /**
-       * Optional. Multimodal content parts for embedding non-text content
-       * (images, video, PDF, audio). When provided, these parts are merged
-       * with the text values in the embedding request.
+       * Optional. Per-value multimodal content parts for embedding non-text
+       * content (images, video, PDF, audio). Each entry corresponds to the
+       * embedding value at the same index and its parts are merged with the
+       * text value in the request. Use `null` for entries that are text-only.
+       *
+       * The array length must match the number of values being embedded. In
+       * the case of a single embedding, the array length must be 1.
        */
-      content: z2.array(googleEmbeddingContentPartSchema).min(1).optional()
+      content: z2.array(z2.array(googleEmbeddingContentPartSchema).min(1).nullable()).optional()
     })
   )
 );
@@ -120,7 +124,6 @@ var GoogleGenerativeAIEmbeddingModel = class {
     abortSignal,
     providerOptions
   }) {
-    var _a;
     const googleOptions = await parseProviderOptions({
       provider: "google",
       providerOptions,
@@ -138,10 +141,16 @@ var GoogleGenerativeAIEmbeddingModel = class {
       await resolve(this.config.headers),
       headers
     );
-    const multimodalContent = (_a = googleOptions == null ? void 0 : googleOptions.content) != null ? _a : [];
+    const multimodalContent = googleOptions == null ? void 0 : googleOptions.content;
+    if (multimodalContent != null && multimodalContent.length !== values.length) {
+      throw new Error(
+        `The number of multimodal content entries (${multimodalContent.length}) must match the number of values (${values.length}).`
+      );
+    }
     if (values.length === 1) {
+      const valueParts = multimodalContent == null ? void 0 : multimodalContent[0];
       const textPart = values[0] ? [{ text: values[0] }] : [];
-      const parts = multimodalContent.length > 0 ? [...textPart, ...multimodalContent] : [{ text: values[0] }];
+      const parts = valueParts != null ? [...textPart, ...valueParts] : [{ text: values[0] }];
       const {
         responseHeaders: responseHeaders2,
         value: response2,
@@ -178,13 +187,14 @@ var GoogleGenerativeAIEmbeddingModel = class {
       url: `${this.config.baseURL}/models/${this.modelId}:batchEmbedContents`,
       headers: mergedHeaders,
       body: {
-        requests: values.map((value) => {
+        requests: values.map((value, index) => {
+          const valueParts = multimodalContent == null ? void 0 : multimodalContent[index];
           const textPart = value ? [{ text: value }] : [];
           return {
             model: `models/${this.modelId}`,
             content: {
               role: "user",
-              parts: multimodalContent.length > 0 ? [...textPart, ...multimodalContent] : [{ text: value }]
+              parts: valueParts != null ? [...textPart, ...valueParts] : [{ text: value }]
             },
             outputDimensionality: googleOptions == null ? void 0 : googleOptions.outputDimensionality,
             taskType: googleOptions == null ? void 0 : googleOptions.taskType
@@ -356,11 +366,12 @@ import {
 } from "@ai-sdk/provider";
 import { convertToBase64 } from "@ai-sdk/provider-utils";
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a;
+  var _a, _b;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
   const isGemmaModel = (_a = options == null ? void 0 : options.isGemmaModel) != null ? _a : false;
+  const supportsFunctionResponseParts = (_b = options == null ? void 0 : options.supportsFunctionResponseParts) != null ? _b : true;
   for (const { role, content } of prompt) {
     switch (role) {
       case "system": {
@@ -408,8 +419,8 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
         contents.push({
           role: "model",
           parts: content.map((part) => {
-            var _a2, _b, _c;
-            const thoughtSignature = ((_b = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
+            var _a2, _b2, _c;
+            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
             switch (part.type) {
               case "text": {
                 return part.text.length === 0 ? void 0 : {
@@ -462,36 +473,10 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
         for (const part of content) {
           const output = part.output;
           if (output.type === "content") {
-            for (const contentPart of output.value) {
-              switch (contentPart.type) {
-                case "text":
-                  parts.push({
-                    functionResponse: {
-                      name: part.toolName,
-                      response: {
-                        name: part.toolName,
-                        content: contentPart.text
-                      }
-                    }
-                  });
-                  break;
-                case "media":
-                  parts.push(
-                    {
-                      inlineData: {
-                        mimeType: contentPart.mediaType,
-                        data: contentPart.data
-                      }
-                    },
-                    {
-                      text: "Tool executed successfully and returned this image as a response"
-                    }
-                  );
-                  break;
-                default:
-                  parts.push({ text: JSON.stringify(contentPart) });
-                  break;
-              }
+            if (supportsFunctionResponseParts) {
+              appendToolResultParts({ parts, part, output });
+            } else {
+              appendLegacyToolResultParts({ parts, part, output });
             }
           } else {
             parts.push({
@@ -522,6 +507,77 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
     contents
   };
 }
+function appendToolResultParts({
+  parts,
+  part,
+  output
+}) {
+  const responseTextParts = [];
+  const functionResponseParts = [];
+  for (const contentPart of output.value) {
+    switch (contentPart.type) {
+      case "text":
+        responseTextParts.push(contentPart.text);
+        break;
+      case "media":
+        functionResponseParts.push({
+          inlineData: {
+            mimeType: contentPart.mediaType,
+            data: contentPart.data
+          }
+        });
+        break;
+    }
+  }
+  const responseText = responseTextParts.length > 0 ? responseTextParts.join("\n") : "Tool executed successfully.";
+  parts.push({
+    functionResponse: {
+      name: part.toolName,
+      response: {
+        name: part.toolName,
+        content: responseText
+      },
+      ...functionResponseParts.length > 0 ? { parts: functionResponseParts } : {}
+    }
+  });
+}
+function appendLegacyToolResultParts({
+  parts,
+  part,
+  output
+}) {
+  for (const contentPart of output.value) {
+    switch (contentPart.type) {
+      case "text":
+        parts.push({
+          functionResponse: {
+            name: part.toolName,
+            response: {
+              name: part.toolName,
+              content: contentPart.text
+            }
+          }
+        });
+        break;
+      case "media":
+        parts.push(
+          {
+            inlineData: {
+              mimeType: contentPart.mediaType,
+              data: contentPart.data
+            }
+          },
+          {
+            text: "Tool executed successfully and returned this image as a response"
+          }
+        );
+        break;
+      default:
+        parts.push({ text: JSON.stringify(contentPart) });
+        break;
+    }
+  }
+}
 
 // src/get-model-path.ts
 function getModelPath(modelId) {
@@ -927,9 +983,10 @@ var GoogleGenerativeAILanguageModel = class {
       });
     }
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
+    const supportsFunctionResponseParts = this.modelId.startsWith("gemini-3");
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
       prompt,
-      { isGemmaModel }
+      { isGemmaModel, supportsFunctionResponseParts }
     );
     const {
       tools: googleTools2,