@ai-sdk/mistral 2.0.0-canary.6 → 2.0.0-canary.8

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @ai-sdk/mistral
 
+## 2.0.0-canary.8
+
+### Patch Changes
+
+- Updated dependencies [5d142ab]
+- Updated dependencies [b6b43c7]
+- Updated dependencies [8aa9e20]
+- Updated dependencies [3795467]
+  - @ai-sdk/provider-utils@3.0.0-canary.8
+  - @ai-sdk/provider@2.0.0-canary.7
+
+## 2.0.0-canary.7
+
+### Patch Changes
+
+- 1251401: chore(providers/mistral): convert to providerOptions
+- 26735b5: chore(embedding-model): add v2 interface
+- 443d8ec: feat(embedding-model-v2): add response body field
+- fd65bc6: chore(embedding-model-v2): rename rawResponse to response
+- Updated dependencies [26735b5]
+- Updated dependencies [443d8ec]
+- Updated dependencies [14c9410]
+- Updated dependencies [d9c98f4]
+- Updated dependencies [c4a2fec]
+- Updated dependencies [0054544]
+- Updated dependencies [9e9c809]
+- Updated dependencies [32831c6]
+- Updated dependencies [d0f9495]
+- Updated dependencies [fd65bc6]
+- Updated dependencies [393138b]
+- Updated dependencies [7182d14]
+  - @ai-sdk/provider@2.0.0-canary.6
+  - @ai-sdk/provider-utils@3.0.0-canary.7
+
 ## 2.0.0-canary.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,15 +1,7 @@
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type MistralChatModelId = 'ministral-3b-latest' | 'ministral-8b-latest' | 'mistral-large-latest' | 'mistral-small-latest' | 'pixtral-large-latest' | 'pixtral-12b-2409' | 'open-mistral-7b' | 'open-mixtral-8x7b' | 'open-mixtral-8x22b' | (string & {});
-interface MistralChatSettings {
-    /**
-  Whether to inject a safety prompt before all conversations.
-  
-  Defaults to `false`.
-     */
-    safePrompt?: boolean;
-}
 
 type MistralEmbeddingModelId = 'mistral-embed' | (string & {});
 interface MistralEmbeddingSettings {
@@ -24,24 +16,24 @@ interface MistralEmbeddingSettings {
 }
 
 interface MistralProvider extends ProviderV2 {
-    (modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    (modelId: MistralChatModelId): LanguageModelV2;
     /**
   Creates a model for text generation.
   */
-    languageModel(modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    languageModel(modelId: MistralChatModelId): LanguageModelV2;
     /**
   Creates a model for text generation.
   */
-    chat(modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    chat(modelId: MistralChatModelId): LanguageModelV2;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    embedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV2<string>;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    textEmbedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV1<string>;
-    textEmbeddingModel: (modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings) => EmbeddingModelV1<string>;
+    textEmbedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV2<string>;
+    textEmbeddingModel: (modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings) => EmbeddingModelV2<string>;
 }
 interface MistralProviderSettings {
     /**

package/dist/index.d.ts

@@ -1,15 +1,7 @@
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type MistralChatModelId = 'ministral-3b-latest' | 'ministral-8b-latest' | 'mistral-large-latest' | 'mistral-small-latest' | 'pixtral-large-latest' | 'pixtral-12b-2409' | 'open-mistral-7b' | 'open-mixtral-8x7b' | 'open-mixtral-8x22b' | (string & {});
-interface MistralChatSettings {
-    /**
-  Whether to inject a safety prompt before all conversations.
-  
-  Defaults to `false`.
-     */
-    safePrompt?: boolean;
-}
 
 type MistralEmbeddingModelId = 'mistral-embed' | (string & {});
 interface MistralEmbeddingSettings {
@@ -24,24 +16,24 @@ interface MistralEmbeddingSettings {
 }
 
 interface MistralProvider extends ProviderV2 {
-    (modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    (modelId: MistralChatModelId): LanguageModelV2;
     /**
   Creates a model for text generation.
   */
-    languageModel(modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    languageModel(modelId: MistralChatModelId): LanguageModelV2;
     /**
   Creates a model for text generation.
   */
-    chat(modelId: MistralChatModelId, settings?: MistralChatSettings): LanguageModelV2;
+    chat(modelId: MistralChatModelId): LanguageModelV2;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    embedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV2<string>;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    textEmbedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV1<string>;
-    textEmbeddingModel: (modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings) => EmbeddingModelV1<string>;
+    textEmbedding(modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings): EmbeddingModelV2<string>;
+    textEmbeddingModel: (modelId: MistralEmbeddingModelId, settings?: MistralEmbeddingSettings) => EmbeddingModelV2<string>;
 }
 interface MistralProviderSettings {
     /**

package/dist/index.js

@@ -31,7 +31,7 @@ var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/mistral-chat-language-model.ts
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
-var import_zod2 = require("zod");
+var import_zod3 = require("zod");
 
 // src/convert-to-mistral-chat-messages.ts
 var import_provider = require("@ai-sdk/provider");
@@ -154,15 +154,28 @@ function mapMistralFinishReason(finishReason) {
   }
 }
 
+// src/mistral-chat-options.ts
+var import_zod = require("zod");
+var mistralProviderOptions = import_zod.z.object({
+  /**
+  Whether to inject a safety prompt before all conversations.
+  
+  Defaults to `false`.
+     */
+  safePrompt: import_zod.z.boolean().nullish(),
+  documentImageLimit: import_zod.z.number().nullish(),
+  documentPageLimit: import_zod.z.number().nullish()
+});
+
 // src/mistral-error.ts
 var import_provider_utils = require("@ai-sdk/provider-utils");
-var import_zod = require("zod");
-var mistralErrorDataSchema = import_zod.z.object({
-  object: import_zod.z.literal("error"),
-  message: import_zod.z.string(),
-  type: import_zod.z.string(),
-  param: import_zod.z.string().nullable(),
-  code: import_zod.z.string().nullable()
+var import_zod2 = require("zod");
+var mistralErrorDataSchema = import_zod2.z.object({
+  object: import_zod2.z.literal("error"),
+  message: import_zod2.z.string(),
+  type: import_zod2.z.string(),
+  param: import_zod2.z.string().nullable(),
+  code: import_zod2.z.string().nullable()
 });
 var mistralFailedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)({
   errorSchema: mistralErrorDataSchema,
@@ -224,12 +237,11 @@ function prepareTools({
 
 // src/mistral-chat-language-model.ts
 var MistralChatLanguageModel = class {
-  constructor(modelId, settings, config) {
+  constructor(modelId, config) {
     this.specificationVersion = "v2";
     this.defaultObjectGenerationMode = "json";
     this.supportsImageUrls = false;
     this.modelId = modelId;
-    this.settings = settings;
     this.config = config;
   }
   get provider() {
@@ -253,8 +265,13 @@ var MistralChatLanguageModel = class {
     tools,
     toolChoice
   }) {
-    var _a, _b;
+    var _a;
     const warnings = [];
+    const options = (_a = (0, import_provider_utils2.parseProviderOptions)({
+      provider: "mistral",
+      providerOptions,
+      schema: mistralProviderOptions
+    })) != null ? _a : {};
     if (topK != null) {
       warnings.push({
         type: "unsupported-setting",
@@ -290,7 +307,7 @@ var MistralChatLanguageModel = class {
       // model id:
       model: this.modelId,
       // model specific settings:
-      safe_prompt: this.settings.safePrompt,
+      safe_prompt: options.safePrompt,
       // standardized settings:
       max_tokens: maxOutputTokens,
       temperature,
@@ -299,8 +316,8 @@ var MistralChatLanguageModel = class {
       // response format:
       response_format: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? { type: "json_object" } : void 0,
       // mistral-specific provider options:
-      document_image_limit: (_a = providerOptions == null ? void 0 : providerOptions.mistral) == null ? void 0 : _a.documentImageLimit,
-      document_page_limit: (_b = providerOptions == null ? void 0 : providerOptions.mistral) == null ? void 0 : _b.documentPageLimit,
+      document_image_limit: options.documentImageLimit,
+      document_page_limit: options.documentPageLimit,
       // messages:
       messages: convertToMistralChatMessages(prompt)
     };
@@ -322,7 +339,6 @@ var MistralChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a;
     const { args: body, warnings } = this.getArgs(options);
     const {
       responseHeaders,
@@ -340,19 +356,28 @@ var MistralChatLanguageModel = class {
       fetch: this.config.fetch
     });
     const choice = response.choices[0];
+    const content = [];
     let text = extractTextContent(choice.message.content);
     const lastMessage = body.messages[body.messages.length - 1];
     if (lastMessage.role === "assistant" && (text == null ? void 0 : text.startsWith(lastMessage.content))) {
       text = text.slice(lastMessage.content.length);
     }
+    if (text != null && text.length > 0) {
+      content.push({ type: "text", text });
+    }
+    if (choice.message.tool_calls != null) {
+      for (const toolCall of choice.message.tool_calls) {
+        content.push({
+          type: "tool-call",
+          toolCallType: "function",
+          toolCallId: toolCall.id,
+          toolName: toolCall.function.name,
+          args: toolCall.function.arguments
+        });
+      }
+    }
     return {
-      text,
-      toolCalls: (_a = choice.message.tool_calls) == null ? void 0 : _a.map((toolCall) => ({
-        toolCallType: "function",
-        toolCallId: toolCall.id,
-        toolName: toolCall.function.name,
-        args: toolCall.function.arguments
-      })),
+      content,
       finishReason: mapMistralFinishReason(choice.finish_reason),
       usage: {
         inputTokens: response.usage.prompt_tokens,
@@ -391,6 +416,9 @@ var MistralChatLanguageModel = class {
     return {
       stream: response.pipeThrough(
         new TransformStream({
+          start(controller) {
+            controller.enqueue({ type: "stream-start", warnings });
+          },
           transform(chunk, controller) {
             if (!chunk.success) {
               controller.enqueue({ type: "error", error: chunk.error });
@@ -428,8 +456,8 @@ var MistralChatLanguageModel = class {
             }
             if (textContent != null) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: trimLeadingSpace ? textContent.trimStart() : textContent
+                type: "text",
+                text: trimLeadingSpace ? textContent.trimStart() : textContent
               });
               trimLeadingSpace = false;
             }
@@ -458,8 +486,7 @@ var MistralChatLanguageModel = class {
         })
       ),
       request: { body },
-      response: { headers: responseHeaders },
-      warnings
+      response: { headers: responseHeaders }
     };
   }
 };
@@ -488,90 +515,90 @@ function extractTextContent(content) {
   }
   return textContent.length ? textContent.join("") : void 0;
 }
-var mistralContentSchema = import_zod2.z.union([
-  import_zod2.z.string(),
-  import_zod2.z.array(
-    import_zod2.z.discriminatedUnion("type", [
-      import_zod2.z.object({
-        type: import_zod2.z.literal("text"),
-        text: import_zod2.z.string()
+var mistralContentSchema = import_zod3.z.union([
+  import_zod3.z.string(),
+  import_zod3.z.array(
+    import_zod3.z.discriminatedUnion("type", [
+      import_zod3.z.object({
+        type: import_zod3.z.literal("text"),
+        text: import_zod3.z.string()
       }),
-      import_zod2.z.object({
-        type: import_zod2.z.literal("image_url"),
-        image_url: import_zod2.z.union([
-          import_zod2.z.string(),
-          import_zod2.z.object({
-            url: import_zod2.z.string(),
-            detail: import_zod2.z.string().nullable()
+      import_zod3.z.object({
+        type: import_zod3.z.literal("image_url"),
+        image_url: import_zod3.z.union([
+          import_zod3.z.string(),
+          import_zod3.z.object({
+            url: import_zod3.z.string(),
+            detail: import_zod3.z.string().nullable()
           })
         ])
       }),
-      import_zod2.z.object({
-        type: import_zod2.z.literal("reference"),
-        reference_ids: import_zod2.z.array(import_zod2.z.number())
+      import_zod3.z.object({
+        type: import_zod3.z.literal("reference"),
+        reference_ids: import_zod3.z.array(import_zod3.z.number())
       })
     ])
   )
 ]).nullish();
-var mistralChatResponseSchema = import_zod2.z.object({
-  id: import_zod2.z.string().nullish(),
-  created: import_zod2.z.number().nullish(),
-  model: import_zod2.z.string().nullish(),
-  choices: import_zod2.z.array(
-    import_zod2.z.object({
-      message: import_zod2.z.object({
-        role: import_zod2.z.literal("assistant"),
+var mistralChatResponseSchema = import_zod3.z.object({
+  id: import_zod3.z.string().nullish(),
+  created: import_zod3.z.number().nullish(),
+  model: import_zod3.z.string().nullish(),
+  choices: import_zod3.z.array(
+    import_zod3.z.object({
+      message: import_zod3.z.object({
+        role: import_zod3.z.literal("assistant"),
         content: mistralContentSchema,
-        tool_calls: import_zod2.z.array(
-          import_zod2.z.object({
-            id: import_zod2.z.string(),
-            function: import_zod2.z.object({ name: import_zod2.z.string(), arguments: import_zod2.z.string() })
+        tool_calls: import_zod3.z.array(
+          import_zod3.z.object({
+            id: import_zod3.z.string(),
+            function: import_zod3.z.object({ name: import_zod3.z.string(), arguments: import_zod3.z.string() })
           })
         ).nullish()
       }),
-      index: import_zod2.z.number(),
-      finish_reason: import_zod2.z.string().nullish()
+      index: import_zod3.z.number(),
+      finish_reason: import_zod3.z.string().nullish()
     })
   ),
-  object: import_zod2.z.literal("chat.completion"),
-  usage: import_zod2.z.object({
-    prompt_tokens: import_zod2.z.number(),
-    completion_tokens: import_zod2.z.number()
+  object: import_zod3.z.literal("chat.completion"),
+  usage: import_zod3.z.object({
+    prompt_tokens: import_zod3.z.number(),
+    completion_tokens: import_zod3.z.number()
   })
 });
-var mistralChatChunkSchema = import_zod2.z.object({
-  id: import_zod2.z.string().nullish(),
-  created: import_zod2.z.number().nullish(),
-  model: import_zod2.z.string().nullish(),
-  choices: import_zod2.z.array(
-    import_zod2.z.object({
-      delta: import_zod2.z.object({
-        role: import_zod2.z.enum(["assistant"]).optional(),
+var mistralChatChunkSchema = import_zod3.z.object({
+  id: import_zod3.z.string().nullish(),
+  created: import_zod3.z.number().nullish(),
+  model: import_zod3.z.string().nullish(),
+  choices: import_zod3.z.array(
+    import_zod3.z.object({
+      delta: import_zod3.z.object({
+        role: import_zod3.z.enum(["assistant"]).optional(),
         content: mistralContentSchema,
-        tool_calls: import_zod2.z.array(
-          import_zod2.z.object({
-            id: import_zod2.z.string(),
-            function: import_zod2.z.object({ name: import_zod2.z.string(), arguments: import_zod2.z.string() })
+        tool_calls: import_zod3.z.array(
+          import_zod3.z.object({
+            id: import_zod3.z.string(),
+            function: import_zod3.z.object({ name: import_zod3.z.string(), arguments: import_zod3.z.string() })
           })
         ).nullish()
       }),
-      finish_reason: import_zod2.z.string().nullish(),
-      index: import_zod2.z.number()
+      finish_reason: import_zod3.z.string().nullish(),
+      index: import_zod3.z.number()
     })
   ),
-  usage: import_zod2.z.object({
-    prompt_tokens: import_zod2.z.number(),
-    completion_tokens: import_zod2.z.number()
+  usage: import_zod3.z.object({
+    prompt_tokens: import_zod3.z.number(),
+    completion_tokens: import_zod3.z.number()
   }).nullish()
 });
 
 // src/mistral-embedding-model.ts
 var import_provider3 = require("@ai-sdk/provider");
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
-var import_zod3 = require("zod");
+var import_zod4 = require("zod");
 var MistralEmbeddingModel = class {
   constructor(modelId, settings, config) {
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
@@ -600,7 +627,11 @@ var MistralEmbeddingModel = class {
         values
       });
     }
-    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
+    const {
+      responseHeaders,
+      value: response,
+      rawValue
+    } = await (0, import_provider_utils3.postJsonToApi)({
       url: `${this.config.baseURL}/embeddings`,
       headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), headers),
       body: {
@@ -618,13 +649,13 @@ var MistralEmbeddingModel = class {
     return {
       embeddings: response.data.map((item) => item.embedding),
       usage: response.usage ? { tokens: response.usage.prompt_tokens } : void 0,
-      rawResponse: { headers: responseHeaders }
+      response: { headers: responseHeaders, body: rawValue }
     };
   }
 };
-var MistralTextEmbeddingResponseSchema = import_zod3.z.object({
-  data: import_zod3.z.array(import_zod3.z.object({ embedding: import_zod3.z.array(import_zod3.z.number()) })),
-  usage: import_zod3.z.object({ prompt_tokens: import_zod3.z.number() }).nullish()
+var MistralTextEmbeddingResponseSchema = import_zod4.z.object({
+  data: import_zod4.z.array(import_zod4.z.object({ embedding: import_zod4.z.array(import_zod4.z.number()) })),
+  usage: import_zod4.z.object({ prompt_tokens: import_zod4.z.number() }).nullish()
 });
 
 // src/mistral-provider.ts
@@ -639,7 +670,7 @@ function createMistral(options = {}) {
     })}`,
     ...options.headers
   });
-  const createChatModel = (modelId, settings = {}) => new MistralChatLanguageModel(modelId, settings, {
+  const createChatModel = (modelId) => new MistralChatLanguageModel(modelId, {
     provider: "mistral.chat",
     baseURL,
     headers: getHeaders,
@@ -651,13 +682,13 @@ function createMistral(options = {}) {
     headers: getHeaders,
     fetch: options.fetch
   });
-  const provider = function(modelId, settings) {
+  const provider = function(modelId) {
     if (new.target) {
       throw new Error(
         "The Mistral model function cannot be called with the new keyword."
       );
     }
-    return createChatModel(modelId, settings);
+    return createChatModel(modelId);
   };
   provider.languageModel = createChatModel;
   provider.chat = createChatModel;