ai 7.0.0-beta.113 → 7.0.0-beta.115

package/src/prompt/file-part-data.ts

@@ -0,0 +1,125 @@
+import type { LanguageModelV4FilePart } from '@ai-sdk/provider';
+import {
+  isBuffer,
+  isProviderReference,
+  type DataContent,
+  type FilePart,
+  type ProviderReference,
+} from '@ai-sdk/provider-utils';
+import { InvalidDataContentError } from './invalid-data-content-error';
+import { splitDataUrl } from './split-data-url';
+
+type TaggedFileData = Extract<FilePart['data'], { type: string }>;
+
+function isTaggedFileData(value: unknown): value is TaggedFileData {
+  if (typeof value !== 'object' || value === null) return false;
+  const type = (value as { type?: unknown }).type;
+  return (
+    type === 'data' || type === 'url' || type === 'reference' || type === 'text'
+  );
+}
+
+type ConvertResult = {
+  data: LanguageModelV4FilePart['data'];
+  mediaType: string | undefined;
+};
+
+function convertUrlToFilePartData(url: URL): ConvertResult {
+  if (url.protocol === 'data:') {
+    const { mediaType, base64Content } = splitDataUrl(url.toString());
+
+    if (mediaType == null || base64Content == null) {
+      throw new InvalidDataContentError({
+        content: url,
+        message: `Invalid data URL format in content ${url.toString()}`,
+      });
+    }
+
+    return { data: { type: 'data', data: base64Content }, mediaType };
+  }
+
+  return { data: { type: 'url', url }, mediaType: undefined };
+}
+
+function convertInlineDataToFilePartData(content: DataContent): ConvertResult {
+  if (content instanceof Uint8Array) {
+    return { data: { type: 'data', data: content }, mediaType: undefined };
+  }
+  if (content instanceof ArrayBuffer) {
+    return {
+      data: { type: 'data', data: new Uint8Array(content) },
+      mediaType: undefined,
+    };
+  }
+  if (isBuffer(content)) {
+    return {
+      data: { type: 'data', data: new Uint8Array(content) },
+      mediaType: undefined,
+    };
+  }
+  return {
+    data: { type: 'data', data: content as string },
+    mediaType: undefined,
+  };
+}
+
+/**
+ * Converts any legacy-or-tagged top-level `FilePart.data` /
+ * `ReasoningFilePart.data` value into the tagged v4 provider prompt shape.
+ *
+ * Returns the tagged `data` together with the resolved mediaType (extracted
+ * from a `data:` URL when applicable).
+ */
+export function convertToLanguageModelV4FilePart(
+  content: FilePart['data'],
+): ConvertResult {
+  if (isTaggedFileData(content)) {
+    switch (content.type) {
+      case 'data':
+        if (
+          typeof content.data === 'string' &&
+          content.data.startsWith('data:')
+        ) {
+          throw new InvalidDataContentError({
+            content: content.data,
+            message:
+              'Data URLs are not valid inline data. Pass them as { type: "url", url } instead.',
+          });
+        }
+        return convertInlineDataToFilePartData(content.data);
+      case 'url':
+        return convertUrlToFilePartData(content.url);
+      case 'reference':
+        return {
+          data: { type: 'reference', reference: content.reference },
+          mediaType: undefined,
+        };
+      case 'text':
+        return {
+          data: { type: 'text', text: content.text },
+          mediaType: undefined,
+        };
+    }
+  }
+
+  if (content instanceof URL) {
+    return convertUrlToFilePartData(content);
+  }
+
+  if (typeof content === 'string') {
+    try {
+      return convertUrlToFilePartData(new URL(content));
+    } catch {
+      return convertInlineDataToFilePartData(content);
+    }
+  }
+
+  if (isProviderReference(content)) {
+    return {
+      data: { type: 'reference', reference: content as ProviderReference },
+      mediaType: undefined,
+    };
+  }
+
+  return convertInlineDataToFilePartData(content as DataContent);
+}

