modelfusion 0.112.0 → 0.114.0

package/model-provider/openai/AbstractOpenAICompletionModel.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";
@@ -27,10 +27,10 @@ export interface AbstractOpenAICompletionModelSettings extends TextGenerationMod
  */
 export declare abstract class AbstractOpenAICompletionModel<SETTINGS extends AbstractOpenAICompletionModelSettings> extends AbstractModel<SETTINGS> {
     constructor(settings: SETTINGS);
-    callAPI<RESULT>(prompt: string, options: {
+    callAPI<RESULT>(prompt: string, callOptions: FunctionCallOptions, options: {
         responseFormat: OpenAITextResponseFormatType<RESULT>;
-    } & FunctionOptions): Promise<RESULT>;
-    doGenerateTexts(prompt: string, options?: FunctionOptions): Promise<{
+    }): Promise<RESULT>;
+    doGenerateTexts(prompt: string, options: FunctionCallOptions): Promise<{
         response: {
             object: "text_completion";
             model: string;
@@ -59,8 +59,38 @@ export declare abstract class AbstractOpenAICompletionModel<SETTINGS extends Abs
             totalTokens: number;
         };
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            object: "text_completion";
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                text: string;
+                index: number;
+                finish_reason?: "length" | "stop" | "content_filter" | null | undefined;
+                logprobs?: any;
+            }[];
+            system_fingerprint?: string | undefined;
+        };
+        textGenerationResults: {
+            finishReason: TextGenerationFinishReason;
+            text: string;
+        }[];
+        usage: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        };
+    };
+    private processTextGenerationResponse;
     private translateFinishReason;
-    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    doStreamText(prompt: string, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         object: "text_completion";
         model: string;
         id: string;

package/model-provider/openai/AbstractOpenAICompletionModel.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 { createEventSourceResponseHandler } from "../../util/streaming/createEventSourceResponseHandler.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
@@ -15,12 +16,12 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new 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 &&
@@ -33,7 +34,12 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
             throttle: api.throttle,
             call: async () => 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,
@@ -60,10 +66,17 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
         });
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: OpenAITextResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(OpenAICompletionResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.choices.map((choice) => {
@@ -92,8 +105,7 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: OpenAITextResponseFormat.deltaIterable,
         });
     }

package/model-provider/openai/AzureOpenAIApiConfiguration.cjs

