modelfusion 0.109.0 → 0.111.0

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -17,100 +17,12 @@ exports.OPENAI_TEXT_GENERATION_MODELS = {
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
     },
-    "davinci-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-        fineTunedTokenCostInMillicents: 1.2,
-    },
-    "babbage-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-        fineTunedTokenCostInMillicents: 0.16,
-    },
-    "text-davinci-003": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-davinci-002": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "code-davinci-002": {
-        contextWindowSize: 8000,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    davinci: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-curie-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    curie: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    "text-babbage-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    babbage: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    "text-ada-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
-    ada: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
 };
 function getOpenAICompletionModelInformation(model) {
-    // Model is already a base model:
-    if (model in exports.OPENAI_TEXT_GENERATION_MODELS) {
-        const baseModelInformation = exports.OPENAI_TEXT_GENERATION_MODELS[model];
-        return {
-            baseModel: model,
-            isFineTuned: false,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.promptTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.completionTokenCostInMillicents,
-        };
-    }
-    // Extract the base model from the fine-tuned model:
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [_, baseModel, ___, ____, _____] = model.split(":");
-    if (["davinci-002", "babbage-002"].includes(baseModel)) {
-        const baseModelInformation = exports.OPENAI_TEXT_GENERATION_MODELS[baseModel];
-        return {
-            baseModel: baseModel,
-            isFineTuned: true,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-        };
-    }
-    throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
+    return exports.OPENAI_TEXT_GENERATION_MODELS[model];
 }
 exports.getOpenAICompletionModelInformation = getOpenAICompletionModelInformation;
-const isOpenAICompletionModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS ||
-    model.startsWith("ft:davinci-002:") ||
-    model.startsWith("ft:babbage-002:");
+const isOpenAICompletionModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS;
 exports.isOpenAICompletionModel = isOpenAICompletionModel;
 const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
     const modelInformation = getOpenAICompletionModelInformation(model);
@@ -161,7 +73,7 @@ class OpenAICompletionModel extends AbstractOpenAICompletionModel_js_1.AbstractO
         });
         const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer_js_1.TikTokenTokenizer({
-            model: modelInformation.baseModel,
+            model: this.settings.model,
         });
         this.contextWindowSize = modelInformation.contextWindowSize;
     }

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

@@ -13,81 +13,14 @@ export declare const OPENAI_TEXT_GENERATION_MODELS: {
         promptTokenCostInMillicents: number;
         completionTokenCostInMillicents: number;
     };
-    "davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-        fineTunedTokenCostInMillicents: number;
-    };
-    "babbage-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-        fineTunedTokenCostInMillicents: number;
-    };
-    "text-davinci-003": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "code-davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    davinci: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-curie-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    curie: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-babbage-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    babbage: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-ada-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    ada: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
 };
 export declare function getOpenAICompletionModelInformation(model: OpenAICompletionModelType): {
-    baseModel: OpenAICompletionBaseModelType;
-    isFineTuned: boolean;
     contextWindowSize: number;
     promptTokenCostInMillicents: number;
     completionTokenCostInMillicents: number;
 };