package/src/prompt/index.ts

@@ -1,8 +1,9 @@
+import type { LanguageModelCallOptions } from './language-model-call-options';
+import type { RequestOptions } from './request-options';
+
 export type { LanguageModelCallOptions } from './language-model-call-options';
 export type { RequestOptions, TimeoutConfiguration } from './request-options';
 
-import type { LanguageModelCallOptions } from './language-model-call-options';
-import type { RequestOptions } from './request-options';
 /** @deprecated Use `LanguageModelCallOptions` combined with `RequestOptions` instead. */
 export type CallSettings = LanguageModelCallOptions &
   Omit<RequestOptions, 'timeout'>;

package/src/prompt/language-model-call-options.ts

@@ -1,4 +1,4 @@
-import { LanguageModelV4CallOptions } from '@ai-sdk/provider';
+import type { LanguageModelV4CallOptions } from '@ai-sdk/provider';
 
 /**
  * Model-facing generation controls. These settings influence how the model

package/src/prompt/message-conversion-error.ts

@@ -1,5 +1,5 @@
 import { AISDKError } from '@ai-sdk/provider';
-import { UIMessage } from '../ui/ui-messages';
+import type { UIMessage } from '../ui/ui-messages';
 
 const name = 'AI_MessageConversionError';
 const marker = `vercel.ai.error.${name}`;

package/src/prompt/message.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   AssistantModelMessage,
   ModelMessage,
   SystemModelMessage,

package/src/prompt/prepare-language-model-call-options.ts

@@ -1,5 +1,5 @@
 import { InvalidArgumentError } from '../error/invalid-argument-error';
-import { LanguageModelCallOptions } from './language-model-call-options';
+import type { LanguageModelCallOptions } from './language-model-call-options';
 
 /**
  * Validates model call options and returns a new object with normalized values.

package/src/prompt/prepare-tool-choice.ts

@@ -1,5 +1,5 @@
-import { LanguageModelV4ToolChoice } from '@ai-sdk/provider';
-import { ToolChoice } from '../types/language-model';
+import type { LanguageModelV4ToolChoice } from '@ai-sdk/provider';
+import type { ToolChoice } from '../types/language-model';
 
 export function prepareToolChoice({
   toolChoice,

package/src/prompt/prepare-tools.ts

@@ -1,8 +1,8 @@
-import {
+import type {
   LanguageModelV4FunctionTool,
   LanguageModelV4ProviderTool,
 } from '@ai-sdk/provider';
-import { asSchema, ToolSet } from '@ai-sdk/provider-utils';
+import { asSchema, type ToolSet } from '@ai-sdk/provider-utils';
 import { isNonEmptyObject } from '../util/is-non-empty-object';
 
 export async function prepareTools<TOOLS extends ToolSet>({

package/src/prompt/prompt.ts

@@ -1,4 +1,4 @@
-import { ModelMessage, SystemModelMessage } from '@ai-sdk/provider-utils';
+import type { ModelMessage, SystemModelMessage } from '@ai-sdk/provider-utils';
 
 /**
  * Prompt part of the AI function options.

package/src/prompt/standardize-prompt.ts

@@ -1,13 +1,13 @@
 import { InvalidPromptError } from '@ai-sdk/provider';
 import {
   asArray,
-  ModelMessage,
   safeValidateTypes,
-  SystemModelMessage,
+  type ModelMessage,
+  type SystemModelMessage,
 } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
 import { modelMessageSchema } from './message';
-import { Prompt } from './prompt';
+import type { Prompt } from './prompt';
 
 export type StandardizedPrompt = {
   /**

package/src/registry/custom-provider.ts

@@ -1,78 +1,65 @@
 import {
-  EmbeddingModelV3,
-  EmbeddingModelV4,
-  Experimental_VideoModelV3,
-  Experimental_VideoModelV4,
-  FilesV4,
-  ImageModelV2,
-  ImageModelV3,
-  ImageModelV4,
-  LanguageModelV2,
-  LanguageModelV3,
-  LanguageModelV4,
+  type EmbeddingModelV4,
+  type Experimental_VideoModelV4,
+  type FilesV4,
+  type ImageModelV4,
+  type LanguageModelV4,
   NoSuchModelError,
-  ProviderV2,
-  ProviderV3,
-  ProviderV4,
-  RerankingModelV3,
-  RerankingModelV4,
-  SkillsV4,
-  SpeechModelV2,
-  SpeechModelV3,
-  SpeechModelV4,
-  TranscriptionModelV2,
-  TranscriptionModelV3,
-  TranscriptionModelV4,
+  type ProviderV2,
+  type ProviderV3,
+  type ProviderV4,
+  type RerankingModelV4,
+  type SkillsV4,
+  type SpeechModelV4,
+  type TranscriptionModelV4,
 } from '@ai-sdk/provider';
-import { asEmbeddingModelV4 } from '../model/as-embedding-model-v4';
-import { asImageModelV4 } from '../model/as-image-model-v4';
-import { asLanguageModelV4 } from '../model/as-language-model-v4';
 import { asProviderV4 } from '../model/as-provider-v4';
-import { asRerankingModelV4 } from '../model/as-reranking-model-v4';
-import { asSpeechModelV4 } from '../model/as-speech-model-v4';
-import { asTranscriptionModelV4 } from '../model/as-transcription-model-v4';
-import { asVideoModelV4 } from '../model/as-video-model-v4';
+import {
+  resolveEmbeddingModel,
+  resolveImageModel,
+  resolveLanguageModel,
+  resolveRerankingModel,
+  resolveSpeechModel,
+  resolveTranscriptionModel,
+  resolveVideoModel,
+} from '../model/resolve-model';
+import type { EmbeddingModel } from '../types/embedding-model';
+import type { ImageModel } from '../types/image-model';
+import type { LanguageModel } from '../types/language-model';
+import type { RerankingModel } from '../types/reranking-model';
+import type { SpeechModel } from '../types/speech-model';
+import type { TranscriptionModel } from '../types/transcription-model';
+import type { VideoModel } from '../types/video-model';
 
 /**
- * Creates a custom provider with specified language models, text embedding models, image models, transcription models, speech models, and an optional fallback provider.
+ * Creates a custom provider with specified language models, text embedding models, image models, transcription models, speech models, file APIs, skill APIs, and an optional fallback provider.
  *
  * @param {Object} options - The options for creating the custom provider.
- * @param {Record<string, LanguageModelV4>} [options.languageModels] - A record of language models, where keys are model IDs and values are LanguageModelV4 instances.
- * @param {Record<string, EmbeddingModelV4>} [options.embeddingModels] - A record of text embedding models, where keys are model IDs and values are EmbeddingModelV4 instances.
- * @param {Record<string, ImageModelV4>} [options.imageModels] - A record of image models, where keys are model IDs and values are ImageModelV4 instances.
- * @param {Record<string, TranscriptionModelV4>} [options.transcriptionModels] - A record of transcription models, where keys are model IDs and values are TranscriptionModelV4 instances.
- * @param {Record<string, SpeechModelV4>} [options.speechModels] - A record of speech models, where keys are model IDs and values are SpeechModelV4 instances.
- * @param {Record<string, RerankingModelV4>} [options.rerankingModels] - A record of reranking models, where keys are model IDs and values are RerankingModelV4 instances.
- * @param {ProviderV4} [options.fallbackProvider] - An optional fallback provider to use when a requested model is not found in the custom provider.
- * @returns {ProviderV4} A ProviderV4 object with languageModel, embeddingModel, imageModel, transcriptionModel, and speechModel methods.
+ * @param {Record<string, LanguageModel>} [options.languageModels] - A record of language models, where keys are model IDs and values are language model instances.
+ * @param {Record<string, EmbeddingModel>} [options.embeddingModels] - A record of text embedding models, where keys are model IDs and values are embedding model instances.
+ * @param {Record<string, ImageModel>} [options.imageModels] - A record of image models, where keys are model IDs and values are image model instances.
+ * @param {Record<string, TranscriptionModel>} [options.transcriptionModels] - A record of transcription models, where keys are model IDs and values are transcription model instances.
+ * @param {Record<string, SpeechModel>} [options.speechModels] - A record of speech models, where keys are model IDs and values are speech model instances.
+ * @param {Record<string, RerankingModel>} [options.rerankingModels] - A record of reranking models, where keys are model IDs and values are reranking model instances.
+ * @param {Record<string, VideoModel>} [options.videoModels] - A record of video models, where keys are model IDs and values are video model instances.
+ * @param {FilesV4} [options.files] - A files interface for uploading files.
+ * @param {SkillsV4} [options.skills] - A skills interface for uploading skills.
+ * @param {ProviderV2 | ProviderV3 | ProviderV4} [options.fallbackProvider] - An optional fallback provider to use when a requested model is not found in the custom provider.
+ * @returns {ProviderV4} A ProviderV4 object with languageModel, embeddingModel, imageModel, transcriptionModel, speechModel, rerankingModel, and videoModel methods.
  *
  * @throws {NoSuchModelError} Throws when a requested model is not found and no fallback provider is available.
  */
 export function customProvider<
