modelfusion 0.99.0 → 0.101.0

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -6,6 +6,14 @@ import { PromptTemplate } from "../../model-function/PromptTemplate.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { Automatic1111ImageGenerationPrompt } from "./Automatic1111ImageGenerationPrompt.js";
+export interface Automatic1111ImageGenerationSettings extends ImageGenerationModelSettings {
+    api?: ApiConfiguration;
+    model: string;
+    height?: number;
+    width?: number;
+    sampler?: string;
+    steps?: number;
+}
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -29,14 +37,6 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
     withSettings(additionalSettings: Automatic1111ImageGenerationSettings): this;
 }
-export interface Automatic1111ImageGenerationSettings extends ImageGenerationModelSettings {
-    api?: ApiConfiguration;
-    model: string;
-    height?: number;
-    width?: number;
-    sampler?: string;
-    steps?: number;
-}
 declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     images: z.ZodArray<z.ZodString, "many">;
     parameters: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -25,13 +25,29 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
         return this.settings.model;
     }
     async callAPI(input, options) {
+        const api = this.settings.api ?? new Automatic1111ApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callAutomatic1111ImageGenerationAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                prompt: input.prompt,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/txt2img`),
+                headers: api.headers,
+                body: {
+                    height: this.settings.height,
+                    width: this.settings.width,
+                    prompt: input.prompt,
+                    negative_prompt: input.negativePrompt,
+                    sampler_index: this.settings.sampler,
+                    steps: this.settings.steps,
+                    seed: input.seed,
+                    override_settings: {
+                        sd_model_checkpoint: this.settings.model,
+                    },
+                },
+                failedResponseHandler: failedAutomatic1111CallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(Automatic1111ImageGenerationResponseSchema),
+                abortSignal,
             }),
         });
     }
@@ -68,24 +84,3 @@ const Automatic1111ImageGenerationResponseSchema = z.object({
     parameters: z.object({}),
     info: z.string(),
 });
-async function callAutomatic1111ImageGenerationAPI({ api = new Automatic1111ApiConfiguration(), abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/txt2img`),
-        headers: api.headers,
-        body: {
-            height,
-            width,
-            prompt,
-            negative_prompt: negativePrompt,
-            sampler_index: sampler,
-            steps,
-            seed,
-            override_settings: {
-                sd_model_checkpoint: model,
-            },
-        },
-        failedResponseHandler: failedAutomatic1111CallResponseHandler,
-        successfulResponseHandler: createJsonResponseHandler(Automatic1111ImageGenerationResponseSchema),
-        abortSignal,
-    });
-}

package/model-provider/automatic1111/index.cjs

@@ -26,10 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.automatic1111 = exports.Automatic1111Error = void 0;
+exports.automatic1111 = void 0;
 __exportStar(require("./Automatic1111ApiConfiguration.cjs"), exports);
-var Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
-Object.defineProperty(exports, "Automatic1111Error", { enumerable: true, get: function () { return Automatic1111Error_js_1.Automatic1111Error; } });
 exports.automatic1111 = __importStar(require("./Automatic1111Facade.cjs"));
 __exportStar(require("./Automatic1111ImageGenerationModel.cjs"), exports);
 __exportStar(require("./Automatic1111ImageGenerationPrompt.cjs"), exports);

package/model-provider/automatic1111/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./Automatic1111ApiConfiguration.js";
-export { Automatic1111Error, Automatic1111ErrorData, } from "./Automatic1111Error.js";
+export { Automatic1111ErrorData } from "./Automatic1111Error.js";
 export * as automatic1111 from "./Automatic1111Facade.js";
 export * from "./Automatic1111ImageGenerationModel.js";
 export * from "./Automatic1111ImageGenerationPrompt.js";

package/model-provider/automatic1111/index.js

@@ -1,5 +1,4 @@
 export * from "./Automatic1111ApiConfiguration.js";