@@ -31,7 +31,7 @@ class AzureOpenAIApiConfiguration extends AbstractApiConfiguration_js_1.Abstract
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "headers", {
+        Object.defineProperty(this, "fixedHeaderValue", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -40,7 +40,7 @@ class AzureOpenAIApiConfiguration extends AbstractApiConfiguration_js_1.Abstract
         this.resourceName = resourceName;
         this.deploymentId = deploymentId;
         this.apiVersion = apiVersion;
-        this.headers = {
+        this.fixedHeaderValue = {
             "api-key": (0, loadApiKey_js_1.loadApiKey)({
                 apiKey,
                 environmentVariableName: "AZURE_OPENAI_API_KEY",
@@ -51,5 +51,8 @@ class AzureOpenAIApiConfiguration extends AbstractApiConfiguration_js_1.Abstract
     assembleUrl(path) {
         return `https://${this.resourceName}.openai.azure.com/openai/deployments/${this.deploymentId}${path}?api-version=${this.apiVersion}`;
     }
+    fixedHeaders() {
+        return this.fixedHeaderValue;
+    }
 }
 exports.AzureOpenAIApiConfiguration = AzureOpenAIApiConfiguration;

package/model-provider/openai/AzureOpenAIApiConfiguration.d.ts

@@ -20,7 +20,8 @@ export declare class AzureOpenAIApiConfiguration extends AbstractApiConfiguratio
     readonly resourceName: string;
     readonly deploymentId: string;
     readonly apiVersion: string;
-    readonly headers: Record<string, string>;
+    readonly fixedHeaderValue: Record<string, string>;
     constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }: AzureOpenAIApiConfigurationOptions);
     assembleUrl(path: string): string;
+    fixedHeaders(): Record<string, string>;
 }

package/model-provider/openai/AzureOpenAIApiConfiguration.js

@@ -28,7 +28,7 @@ export class AzureOpenAIApiConfiguration extends AbstractApiConfiguration {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "headers", {
+        Object.defineProperty(this, "fixedHeaderValue", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -37,7 +37,7 @@ export class AzureOpenAIApiConfiguration extends AbstractApiConfiguration {
         this.resourceName = resourceName;
         this.deploymentId = deploymentId;
         this.apiVersion = apiVersion;
-        this.headers = {
+        this.fixedHeaderValue = {
             "api-key": loadApiKey({
                 apiKey,
                 environmentVariableName: "AZURE_OPENAI_API_KEY",
@@ -48,4 +48,7 @@ export class AzureOpenAIApiConfiguration extends AbstractApiConfiguration {
     assembleUrl(path) {
         return `https://${this.resourceName}.openai.azure.com/openai/deployments/${this.deploymentId}${path}?api-version=${this.apiVersion}`;
     }
+    fixedHeaders() {
+        return this.fixedHeaderValue;
+    }
 }

package/model-provider/openai/OpenAIChatFunctionCallStructureGenerationModel.cjs

@@ -44,10 +44,18 @@ class OpenAIChatFunctionCallStructureGenerationModel {
         return this.model.modelInformation;
     }
     get settings() {
-        return this.model.settings;
+        return {
+            ...this.model.settings,
+            fnName: this.fnName,
+            fnDescription: this.fnDescription,
+        };
     }
     get settingsForEvent() {
-        return this.model.settingsForEvent;
+        return {
+            ...this.model.settingsForEvent,
+            fnName: this.fnName,
+            fnDescription: this.fnDescription,
+        };
     }
     /**
      * Returns this model with a text prompt template.
@@ -100,8 +108,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
                 ...this.promptTemplate.stopSequences,
             ],
         })
-            .callAPI(expandedPrompt, {
-            ...options,
+            .callAPI(expandedPrompt, options, {
             responseFormat: AbstractOpenAIChatModel_js_1.OpenAIChatResponseFormat.json,
             functionCall: { name: this.fnName },
             functions: [
@@ -131,8 +138,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
     async doStreamStructure(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
-        return this.model.callAPI(expandedPrompt, {
-            ...options,
+        return this.model.callAPI(expandedPrompt, options, {
             responseFormat: AbstractOpenAIChatModel_js_1.OpenAIChatResponseFormat.deltaIterable,
             functionCall: { name: this.fnName },
             functions: [

package/model-provider/openai/OpenAIChatFunctionCallStructureGenerationModel.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
 import { Schema } from "../../core/schema/Schema.js";
 import { StructureStreamingModel } from "../../model-function/generate-structure/StructureGenerationModel.js";
@@ -18,8 +18,92 @@ OpenAIChatSettings> {
         promptTemplate: PROMPT_TEMPLATE;
     });
     get modelInformation(): import("../../index.js").ModelInformation;
-    get settings(): OpenAIChatSettings;
-    get settingsForEvent(): Partial<OpenAIChatSettings>;
+    get settings(): {
+        fnName: string;
+        fnDescription: string | undefined;
+        model: import("./OpenAIChatModel.js").OpenAIChatModelType;
+        api?: import("../../index.js").ApiConfiguration | undefined;
+        functions?: {
+            name: string;
+            description?: string | undefined;
+            parameters: unknown;
+        }[] | undefined;
+        functionCall?: "auto" | {
+            name: string;
+        } | "none" | undefined;
+        tools?: {
+            type: "function";
+            function: {
+                name: string;
+                description?: string | undefined;
+                parameters: unknown;
+            };
+        }[] | undefined;
+        toolChoice?: "auto" | "none" | {
+            type: "function";
+            function: {
+                name: string;
+            };
+        } | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        seed?: number | null | undefined;
+        presencePenalty?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        responseFormat?: {
+            type?: "text" | "json_object" | undefined;
+        } | undefined;
+        logitBias?: Record<number, number> | undefined;
+        isUserIdForwardingEnabled?: boolean | undefined;
+        maxGenerationTokens?: number | undefined;
+        stopSequences?: string[] | undefined;
+        numberOfGenerations?: number | undefined;
+        trimWhitespace?: boolean | undefined;
+        observers?: import("../../index.js").FunctionObserver[] | undefined;
+    };
+    get settingsForEvent(): {
+        fnName: string;
+        fnDescription: string | undefined;
+        model?: import("./OpenAIChatModel.js").OpenAIChatModelType | undefined;
+        api?: import("../../index.js").ApiConfiguration | undefined;
+        functions?: {
+            name: string;
+            description?: string | undefined;
+            parameters: unknown;
+        }[] | undefined;
+        functionCall?: "auto" | {
+            name: string;
+        } | "none" | undefined;
+        tools?: {
+            type: "function";
+            function: {
+                name: string;
+                description?: string | undefined;
+                parameters: unknown;
+            };
+        }[] | undefined;
+        toolChoice?: "auto" | "none" | {
+            type: "function";
+            function: {
+                name: string;
+            };
+        } | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        seed?: number | null | undefined;
+        presencePenalty?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        responseFormat?: {
+            type?: "text" | "json_object" | undefined;
+        } | undefined;
+        logitBias?: Record<number, number> | undefined;
+        isUserIdForwardingEnabled?: boolean | undefined;
+        maxGenerationTokens?: number | undefined;
+        stopSequences?: string[] | undefined;
+        numberOfGenerations?: number | undefined;
+        trimWhitespace?: boolean | undefined;
+        observers?: import("../../index.js").FunctionObserver[] | undefined;
+    };
     /**
      * Returns this model with a text prompt template.
      */
@@ -42,7 +126,7 @@ OpenAIChatSettings> {
      * @see https://platform.openai.com/docs/guides/gpt/function-calling
      */
     doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
-    options?: FunctionOptions): Promise<{
+    options: FunctionCallOptions): Promise<{
         response: {
             object: "chat.completion";
             model: string;
@@ -85,7 +169,7 @@ OpenAIChatSettings> {
         };
     }>;
     doStreamStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
-    options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+    options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         object: "chat.completion.chunk";
         model: string;
         id: string;

package/model-provider/openai/OpenAIChatFunctionCallStructureGenerationModel.js

@@ -38,10 +38,18 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
         return this.model.modelInformation;
     }
     get settings() {
-        return this.model.settings;
+        return {
+            ...this.model.settings,
+            fnName: this.fnName,
+            fnDescription: this.fnDescription,
+        };
     }
     get settingsForEvent() {
-        return this.model.settingsForEvent;
+        return {
+            ...this.model.settingsForEvent,
+            fnName: this.fnName,
+            fnDescription: this.fnDescription,
+        };
     }
     /**
      * Returns this model with a text prompt template.
@@ -94,8 +102,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
                 ...this.promptTemplate.stopSequences,
             ],
         })
-            .callAPI(expandedPrompt, {
-            ...options,
+            .callAPI(expandedPrompt, options, {
             responseFormat: OpenAIChatResponseFormat.json,
             functionCall: { name: this.fnName },
             functions: [
@@ -125,8 +132,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
     async doStreamStructure(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
-        return this.model.callAPI(expandedPrompt, {
-            ...options,
+        return this.model.callAPI(expandedPrompt, options, {
             responseFormat: OpenAIChatResponseFormat.deltaIterable,
             functionCall: { name: this.fnName },
             functions: [

package/model-provider/openai/OpenAIChatModel.cjs

@@ -219,10 +219,15 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
         });
     }
     asStructureGenerationModel(promptTemplate) {
-        return new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
-            model: this,
-            template: 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.
@@ -253,6 +258,9 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
             promptTemplate,
         });
     }
+    withJsonOutput() {
+        return this.withSettings({ responseFormat: { type: "json_object" } });
+    }
     withSettings(additionalSettings) {
         return new OpenAIChatModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/openai/OpenAIChatModel.d.ts

@@ -1,4 +1,4 @@
-import { StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
+import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
@@ -140,7 +140,7 @@ export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatS
         fnName: string;
         fnDescription?: string;
     }): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<OpenAIChatPrompt, OpenAIChatPrompt>>;
-    asStructureGenerationModel<INPUT_PROMPT>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt>): StructureFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, this>;
+    asStructureGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     /**
      * Returns this model with a text prompt template.
      */
@@ -154,6 +154,7 @@ export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatS
      */
     withChatPrompt(): PromptTemplateFullTextModel<import("../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt>): PromptTemplateFullTextModel<INPUT_PROMPT, OpenAIChatPrompt, OpenAIChatSettings, this>;
+    withJsonOutput(): this;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
 }
 export {};

package/model-provider/openai/OpenAIChatModel.js

@@ -213,10 +213,15 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
         });
     }
     asStructureGenerationModel(promptTemplate) {
-        return new StructureFromTextStreamingModel({
-            model: this,
-            template: 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.
@@ -247,6 +252,9 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
             promptTemplate,
         });
     }
+    withJsonOutput() {
+        return this.withSettings({ responseFormat: { type: "json_object" } });
+    }
     withSettings(additionalSettings) {
         return new OpenAIChatModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -88,17 +88,22 @@ class OpenAIImageGenerationModel 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 OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
-        const userId = options.run?.userId;
+        const abortSignal = callOptions.run?.abortSignal;
+        const userId = callOptions.run?.userId;
         const responseFormat = options.responseFormat;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl("/images/generations"),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     prompt,
                     n: this.settings.numberOfGenerations,
@@ -122,9 +127,8 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
-        const response = await this.callAPI(prompt, {
+        const response = await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIImageGenerationResponseFormat.base64Json,
-            ...options,
         });
         return {
             response,

package/model-provider/openai/OpenAIImageGenerationModel.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 OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
     constructor(settings: OpenAIImageGenerationSettings);
     readonly provider: "openai";
     get modelName(): "dall-e-2" | "dall-e-3";
-    callAPI<RESULT>(prompt: string, options: {
+    callAPI<RESULT>(prompt: string, callOptions: FunctionCallOptions, options: {
         responseFormat: OpenAIImageGenerationResponseFormatType<RESULT>;
-    } & FunctionOptions): Promise<RESULT>;
+    }): Promise<RESULT>;
     get settingsForEvent(): Partial<OpenAIImageGenerationSettings>;
-    doGenerateImages(prompt: string, options?: FunctionOptions): Promise<{
+    doGenerateImages(prompt: string, options: FunctionCallOptions): Promise<{
         response: {
             data: {
                 b64_json: string;

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -84,17 +84,22 @@ export class OpenAIImageGenerationModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new OpenAIApiConfiguration();
-        const abortSignal = options.run?.abortSignal;
-        const userId = options.run?.userId;
+        const abortSignal = callOptions.run?.abortSignal;
+        const userId = callOptions.run?.userId;
         const responseFormat = options.responseFormat;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl("/images/generations"),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     prompt,
                     n: this.settings.numberOfGenerations,
@@ -118,9 +123,8 @@ export class OpenAIImageGenerationModel extends AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
-        const response = await this.callAPI(prompt, {
+        const response = await this.callAPI(prompt, options, {
             responseFormat: OpenAIImageGenerationResponseFormat.base64Json,
-            ...options,
         });
         return {
             response,

package/model-provider/openai/OpenAISpeechModel.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAISpeechModel = exports.calculateOpenAISpeechCostInMillicents = exports.OPENAI_SPEECH_MODELS = void 0;
-const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 /**
@@ -45,15 +45,20 @@ class OpenAISpeechModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(text, options) {
+    async callAPI(text, callOptions) {
         const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
-        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(`/audio/speech`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     input: text,
                     voice: this.settings.voice,

package/model-provider/openai/OpenAISpeechModel.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { SpeechGenerationModel, SpeechGenerationModelSettings } from "../../model-function/generate-speech/SpeechGenerationModel.js";
 /**
  * @see https://openai.com/pricing
@@ -46,7 +46,7 @@ export declare class OpenAISpeechModel extends AbstractModel<OpenAISpeechModelSe
     get modelName(): "tts-1" | "tts-1-hd";
     private callAPI;
     get settingsForEvent(): Partial<OpenAISpeechModelSettings>;
-    doGenerateSpeechStandard(text: string, options?: FunctionOptions): Promise<Buffer>;
+    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Buffer>;
     withSettings(additionalSettings: Partial<OpenAISpeechModelSettings>): this;
 }
 export {};