modelfusion 0.112.0 → 0.114.0

package/model-provider/llamacpp/LlamaCppTokenizer.js

@@ -27,15 +27,20 @@ export class LlamaCppTokenizer {
         });
         this.api = api;
     }
-    async callTokenizeAPI(text, context) {
+    async callTokenizeAPI(text, callOptions) {
         const api = this.api;
-        const abortSignal = context?.abortSignal;
+        const abortSignal = callOptions?.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/tokenize`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: "tokenize",
+                    functionId: callOptions?.functionId,
+                    run: callOptions?.run,
+                    callId: "",
+                }),
                 body: {
                     content: text,
                 },

package/model-provider/lmnt/LmntSpeechModel.cjs

@@ -25,9 +25,9 @@ class LmntSpeechModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.voice;
     }
-    async callAPI(text, options) {
+    async callAPI(text, callOptions) {
         const api = this.settings.api ?? new LmntApiConfiguration_js_1.LmntApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: api.retry,
             throttle: api.throttle,
@@ -48,7 +48,12 @@ class LmntSpeechModel extends AbstractModel_js_1.AbstractModel {
                 }
                 return (0, postToApi_js_1.postToApi)({
                     url: api.assembleUrl(`/ai/speech`),
-                    headers: api.headers,
+                    headers: api.headers({
+                        functionType: callOptions.functionType,
+                        functionId: callOptions.functionId,
+                        run: callOptions.run,
+                        callId: callOptions.callId,
+                    }),
                     body: {
                         content: formData,
                         values: {

package/model-provider/lmnt/LmntSpeechModel.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { SpeechGenerationModel, SpeechGenerationModelSettings } from "../../model-function/generate-speech/SpeechGenerationModel.js";
@@ -34,7 +34,7 @@ export declare class LmntSpeechModel extends AbstractModel<LmntSpeechModelSettin
     get modelName(): string;
     private callAPI;
     get settingsForEvent(): Partial<LmntSpeechModelSettings>;
-    doGenerateSpeechStandard(text: string, options?: FunctionOptions): Promise<Buffer>;
+    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Buffer>;
     withSettings(additionalSettings: Partial<LmntSpeechModelSettings>): this;
 }
 declare const lmntSpeechResponseSchema: z.ZodObject<{

package/model-provider/lmnt/LmntSpeechModel.js

@@ -22,9 +22,9 @@ export class LmntSpeechModel extends AbstractModel {
     get modelName() {
         return this.settings.voice;
     }
-    async callAPI(text, options) {
+    async callAPI(text, callOptions) {
         const api = this.settings.api ?? new LmntApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
@@ -45,7 +45,12 @@ export class LmntSpeechModel extends AbstractModel {
                 }
                 return postToApi({
                     url: api.assembleUrl(`/ai/speech`),
-                    headers: api.headers,
+                    headers: api.headers({
+                        functionType: callOptions.functionType,
+                        functionId: callOptions.functionId,
+                        run: callOptions.run,
+                        callId: callOptions.callId,
+                    }),
                     body: {
                         content: formData,
                         values: {

package/model-provider/mistral/MistralChatModel.cjs

@@ -5,6 +5,7 @@ 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 validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 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");
@@ -43,9 +44,9 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new MistralApiConfiguration_js_1.MistralApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const stream = options.responseFormat.stream;
         const successfulResponseHandler = options.responseFormat.handler;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
@@ -53,7 +54,12 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
             throttle: api.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl(`/chat/completions`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream,
                     messages: prompt,
@@ -81,10 +87,17 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: exports.MistralChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(mistralChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => ({
@@ -105,8 +118,7 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.MistralChatResponseFormat.textDeltaIterable,
         });
     }

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

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
@@ -54,11 +54,11 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     readonly contextWindowSize: undefined;
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
-    callAPI<RESULT>(prompt: MistralChatPrompt, options: {
+    callAPI<RESULT>(prompt: MistralChatPrompt, callOptions: FunctionCallOptions, options: {
         responseFormat: MistralChatResponseFormatType<RESULT>;
-    } & FunctionOptions): Promise<RESULT>;
+    }): Promise<RESULT>;
     get settingsForEvent(): Partial<MistralChatModelSettings>;
-    doGenerateTexts(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: MistralChatPrompt, options: FunctionCallOptions): Promise<{
         response: {
             object: string;
             model: string;
@@ -83,8 +83,58 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
             finishReason: TextGenerationFinishReason;
         }[];
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            object: string;
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                message: {
+                    role: "user" | "assistant";
+                    content: string;
+                };
+                finish_reason: "length" | "stop" | "model_length";
+                index: number;
+            }[];
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+    };
+    processTextGenerationResponse(response: MistralChatResponse): {
+        response: {
+            object: string;
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                message: {
+                    role: "user" | "assistant";
+                    content: string;
+                };
+                finish_reason: "length" | "stop" | "model_length";
+                index: number;
+            }[];
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+    };
     private translateFinishReason;
-    doStreamText(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    doStreamText(prompt: MistralChatPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         model: string;
         id: string;
         choices: {

package/model-provider/mistral/MistralChatModel.js

@@ -2,6 +2,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 { validateTypes } from "../../core/schema/validateTypes.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";
@@ -40,9 +41,9 @@ export class MistralChatModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new MistralApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const stream = options.responseFormat.stream;
         const successfulResponseHandler = options.responseFormat.handler;
         return callWithRetryAndThrottle({
@@ -50,7 +51,12 @@ export class MistralChatModel extends AbstractModel {
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/chat/completions`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream,
                     messages: prompt,
@@ -78,10 +84,17 @@ export class MistralChatModel extends AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: MistralChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(mistralChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => ({
@@ -102,8 +115,7 @@ export class MistralChatModel extends AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: MistralChatResponseFormat.textDeltaIterable,
         });
     }

package/model-provider/mistral/MistralTextEmbeddingModel.cjs

@@ -43,12 +43,12 @@ class MistralTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Mistral embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
         const api = this.settings.api ?? new MistralApiConfiguration_js_1.MistralApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const model = this.settings.model;
         const encodingFormat = this.settings.encodingFormat ?? "float";
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
@@ -56,7 +56,12 @@ class MistralTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
             throttle: this.settings.api?.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl(`/embeddings`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model,
                     input: texts,

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

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { EmbeddingModel, EmbeddingModelSettings } from "../../model-function/embed/EmbeddingModel.js";
@@ -27,9 +27,9 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
      */
     readonly isParallelizable = false;
     readonly embeddingDimensions = 1024;
-    callAPI(texts: Array<string>, options?: FunctionOptions): Promise<MistralTextEmbeddingResponse>;
+    callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<MistralTextEmbeddingResponse>;
     get settingsForEvent(): Partial<MistralTextEmbeddingModelSettings>;
-    doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
+    doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
         response: {
             object: string;
             data: {

package/model-provider/mistral/MistralTextEmbeddingModel.js

@@ -40,12 +40,12 @@ export class MistralTextEmbeddingModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Mistral embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
         const api = this.settings.api ?? new MistralApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const model = this.settings.model;
         const encodingFormat = this.settings.encodingFormat ?? "float";
         return callWithRetryAndThrottle({
@@ -53,7 +53,12 @@ export class MistralTextEmbeddingModel extends AbstractModel {
             throttle: this.settings.api?.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/embeddings`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model,
                     input: texts,

package/model-provider/ollama/OllamaChatModel.cjs

@@ -7,7 +7,9 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.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");
@@ -50,16 +52,21 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const { responseFormat } = options;
         const api = this.settings.api ?? new OllamaApiConfiguration_js_1.OllamaApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl(`/api/chat`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream: responseFormat.stream,
                     model: this.settings.model,
@@ -112,10 +119,17 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: exports.OllamaChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(ollamaChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -127,8 +141,7 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.OllamaChatResponseFormat.deltaIterable,
         });
     }
@@ -148,6 +161,17 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             template: promptTemplate,
         });
     }
+    asStructureGenerationModel(promptTemplate) {
+        return "adaptModel" in promptTemplate
+            ? new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+                model: promptTemplate.adaptModel(this),
+                template: promptTemplate,
+            })
+            : new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+                model: this,
+                template: promptTemplate,
+            });
+    }
     /**
      * Returns this model with a text prompt template.
      */
@@ -177,6 +201,9 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             promptTemplate,
         });
     }
+    withJsonOutput() {
+        return this.withSettings({ format: "json" });
+    }
     withSettings(additionalSettings) {
         return new OllamaChatModel(Object.assign({}, this.settings, additionalSettings));
     }

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

@@ -1,8 +1,10 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
+import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.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";
@@ -32,11 +34,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
     readonly contextWindowSize: undefined;
-    callAPI<RESPONSE>(prompt: OllamaChatPrompt, options: {
+    callAPI<RESPONSE>(prompt: OllamaChatPrompt, callOptions: FunctionCallOptions, options: {
         responseFormat: OllamaChatResponseFormatType<RESPONSE>;
-    } & FunctionOptions): Promise<RESPONSE>;
+    }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaChatModelSettings>;
-    doGenerateTexts(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: OllamaChatPrompt, options: FunctionCallOptions): Promise<{
         response: {
             message: {
                 role: string;
@@ -57,7 +59,29 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
             finishReason: "unknown";
         }[];
     }>;
-    doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            message: {
+                role: string;
+                content: string;
+            };
+            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;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
+    };
+    private processTextGenerationResponse;
+    doStreamText(prompt: OllamaChatPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         message: {
             role: string;
             content: string;
@@ -79,6 +103,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: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
+    asStructureGenerationModel<INPUT_PROMPT, OllamaChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, TextStreamingModel<OllamaChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     /**
      * Returns this model with a text prompt template.
      */
@@ -92,6 +117,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
      */
     withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, OllamaChatModelSettings, this>;
+    withJsonOutput(): this;
     withSettings(additionalSettings: Partial<OllamaChatModelSettings>): this;
 }
 declare const ollamaChatResponseSchema: z.ZodObject<{

package/model-provider/ollama/OllamaChatModel.js

@@ -4,7 +4,9 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { postJsonToApi } from "../../core/api/postToApi.js";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
+import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.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";
@@ -47,16 +49,21 @@ export class OllamaChatModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const { responseFormat } = options;
         const api = this.settings.api ?? new OllamaApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/api/chat`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream: responseFormat.stream,
                     model: this.settings.model,
@@ -109,10 +116,17 @@ export class OllamaChatModel extends AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: OllamaChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(ollamaChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -124,8 +138,7 @@ export class OllamaChatModel extends AbstractModel {
         };
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: OllamaChatResponseFormat.deltaIterable,
         });
     }
@@ -145,6 +158,17 @@ export class OllamaChatModel extends AbstractModel {
             template: promptTemplate,
         });
     }
+    asStructureGenerationModel(promptTemplate) {
+        return "adaptModel" in promptTemplate
+            ? new StructureFromTextStreamingModel({
+                model: promptTemplate.adaptModel(this),
+                template: promptTemplate,
+            })
+            : new StructureFromTextStreamingModel({
+                model: this,
+                template: promptTemplate,
+            });
+    }
     /**
      * Returns this model with a text prompt template.
      */
@@ -174,6 +198,9 @@ export class OllamaChatModel extends AbstractModel {
             promptTemplate,
         });
     }
+    withJsonOutput() {
+        return this.withSettings({ format: "json" });
+    }
     withSettings(additionalSettings) {
         return new OllamaChatModel(Object.assign({}, this.settings, additionalSettings));
     }