-export { Automatic1111Error, } from "./Automatic1111Error.js";
 export * as automatic1111 from "./Automatic1111Facade.js";
 export * from "./Automatic1111ImageGenerationModel.js";
 export * from "./Automatic1111ImageGenerationPrompt.js";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -65,8 +65,8 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
             generation_settings: {
                 model: string;
                 stream: boolean;
-                seed: number;
                 mirostat: number;
+                seed: number;
                 stop: string[];
                 frequency_penalty: number;
                 ignore_eos: boolean;
@@ -155,8 +155,8 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         model: string;
         stream: boolean;
-        seed: number;
         mirostat: number;
+        seed: number;
         stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
@@ -179,8 +179,8 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     }, {
         model: string;
         stream: boolean;
-        seed: number;
         mirostat: number;
+        seed: number;
         stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
@@ -247,8 +247,8 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     generation_settings: {
         model: string;
         stream: boolean;
-        seed: number;
         mirostat: number;
+        seed: number;
         stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
@@ -295,8 +295,8 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     generation_settings: {
         model: string;
         stream: boolean;
-        seed: number;
         mirostat: number;
+        seed: number;
         stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
@@ -360,8 +360,8 @@ export declare const LlamaCppTextGenerationResponseFormat: {
             generation_settings: {
                 model: string;
                 stream: boolean;
-                seed: number;
                 mirostat: number;
+                seed: number;
                 stop: string[];
                 frequency_penalty: number;
                 ignore_eos: boolean;

package/model-provider/mistral/{MistralTextGenerationModel.cjs → MistralChatModel.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MistralTextGenerationResponseFormat = exports.MistralTextGenerationModel = void 0;
+exports.MistralChatResponseFormat = exports.MistralChatModel = void 0;
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
@@ -13,7 +13,7 @@ const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSour
 const MistralApiConfiguration_js_1 = require("./MistralApiConfiguration.cjs");
 const MistralError_js_1 = require("./MistralError.cjs");
 const MistralPromptTemplate_js_1 = require("./MistralPromptTemplate.cjs");
-class MistralTextGenerationModel extends AbstractModel_js_1.AbstractModel {
+class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -85,7 +85,7 @@ class MistralTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     async doGenerateTexts(prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
-            responseFormat: exports.MistralTextGenerationResponseFormat.json,
+            responseFormat: exports.MistralChatResponseFormat.json,
         });
         return {
             response,
@@ -95,7 +95,7 @@ class MistralTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
-            responseFormat: exports.MistralTextGenerationResponseFormat.textDeltaIterable,
+            responseFormat: exports.MistralChatResponseFormat.textDeltaIterable,
         });
     }
     /**
@@ -123,11 +123,11 @@ class MistralTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     withSettings(additionalSettings) {
-        return new MistralTextGenerationModel(Object.assign({}, this.settings, additionalSettings));
+        return new MistralChatModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-exports.MistralTextGenerationModel = MistralTextGenerationModel;
-const mistralTextGenerationResponseSchema = zod_1.z.object({
+exports.MistralChatModel = MistralChatModel;
+const mistralChatResponseSchema = zod_1.z.object({
     id: zod_1.z.string(),
     object: zod_1.z.string(),
     created: zod_1.z.number(),
@@ -146,23 +146,23 @@ const mistralTextGenerationResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-exports.MistralTextGenerationResponseFormat = {
+exports.MistralChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
      */
     json: {
         stream: false,
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(mistralTextGenerationResponseSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)(mistralChatResponseSchema),
     },
     /**
      * Returns an async iterable over the text deltas (only the tex different of the first choice).
      */
     textDeltaIterable: {
         stream: true,
-        handler: async ({ response }) => createMistralTextGenerationDeltaIterableQueue(response.body, (delta) => delta[0]?.delta.content ?? ""),
+        handler: async ({ response }) => createMistralChatDeltaIterableQueue(response.body, (delta) => delta[0]?.delta.content ?? ""),
     },
 };
-const mistralTextGenerationChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const mistralChatChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     id: zod_1.z.string(),
     object: zod_1.z.string().optional(),
     created: zod_1.z.number().optional(),
@@ -179,7 +179,7 @@ const mistralTextGenerationChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.ob
             .optional(),
     })),
 }));