-type FineTuneableOpenAICompletionModelType = "davinci-002" | "babbage-002";
-type FineTunedOpenAICompletionModelType = `ft:${FineTuneableOpenAICompletionModelType}:${string}:${string}:${string}`;
-export type OpenAICompletionBaseModelType = keyof typeof OPENAI_TEXT_GENERATION_MODELS;
-export type OpenAICompletionModelType = OpenAICompletionBaseModelType | FineTunedOpenAICompletionModelType;
-export declare const isOpenAICompletionModel: (model: string) => model is OpenAICompletionModelType;
+export type OpenAICompletionModelType = keyof typeof OPENAI_TEXT_GENERATION_MODELS;
+export declare const isOpenAICompletionModel: (model: string) => model is "gpt-3.5-turbo-instruct";
 export declare const calculateOpenAICompletionCostInMillicents: ({ model, response, }: {
     model: OpenAICompletionModelType;
     response: OpenAICompletionResponse;
@@ -116,7 +49,7 @@ export interface OpenAICompletionModelSettings extends AbstractOpenAICompletionM
 export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel<OpenAICompletionModelSettings> implements TextStreamingModel<string, OpenAICompletionModelSettings> {
     constructor(settings: OpenAICompletionModelSettings);
     readonly provider: "openai";
-    get modelName(): OpenAICompletionModelType;
+    get modelName(): "gpt-3.5-turbo-instruct";
     readonly contextWindowSize: number;
     readonly tokenizer: TikTokenTokenizer;
     countPromptTokens(input: string): Promise<number>;
@@ -135,4 +68,3 @@ export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }
-export {};

package/model-provider/openai/OpenAICompletionModel.js

@@ -14,99 +14,11 @@ export const OPENAI_TEXT_GENERATION_MODELS = {
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
     },
-    "davinci-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-        fineTunedTokenCostInMillicents: 1.2,
-    },
-    "babbage-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-        fineTunedTokenCostInMillicents: 0.16,
-    },
-    "text-davinci-003": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-davinci-002": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "code-davinci-002": {
-        contextWindowSize: 8000,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    davinci: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-curie-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    curie: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    "text-babbage-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    babbage: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    "text-ada-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
-    ada: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
 };
 export function getOpenAICompletionModelInformation(model) {
-    // Model is already a base model:
-    if (model in OPENAI_TEXT_GENERATION_MODELS) {
-        const baseModelInformation = OPENAI_TEXT_GENERATION_MODELS[model];
-        return {
-            baseModel: model,
-            isFineTuned: false,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.promptTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.completionTokenCostInMillicents,
-        };
-    }
-    // Extract the base model from the fine-tuned model:
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [_, baseModel, ___, ____, _____] = model.split(":");
-    if (["davinci-002", "babbage-002"].includes(baseModel)) {
-        const baseModelInformation = OPENAI_TEXT_GENERATION_MODELS[baseModel];
-        return {
-            baseModel: baseModel,
-            isFineTuned: true,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-        };
-    }
-    throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
+    return OPENAI_TEXT_GENERATION_MODELS[model];
 }
-export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
-    model.startsWith("ft:davinci-002:") ||
-    model.startsWith("ft:babbage-002:");
+export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS;
 export const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
     const modelInformation = getOpenAICompletionModelInformation(model);
     return (response.usage.prompt_tokens *
@@ -155,7 +67,7 @@ export class OpenAICompletionModel extends AbstractOpenAICompletionModel {
         });
         const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer({
-            model: modelInformation.baseModel,
+            model: this.settings.model,
         });
         this.contextWindowSize = modelInformation.contextWindowSize;
     }

package/model-provider/openai/OpenAIError.cjs

@@ -4,19 +4,19 @@ exports.failedOpenAICallResponseHandler = void 0;
 const zod_1 = require("zod");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const openAIErrorDataSchema = zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),
         type: zod_1.z.string(),
         param: zod_1.z.any().nullable(),
         code: zod_1.z.string().nullable(),
     }),
-}));
+});
 exports.failedOpenAICallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
-    errorSchema: openAIErrorDataSchema,
-    errorToMessage: (error) => error.error.message,
-    isRetryable: (error, response) => (response.status === 429 &&
-        // insufficient_quota is also reported as a 429, but it's not retryable:
-        error.error.type !== "insufficient_quota") ||
-        response.status >= 500,
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(openAIErrorDataSchema),
+    errorToMessage: (data) => data.error.message,
+    isRetryable: (response, error) => response.status >= 500 ||
+        (response.status === 429 &&
+            // insufficient_quota is also reported as a 429, but it's not retryable:
+            error?.error.type !== "insufficient_quota"),
 });

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

