modelfusion 0.101.0 → 0.103.0

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -4,6 +4,7 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
@@ -34,25 +35,52 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         return this.settings.contextWindowSize;
     }
     async callAPI(prompt, options) {
+        const api = this.settings.api ?? new LlamaCppApiConfiguration();
+        const responseFormat = options.responseFormat;
+        const abortSignal = options.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callLlamaCppTextGenerationAPI({
-                ...this.settings,
-                // mapping
-                nPredict: this.settings.maxGenerationTokens,
-                stop: this.settings.stopSequences,
-                // other
-                abortSignal: options.run?.abortSignal,
-                prompt,
-                responseFormat: options.responseFormat,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/completion`),
+                headers: api.headers,
+                body: {
+                    stream: responseFormat.stream,
+                    prompt: prompt.text,
+                    image_data: prompt.images != null
+                        ? Object.entries(prompt.images).map(([id, data]) => ({
+                            id: +id,
+                            data,
+                        }))
+                        : undefined,
+                    cache_prompt: this.settings.cachePrompt,
+                    temperature: this.settings.temperature,
+                    top_k: this.settings.topK,
+                    top_p: this.settings.topP,
+                    n_predict: this.settings.maxGenerationTokens,
+                    n_keep: this.settings.nKeep,
+                    stop: this.settings.stopSequences,
+                    tfs_z: this.settings.tfsZ,
+                    typical_p: this.settings.typicalP,
+                    repeat_penalty: this.settings.repeatPenalty,
+                    repeat_last_n: this.settings.repeatLastN,
+                    penalize_nl: this.settings.penalizeNl,
+                    mirostat: this.settings.mirostat,
+                    mirostat_tau: this.settings.mirostatTau,
+                    mirostat_eta: this.settings.mirostatEta,
+                    seed: this.settings.seed,
+                    ignore_eos: this.settings.ignoreEos,
+                    logit_bias: this.settings.logitBias,
+                },
+                failedResponseHandler: failedLlamaCppCallResponseHandler,
+                successfulResponseHandler: responseFormat.handler,
+                abortSignal,
             }),
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "contextWindowSize",
             "cachePrompt",
             "temperature",
@@ -84,7 +112,16 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.content],
+            textGenerationResults: [
+                {
+                    text: response.content,
+                    finishReason: response.stopped_eos || response.stopped_word
+                        ? "stop"
+                        : response.stopped_limit
+                            ? "length"
+                            : "unknown",
+                },
+            ],
             usage: {
                 promptTokens: response.tokens_evaluated,
                 completionTokens: response.tokens_predicted,
@@ -194,43 +231,6 @@ const llamaCppTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("
     }),
     llamaCppTextGenerationResponseSchema,
 ]));
-async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, cachePrompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/completion`),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            prompt: prompt.text,
-            cache_prompt: cachePrompt,
-            temperature,
-            top_k: topK,
-            top_p: topP,
-            n_predict: nPredict,
-            n_keep: nKeep,
-            stop,
-            tfs_z: tfsZ,
-            typical_p: typicalP,
-            repeat_penalty: repeatPenalty,
-            repeat_last_n: repeatLastN,
-            penalize_nl: penalizeNl,
-            mirostat,
-            mirostat_tau: mirostatTau,
-            mirostat_eta: mirostatEta,
-            seed,
-            ignore_eos: ignoreEos,
-            logit_bias: logitBias,
-            image_data: prompt.images != null
-                ? Object.entries(prompt.images).map(([id, data]) => ({
-                    id: +id,
-                    data,
-                }))
-                : undefined,
-        },
-        failedResponseHandler: failedLlamaCppCallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 async function createLlamaCppFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     let content = "";

package/model-provider/mistral/MistralChatModel.cjs

@@ -75,6 +75,9 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     get settingsForEvent() {
         const eventSettingProperties = [
             "maxGenerationTokens",
+            "stopSequences",
+            "numberOfGenerations",
+            "trimWhitespace",
             "temperature",
             "topP",
             "safeMode",
@@ -89,9 +92,23 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content,
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+            case "model_length":
+                return "length";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
@@ -118,7 +135,7 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
-            model: this,
+            model: this, // stop tokens are not supported by this model
             promptTemplate,
         });
     }

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

@@ -7,6 +7,7 @@ import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationFinishReason } from "../../model-function/generate-text/TextGenerationResult.js";
 export type MistralChatMessage = {
     role: "system" | "user" | "assistant";
     content: string;
@@ -78,8 +79,12 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
                 index: number;
             }[];
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
     }>;