-  LANGUAGE_MODELS extends Record<
-    string,
-    LanguageModelV2 | LanguageModelV3 | LanguageModelV4
-  >,
-  EMBEDDING_MODELS extends Record<string, EmbeddingModelV3 | EmbeddingModelV4>,
-  IMAGE_MODELS extends Record<
-    string,
-    ImageModelV2 | ImageModelV3 | ImageModelV4
-  >,
-  TRANSCRIPTION_MODELS extends Record<
-    string,
-    TranscriptionModelV2 | TranscriptionModelV3 | TranscriptionModelV4
-  >,
-  SPEECH_MODELS extends Record<
-    string,
-    SpeechModelV2 | SpeechModelV3 | SpeechModelV4
-  >,
-  RERANKING_MODELS extends Record<string, RerankingModelV3 | RerankingModelV4>,
-  VIDEO_MODELS extends Record<
-    string,
-    Experimental_VideoModelV3 | Experimental_VideoModelV4
-  >,
+  LANGUAGE_MODELS extends Record<string, LanguageModel>,
+  EMBEDDING_MODELS extends Record<string, EmbeddingModel>,
+  IMAGE_MODELS extends Record<string, ImageModel>,
+  TRANSCRIPTION_MODELS extends Record<string, TranscriptionModel>,
+  SPEECH_MODELS extends Record<string, SpeechModel>,
+  RERANKING_MODELS extends Record<string, RerankingModel>,
+  VIDEO_MODELS extends Record<string, VideoModel>,
   FILES extends FilesV4 | undefined = undefined,
   SKILLS extends SkillsV4 | undefined = undefined,