@@ -1,5 +1,29 @@
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-declare const openAIErrorDataSchema: ZodSchema<{
+import { z } from "zod";
+declare const openAIErrorDataSchema: z.ZodObject<{
+    error: z.ZodObject<{
+        message: z.ZodString;
+        type: z.ZodString;
+        param: z.ZodNullable<z.ZodAny>;
+        code: z.ZodNullable<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        message: string;
+        code: string | null;
+        type: string;
+        param?: any;
+    }, {
+        message: string;
+        code: string | null;
+        type: string;
+        param?: any;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    error: {
+        message: string;
+        code: string | null;
+        type: string;
+        param?: any;
+    };
+}, {
     error: {
         message: string;
         code: string | null;
@@ -7,6 +31,6 @@ declare const openAIErrorDataSchema: ZodSchema<{
         param?: any;
     };
 }>;
-export type OpenAIErrorData = (typeof openAIErrorDataSchema)["_type"];
+export type OpenAIErrorData = z.infer<typeof openAIErrorDataSchema>;
 export declare const failedOpenAICallResponseHandler: import("../../core/api/postToApi.js").ResponseHandler<import("../../index.js").ApiCallError>;
 export {};

package/model-provider/openai/OpenAIError.js

@@ -1,19 +1,19 @@
 import { z } from "zod";
 import { createJsonErrorResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-const openAIErrorDataSchema = new ZodSchema(z.object({
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const openAIErrorDataSchema = z.object({
     error: z.object({
         message: z.string(),
         type: z.string(),
         param: z.any().nullable(),
         code: z.string().nullable(),
     }),
-}));
+});
 export const failedOpenAICallResponseHandler = createJsonErrorResponseHandler({
-    errorSchema: openAIErrorDataSchema,
-    errorToMessage: (error) => error.error.message,
-    isRetryable: (error, response) => (response.status === 429 &&
-        // insufficient_quota is also reported as a 429, but it's not retryable:
-        error.error.type !== "insufficient_quota") ||
-        response.status >= 500,
+    errorSchema: zodSchema(openAIErrorDataSchema),
+    errorToMessage: (data) => data.error.message,
+    isRetryable: (response, error) => response.status >= 500 ||
+        (response.status === 429 &&
+            // insufficient_quota is also reported as a 429, but it's not retryable:
+            error?.error.type !== "insufficient_quota"),
 });

package/model-provider/openai/OpenAIFacade.cjs

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatMessage = 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 = exports.AzureApi = exports.Api = void 0;
+const AzureOpenAIApiConfiguration_js_1 = require("./AzureOpenAIApiConfiguration.cjs");
+const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
+const OpenAIChatModel_js_1 = require("./OpenAIChatModel.cjs");
 const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
 const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
-const OpenAIChatModel_js_1 = require("./OpenAIChatModel.cjs");
+/**
+ * Creates an API configuration for the OpenAI API.
+ * It calls the API at https://api.openai.com/v1 and uses the `OPENAI_API_KEY` env variable by default.
+ */
+function Api(settings) {
+    return new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(settings);
+}
+exports.Api = Api;
+/**
+ * Configuration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+function AzureApi(settings) {
+    return new AzureOpenAIApiConfiguration_js_1.AzureOpenAIApiConfiguration(settings);
+}
+exports.AzureApi = AzureApi;
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *

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

@@ -1,10 +1,28 @@
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { AzureOpenAIApiConfiguration, AzureOpenAIApiConfigurationOptions } from "./AzureOpenAIApiConfiguration.js";
+import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
+import { OpenAIChatModel, OpenAIChatSettings } from "./OpenAIChatModel.js";
 import { OpenAICompletionModel, OpenAICompletionModelSettings } from "./OpenAICompletionModel.js";
 import { OpenAIImageGenerationModel, OpenAIImageGenerationSettings } from "./OpenAIImageGenerationModel.js";
 import { OpenAISpeechModel, OpenAISpeechModelSettings } from "./OpenAISpeechModel.js";
 import { OpenAITextEmbeddingModel, OpenAITextEmbeddingModelSettings } from "./OpenAITextEmbeddingModel.js";
 import { OpenAITranscriptionModel, OpenAITranscriptionModelSettings } from "./OpenAITranscriptionModel.js";
 import { TikTokenTokenizer, TikTokenTokenizerSettings } from "./TikTokenTokenizer.js";
-import { OpenAIChatModel, OpenAIChatSettings } from "./OpenAIChatModel.js";
+/**
+ * Creates an API configuration for the OpenAI API.
+ * It calls the API at https://api.openai.com/v1 and uses the `OPENAI_API_KEY` env variable by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions & {
+    apiKey?: string;
+}): OpenAIApiConfiguration;
+/**
+ * Configuration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+export declare function AzureApi(settings: AzureOpenAIApiConfigurationOptions): AzureOpenAIApiConfiguration;
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *
@@ -124,5 +142,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 "./OpenAIChatMessage.js";
 export { OpenAIChatPrompt as ChatPrompt } from "./AbstractOpenAIChatModel.js";
+export { OpenAIChatMessage as ChatMessage } from "./OpenAIChatMessage.js";

package/model-provider/openai/OpenAIFacade.js

@@ -1,10 +1,29 @@
+import { AzureOpenAIApiConfiguration, } from "./AzureOpenAIApiConfiguration.js";
+import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
+import { OpenAIChatModel } from "./OpenAIChatModel.js";
 import { OpenAICompletionModel, } from "./OpenAICompletionModel.js";
 import { OpenAIImageGenerationModel, } from "./OpenAIImageGenerationModel.js";
 import { OpenAISpeechModel, } from "./OpenAISpeechModel.js";
 import { OpenAITextEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
 import { OpenAITranscriptionModel, } from "./OpenAITranscriptionModel.js";
 import { TikTokenTokenizer, } from "./TikTokenTokenizer.js";
-import { OpenAIChatModel } from "./OpenAIChatModel.js";
+/**
+ * Creates an API configuration for the OpenAI API.
+ * It calls the API at https://api.openai.com/v1 and uses the `OPENAI_API_KEY` env variable by default.
+ */
+export function Api(settings) {
+    return new OpenAIApiConfiguration(settings);
+}
+/**
+ * Configuration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+export function AzureApi(settings) {
+    return new AzureOpenAIApiConfiguration(settings);
+}
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.OpenAIImageGenerationResponseFormat = exports.OpenAIImageGenerationModel
 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 AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptTemplateImageGenerationModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
@@ -89,28 +90,26 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     async callAPI(prompt, options) {
         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 abortSignal = options.run?.abortSignal;
+        const userId = options.run?.userId;
+        const responseFormat = options.responseFormat;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             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,
-                });
-            },
+            call: async () => (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() {
@@ -158,10 +157,10 @@ const openAIImageGenerationBase64JsonSchema = zod_1.z.object({
 exports.OpenAIImageGenerationResponseFormat = {
     url: {
         type: "url",
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAIImageGenerationUrlSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAIImageGenerationUrlSchema)),
     },
     base64Json: {
         type: "b64_json",
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAIImageGenerationBase64JsonSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAIImageGenerationBase64JsonSchema)),
     },
 };

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

@@ -11,7 +11,7 @@ export declare const OPENAI_IMAGE_MODELS: {
         getCost(settings: OpenAIImageGenerationSettings): 2000 | 1800 | 1600 | null;
     };
     "dall-e-3": {
-        getCost(settings: OpenAIImageGenerationSettings): 8000 | 4000 | 12000 | null;
+        getCost(settings: OpenAIImageGenerationSettings): 4000 | 8000 | 12000 | null;
     };
 };
 /**