-async function createMistralTextGenerationDeltaIterableQueue(stream, extractDeltaValue) {
+async function createMistralChatDeltaIterableQueue(stream, extractDeltaValue) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     const streamDelta = [];
     // process the stream asynchonously (no 'await' on purpose):
@@ -194,7 +194,7 @@ async function createMistralTextGenerationDeltaIterableQueue(stream, extractDelt
                 }
                 const parseResult = (0, parseJSON_js_1.safeParseJSON)({
                     text: data,
-                    schema: mistralTextGenerationChunkSchema,
+                    schema: mistralChatChunkSchema,
                 });
                 if (!parseResult.success) {
                     queue.push({

package/model-provider/mistral/{MistralTextGenerationModel.d.ts → MistralChatModel.d.ts}

@@ -7,11 +7,12 @@ import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-export type MistralTextGenerationPrompt = Array<{
+export type MistralChatMessage = {
     role: "system" | "user" | "assistant";
     content: string;
-}>;
-export interface MistralTextGenerationModelSettings extends TextGenerationModelSettings {
+};
+export type MistralChatPrompt = Array<MistralChatMessage>;
+export interface MistralChatModelSettings extends TextGenerationModelSettings {
     api?: ApiConfiguration;
     model: "mistral-tiny" | "mistral-small" | "mistral-medium";
     /**
@@ -46,18 +47,18 @@ export interface MistralTextGenerationModelSettings extends TextGenerationModelS
      */
     randomSeed?: number | null;
 }
-export declare class MistralTextGenerationModel extends AbstractModel<MistralTextGenerationModelSettings> implements TextStreamingModel<MistralTextGenerationPrompt, MistralTextGenerationModelSettings> {
-    constructor(settings: MistralTextGenerationModelSettings);
+export declare class MistralChatModel extends AbstractModel<MistralChatModelSettings> implements TextStreamingModel<MistralChatPrompt, MistralChatModelSettings> {
+    constructor(settings: MistralChatModelSettings);
     readonly provider = "mistral";
     get modelName(): "mistral-tiny" | "mistral-small" | "mistral-medium";
     readonly contextWindowSize: undefined;
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
-    callAPI<RESULT>(prompt: MistralTextGenerationPrompt, options: {
-        responseFormat: MistralTextGenerationResponseFormatType<RESULT>;
+    callAPI<RESULT>(prompt: MistralChatPrompt, options: {
+        responseFormat: MistralChatResponseFormatType<RESULT>;
     } & FunctionOptions): Promise<RESULT>;
-    get settingsForEvent(): Partial<MistralTextGenerationModelSettings>;
-    doGenerateTexts(prompt: MistralTextGenerationPrompt, options?: FunctionOptions): Promise<{
+    get settingsForEvent(): Partial<MistralChatModelSettings>;
+    doGenerateTexts(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: string;
             usage: {
@@ -79,23 +80,23 @@ export declare class MistralTextGenerationModel extends AbstractModel<MistralTex
         };
         texts: string[];
     }>;
-    doStreamText(prompt: MistralTextGenerationPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
+    doStreamText(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with a text prompt template.
      */
-    withTextPrompt(): PromptTemplateTextStreamingModel<string, MistralTextGenerationPrompt, MistralTextGenerationModelSettings, this>;
+    withTextPrompt(): PromptTemplateTextStreamingModel<string, MistralChatPrompt, MistralChatModelSettings, this>;
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, MistralTextGenerationPrompt, MistralTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, MistralTextGenerationPrompt, MistralTextGenerationModelSettings, this>;
-    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, MistralTextGenerationPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, MistralTextGenerationPrompt, MistralTextGenerationModelSettings, this>;
-    withSettings(additionalSettings: Partial<MistralTextGenerationModelSettings>): this;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, MistralChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, MistralChatPrompt, MistralChatModelSettings, this>;
+    withSettings(additionalSettings: Partial<MistralChatModelSettings>): this;
 }
-declare const mistralTextGenerationResponseSchema: z.ZodObject<{
+declare const mistralChatResponseSchema: z.ZodObject<{
     id: z.ZodString;
     object: z.ZodString;
     created: z.ZodNumber;
@@ -178,12 +179,12 @@ declare const mistralTextGenerationResponseSchema: z.ZodObject<{
         index: number;
     }[];
 }>;
-export type MistralTextGenerationResponse = z.infer<typeof mistralTextGenerationResponseSchema>;
-export type MistralTextGenerationResponseFormatType<T> = {
+export type MistralChatResponse = z.infer<typeof mistralChatResponseSchema>;
+export type MistralChatResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;
 };
-export declare const MistralTextGenerationResponseFormat: {
+export declare const MistralChatResponseFormat: {
     /**
      * Returns the response as a JSON object.
      */
@@ -219,7 +220,7 @@ export declare const MistralTextGenerationResponseFormat: {
         }) => Promise<AsyncIterable<Delta<string>>>;
     };
 };
-export type MistralTextGenerationDelta = Array<{
+export type MistralChatDelta = Array<{
     role: "assistant" | "user" | undefined;
     content: string;
     isComplete: boolean;

package/model-provider/mistral/{MistralTextGenerationModel.js → MistralChatModel.js}

@@ -10,7 +10,7 @@ import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStr
 import { MistralApiConfiguration } from "./MistralApiConfiguration.js";
 import { failedMistralCallResponseHandler } from "./MistralError.js";
 import { chat, instruction, text } from "./MistralPromptTemplate.js";
-export class MistralTextGenerationModel extends AbstractModel {
+export class MistralChatModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -82,7 +82,7 @@ export class MistralTextGenerationModel extends AbstractModel {
     async doGenerateTexts(prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
-            responseFormat: MistralTextGenerationResponseFormat.json,
+            responseFormat: MistralChatResponseFormat.json,
         });
         return {
             response,
@@ -92,7 +92,7 @@ export class MistralTextGenerationModel extends AbstractModel {
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
-            responseFormat: MistralTextGenerationResponseFormat.textDeltaIterable,
+            responseFormat: MistralChatResponseFormat.textDeltaIterable,
         });
     }
     /**
@@ -120,10 +120,10 @@ export class MistralTextGenerationModel extends AbstractModel {
         });
     }
     withSettings(additionalSettings) {
-        return new MistralTextGenerationModel(Object.assign({}, this.settings, additionalSettings));
+        return new MistralChatModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const mistralTextGenerationResponseSchema = z.object({
+const mistralChatResponseSchema = z.object({
     id: z.string(),
     object: z.string(),
     created: z.number(),
@@ -142,23 +142,23 @@ const mistralTextGenerationResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-export const MistralTextGenerationResponseFormat = {
+export const MistralChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(mistralTextGenerationResponseSchema),
+        handler: createJsonResponseHandler(mistralChatResponseSchema),
     },
     /**
      * Returns an async iterable over the text deltas (only the tex different of the first choice).
      */
     textDeltaIterable: {
         stream: true,
-        handler: async ({ response }) => createMistralTextGenerationDeltaIterableQueue(response.body, (delta) => delta[0]?.delta.content ?? ""),
+        handler: async ({ response }) => createMistralChatDeltaIterableQueue(response.body, (delta) => delta[0]?.delta.content ?? ""),
     },
 };
-const mistralTextGenerationChunkSchema = new ZodSchema(z.object({
+const mistralChatChunkSchema = new ZodSchema(z.object({
     id: z.string(),
     object: z.string().optional(),
     created: z.number().optional(),
@@ -175,7 +175,7 @@ const mistralTextGenerationChunkSchema = new ZodSchema(z.object({
             .optional(),
     })),
 }));
-async function createMistralTextGenerationDeltaIterableQueue(stream, extractDeltaValue) {
+async function createMistralChatDeltaIterableQueue(stream, extractDeltaValue) {
     const queue = new AsyncQueue();
     const streamDelta = [];
     // process the stream asynchonously (no 'await' on purpose):
@@ -190,7 +190,7 @@ async function createMistralTextGenerationDeltaIterableQueue(stream, extractDelt
                 }
                 const parseResult = safeParseJSON({
                     text: data,
-                    schema: mistralTextGenerationChunkSchema,
+                    schema: mistralChatChunkSchema,
                 });
                 if (!parseResult.success) {
                     queue.push({

package/model-provider/mistral/MistralFacade.cjs

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextEmbedder = exports.TextGenerator = exports.Api = void 0;
+exports.TextEmbedder = exports.ChatTextGenerator = exports.Api = void 0;
 const MistralApiConfiguration_js_1 = require("./MistralApiConfiguration.cjs");
 const MistralTextEmbeddingModel_js_1 = require("./MistralTextEmbeddingModel.cjs");
-const MistralTextGenerationModel_js_1 = require("./MistralTextGenerationModel.cjs");
+const MistralChatModel_js_1 = require("./MistralChatModel.cjs");
 function Api(settings) {
     return new MistralApiConfiguration_js_1.MistralApiConfiguration(settings);
 }
 exports.Api = Api;
-function TextGenerator(settings) {
-    return new MistralTextGenerationModel_js_1.MistralTextGenerationModel(settings);
+function ChatTextGenerator(settings) {
+    return new MistralChatModel_js_1.MistralChatModel(settings);
 }
-exports.TextGenerator = TextGenerator;
+exports.ChatTextGenerator = ChatTextGenerator;
 function TextEmbedder(settings) {
     return new MistralTextEmbeddingModel_js_1.MistralTextEmbeddingModel(settings);
 }

package/model-provider/mistral/MistralFacade.d.ts

@@ -1,6 +1,7 @@
 import { MistralApiConfiguration, MistralApiConfigurationSettings } from "./MistralApiConfiguration.js";
 import { MistralTextEmbeddingModel, MistralTextEmbeddingModelSettings } from "./MistralTextEmbeddingModel.js";
-import { MistralTextGenerationModel, MistralTextGenerationModelSettings } from "./MistralTextGenerationModel.js";
+import { MistralChatModel, MistralChatModelSettings } from "./MistralChatModel.js";
 export declare function Api(settings: MistralApiConfigurationSettings): MistralApiConfiguration;
-export declare function TextGenerator(settings: MistralTextGenerationModelSettings): MistralTextGenerationModel;
+export declare function ChatTextGenerator(settings: MistralChatModelSettings): MistralChatModel;
 export declare function TextEmbedder(settings: MistralTextEmbeddingModelSettings): MistralTextEmbeddingModel;
+export { MistralChatMessage as ChatMessage, MistralChatPrompt as ChatPrompt, } from "./MistralChatModel.js";

package/model-provider/mistral/MistralFacade.js

@@ -1,11 +1,11 @@
 import { MistralApiConfiguration, } from "./MistralApiConfiguration.js";
 import { MistralTextEmbeddingModel, } from "./MistralTextEmbeddingModel.js";
-import { MistralTextGenerationModel, } from "./MistralTextGenerationModel.js";
+import { MistralChatModel, } from "./MistralChatModel.js";
 export function Api(settings) {
     return new MistralApiConfiguration(settings);
 }
-export function TextGenerator(settings) {
-    return new MistralTextGenerationModel(settings);
+export function ChatTextGenerator(settings) {
+    return new MistralChatModel(settings);
 }
 export function TextEmbedder(settings) {
     return new MistralTextEmbeddingModel(settings);

package/model-provider/mistral/MistralPromptTemplate.d.ts

@@ -1,16 +1,16 @@
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
 import { TextInstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
-import { MistralTextGenerationPrompt } from "./MistralTextGenerationModel.js";
+import { MistralChatPrompt } from "./MistralChatModel.js";
 /**
  * Formats a text prompt as a Mistral prompt.
  */
-export declare function text(): TextGenerationPromptTemplate<string, MistralTextGenerationPrompt>;
+export declare function text(): TextGenerationPromptTemplate<string, MistralChatPrompt>;
 /**
  * Formats an instruction prompt as a Mistral prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, MistralTextGenerationPrompt>;
+export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, MistralChatPrompt>;
 /**
  * Formats a chat prompt as a Mistral prompt.
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, MistralTextGenerationPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, MistralChatPrompt>;

package/model-provider/mistral/index.cjs

@@ -31,4 +31,4 @@ __exportStar(require("./MistralApiConfiguration.cjs"), exports);
 exports.mistral = __importStar(require("./MistralFacade.cjs"));
 exports.MistralPrompt = __importStar(require("./MistralPromptTemplate.cjs"));
 __exportStar(require("./MistralTextEmbeddingModel.cjs"), exports);
-__exportStar(require("./MistralTextGenerationModel.cjs"), exports);
+__exportStar(require("./MistralChatModel.cjs"), exports);

package/model-provider/mistral/index.d.ts

@@ -3,4 +3,4 @@ export { MistralErrorData } from "./MistralError.js";
 export * as mistral from "./MistralFacade.js";
 export * as MistralPrompt from "./MistralPromptTemplate.js";
 export * from "./MistralTextEmbeddingModel.js";
-export * from "./MistralTextGenerationModel.js";
+export * from "./MistralChatModel.js";

package/model-provider/mistral/index.js

@@ -2,4 +2,4 @@ export * from "./MistralApiConfiguration.js";
 export * as mistral from "./MistralFacade.js";
 export * as MistralPrompt from "./MistralPromptTemplate.js";
 export * from "./MistralTextEmbeddingModel.js";
-export * from "./MistralTextGenerationModel.js";
+export * from "./MistralChatModel.js";

package/model-provider/ollama/OllamaApiConfiguration.d.ts

@@ -1,10 +1,11 @@
 import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
 import { RetryFunction } from "../../core/api/RetryFunction.js";
 import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export type OllamaApiConfigurationSettings = {
+    baseUrl?: string;
+    retry?: RetryFunction;
+    throttle?: ThrottleFunction;
+};
 export declare class OllamaApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, retry, throttle, }?: {
-        baseUrl?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    });
+    constructor({ baseUrl, retry, throttle, }?: OllamaApiConfigurationSettings);
 }