+  FALLBACK extends ProviderV2 | ProviderV3 | ProviderV4 | undefined = undefined,
 >({
   languageModels,
   embeddingModels,
@@ -94,7 +81,7 @@ export function customProvider<
   videoModels?: VIDEO_MODELS;
   files?: FILES;
   skills?: SKILLS;
-  fallbackProvider?: ProviderV4 | ProviderV3 | ProviderV2;
+  fallbackProvider?: FALLBACK;
 }): ProviderV4 & {
   languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>): LanguageModelV4;
   embeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>): EmbeddingModelV4;
@@ -105,24 +92,40 @@ export function customProvider<
   rerankingModel(modelId: ExtractModelId<RERANKING_MODELS>): RerankingModelV4;
   speechModel(modelId: ExtractModelId<SPEECH_MODELS>): SpeechModelV4;
   videoModel(modelId: ExtractModelId<VIDEO_MODELS>): Experimental_VideoModelV4;
-} & (FILES extends FilesV4 ? { files(): FilesV4 } : { files?(): FilesV4 }) &
-  (SKILLS extends SkillsV4 ? { skills(): SkillsV4 } : { skills?(): SkillsV4 }) {
-  const fallbackProvider = fallbackProviderArg
-    ? asProviderV4(fallbackProviderArg)
-    : undefined;
-
-  const resolvedFiles = files ?? fallbackProvider?.files?.();
-  const resolvedSkills = skills ?? fallbackProvider?.skills?.();
+} & (FILES extends FilesV4
+    ? { files(): FilesV4 }
+    : [FALLBACK] extends [{ files: () => FilesV4 }]
+      ? { files(): FilesV4 }
+      : { files?(): FilesV4 }) &
+  (SKILLS extends SkillsV4
+    ? { skills(): SkillsV4 }
+    : [FALLBACK] extends [{ skills: () => SkillsV4 }]
+      ? { skills(): SkillsV4 }
+      : { skills?(): SkillsV4 }) {
+  const fallbackProvider =
+    fallbackProviderArg == null ? undefined : asProviderV4(fallbackProviderArg);
 
-  return {
+  const baseProvider: ProviderV4 & {
+    languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>): LanguageModelV4;
+    embeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>): EmbeddingModelV4;
+    imageModel(modelId: ExtractModelId<IMAGE_MODELS>): ImageModelV4;
+    transcriptionModel(
+      modelId: ExtractModelId<TRANSCRIPTION_MODELS>,
+    ): TranscriptionModelV4;
+    rerankingModel(modelId: ExtractModelId<RERANKING_MODELS>): RerankingModelV4;
+    speechModel(modelId: ExtractModelId<SPEECH_MODELS>): SpeechModelV4;
+    videoModel(
+      modelId: ExtractModelId<VIDEO_MODELS>,
+    ): Experimental_VideoModelV4;
+  } = {
     specificationVersion: 'v4',
     languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>): LanguageModelV4 {
       if (languageModels != null && modelId in languageModels) {
-        return asLanguageModelV4(languageModels[modelId]);
+        return resolveLanguageModel(languageModels[modelId]);
       }
 
       if (fallbackProvider) {
-        return (fallbackProvider as ProviderV4).languageModel(modelId);
+        return fallbackProvider.languageModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'languageModel' });
@@ -132,11 +135,11 @@ export function customProvider<
       modelId: ExtractModelId<EMBEDDING_MODELS>,
     ): EmbeddingModelV4 {
       if (embeddingModels != null && modelId in embeddingModels) {
-        return asEmbeddingModelV4(embeddingModels[modelId]);
+        return resolveEmbeddingModel(embeddingModels[modelId]);
       }
 
       if (fallbackProvider) {
-        return (fallbackProvider as ProviderV4).embeddingModel(modelId);
+        return fallbackProvider.embeddingModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'embeddingModel' });
@@ -144,11 +147,11 @@ export function customProvider<
 
     imageModel(modelId: ExtractModelId<IMAGE_MODELS>): ImageModelV4 {
       if (imageModels != null && modelId in imageModels) {
-        return asImageModelV4(imageModels[modelId]);
+        return resolveImageModel(imageModels[modelId]);
       }
 
       if (fallbackProvider?.imageModel) {
-        return (fallbackProvider as ProviderV4).imageModel(modelId);
+        return fallbackProvider.imageModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'imageModel' });
@@ -158,11 +161,15 @@ export function customProvider<
       modelId: ExtractModelId<TRANSCRIPTION_MODELS>,
     ): TranscriptionModelV4 {
       if (transcriptionModels != null && modelId in transcriptionModels) {
-        return asTranscriptionModelV4(transcriptionModels[modelId]);
+        const model = resolveTranscriptionModel(transcriptionModels[modelId]);
+
+        if (model != null) {
+          return model;
+        }
       }
 
       if (fallbackProvider?.transcriptionModel) {
-        return (fallbackProvider as ProviderV4).transcriptionModel!(modelId);
+        return fallbackProvider.transcriptionModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'transcriptionModel' });
@@ -170,11 +177,15 @@ export function customProvider<
 
     speechModel(modelId: ExtractModelId<SPEECH_MODELS>): SpeechModelV4 {
       if (speechModels != null && modelId in speechModels) {
-        return asSpeechModelV4(speechModels[modelId]);
+        const model = resolveSpeechModel(speechModels[modelId]);
+
+        if (model != null) {
+          return model;
+        }
       }
 
       if (fallbackProvider?.speechModel) {
-        return (fallbackProvider as ProviderV4).speechModel!(modelId);
+        return fallbackProvider.speechModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'speechModel' });
@@ -183,7 +194,7 @@ export function customProvider<
       modelId: ExtractModelId<RERANKING_MODELS>,
     ): RerankingModelV4 {
       if (rerankingModels != null && modelId in rerankingModels) {
-        return asRerankingModelV4(rerankingModels[modelId]);
+        return resolveRerankingModel(rerankingModels[modelId]);
       }
 
       if (fallbackProvider?.rerankingModel) {
@@ -196,25 +207,49 @@ export function customProvider<
       modelId: ExtractModelId<VIDEO_MODELS>,
     ): Experimental_VideoModelV4 {
       if (videoModels != null && modelId in videoModels) {
-        return asVideoModelV4(videoModels[modelId]);
+        return resolveVideoModel(videoModels[modelId]);
       }
 
-      const videoModel = (fallbackProvider as any)?.videoModel;
+      // TODO AI SDK v7
+      // @ts-expect-error - videoModel support is experimental
+      const videoModel = fallbackProvider?.videoModel;
       if (videoModel) {
         return videoModel(modelId);
       }
 
       throw new NoSuchModelError({ modelId, modelType: 'videoModel' });
     },
-    ...(resolvedFiles != null ? { files: () => resolvedFiles } : {}),
-    ...(resolvedSkills != null ? { skills: () => resolvedSkills } : {}),
-  } as any; // necessary workaround to satisfy the complex return type while maintaining type safety
-}
+  };
 
