ai 7.0.0-beta.88 → 7.0.0-beta.89

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ai
 
+## 7.0.0-beta.89
+
+### Patch Changes
+
+- ff5eba1: feat: roll `image-*` tool output types into their equivalent `file-*` types
+- Updated dependencies [b3976a2]
+- Updated dependencies [ff5eba1]
+  - @ai-sdk/provider-utils@5.0.0-beta.20
+  - @ai-sdk/gateway@4.0.0-beta.50
+  - @ai-sdk/provider@4.0.0-beta.12
+
 ## 7.0.0-beta.88
 
 ### Major Changes

package/dist/index.js

@@ -882,76 +882,76 @@ function asProviderV4(provider) {
 
 // src/model/resolve-model.ts
 function resolveLanguageModel(model) {
-  if (typeof model !== "string") {
-    if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3" && model.specificationVersion !== "v2") {
-      const unsupportedModel = model;
-      throw new UnsupportedModelVersionError({
-        version: unsupportedModel.specificationVersion,
-        provider: unsupportedModel.provider,
-        modelId: unsupportedModel.modelId
-      });
-    }
-    return asLanguageModelV4(model);
+  if (typeof model === "string") {
+    return getGlobalProvider().languageModel(model);
   }
-  return getGlobalProvider().languageModel(model);
+  if (!["v4", "v3", "v2"].includes(model.specificationVersion)) {
+    const unsupportedModel = model;
+    throw new UnsupportedModelVersionError({
+      version: unsupportedModel.specificationVersion,
+      provider: unsupportedModel.provider,
+      modelId: unsupportedModel.modelId
+    });
+  }
+  return asLanguageModelV4(model);
 }
 function resolveEmbeddingModel(model) {
-  if (typeof model !== "string") {
-    if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3" && model.specificationVersion !== "v2") {
-      const unsupportedModel = model;
-      throw new UnsupportedModelVersionError({
-        version: unsupportedModel.specificationVersion,
-        provider: unsupportedModel.provider,
-        modelId: unsupportedModel.modelId
-      });
-    }
-    return asEmbeddingModelV4(model);
+  if (typeof model === "string") {
+    return getGlobalProvider().embeddingModel(model);
   }
-  return getGlobalProvider().embeddingModel(model);
+  if (!["v4", "v3", "v2"].includes(model.specificationVersion)) {
+    const unsupportedModel = model;
+    throw new UnsupportedModelVersionError({
+      version: unsupportedModel.specificationVersion,
+      provider: unsupportedModel.provider,
+      modelId: unsupportedModel.modelId
+    });
+  }
+  return asEmbeddingModelV4(model);
 }
 function resolveTranscriptionModel(model) {
   var _a21, _b;
-  if (typeof model !== "string") {
-    if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3" && model.specificationVersion !== "v2") {
-      const unsupportedModel = model;
-      throw new UnsupportedModelVersionError({
-        version: unsupportedModel.specificationVersion,
-        provider: unsupportedModel.provider,
-        modelId: unsupportedModel.modelId
-      });
-    }
-    return asTranscriptionModelV4(model);
+  if (typeof model === "string") {
+    return (_b = (_a21 = getGlobalProvider()).transcriptionModel) == null ? void 0 : _b.call(_a21, model);
   }
-  return (_b = (_a21 = getGlobalProvider()).transcriptionModel) == null ? void 0 : _b.call(_a21, model);
+  if (!["v4", "v3", "v2"].includes(model.specificationVersion)) {
+    const unsupportedModel = model;
+    throw new UnsupportedModelVersionError({
+      version: unsupportedModel.specificationVersion,
+      provider: unsupportedModel.provider,
+      modelId: unsupportedModel.modelId
+    });
+  }
+  return asTranscriptionModelV4(model);
 }
 function resolveSpeechModel(model) {
   var _a21, _b;
-  if (typeof model !== "string") {
-    if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3" && model.specificationVersion !== "v2") {
-      const unsupportedModel = model;
-      throw new UnsupportedModelVersionError({
-        version: unsupportedModel.specificationVersion,
-        provider: unsupportedModel.provider,
-        modelId: unsupportedModel.modelId
-      });
-    }
-    return asSpeechModelV4(model);
+  if (typeof model === "string") {
+    return (_b = (_a21 = getGlobalProvider()).speechModel) == null ? void 0 : _b.call(_a21, model);
   }
-  return (_b = (_a21 = getGlobalProvider()).speechModel) == null ? void 0 : _b.call(_a21, model);
+  if (!["v4", "v3", "v2"].includes(model.specificationVersion)) {
+    const unsupportedModel = model;
+    throw new UnsupportedModelVersionError({
+      version: unsupportedModel.specificationVersion,
+      provider: unsupportedModel.provider,
+      modelId: unsupportedModel.modelId
+    });
+  }
+  return asSpeechModelV4(model);
 }
 function resolveImageModel(model) {
-  if (typeof model !== "string") {
-    if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3" && model.specificationVersion !== "v2") {
-      const unsupportedModel = model;
-      throw new UnsupportedModelVersionError({
-        version: unsupportedModel.specificationVersion,
-        provider: unsupportedModel.provider,
-        modelId: unsupportedModel.modelId
-      });
-    }
-    return asImageModelV4(model);
+  if (typeof model === "string") {
+    return getGlobalProvider().imageModel(model);
   }
-  return getGlobalProvider().imageModel(model);
+  if (!["v4", "v3", "v2"].includes(model.specificationVersion)) {
+    const unsupportedModel = model;
+    throw new UnsupportedModelVersionError({
+      version: unsupportedModel.specificationVersion,
+      provider: unsupportedModel.provider,
+      modelId: unsupportedModel.modelId
+    });
+  }
+  return asImageModelV4(model);
 }
 function resolveVideoModel(model) {
   var _a21;
@@ -965,7 +965,7 @@ function resolveVideoModel(model) {
     }
     return videoModel(model);
   }
-  if (model.specificationVersion !== "v4" && model.specificationVersion !== "v3") {
+  if (!["v4", "v3"].includes(model.specificationVersion)) {
     const unsupportedModel = model;
     throw new UnsupportedModelVersionError({
       version: unsupportedModel.specificationVersion,
@@ -1285,7 +1285,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.0-beta.88" : "0.0.0-test";
+var VERSION = true ? "7.0.0-beta.89" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1822,8 +1822,25 @@ function mapToolResultOutput({
   return {
     type: "content",
     value: output.value.map((item) => {
+      var _a21;
       switch (item.type) {
-        case "file-id": {
+        case "image-data": {
+          return {
+            type: "file-data",
+            data: item.data,
+            mediaType: item.mediaType,
+            providerOptions: item.providerOptions
+          };
+        }
+        case "image-url": {
+          return {
+            type: "file-url",
+            url: item.url,
+            mediaType: getMediaTypeFromUrl(item.url, "image/*"),
+            providerOptions: item.providerOptions
+          };
+        }
+        case "image-file-id": {
           return {
             type: "file-reference",
             providerReference: convertFileIdToProviderReference({
@@ -1833,9 +1850,16 @@ function mapToolResultOutput({
             providerOptions: item.providerOptions
           };
         }
-        case "image-file-id": {
+        case "image-file-reference": {
           return {
-            type: "image-file-reference",
+            type: "file-reference",
+            providerReference: item.providerReference,
+            providerOptions: item.providerOptions
+          };
+        }
+        case "file-id": {
+          return {
+            type: "file-reference",
             providerReference: convertFileIdToProviderReference({
               fileId: item.fileId,
               provider
@@ -1843,6 +1867,26 @@ function mapToolResultOutput({
             providerOptions: item.providerOptions
           };
         }
+        case "file-url": {
+          const mediaType = (_a21 = item.mediaType) != null ? _a21 : getMediaTypeFromUrl(item.url);
+          if (!item.mediaType) {
+            if (mediaType === "application/octet-stream") {
+              console.warn(
+                `AI SDK: 'file-url' tool result content part is missing 'mediaType'. Unable to infer media type from URL. Defaulting to 'application/octet-stream'. Provide 'mediaType' on the 'file-url' part for correct provider behavior.`
+              );
+            } else {
+              console.warn(
+                `AI SDK: 'file-url' tool result content part is missing 'mediaType'. Inferred '${mediaType}' from URL. Provide 'mediaType' on the 'file-url' part for correct provider behavior.`
+              );
+            }
+          }
+          return {
+            type: "file-url",
+            url: item.url,
+            mediaType,
+            providerOptions: item.providerOptions
+          };
+        }
         default:
           return item;
       }
@@ -1863,6 +1907,37 @@ function convertFileIdToProviderReference({
   }
   return { [provider]: fileId };
 }
+var URL_EXTENSION_TO_MEDIA_TYPE = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  svg: "image/svg+xml",
+  avif: "image/avif",
+  heic: "image/heic",
+  bmp: "image/bmp",
+  tiff: "image/tiff",
+  tif: "image/tiff",
+  pdf: "application/pdf",
+  mp4: "video/mp4",
+  webm: "video/webm",
+  mp3: "audio/mpeg",
+  wav: "audio/wav",
+  ogg: "audio/ogg"
+};
+function getMediaTypeFromUrl(url, fallbackMediaType = "application/octet-stream") {
+  var _a21;
+  try {
+    const pathname = new URL(url).pathname;
+    const ext = (_a21 = pathname.split(".").pop()) == null ? void 0 : _a21.toLowerCase();
+    if (ext && ext in URL_EXTENSION_TO_MEDIA_TYPE) {
+      return URL_EXTENSION_TO_MEDIA_TYPE[ext];
+    }
+  } catch (e) {
+  }
+  return fallbackMediaType;
+}
 
 // src/prompt/create-tool-model-output.ts
 import { getErrorMessage as getErrorMessage3 } from "@ai-sdk/provider";
@@ -2170,6 +2245,8 @@ var outputSchema = z4.discriminatedUnion(
           z4.object({
             type: z4.literal("file-url"),
             url: z4.string(),
+            // Temporarily optional. TODO: make required in v8, after migration period.
+            mediaType: z4.string().optional(),
             providerOptions: providerMetadataSchema.optional()
           }),
           z4.object({