modelfusion 0.98.0 → 0.100.0

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

@@ -101,13 +101,10 @@ export interface OpenAICompletionCallSettings {
     api?: ApiConfiguration;
     model: OpenAICompletionModelType;
     suffix?: string;
-    maxTokens?: number;
     temperature?: number;
     topP?: number;
-    n?: number;
     logprobs?: number;
     echo?: boolean;
-    stop?: string | string[];
     presencePenalty?: number;
     frequencyPenalty?: number;
     bestOf?: number;
@@ -126,7 +123,7 @@ export interface OpenAICompletionModelSettings extends TextGenerationModelSettin
  * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  *   retry: retryWithExponentialBackoff({ maxTries: 5 }),
  * });
  *
@@ -146,7 +143,7 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
         responseFormat: OpenAITextResponseFormatType<RESULT>;
     } & FunctionOptions): Promise<RESULT>;
     get settingsForEvent(): Partial<OpenAICompletionModelSettings>;
-    doGenerateText(prompt: string, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: string, options?: FunctionOptions): Promise<{
         response: {
             object: "text_completion";
             usage: {
@@ -165,7 +162,7 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
             }[];
             system_fingerprint?: string | undefined;
         };
-        text: string;
+        texts: string[];
         usage: {
             promptTokens: number;
             completionTokens: number;

package/model-provider/openai/OpenAICompletionModel.js

@@ -131,7 +131,7 @@ export const calculateOpenAICompletionCostInMillicents = ({ model, response, })
  * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  *   retry: retryWithExponentialBackoff({ maxTries: 5 }),
  * });
  *
