modelfusion 0.113.0 → 0.114.0

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,6 +7,7 @@ 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");
@@ -51,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,
@@ -113,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: [
@@ -128,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,
         });
     }

package/model-provider/ollama/OllamaChatModel.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";
@@ -34,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;
@@ -59,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;

package/model-provider/ollama/OllamaChatModel.js

@@ -4,6 +4,7 @@ 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";
@@ -48,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,
@@ -110,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: [
@@ -125,8 +138,7 @@ export class OllamaChatModel extends AbstractModel {
         };
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: OllamaChatResponseFormat.deltaIterable,
         });
     }

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -7,6 +7,7 @@ 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 PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
@@ -43,16 +44,21 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
     get contextWindowSize() {
         return this.settings.contextWindowSize;
     }
-    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/generate`),
-                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,
@@ -114,10 +120,17 @@ class OllamaCompletionModel 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.OllamaCompletionResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(ollamaCompletionResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -129,7 +142,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
+        return this.callAPI(prompt, options, {
             ...options,
             responseFormat: exports.OllamaCompletionResponseFormat.deltaIterable,
         });

package/model-provider/ollama/OllamaCompletionModel.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";
@@ -47,11 +47,11 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
     get contextWindowSize(): CONTEXT_WINDOW_SIZE;
-    callAPI<RESPONSE>(prompt: OllamaCompletionPrompt, options: {
+    callAPI<RESPONSE>(prompt: OllamaCompletionPrompt, callOptions: FunctionCallOptions, options: {
         responseFormat: OllamaCompletionResponseFormatType<RESPONSE>;
-    } & FunctionOptions): Promise<RESPONSE>;
+    }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>>;
-    doGenerateTexts(prompt: OllamaCompletionPrompt, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<{
         response: {
             response: string;
             model: string;
@@ -70,7 +70,45 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
             finishReason: "unknown";
         }[];
     }>;
-    doStreamText(prompt: OllamaCompletionPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            response: 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;
+            context?: number[] | undefined;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
+    };
+    processTextGenerationResponse(response: OllamaCompletionResponse): {
+        response: {
+            response: 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;
+            context?: number[] | undefined;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
+    };
+    doStreamText(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         response: string;
         model: string;
         done: false;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -4,6 +4,7 @@ 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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
@@ -40,16 +41,21 @@ export class OllamaCompletionModel extends AbstractModel {
     get contextWindowSize() {
         return this.settings.contextWindowSize;
     }
-    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/generate`),
-                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,
@@ -111,10 +117,17 @@ export class OllamaCompletionModel 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: OllamaCompletionResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(ollamaCompletionResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -126,7 +139,7 @@ export class OllamaCompletionModel extends AbstractModel {
         };
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
+        return this.callAPI(prompt, options, {
             ...options,
             responseFormat: OllamaCompletionResponseFormat.deltaIterable,
         });

package/model-provider/ollama/OllamaTextEmbeddingModel.cjs

@@ -33,18 +33,23 @@ class OllamaTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     get embeddingDimensions() {
         return this.settings.embeddingDimensions;
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         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;
+        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/embeddings`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     prompt: texts[0],

package/model-provider/ollama/OllamaTextEmbeddingModel.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";
@@ -16,9 +16,9 @@ export declare class OllamaTextEmbeddingModel extends AbstractModel<OllamaTextEm
     readonly maxValuesPerCall = 1;
     get isParallelizable(): boolean;
     get embeddingDimensions(): number | undefined;
-    callAPI(texts: Array<string>, options?: FunctionOptions): Promise<OllamaTextEmbeddingResponse>;
+    callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<OllamaTextEmbeddingResponse>;
     get settingsForEvent(): Partial<OllamaTextEmbeddingModelSettings>;
-    doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
+    doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
         response: {
             embedding: number[];
         };

package/model-provider/ollama/OllamaTextEmbeddingModel.js

@@ -30,18 +30,23 @@ export class OllamaTextEmbeddingModel extends AbstractModel {
     get embeddingDimensions() {
         return this.settings.embeddingDimensions;
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         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;
+        const abortSignal = callOptions.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/api/embeddings`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     prompt: texts[0],

package/model-provider/openai/AbstractOpenAIChatModel.cjs

@@ -6,6 +6,7 @@ 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 createEventSourceResponseHandler_js_1 = require("../../util/streaming/createEventSourceResponseHandler.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
@@ -19,12 +20,12 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
     }
-    async callAPI(messages, options) {
+    async callAPI(messages, callOptions, options) {
         const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
         const responseFormat = options.responseFormat;
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const user = this.settings.isUserIdForwardingEnabled
-            ? options.run?.userId
+            ? callOptions.run?.userId
             : undefined;
         const openAIResponseFormat = this.settings.responseFormat;
         // function & tool calling:
@@ -45,7 +46,12 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                 }
                 return (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: responseFormat.stream,
                         model: this.settings.model,
@@ -74,10 +80,17 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(openAIChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => ({
@@ -103,8 +116,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.deltaIterable,
         });
     }
@@ -121,8 +133,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         return firstChoice.delta.content ?? undefined;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        const response = await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.json,
             toolChoice: {
                 type: "function",
@@ -152,8 +163,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async doGenerateToolCalls(tools, prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        const response = await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.json,
             toolChoice: "auto",
             tools: tools.map((tool) => ({