-/**
- * @deprecated Use `customProvider` instead.
- */
-export const experimental_customProvider = customProvider;
+  const filesAndSkills = {
+    ...(files != null || fallbackProvider?.files != null
+      ? {
+          files(): FilesV4 {
+            return files ?? fallbackProvider!.files!();
+          },
+        }
+      : {}),
+
+    ...(skills != null || fallbackProvider?.skills != null
+      ? {
+          skills(): SkillsV4 {
+            return skills ?? fallbackProvider!.skills!();
+          },
+        }
+      : {}),
+  } as (FILES extends FilesV4
+    ? { files(): FilesV4 }
+    : [FALLBACK] extends [{ files: () => FilesV4 }]
+      ? { files(): FilesV4 }
+      : { files?(): FilesV4 }) &
+    (SKILLS extends SkillsV4
+      ? { skills(): SkillsV4 }
+      : [FALLBACK] extends [{ skills: () => SkillsV4 }]
+        ? { skills(): SkillsV4 }
+        : { skills?(): SkillsV4 });
+
+  return Object.assign(baseProvider, filesAndSkills);
+}
 
 type ExtractModelId<MODELS extends Record<string, unknown>> = Extract<
   keyof MODELS,

package/src/registry/index.ts

@@ -1,4 +1,4 @@
-export { customProvider, experimental_customProvider } from './custom-provider';
+export { customProvider } from './custom-provider';
 export { NoSuchProviderError } from './no-such-provider-error';
 export {
   createProviderRegistry,