modelfusion 0.110.0 → 0.112.0

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

@@ -2,14 +2,13 @@ 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 { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
-import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
+import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export type OllamaChatMessage = {
     role: "system" | "user" | "assistant";
@@ -79,7 +78,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, OllamaChatPrompt, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     /**
      * Returns this model with a text prompt template.
      */
@@ -145,7 +144,29 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     prompt_eval_duration?: number | undefined;
 }>;
 export type OllamaChatResponse = z.infer<typeof ollamaChatResponseSchema>;
-declare const ollamaChatStreamChunkSchema: ZodSchema<{
+declare const ollamaChatStreamChunkSchema: z.ZodDiscriminatedUnion<"done", [z.ZodObject<{
+    done: z.ZodLiteral<false>;
+    model: z.ZodString;
+    created_at: z.ZodString;
+    message: z.ZodObject<{
+        role: z.ZodString;
+        content: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        role: string;
+        content: string;
+    }, {
+        role: string;
+        content: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    message: {
+        role: string;
+        content: string;
+    };
+    model: string;
+    done: false;
+    created_at: string;
+}, {
     message: {
         role: string;
         content: string;
@@ -153,7 +174,17 @@ declare const ollamaChatStreamChunkSchema: ZodSchema<{
     model: string;
     done: false;
     created_at: string;
-} | {
+}>, z.ZodObject<{
+    done: z.ZodLiteral<true>;
+    model: z.ZodString;
+    created_at: z.ZodString;
+    total_duration: z.ZodNumber;
+    load_duration: z.ZodOptional<z.ZodNumber>;
+    prompt_eval_count: z.ZodNumber;
+    prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
+    eval_count: z.ZodNumber;
+    eval_duration: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
     model: string;
     done: true;
     created_at: string;
@@ -163,8 +194,18 @@ declare const ollamaChatStreamChunkSchema: ZodSchema<{
     eval_duration: number;
     load_duration?: number | undefined;
     prompt_eval_duration?: number | undefined;
-}>;
-export type OllamaChatStreamChunk = (typeof ollamaChatStreamChunkSchema)["_type"];
+}, {
+    model: string;
+    done: true;
+    created_at: string;
+    total_duration: number;
+    prompt_eval_count: number;
+    eval_count: number;
+    eval_duration: number;
+    load_duration?: number | undefined;
+    prompt_eval_duration?: number | undefined;
+}>]>;
+export type OllamaChatStreamChunk = z.infer<typeof ollamaChatStreamChunkSchema>;
 export type OllamaChatResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;

package/model-provider/ollama/OllamaChatModel.js

@@ -2,13 +2,13 @@ import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { postJsonToApi } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { chat, instruction, text } from "./OllamaChatPromptTemplate.js";
@@ -140,7 +140,7 @@ export class OllamaChatModel extends AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });
@@ -193,7 +193,7 @@ const ollamaChatResponseSchema = z.object({
     eval_count: z.number(),
     eval_duration: z.number(),
 });
-const ollamaChatStreamChunkSchema = new ZodSchema(z.discriminatedUnion("done", [
+const ollamaChatStreamChunkSchema = z.discriminatedUnion("done", [
     z.object({
         done: z.literal(false),
         model: z.string(),
@@ -214,7 +214,7 @@ const ollamaChatStreamChunkSchema = new ZodSchema(z.discriminatedUnion("done", [
         eval_count: z.number(),
         eval_duration: z.number(),
     }),
-]));
+]);
 export const OllamaChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -225,7 +225,7 @@ export const OllamaChatResponseFormat = {
             const responseBody = await response.text();
             const parsedResult = safeParseJSON({
                 text: responseBody,
-                schema: new ZodSchema(z.union([
+                schema: zodSchema(z.union([
                     ollamaChatResponseSchema,
                     z.object({
                         done: z.literal(false),
@@ -263,6 +263,6 @@ export const OllamaChatResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: createJsonStreamResponseHandler(ollamaChatStreamChunkSchema),
+        handler: createJsonStreamResponseHandler(zodSchema(ollamaChatStreamChunkSchema)),
     },
 };

package/model-provider/ollama/OllamaCompletionModel.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 OllamaError_js_1 = require("./OllamaError.cjs");
@@ -145,7 +145,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });
@@ -201,7 +201,7 @@ const ollamaCompletionResponseSchema = zod_1.z.object({
     eval_duration: zod_1.z.number(),
     context: zod_1.z.array(zod_1.z.number()).optional(),
 });
-const ollamaCompletionStreamChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.discriminatedUnion("done", [
+const ollamaCompletionStreamChunkSchema = zod_1.z.discriminatedUnion("done", [
     zod_1.z.object({
         done: zod_1.z.literal(false),
         model: zod_1.z.string(),
@@ -222,7 +222,7 @@ const ollamaCompletionStreamChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.
         eval_duration: zod_1.z.number(),
         context: zod_1.z.array(zod_1.z.number()).optional(),
     }),
-]));
+]);
 exports.OllamaCompletionResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -233,7 +233,7 @@ exports.OllamaCompletionResponseFormat = {
             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([
                     ollamaCompletionResponseSchema,
                     zod_1.z.object({
                         done: zod_1.z.literal(false),
@@ -272,6 +272,6 @@ exports.OllamaCompletionResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)(ollamaCompletionStreamChunkSchema),
+        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)((0, ZodSchema_js_1.zodSchema)(ollamaCompletionStreamChunkSchema)),
     },
 };

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

@@ -2,14 +2,13 @@ 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 { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
-import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
+import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export interface OllamaCompletionPrompt {
     /**
@@ -92,7 +91,7 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     /**
      * Maps the prompt for a text version of the Ollama completion prompt template (without image support).
@@ -139,12 +138,48 @@ declare const ollamaCompletionResponseSchema: z.ZodObject<{
     context?: number[] | undefined;
 }>;
 export type OllamaCompletionResponse = z.infer<typeof ollamaCompletionResponseSchema>;
-declare const ollamaCompletionStreamChunkSchema: ZodSchema<{
+declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done", [z.ZodObject<{
+    done: z.ZodLiteral<false>;
+    model: z.ZodString;
+    created_at: z.ZodString;
+    response: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    response: string;
+    model: string;
+    done: false;
+    created_at: string;
+}, {
     response: string;
     model: string;
     done: false;
     created_at: string;
-} | {
+}>, z.ZodObject<{
+    done: z.ZodLiteral<true>;
+    model: z.ZodString;
+    created_at: z.ZodString;
+    total_duration: z.ZodNumber;
+    load_duration: z.ZodOptional<z.ZodNumber>;
+    sample_count: z.ZodOptional<z.ZodNumber>;
+    sample_duration: z.ZodOptional<z.ZodNumber>;
+    prompt_eval_count: z.ZodNumber;
+    prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
+    eval_count: z.ZodNumber;
+    eval_duration: z.ZodNumber;
+    context: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+}, "strip", z.ZodTypeAny, {
+    model: string;
+    done: true;
+    created_at: string;
+    total_duration: number;
+    prompt_eval_count: number;
+    eval_count: number;
+    eval_duration: number;
+    load_duration?: number | undefined;
+    sample_count?: number | undefined;
+    sample_duration?: number | undefined;
+    prompt_eval_duration?: number | undefined;
+    context?: number[] | undefined;
+}, {
     model: string;
     done: true;
     created_at: string;
@@ -157,8 +192,8 @@ declare const ollamaCompletionStreamChunkSchema: ZodSchema<{
     sample_duration?: number | undefined;
     prompt_eval_duration?: number | undefined;
     context?: number[] | undefined;
-}>;
-export type OllamaCompletionStreamChunk = (typeof ollamaCompletionStreamChunkSchema)["_type"];
+}>]>;
+export type OllamaCompletionStreamChunk = z.infer<typeof ollamaCompletionStreamChunkSchema>;
 export type OllamaCompletionResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -2,13 +2,13 @@ import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { postJsonToApi } from "../../core/api/postToApi.js";
-import { ZodSchema, zodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";
@@ -142,7 +142,7 @@ export class OllamaCompletionModel extends AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });
@@ -197,7 +197,7 @@ const ollamaCompletionResponseSchema = z.object({
     eval_duration: z.number(),
     context: z.array(z.number()).optional(),
 });
-const ollamaCompletionStreamChunkSchema = zodSchema(z.discriminatedUnion("done", [
+const ollamaCompletionStreamChunkSchema = z.discriminatedUnion("done", [
     z.object({
         done: z.literal(false),
         model: z.string(),
@@ -218,7 +218,7 @@ const ollamaCompletionStreamChunkSchema = zodSchema(z.discriminatedUnion("done",
         eval_duration: z.number(),
         context: z.array(z.number()).optional(),
     }),
-]));
+]);
 export const OllamaCompletionResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -229,7 +229,7 @@ export const OllamaCompletionResponseFormat = {
             const responseBody = await response.text();
             const parsedResult = safeParseJSON({
                 text: responseBody,
-                schema: new ZodSchema(z.union([
+                schema: zodSchema(z.union([
                     ollamaCompletionResponseSchema,
                     z.object({
                         done: z.literal(false),
@@ -268,6 +268,6 @@ export const OllamaCompletionResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: createJsonStreamResponseHandler(ollamaCompletionStreamChunkSchema),
+        handler: createJsonStreamResponseHandler(zodSchema(ollamaCompletionStreamChunkSchema)),
     },
 };

package/model-provider/ollama/OllamaError.cjs

@@ -4,10 +4,10 @@ exports.failedOllamaCallResponseHandler = 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 ollamaErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const ollamaErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
-}));
+});
 exports.failedOllamaCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
-    errorSchema: ollamaErrorDataSchema,
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(ollamaErrorDataSchema),
     errorToMessage: (error) => error.error,
 });

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

@@ -1,9 +1,13 @@
+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 ollamaErrorDataSchema: ZodSchema<{
+declare const ollamaErrorDataSchema: z.ZodObject<{
+    error: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    error: string;
+}, {
     error: string;
 }>;
-export type OllamaErrorData = (typeof ollamaErrorDataSchema)["_type"];
+export type OllamaErrorData = z.infer<typeof ollamaErrorDataSchema>;
 export declare const failedOllamaCallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/ollama/OllamaError.js

@@ -1,10 +1,10 @@
 import { z } from "zod";
 import { createJsonErrorResponseHandler, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-const ollamaErrorDataSchema = new ZodSchema(z.object({
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const ollamaErrorDataSchema = z.object({
     error: z.string(),
-}));
+});
 export const failedOllamaCallResponseHandler = createJsonErrorResponseHandler({
-    errorSchema: ollamaErrorDataSchema,
+    errorSchema: zodSchema(ollamaErrorDataSchema),
     errorToMessage: (error) => error.error,
 });

package/model-provider/ollama/OllamaFacade.cjs

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = exports.Api = void 0;
+const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatModel_js_1 = require("./OllamaChatModel.cjs");
-const OllamaTextEmbeddingModel_js_1 = require("./OllamaTextEmbeddingModel.cjs");
 const OllamaCompletionModel_js_1 = require("./OllamaCompletionModel.cjs");
-const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
+const OllamaTextEmbeddingModel_js_1 = require("./OllamaTextEmbeddingModel.cjs");
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
 function Api(settings) {
     return new OllamaApiConfiguration_js_1.OllamaApiConfiguration(settings);
 }

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

@@ -1,8 +1,13 @@
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { OllamaChatModel, OllamaChatModelSettings } from "./OllamaChatModel.js";
-import { OllamaTextEmbeddingModel, OllamaTextEmbeddingModelSettings } from "./OllamaTextEmbeddingModel.js";
 import { OllamaCompletionModel, OllamaCompletionModelSettings } from "./OllamaCompletionModel.js";
-import { OllamaApiConfiguration, OllamaApiConfigurationSettings } from "./OllamaApiConfiguration.js";
-export declare function Api(settings: OllamaApiConfigurationSettings): OllamaApiConfiguration;
+import { OllamaTextEmbeddingModel, OllamaTextEmbeddingModelSettings } from "./OllamaTextEmbeddingModel.js";
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions): OllamaApiConfiguration;
 export declare function CompletionTextGenerator<CONTEXT_WINDOW_SIZE extends number>(settings: OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>): OllamaCompletionModel<CONTEXT_WINDOW_SIZE>;
 export declare function ChatTextGenerator(settings: OllamaChatModelSettings): OllamaChatModel;
 export declare function TextEmbedder(settings: OllamaTextEmbeddingModelSettings): OllamaTextEmbeddingModel;

package/model-provider/ollama/OllamaFacade.js

@@ -1,7 +1,11 @@
+import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { OllamaChatModel } from "./OllamaChatModel.js";
-import { OllamaTextEmbeddingModel, } from "./OllamaTextEmbeddingModel.js";
 import { OllamaCompletionModel, } from "./OllamaCompletionModel.js";
-import { OllamaApiConfiguration, } from "./OllamaApiConfiguration.js";
+import { OllamaTextEmbeddingModel, } from "./OllamaTextEmbeddingModel.js";
+/**
+ * Creates an API configuration for the Ollama API.
+ * It calls the API at http://127.0.0.1:11434 by default.
+ */
 export function Api(settings) {
     return new OllamaApiConfiguration(settings);
 }

package/model-provider/ollama/OllamaTextEmbeddingModel.cjs

@@ -4,6 +4,7 @@ exports.OllamaTextEmbeddingModel = 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 OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaError_js_1 = require("./OllamaError.cjs");
@@ -36,13 +37,21 @@ class OllamaTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Ollama embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
+        const api = this.settings.api ?? new OllamaApiConfiguration_js_1.OllamaApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOllamaEmbeddingAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                prompt: texts[0],
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/api/embeddings`),
+                headers: api.headers,
+                body: {
+                    model: this.settings.model,
+                    prompt: texts[0],
+                },
+                failedResponseHandler: OllamaError_js_1.failedOllamaCallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(ollamaTextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -66,13 +75,3 @@ exports.OllamaTextEmbeddingModel = OllamaTextEmbeddingModel;
 const ollamaTextEmbeddingResponseSchema = zod_1.z.object({
     embedding: zod_1.z.array(zod_1.z.number()),
 });
-async function callOllamaEmbeddingAPI({ api = new OllamaApiConfiguration_js_1.OllamaApiConfiguration(), abortSignal, model, prompt, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/api/embeddings`),
-        headers: api.headers,
-        body: { model, prompt },
-        failedResponseHandler: OllamaError_js_1.failedOllamaCallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(ollamaTextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}

package/model-provider/ollama/OllamaTextEmbeddingModel.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 { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";
@@ -33,13 +34,21 @@ export class OllamaTextEmbeddingModel extends AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Ollama embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
+        const api = this.settings.api ?? new OllamaApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOllamaEmbeddingAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                prompt: texts[0],
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/api/embeddings`),
+                headers: api.headers,
+                body: {
+                    model: this.settings.model,
+                    prompt: texts[0],
+                },
+                failedResponseHandler: failedOllamaCallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(ollamaTextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -62,13 +71,3 @@ export class OllamaTextEmbeddingModel extends AbstractModel {
 const ollamaTextEmbeddingResponseSchema = z.object({
     embedding: z.array(z.number()),
 });
-async function callOllamaEmbeddingAPI({ api = new OllamaApiConfiguration(), abortSignal, model, prompt, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/api/embeddings`),
-        headers: api.headers,
-        body: { model, prompt },
-        failedResponseHandler: failedOllamaCallResponseHandler,
-        successfulResponseHandler: createJsonResponseHandler(ollamaTextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}

package/model-provider/openai/AbstractOpenAIChatModel.cjs

@@ -151,7 +151,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
             usage: this.extractUsage(response),
         };
     }
-    async doGenerateToolCallsOrText(tools, prompt, options) {
+    async doGenerateToolCalls(tools, prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: exports.OpenAIChatResponseFormat.json,
@@ -232,7 +232,7 @@ const openAIChatResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-const openaiChatChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
+const openaiChatChunkSchema = zod_1.z.object({
     object: zod_1.z.literal("chat.completion.chunk"),
     id: zod_1.z.string(),
     choices: zod_1.z.array(zod_1.z.object({
@@ -271,20 +271,20 @@ const openaiChatChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     created: zod_1.z.number(),
     model: zod_1.z.string(),
     system_fingerprint: zod_1.z.string().optional().nullable(),
-}));
+});
 exports.OpenAIChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
      */
     json: {
         stream: false,
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAIChatResponseSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAIChatResponseSchema)),
     },
     /**
      * Returns an async iterable over the text deltas (only the tex different of the first choice).
      */
     deltaIterable: {
         stream: true,
-        handler: (0, createEventSourceResponseHandler_js_1.createEventSourceResponseHandler)(openaiChatChunkSchema),
+        handler: (0, createEventSourceResponseHandler_js_1.createEventSourceResponseHandler)((0, ZodSchema_js_1.zodSchema)(openaiChatChunkSchema)),
     },
 };