+    private translateFinishReason;
     doStreamText(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with a text prompt template.

package/model-provider/mistral/MistralChatModel.js

@@ -72,6 +72,9 @@ export class MistralChatModel extends AbstractModel {
     get settingsForEvent() {
         const eventSettingProperties = [
             "maxGenerationTokens",
+            "stopSequences",
+            "numberOfGenerations",
+            "trimWhitespace",
             "temperature",
             "topP",
             "safeMode",
@@ -86,9 +89,23 @@ export class MistralChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content,
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+            case "model_length":
+                return "length";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
@@ -115,7 +132,7 @@ export class MistralChatModel extends AbstractModel {
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
-            model: this,
+            model: this, // stop tokens are not supported by this model
             promptTemplate,
         });
     }

package/model-provider/ollama/OllamaChatModel.cjs

@@ -9,6 +9,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.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");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
 const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -92,8 +93,7 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "temperature",
             "mirostat",
             "mirostatEta",
@@ -119,7 +119,12 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.message.content],
+            textGenerationResults: [
+                {
+                    text: response.message.content,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

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

@@ -52,7 +52,10 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
             load_duration?: number | undefined;
             prompt_eval_duration?: number | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
     }>;
     doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;

package/model-provider/ollama/OllamaChatModel.js

@@ -6,6 +6,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -89,8 +90,7 @@ export class OllamaChatModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "temperature",
             "mirostat",
             "mirostatEta",
@@ -116,7 +116,12 @@ export class OllamaChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.message.content],
+            textGenerationResults: [
+                {
+                    text: response.message.content,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -9,6 +9,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.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");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
 const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -90,8 +91,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "contextWindowSize",
             "temperature",
             "mirostat",
@@ -121,7 +121,12 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.response],
+            textGenerationResults: [
+                {
+                    text: response.response,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

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

@@ -65,7 +65,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
             prompt_eval_duration?: number | undefined;
             context?: number[] | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
     }>;
     doStreamText(prompt: OllamaCompletionPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -6,6 +6,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -87,8 +88,7 @@ export class OllamaCompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "contextWindowSize",
             "temperature",
             "mirostat",
@@ -118,7 +118,12 @@ export class OllamaCompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.response],
+            textGenerationResults: [
+                {
+                    text: response.response,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -8,6 +8,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.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");
 const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -228,9 +229,7 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -251,7 +250,12 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -259,6 +263,18 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

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

@@ -7,6 +7,7 @@ import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationFinishReason } from "../../model-function/generate-text/TextGenerationResult.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -162,13 +163,17 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
             }[];
             system_fingerprint?: string | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            finishReason: TextGenerationFinishReason;
+            text: string;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with an instruction prompt template.

package/model-provider/openai/OpenAICompletionModel.js

@@ -5,6 +5,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -222,9 +223,7 @@ export class OpenAICompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -245,7 +244,12 @@ export class OpenAICompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -253,6 +257,18 @@ export class OpenAICompletionModel extends AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -60,7 +60,7 @@ const calculateOpenAIImageGenerationCostInMillicents = ({ model, settings, }) =>
     if (cost == null) {
         return null;
     }
-    return (settings.n ?? 1) * cost;
+    return (settings.numberOfGenerations ?? 1) * cost;
 };
 exports.calculateOpenAIImageGenerationCostInMillicents = calculateOpenAIImageGenerationCostInMillicents;
 /**
@@ -88,38 +88,48 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.model;
     }
     async callAPI(prompt, options) {
-        const run = options?.run;
+        const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
+        const userId = options?.run?.userId;
         const responseFormat = options?.responseFormat;
-        const callSettings = {
-            ...this.settings,
-            user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-            abortSignal: run?.abortSignal,
-            responseFormat,
-            prompt,
-        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: callSettings.api?.retry,
-            throttle: callSettings.api?.throttle,
-            call: async () => callOpenAIImageGenerationAPI(callSettings),
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                return (0, postToApi_js_1.postJsonToApi)({
+                    url: api.assembleUrl("/images/generations"),
+                    headers: api.headers,
+                    body: {
+                        prompt,
+                        n: this.settings.numberOfGenerations,
+                        size: this.settings.size,
+                        response_format: responseFormat.type,
+                        user: this.settings.isUserIdForwardingEnabled ? userId : undefined,
+                    },
+                    failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                    successfulResponseHandler: responseFormat?.handler,
+                    abortSignal,
+                });
+            },
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "n",
+            "numberOfGenerations",
             "size",
             "quality",
             "style",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    async doGenerateImage(prompt, options) {
+    async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, {
             responseFormat: exports.OpenAIImageGenerationResponseFormat.base64Json,
             ...options,
         });
         return {
             response,
-            base64Image: response.data[0].b64_json,
+            base64Images: response.data.map((item) => item.b64_json),
         };
     }
     withPromptTemplate(promptTemplate) {
@@ -155,19 +165,3 @@ exports.OpenAIImageGenerationResponseFormat = {
         handler: (0, postToApi_js_1.createJsonResponseHandler)(openAIImageGenerationBase64JsonSchema),
     },
 };
-async function callOpenAIImageGenerationAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, prompt, n, size, responseFormat, user, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl("/images/generations"),
-        headers: api.headers,
-        body: {
-            prompt,
-            n,
-            size,
-            response_format: responseFormat.type,
-            user,
-        },
-        failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat?.handler,
-        abortSignal,
-    });
-}

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

@@ -24,7 +24,6 @@ export declare const calculateOpenAIImageGenerationCostInMillicents: ({ model, s
 export type OpenAIImageModelType = keyof typeof OPENAI_IMAGE_MODELS;
 export interface OpenAIImageGenerationCallSettings {
     model: OpenAIImageModelType;
-    n?: number;
     size?: "256x256" | "512x512" | "1024x1024" | "1792x1024" | "1024x1792";
     quality?: "standard" | "hd";
     style?: "vivid" | "natural";
@@ -52,14 +51,14 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
         responseFormat: OpenAIImageGenerationResponseFormatType<RESULT>;
     } & FunctionOptions): Promise<RESULT>;
     get settingsForEvent(): Partial<OpenAIImageGenerationSettings>;
-    doGenerateImage(prompt: string, options?: FunctionOptions): Promise<{
+    doGenerateImages(prompt: string, options?: FunctionOptions): Promise<{
         response: {
             data: {
                 b64_json: string;
             }[];
             created: number;
         };
-        base64Image: string;
+        base64Images: string[];
     }>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, string>): PromptTemplateImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIImageGenerationSettings>): this;