modelfusion 0.112.0 → 0.114.0

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) => ({

package/model-provider/openai/AbstractOpenAIChatModel.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";
@@ -82,15 +82,14 @@ export type OpenAIChatPrompt = OpenAIChatMessage[];
  */
 export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractOpenAIChatSettings> extends AbstractModel<SETTINGS> {
     constructor(settings: SETTINGS);
-    callAPI<RESULT>(messages: OpenAIChatPrompt, options: {
+    callAPI<RESULT>(messages: OpenAIChatPrompt, callOptions: FunctionCallOptions, options: {
         responseFormat: OpenAIChatResponseFormatType<RESULT>;
-    } & FunctionOptions & {
         functions?: AbstractOpenAIChatSettings["functions"];
         functionCall?: AbstractOpenAIChatSettings["functionCall"];
         tools?: AbstractOpenAIChatSettings["tools"];
         toolChoice?: AbstractOpenAIChatSettings["toolChoice"];
     }): Promise<RESULT>;
-    doGenerateTexts(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
         response: {
             object: "chat.completion";
             model: string;
@@ -134,8 +133,96 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             totalTokens: number;
         };
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            object: "chat.completion";
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                message: {
+                    role: "assistant";
+                    content: string | null;
+                    function_call?: {
+                        name: string;
+                        arguments: string;
+                    } | undefined;
+                    tool_calls?: {
+                        function: {
+                            name: string;
+                            arguments: string;
+                        };
+                        type: "function";
+                        id: string;
+                    }[] | undefined;
+                };
+                index: number;
+                logprobs?: any;
+                finish_reason?: "length" | "stop" | "function_call" | "tool_calls" | "content_filter" | null | undefined;
+            }[];
+            system_fingerprint?: string | null | undefined;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+        usage: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        };
+    };
+    processTextGenerationResponse(response: OpenAIChatResponse): {
+        response: {
+            object: "chat.completion";
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                message: {
+                    role: "assistant";
+                    content: string | null;
+                    function_call?: {
+                        name: string;
+                        arguments: string;
+                    } | undefined;
+                    tool_calls?: {
+                        function: {
+                            name: string;
+                            arguments: string;
+                        };
+                        type: "function";
+                        id: string;
+                    }[] | undefined;
+                };
+                index: number;
+                logprobs?: any;
+                finish_reason?: "length" | "stop" | "function_call" | "tool_calls" | "content_filter" | null | undefined;
+            }[];
+            system_fingerprint?: string | null | undefined;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+        usage: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        };
+    };
     private translateFinishReason;
-    doStreamText(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    doStreamText(prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         object: "chat.completion.chunk";
         model: string;
         id: string;
@@ -163,7 +250,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
         system_fingerprint?: string | null | undefined;
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
-    doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
         response: {
             object: "chat.completion";
             model: string;
@@ -207,7 +294,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             totalTokens: number;
         };
     }>;
-    doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
         response: {
             object: "chat.completion";
             model: string;

package/model-provider/openai/AbstractOpenAIChatModel.js

@@ -3,6 +3,7 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
+import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { createEventSourceResponseHandler } from "../../util/streaming/createEventSourceResponseHandler.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
@@ -16,12 +17,12 @@ export class AbstractOpenAIChatModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
     }
-    async callAPI(messages, options) {
+    async callAPI(messages, callOptions, options) {
         const api = this.settings.api ?? new 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:
@@ -42,7 +43,12 @@ export class AbstractOpenAIChatModel extends AbstractModel {
                 }
                 return 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,
@@ -71,10 +77,17 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         });
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: OpenAIChatResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(openAIChatResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => ({
@@ -100,8 +113,7 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: OpenAIChatResponseFormat.deltaIterable,
         });
     }
@@ -118,8 +130,7 @@ export class AbstractOpenAIChatModel extends 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: OpenAIChatResponseFormat.json,
             toolChoice: {
                 type: "function",
@@ -149,8 +160,7 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         };
     }
     async doGenerateToolCalls(tools, prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        const response = await this.callAPI(prompt, options, {
             responseFormat: OpenAIChatResponseFormat.json,
             toolChoice: "auto",
             tools: tools.map((tool) => ({

package/model-provider/openai/AbstractOpenAICompletionModel.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 createEventSourceResponseHandler_js_1 = require("../../util/streaming/createEventSourceResponseHandler.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
@@ -18,12 +19,12 @@ class AbstractOpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
         const user = this.settings.isUserIdForwardingEnabled
-            ? options.run?.userId
+            ? callOptions.run?.userId
             : undefined;
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const openaiResponseFormat = options.responseFormat;
         // empty arrays are not allowed for stop:
         const stopSequences = this.settings.stopSequences != null &&
@@ -36,7 +37,12 @@ class AbstractOpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             throttle: api.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl("/completions"),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream: openaiResponseFormat.stream,
                     model: this.settings.model,
@@ -63,10 +69,17 @@ class AbstractOpenAICompletionModel 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.OpenAITextResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(OpenAICompletionResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => {
@@ -95,8 +108,7 @@ class AbstractOpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.OpenAITextResponseFormat.deltaIterable,
         });
     }