modelfusion 0.110.0 → 0.112.0

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

@@ -1,12 +1,10 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export type MistralApiConfigurationSettings = {
-    baseUrl?: string;
-    apiKey?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-};
-export declare class MistralApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, apiKey, retry, throttle, }?: MistralApiConfigurationSettings);
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Mistral API.
+ * It calls the API at https://api.mistral.ai/v1 and uses the `MISTRAL_API_KEY` env variable by default.
+ */
+export declare class MistralApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
+        apiKey?: string;
+    });
 }

package/model-provider/mistral/MistralApiConfiguration.js

@@ -1,18 +1,26 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
 import { loadApiKey } from "../../core/api/loadApiKey.js";
-export class MistralApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.mistral.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Mistral API.
+ * It calls the API at https://api.mistral.ai/v1 and uses the `MISTRAL_API_KEY` env variable by default.
+ */
+export class MistralApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 Authorization: `Bearer ${loadApiKey({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "MISTRAL_API_KEY",
                     description: "Mistral",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.mistral.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/mistral/MistralChatModel.cjs

@@ -162,7 +162,7 @@ const mistralChatResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-const mistralChatStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const mistralChatStreamChunkSchema = zod_1.z.object({
     id: zod_1.z.string(),
     object: zod_1.z.string().optional(),
     created: zod_1.z.number().optional(),
@@ -178,20 +178,20 @@ const mistralChatStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object
             .nullable()
             .optional(),
     })),
-}));
+});
 exports.MistralChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
      */
     json: {
         stream: false,
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(mistralChatResponseSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(mistralChatResponseSchema)),
     },
     /**
      * Returns an async iterable over the text deltas (only the tex different of the first choice).
      */
     textDeltaIterable: {
         stream: true,
-        handler: (0, createEventSourceResponseHandler_js_1.createEventSourceResponseHandler)(mistralChatStreamChunkSchema),
+        handler: (0, createEventSourceResponseHandler_js_1.createEventSourceResponseHandler)((0, ZodSchema_js_1.zodSchema)(mistralChatStreamChunkSchema)),
     },
 };

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

@@ -2,7 +2,6 @@ import { z } from "zod";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
@@ -62,12 +61,12 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     doGenerateTexts(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: string;
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {
@@ -163,12 +162,12 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: string;
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -181,12 +180,12 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     }[];
 }, {
     object: string;
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -199,7 +198,53 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     }[];
 }>;
 export type MistralChatResponse = z.infer<typeof mistralChatResponseSchema>;
-declare const mistralChatStreamChunkSchema: ZodSchema<{
+declare const mistralChatStreamChunkSchema: z.ZodObject<{
+    id: z.ZodString;
+    object: z.ZodOptional<z.ZodString>;
+    created: z.ZodOptional<z.ZodNumber>;
+    model: z.ZodString;
+    choices: z.ZodArray<z.ZodObject<{
+        index: z.ZodNumber;
+        delta: z.ZodObject<{
+            role: z.ZodNullable<z.ZodOptional<z.ZodEnum<["assistant", "user"]>>>;
+            content: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        }, "strip", z.ZodTypeAny, {
+            role?: "user" | "assistant" | null | undefined;
+            content?: string | null | undefined;
+        }, {
+            role?: "user" | "assistant" | null | undefined;
+            content?: string | null | undefined;
+        }>;
+        finish_reason: z.ZodOptional<z.ZodNullable<z.ZodEnum<["stop", "length", "model_length"]>>>;
+    }, "strip", z.ZodTypeAny, {
+        delta: {
+            role?: "user" | "assistant" | null | undefined;
+            content?: string | null | undefined;
+        };
+        index: number;
+        finish_reason?: "length" | "stop" | "model_length" | null | undefined;
+    }, {
+        delta: {
+            role?: "user" | "assistant" | null | undefined;
+            content?: string | null | undefined;
+        };
+        index: number;
+        finish_reason?: "length" | "stop" | "model_length" | null | undefined;
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    model: string;
+    id: string;
+    choices: {
+        delta: {
+            role?: "user" | "assistant" | null | undefined;
+            content?: string | null | undefined;
+        };
+        index: number;
+        finish_reason?: "length" | "stop" | "model_length" | null | undefined;
+    }[];
+    object?: string | undefined;
+    created?: number | undefined;
+}, {
     model: string;
     id: string;
     choices: {
@@ -213,7 +258,7 @@ declare const mistralChatStreamChunkSchema: ZodSchema<{
     object?: string | undefined;
     created?: number | undefined;
 }>;
-export type MistralChatStreamChunk = (typeof mistralChatStreamChunkSchema)["_type"];
+export type MistralChatStreamChunk = z.infer<typeof mistralChatStreamChunkSchema>;
 export type MistralChatResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;
@@ -226,12 +271,12 @@ export declare const MistralChatResponseFormat: {
         stream: boolean;
         handler: ResponseHandler<{
             object: string;
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {

package/model-provider/mistral/MistralChatModel.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
@@ -158,7 +158,7 @@ const mistralChatResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-const mistralChatStreamChunkSchema = new ZodSchema(z.object({
+const mistralChatStreamChunkSchema = z.object({
     id: z.string(),
     object: z.string().optional(),
     created: z.number().optional(),
@@ -174,20 +174,20 @@ const mistralChatStreamChunkSchema = new ZodSchema(z.object({
             .nullable()
             .optional(),
     })),
-}));
+});
 export const MistralChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(mistralChatResponseSchema),
+        handler: createJsonResponseHandler(zodSchema(mistralChatResponseSchema)),
     },
     /**
      * Returns an async iterable over the text deltas (only the tex different of the first choice).
      */
     textDeltaIterable: {
         stream: true,
-        handler: createEventSourceResponseHandler(mistralChatStreamChunkSchema),
+        handler: createEventSourceResponseHandler(zodSchema(mistralChatStreamChunkSchema)),
     },
 };

package/model-provider/mistral/MistralError.cjs

@@ -4,14 +4,14 @@ exports.failedMistralCallResponseHandler = void 0;
 const zod_1 = require("zod");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const mistralErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const mistralErrorDataSchema = zod_1.z.object({
     object: zod_1.z.literal("error"),
     message: zod_1.z.string(),
     type: zod_1.z.string(),
     param: zod_1.z.string().nullable(),
     code: zod_1.z.string(),
-}));
+});
 exports.failedMistralCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
-    errorSchema: mistralErrorDataSchema,
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(mistralErrorDataSchema),
     errorToMessage: (error) => error.message,
 });

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

@@ -1,13 +1,25 @@
+import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-declare const mistralErrorDataSchema: ZodSchema<{
+declare const mistralErrorDataSchema: z.ZodObject<{
+    object: z.ZodLiteral<"error">;
+    message: z.ZodString;
+    type: z.ZodString;
+    param: z.ZodNullable<z.ZodString>;
+    code: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    object: "error";
+    message: string;
+    code: string;
+    type: string;
+    param: string | null;
+}, {
     object: "error";
     message: string;
     code: string;
     type: string;
     param: string | null;
 }>;
-export type MistralErrorData = (typeof mistralErrorDataSchema)["_type"];
+export type MistralErrorData = z.infer<typeof mistralErrorDataSchema>;
 export declare const failedMistralCallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/mistral/MistralError.js

@@ -1,14 +1,14 @@
 import { z } from "zod";
 import { createJsonErrorResponseHandler, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-const mistralErrorDataSchema = new ZodSchema(z.object({
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const mistralErrorDataSchema = z.object({
     object: z.literal("error"),
     message: z.string(),
     type: z.string(),
     param: z.string().nullable(),
     code: z.string(),
-}));
+});
 export const failedMistralCallResponseHandler = createJsonErrorResponseHandler({
-    errorSchema: mistralErrorDataSchema,
+    errorSchema: zodSchema(mistralErrorDataSchema),
     errorToMessage: (error) => error.message,
 });

package/model-provider/mistral/MistralFacade.cjs

@@ -2,8 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextEmbedder = exports.ChatTextGenerator = exports.Api = void 0;
 const MistralApiConfiguration_js_1 = require("./MistralApiConfiguration.cjs");
-const MistralTextEmbeddingModel_js_1 = require("./MistralTextEmbeddingModel.cjs");
 const MistralChatModel_js_1 = require("./MistralChatModel.cjs");
+const MistralTextEmbeddingModel_js_1 = require("./MistralTextEmbeddingModel.cjs");
+/**
+ * Creates an API configuration for the Mistral API.
+ * It calls the API at https://api.mistral.ai/v1 and uses the `MISTRAL_API_KEY` env variable by default.
+ */
 function Api(settings) {
     return new MistralApiConfiguration_js_1.MistralApiConfiguration(settings);
 }

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

@@ -1,7 +1,14 @@
-import { MistralApiConfiguration, MistralApiConfigurationSettings } from "./MistralApiConfiguration.js";
-import { MistralTextEmbeddingModel, MistralTextEmbeddingModelSettings } from "./MistralTextEmbeddingModel.js";
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { MistralApiConfiguration } from "./MistralApiConfiguration.js";
 import { MistralChatModel, MistralChatModelSettings } from "./MistralChatModel.js";
-export declare function Api(settings: MistralApiConfigurationSettings): MistralApiConfiguration;
+import { MistralTextEmbeddingModel, MistralTextEmbeddingModelSettings } from "./MistralTextEmbeddingModel.js";
+/**
+ * Creates an API configuration for the Mistral API.
+ * It calls the API at https://api.mistral.ai/v1 and uses the `MISTRAL_API_KEY` env variable by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions & {
+    apiKey?: string;
+}): MistralApiConfiguration;
 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,6 +1,10 @@
-import { MistralApiConfiguration, } from "./MistralApiConfiguration.js";
-import { MistralTextEmbeddingModel, } from "./MistralTextEmbeddingModel.js";
+import { MistralApiConfiguration } from "./MistralApiConfiguration.js";
 import { MistralChatModel, } from "./MistralChatModel.js";
+import { MistralTextEmbeddingModel, } from "./MistralTextEmbeddingModel.js";
+/**
+ * Creates an API configuration for the Mistral API.
+ * It calls the API at https://api.mistral.ai/v1 and uses the `MISTRAL_API_KEY` env variable by default.
+ */
 export function Api(settings) {
     return new MistralApiConfiguration(settings);
 }

package/model-provider/mistral/MistralTextEmbeddingModel.cjs

@@ -4,6 +4,7 @@ exports.MistralTextEmbeddingModel = 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");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const MistralApiConfiguration_js_1 = require("./MistralApiConfiguration.cjs");
 const MistralError_js_1 = require("./MistralError.cjs");
@@ -62,7 +63,7 @@ class MistralTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
                     encoding_format: encodingFormat,
                 },
                 failedResponseHandler: MistralError_js_1.failedMistralCallResponseHandler,
-                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(MistralTextEmbeddingResponseSchema),
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(MistralTextEmbeddingResponseSchema)),
                 abortSignal,
             }),
         });

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

@@ -37,11 +37,11 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
                 embedding: number[];
                 index: number;
             }[];
+            model: string;
             usage: {
                 prompt_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
         };
         embeddings: number[][];
@@ -82,11 +82,11 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
 }, {
     object: string;
@@ -95,11 +95,11 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
 }>;
 export type MistralTextEmbeddingResponse = z.infer<typeof MistralTextEmbeddingResponseSchema>;

package/model-provider/mistral/MistralTextEmbeddingModel.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { MistralApiConfiguration } from "./MistralApiConfiguration.js";
 import { failedMistralCallResponseHandler } from "./MistralError.js";
@@ -59,7 +60,7 @@ export class MistralTextEmbeddingModel extends AbstractModel {
                     encoding_format: encodingFormat,
                 },
                 failedResponseHandler: failedMistralCallResponseHandler,
-                successfulResponseHandler: createJsonResponseHandler(MistralTextEmbeddingResponseSchema),
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(MistralTextEmbeddingResponseSchema)),
                 abortSignal,
             }),
         });

package/model-provider/ollama/OllamaApiConfiguration.cjs

@@ -2,13 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OllamaApiConfiguration = void 0;
 const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
-class OllamaApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:11434", retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
+class OllamaApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "11434",
+                path: "",
+            },
         });
     }
 }

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

@@ -1,11 +1,8 @@
-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, }?: OllamaApiConfigurationSettings);
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
+export declare class OllamaApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions);
 }

package/model-provider/ollama/OllamaApiConfiguration.js

@@ -1,11 +1,18 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-export class OllamaApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:11434", retry, throttle, } = {}) {
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
+export class OllamaApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "11434",
+                path: "",
+            },
         });
     }
 }

package/model-provider/ollama/OllamaChatModel.cjs

@@ -11,7 +11,7 @@ const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
-const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
+const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.cjs");
 const createJsonStreamResponseHandler_js_1 = require("../../util/streaming/createJsonStreamResponseHandler.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatPromptTemplate_js_1 = require("./OllamaChatPromptTemplate.cjs");
@@ -143,7 +143,7 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });
@@ -197,7 +197,7 @@ const ollamaChatResponseSchema = zod_1.z.object({
     eval_count: zod_1.z.number(),
     eval_duration: zod_1.z.number(),
 });
-const ollamaChatStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("done", [
+const ollamaChatStreamChunkSchema = zod_1.z.discriminatedUnion("done", [
     zod_1.z.object({
         done: zod_1.z.literal(false),
         model: zod_1.z.string(),
@@ -218,7 +218,7 @@ const ollamaChatStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discrim
         eval_count: zod_1.z.number(),
         eval_duration: zod_1.z.number(),
     }),
-]));
+]);
 exports.OllamaChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -229,7 +229,7 @@ exports.OllamaChatResponseFormat = {
             const responseBody = await response.text();
             const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
                 text: responseBody,
-                schema: new ZodSchema_js_1.ZodSchema(zod_1.z.union([
+                schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.union([
                     ollamaChatResponseSchema,
                     zod_1.z.object({
                         done: zod_1.z.literal(false),
@@ -267,6 +267,6 @@ exports.OllamaChatResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)(ollamaChatStreamChunkSchema),
+        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)((0, ZodSchema_js_1.zodSchema)(ollamaChatStreamChunkSchema)),
     },
 };