@@ -174,33 +174,60 @@ export class OpenAICompletionModel extends AbstractModel {
         return countTokens(this.tokenizer, input);
     }
     async callAPI(prompt, options) {
-        const { run, responseFormat } = options;
-        const callSettings = {
-            user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-            // Copied settings:
-            ...this.settings,
-            // map to OpenAI API names:
-            stop: this.settings.stopSequences,
-            maxTokens: this.settings.maxCompletionTokens,
-            // other settings:
-            abortSignal: run?.abortSignal,
-            prompt,
-            responseFormat,
-        };
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const user = this.settings.isUserIdForwardingEnabled
+            ? options.run?.userId
+            : undefined;
+        const abortSignal = options.run?.abortSignal;
+        let { stopSequences } = this.settings;
+        const openaiResponseFormat = options.responseFormat;
         return callWithRetryAndThrottle({
-            retry: callSettings.api?.retry,
-            throttle: callSettings.api?.throttle,
-            call: async () => callOpenAICompletionAPI(callSettings),
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                // empty arrays are not allowed for stop:
+                if (stopSequences != null &&
+                    Array.isArray(stopSequences) &&
+                    stopSequences.length === 0) {
+                    stopSequences = undefined;
+                }
+                return postJsonToApi({
+                    url: api.assembleUrl("/completions"),
+                    headers: api.headers,
+                    body: {
+                        stream: openaiResponseFormat.stream,
+                        model: this.settings.model,
+                        prompt,
+                        suffix: this.settings.suffix,
+                        max_tokens: this.settings.maxGenerationTokens,
+                        temperature: this.settings.temperature,
+                        top_p: this.settings.topP,
+                        n: this.settings.numberOfGenerations,
+                        logprobs: this.settings.logprobs,
+                        echo: this.settings.echo,
+                        stop: this.settings.stopSequences,
+                        seed: this.settings.seed,
+                        presence_penalty: this.settings.presencePenalty,
+                        frequency_penalty: this.settings.frequencyPenalty,
+                        best_of: this.settings.bestOf,
+                        logit_bias: this.settings.logitBias,
+                        user,
+                    },
+                    failedResponseHandler: failedOpenAICallResponseHandler,
+                    successfulResponseHandler: openaiResponseFormat.handler,
+                    abortSignal,
+                });
+            },
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxCompletionTokens",
+            "maxGenerationTokens",
             "stopSequences",
+            "numberOfGenerations",
             "suffix",
             "temperature",
             "topP",
-            "n",
             "logprobs",
             "echo",
             "presencePenalty",
@@ -211,14 +238,14 @@ export class OpenAICompletionModel extends AbstractModel {
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    async doGenerateText(prompt, options) {
+    async doGenerateTexts(prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: OpenAITextResponseFormat.json,
         });
         return {
             response,
-            text: response.choices[0].text,
+            texts: response.choices.map((choice) => choice.text),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -280,38 +307,6 @@ const OpenAICompletionResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAICompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, seed, user, }) {
-    // empty arrays are not allowed for stop:
-    if (stop != null && Array.isArray(stop) && stop.length === 0) {
-        stop = undefined;
-    }
-    return postJsonToApi({
-        url: api.assembleUrl("/completions"),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            model,
-            prompt,
-            suffix,
-            max_tokens: maxTokens,
-            temperature,
-            top_p: topP,
-            n,
-            logprobs,
-            echo,
-            stop,
-            seed,
-            presence_penalty: presencePenalty,
-            frequency_penalty: frequencyPenalty,
-            best_of: bestOf,
-            logit_bias: logitBias,
-            user,
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 export const OpenAITextResponseFormat = {
     /**
      * Returns the response as a JSON object.

package/model-provider/openai/OpenAIFacade.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tokenizer = exports.ImageGenerator = exports.Transcriber = exports.SpeechGenerator = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = void 0;
+exports.ChatMessage = exports.Tokenizer = exports.ImageGenerator = exports.Transcriber = exports.SpeechGenerator = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = void 0;
 const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
 const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
@@ -17,7 +17,7 @@ const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
  * const model = openai.CompletionTextGenerator({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  *   retry: retryWithExponentialBackoff({ maxTries: 5 }),
  * });
  *
@@ -41,13 +41,13 @@ exports.CompletionTextGenerator = CompletionTextGenerator;
  * const model = openai.ChatTextGenerator({
  *   model: "gpt-3.5-turbo",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  * });
  *
  * const text = await generateText(
  *   model,
  *   [
- *     OpenAIChatMessage.system(
+ *     openai.ChatMessage.system(
  *       "Write a short story about a robot learning to love:"
  *     ),
  *   ]
@@ -148,3 +148,5 @@ function Tokenizer(settings) {
     return new TikTokenTokenizer_js_1.TikTokenTokenizer(settings);
 }
 exports.Tokenizer = Tokenizer;
+var OpenAIChatMessage_js_1 = require("./chat/OpenAIChatMessage.cjs");
+Object.defineProperty(exports, "ChatMessage", { enumerable: true, get: function () { return OpenAIChatMessage_js_1.OpenAIChatMessage; } });

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

@@ -14,7 +14,7 @@ import { OpenAIChatModel, OpenAIChatSettings } from "./chat/OpenAIChatModel.js";
  * const model = openai.CompletionTextGenerator({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  *   retry: retryWithExponentialBackoff({ maxTries: 5 }),
  * });
  *
@@ -35,13 +35,13 @@ export declare function CompletionTextGenerator(settings: OpenAICompletionModelS
  * const model = openai.ChatTextGenerator({
  *   model: "gpt-3.5-turbo",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  * });
  *
  * const text = await generateText(
  *   model,
  *   [
- *     OpenAIChatMessage.system(
+ *     openai.ChatMessage.system(
  *       "Write a short story about a robot learning to love:"
  *     ),
  *   ]
@@ -124,3 +124,5 @@ export declare function ImageGenerator(settings: OpenAIImageGenerationSettings):
  * @returns A new instance of {@link TikTokenTokenizer}.
  */
 export declare function Tokenizer(settings: TikTokenTokenizerSettings): TikTokenTokenizer;
+export { OpenAIChatMessage as ChatMessage } from "./chat/OpenAIChatMessage.js";
+export { OpenAIChatPrompt as ChatPrompt } from "./chat/AbstractOpenAIChatModel.js";

package/model-provider/openai/OpenAIFacade.js

@@ -14,7 +14,7 @@ import { OpenAIChatModel } from "./chat/OpenAIChatModel.js";
  * const model = openai.CompletionTextGenerator({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  *   retry: retryWithExponentialBackoff({ maxTries: 5 }),
  * });
  *
@@ -37,13 +37,13 @@ export function CompletionTextGenerator(settings) {
  * const model = openai.ChatTextGenerator({
  *   model: "gpt-3.5-turbo",
  *   temperature: 0.7,
- *   maxCompletionTokens: 500,
+ *   maxGenerationTokens: 500,
  * });
  *
  * const text = await generateText(
  *   model,
  *   [
- *     OpenAIChatMessage.system(
+ *     openai.ChatMessage.system(
  *       "Write a short story about a robot learning to love:"
  *     ),
  *   ]
@@ -138,3 +138,4 @@ export function ImageGenerator(settings) {
 export function Tokenizer(settings) {
     return new TikTokenTokenizer(settings);
 }
+export { OpenAIChatMessage as ChatMessage } from "./chat/OpenAIChatMessage.js";

package/model-provider/openai/chat/AbstractOpenAIChatModel.cjs

@@ -20,38 +20,67 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         super({ settings });
     }
     async callAPI(messages, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
+        const responseFormat = options.responseFormat;
+        const abortSignal = options.run?.abortSignal;
+        const user = this.settings.isUserIdForwardingEnabled
+            ? options.run?.userId
+            : undefined;
+        const openAIResponseFormat = this.settings.responseFormat;
+        // function & tool calling:
+        const functions = options.functions ?? this.settings.functions;
+        const functionCall = options.functionCall ?? this.settings.functionCall;
+        const tools = options.tools ?? this.settings.tools;
+        const toolChoice = options.toolChoice ?? this.settings.toolChoice;
+        let { stopSequences } = this.settings;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: this.settings.api?.retry,
             throttle: this.settings.api?.throttle,
-            call: async () => callOpenAIChatCompletionAPI({
-                ...this.settings,
-                // function & tool calling:
-                functions: options.functions ?? this.settings.functions,
-                functionCall: options.functionCall ?? this.settings.functionCall,
-                tools: options.tools ?? this.settings.tools,
-                toolChoice: options.toolChoice ?? this.settings.toolChoice,
-                // map to OpenAI API names:
-                stop: this.settings.stopSequences,
-                maxTokens: this.settings.maxCompletionTokens,
-                openAIResponseFormat: this.settings.responseFormat,
-                // other settings:
-                user: this.settings.isUserIdForwardingEnabled
-                    ? options.run?.userId
-                    : undefined,
-                abortSignal: options.run?.abortSignal,
-                responseFormat: options.responseFormat,
-                messages,
-            }),
+            call: async () => {
+                // empty arrays are not allowed for stopSequences:
+                if (stopSequences != null &&
+                    Array.isArray(stopSequences) &&
+                    stopSequences.length === 0) {
+                    stopSequences = undefined;
+                }
+                return (0, postToApi_js_1.postJsonToApi)({
+                    url: api.assembleUrl("/chat/completions"),
+                    headers: api.headers,
+                    body: {
+                        stream: responseFormat.stream,
+                        model: this.settings.model,
+                        messages,
+                        functions,
+                        function_call: functionCall,
+                        tools,
+                        tool_choice: toolChoice,
+                        temperature: this.settings.temperature,
+                        top_p: this.settings.topP,
+                        n: this.settings.numberOfGenerations,
+                        stop: this.settings.stopSequences,
+                        max_tokens: this.settings.maxGenerationTokens,
+                        presence_penalty: this.settings.presencePenalty,
+                        frequency_penalty: this.settings.frequencyPenalty,
+                        logit_bias: this.settings.logitBias,
+                        seed: this.settings.seed,
+                        response_format: openAIResponseFormat,
+                        user,
+                    },
+                    failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                    successfulResponseHandler: responseFormat.handler,
+                    abortSignal,
+                });
+            },
         });
     }
-    async doGenerateText(prompt, options) {
+    async doGenerateTexts(prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: exports.OpenAIChatResponseFormat.json,
         });
         return {
             response,
-            text: response.choices[0].message.content,
+            texts: response.choices.map((choice) => choice.message.content ?? ""),
             usage: this.extractUsage(response),
         };
     }
@@ -173,39 +202,6 @@ const openAIChatResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, tools, toolChoice, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, openAIResponseFormat, seed, }) {
-    // empty arrays are not allowed for stop:
-    if (stop != null && Array.isArray(stop) && stop.length === 0) {
-        stop = undefined;
-    }
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl("/chat/completions"),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            model,
-            messages,
-            functions,
-            function_call: functionCall,
-            tools,
-            tool_choice: toolChoice,
-            temperature,
-            top_p: topP,
-            n,
-            stop,
-            max_tokens: maxTokens,
-            presence_penalty: presencePenalty,
-            frequency_penalty: frequencyPenalty,
-            logit_bias: logitBias,
-            seed,
-            response_format: openAIResponseFormat,
-            user,
-        },
-        failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 exports.OpenAIChatResponseFormat = {
     /**
      * Returns the response as a JSON object.

package/model-provider/openai/chat/AbstractOpenAIChatModel.d.ts

@@ -32,19 +32,6 @@ export interface AbstractOpenAIChatCallSettings {
             name: string;
         };
     };
-    /**
-     * An array of strings or a single string that the model will recognize as end-of-text indicators.
-     * The model stops generating more content when it encounters any of these strings.
-     * This is particularly useful in scripted or formatted text generation, where a specific end point is required.
-     * Example: stop: ['\n', 'END']
-     */
-    stop?: string | string[];
-    /**
-     * Specifies the maximum number of tokens (words, punctuation, parts of words) that the model can generate in a single response.
-     * It helps to control the length of the output, this can help prevent wasted time and tokens when tweaker topP or temperature.
-     * Example: maxTokens: 1000
-     */
-    maxTokens?: number;
     /**
      * `temperature`: Controls the randomness and creativity in the model's responses.
      * A lower temperature (close to 0) results in more predictable, conservative text, while a higher temperature (close to 1) produces more varied and creative output.
@@ -67,17 +54,6 @@ export interface AbstractOpenAIChatCallSettings {
      * Example: seed: 89 (or) seed: null
      */
     seed?: number | null;
-    responseFormat?: {
-        type?: "text" | "json_object";
-    };
-    /**
-     * Specifies the number of responses or completions the model should generate for a given prompt.
-     * This is useful when you need multiple different outputs or ideas for a single prompt.
-     * The model will generate 'n' distinct responses, each based on the same initial prompt.
-     * In a streaming model this will result in both responses streamed back in real time.
-     * Example: n: 3 // The model will produce 3 different responses.
-     */
-    n?: number;
     /**
      * Discourages the model from repeating the same information or context already mentioned in the conversation or prompt.
      * Increasing this value encourages the model to introduce new topics or ideas, rather than reiterating what has been said.
@@ -92,9 +68,12 @@ export interface AbstractOpenAIChatCallSettings {
      * Example: frequencyPenalty: 0.5 // Moderately discourages repetitive language.
      */
     frequencyPenalty?: number;
+    responseFormat?: {
+        type?: "text" | "json_object";
+    };
     logitBias?: Record<number, number>;
 }
-export interface AbstractOpenAIChatSettings extends TextGenerationModelSettings, Omit<AbstractOpenAIChatCallSettings, "stop" | "maxTokens"> {
+export interface AbstractOpenAIChatSettings extends TextGenerationModelSettings, AbstractOpenAIChatCallSettings {
     isUserIdForwardingEnabled?: boolean;
 }
 export type OpenAIChatPrompt = OpenAIChatMessage[];
@@ -105,7 +84,7 @@ export type OpenAIChatPrompt = OpenAIChatMessage[];
  */
 export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractOpenAIChatSettings> extends AbstractModel<SETTINGS> {
     constructor(settings: SETTINGS);
-    callAPI<RESULT>(messages: Array<OpenAIChatMessage>, options: {
+    callAPI<RESULT>(messages: OpenAIChatPrompt, options: {
         responseFormat: OpenAIChatResponseFormatType<RESULT>;
     } & FunctionOptions & {
         functions?: AbstractOpenAIChatCallSettings["functions"];
@@ -113,7 +92,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
         tools?: AbstractOpenAIChatCallSettings["tools"];
         toolChoice?: AbstractOpenAIChatCallSettings["toolChoice"];
     }): Promise<RESULT>;
-    doGenerateText(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
             usage: {
@@ -147,7 +126,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             }[];
             system_fingerprint?: string | null | undefined;
         };
-        text: string;
+        texts: string[];
         usage: {
             promptTokens: number;
             completionTokens: number;

package/model-provider/openai/chat/AbstractOpenAIChatModel.js

@@ -17,38 +17,67 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         super({ settings });
     }
     async callAPI(messages, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const responseFormat = options.responseFormat;
+        const abortSignal = options.run?.abortSignal;
+        const user = this.settings.isUserIdForwardingEnabled
+            ? options.run?.userId
+            : undefined;
+        const openAIResponseFormat = this.settings.responseFormat;
+        // function & tool calling:
+        const functions = options.functions ?? this.settings.functions;
+        const functionCall = options.functionCall ?? this.settings.functionCall;
+        const tools = options.tools ?? this.settings.tools;
+        const toolChoice = options.toolChoice ?? this.settings.toolChoice;
+        let { stopSequences } = this.settings;
         return callWithRetryAndThrottle({
             retry: this.settings.api?.retry,
             throttle: this.settings.api?.throttle,
-            call: async () => callOpenAIChatCompletionAPI({
-                ...this.settings,
-                // function & tool calling:
-                functions: options.functions ?? this.settings.functions,
-                functionCall: options.functionCall ?? this.settings.functionCall,
-                tools: options.tools ?? this.settings.tools,
-                toolChoice: options.toolChoice ?? this.settings.toolChoice,
-                // map to OpenAI API names:
-                stop: this.settings.stopSequences,
-                maxTokens: this.settings.maxCompletionTokens,
-                openAIResponseFormat: this.settings.responseFormat,
-                // other settings:
-                user: this.settings.isUserIdForwardingEnabled
-                    ? options.run?.userId
-                    : undefined,
-                abortSignal: options.run?.abortSignal,
-                responseFormat: options.responseFormat,
-                messages,
-            }),
+            call: async () => {
+                // empty arrays are not allowed for stopSequences:
+                if (stopSequences != null &&
+                    Array.isArray(stopSequences) &&
+                    stopSequences.length === 0) {
+                    stopSequences = undefined;
+                }
+                return postJsonToApi({
+                    url: api.assembleUrl("/chat/completions"),
+                    headers: api.headers,
+                    body: {
+                        stream: responseFormat.stream,
+                        model: this.settings.model,
+                        messages,
+                        functions,
+                        function_call: functionCall,
+                        tools,
+                        tool_choice: toolChoice,
+                        temperature: this.settings.temperature,
+                        top_p: this.settings.topP,
+                        n: this.settings.numberOfGenerations,
+                        stop: this.settings.stopSequences,
+                        max_tokens: this.settings.maxGenerationTokens,
+                        presence_penalty: this.settings.presencePenalty,
+                        frequency_penalty: this.settings.frequencyPenalty,
+                        logit_bias: this.settings.logitBias,
+                        seed: this.settings.seed,
+                        response_format: openAIResponseFormat,
+                        user,
+                    },
+                    failedResponseHandler: failedOpenAICallResponseHandler,
+                    successfulResponseHandler: responseFormat.handler,
+                    abortSignal,
+                });
+            },
         });
     }
-    async doGenerateText(prompt, options) {
+    async doGenerateTexts(prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: OpenAIChatResponseFormat.json,
         });
         return {
             response,
-            text: response.choices[0].message.content,
+            texts: response.choices.map((choice) => choice.message.content ?? ""),
             usage: this.extractUsage(response),
         };
     }
@@ -169,39 +198,6 @@ const openAIChatResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, tools, toolChoice, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, openAIResponseFormat, seed, }) {
-    // empty arrays are not allowed for stop:
-    if (stop != null && Array.isArray(stop) && stop.length === 0) {
-        stop = undefined;
-    }
-    return postJsonToApi({
-        url: api.assembleUrl("/chat/completions"),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            model,
-            messages,
-            functions,
-            function_call: functionCall,
-            tools,
-            tool_choice: toolChoice,
-            temperature,
-            top_p: topP,
-            n,
-            stop,
-            max_tokens: maxTokens,
-            presence_penalty: presencePenalty,
-            frequency_penalty: frequencyPenalty,
-            logit_bias: logitBias,
-            seed,
-            response_format: openAIResponseFormat,
-            user,
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 export const OpenAIChatResponseFormat = {
     /**
      * Returns the response as a JSON object.

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

@@ -23,15 +23,15 @@ OpenAIChatSettings> {
     /**
      * Returns this model with a text prompt template.
      */
-    withTextPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<string, import("./OpenAIChatMessage.js").OpenAIChatMessage[]>>;
+    withTextPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<string, OpenAIChatPrompt>>;
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").MultiModalInstructionPrompt | import("../../../index.js").TextInstructionPrompt, import("./OpenAIChatMessage.js").OpenAIChatMessage[]>>;
+    withInstructionPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").MultiModalInstructionPrompt | import("../../../index.js").TextInstructionPrompt, OpenAIChatPrompt>>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").TextChatPrompt | import("../../../index.js").MultiModalChatPrompt, import("./OpenAIChatMessage.js").OpenAIChatMessage[]>>;
+    withChatPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").TextChatPrompt | import("../../../index.js").MultiModalChatPrompt, OpenAIChatPrompt>>;
     withPromptTemplate<TARGET_PROMPT_FORMAT extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>>(promptTemplate: TARGET_PROMPT_FORMAT): OpenAIChatFunctionCallStructureGenerationModel<TARGET_PROMPT_FORMAT>;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
     /**