modelfusion 0.110.0 → 0.112.0

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

@@ -4,7 +4,7 @@ import { PromptTemplateFullTextModel } from "../../model-function/generate-text/
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { ToolCallGenerationModel } from "../../tool/generate-tool-call/ToolCallGenerationModel.js";
-import { ToolCallsOrTextGenerationModel } from "../../tool/generate-tool-calls-or-text/ToolCallsOrTextGenerationModel.js";
+import { ToolCallsGenerationModel } from "../../tool/generate-tool-calls/ToolCallsGenerationModel.js";
 import { AbstractOpenAIChatModel, AbstractOpenAIChatSettings, OpenAIChatPrompt, OpenAIChatResponse } from "./AbstractOpenAIChatModel.js";
 import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
@@ -124,7 +124,7 @@ export interface OpenAIChatSettings extends AbstractOpenAIChatSettings {
  *   ),
  * ]);
  */
-export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatSettings> implements TextStreamingModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallGenerationModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallsOrTextGenerationModel<OpenAIChatPrompt, OpenAIChatSettings> {
+export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatSettings> implements TextStreamingModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallGenerationModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallsGenerationModel<OpenAIChatPrompt, OpenAIChatSettings> {
     constructor(settings: OpenAIChatSettings);
     readonly provider: "openai";
     get modelName(): OpenAIChatModelType;

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.js

@@ -1,6 +1,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 { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
@@ -85,28 +86,26 @@ export class OpenAIImageGenerationModel extends AbstractModel {
     }
     async callAPI(prompt, options) {
         const api = this.settings.api ?? new 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 callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
-            call: async () => {
-                return 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: failedOpenAICallResponseHandler,
-                    successfulResponseHandler: responseFormat?.handler,
-                    abortSignal,
-                });
-            },
+            call: async () => 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: failedOpenAICallResponseHandler,
+                successfulResponseHandler: responseFormat.handler,
+                abortSignal,
+            }),
         });
     }
     get settingsForEvent() {
@@ -153,10 +152,10 @@ const openAIImageGenerationBase64JsonSchema = z.object({
 export const OpenAIImageGenerationResponseFormat = {
     url: {
         type: "url",
-        handler: createJsonResponseHandler(openAIImageGenerationUrlSchema),
+        handler: createJsonResponseHandler(zodSchema(openAIImageGenerationUrlSchema)),
     },
     base64Json: {
         type: "b64_json",
-        handler: createJsonResponseHandler(openAIImageGenerationBase64JsonSchema),
+        handler: createJsonResponseHandler(zodSchema(openAIImageGenerationBase64JsonSchema)),
     },
 };

package/model-provider/openai/OpenAISpeechModel.cjs

@@ -46,13 +46,24 @@ class OpenAISpeechModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.model;
     }
     async callAPI(text, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOpenAITextToSpeechAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                text,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/audio/speech`),
+                headers: api.headers,
+                body: {
+                    input: text,
+                    voice: this.settings.voice,
+                    speed: this.settings.speed,
+                    model: this.settings.model,
+                    response_format: this.settings.responseFormat,
+                },
+                failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createAudioMpegResponseHandler)(),
+                abortSignal,
             }),
         });
     }
@@ -75,19 +86,3 @@ class OpenAISpeechModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.OpenAISpeechModel = OpenAISpeechModel;
-async function callOpenAITextToSpeechAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, text, voice, model, speed, responseFormat, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/audio/speech`),
-        headers: api.headers,
-        body: {
-            input: text,
-            voice,
-            speed,
-            model,
-            response_format: responseFormat,
-        },
-        failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createAudioMpegResponseHandler)(),
-        abortSignal,
-    });
-}

package/model-provider/openai/OpenAISpeechModel.js

@@ -42,13 +42,24 @@ export class OpenAISpeechModel extends AbstractModel {
         return this.settings.model;
     }
     async callAPI(text, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOpenAITextToSpeechAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                text,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/audio/speech`),
+                headers: api.headers,
+                body: {
+                    input: text,
+                    voice: this.settings.voice,
+                    speed: this.settings.speed,
+                    model: this.settings.model,
+                    response_format: this.settings.responseFormat,
+                },
+                failedResponseHandler: failedOpenAICallResponseHandler,
+                successfulResponseHandler: createAudioMpegResponseHandler(),
+                abortSignal,
             }),
         });
     }
@@ -70,19 +81,3 @@ export class OpenAISpeechModel extends AbstractModel {
         });
     }
 }
-async function callOpenAITextToSpeechAPI({ api = new OpenAIApiConfiguration(), abortSignal, text, voice, model, speed, responseFormat, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/audio/speech`),
-        headers: api.headers,
-        body: {
-            input: text,
-            voice,
-            speed,
-            model,
-            response_format: responseFormat,
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: createAudioMpegResponseHandler(),
-        abortSignal,
-    });
-}

package/model-provider/openai/OpenAITextEmbeddingModel.cjs

@@ -4,6 +4,7 @@ exports.OpenAITextEmbeddingModel = exports.calculateOpenAIEmbeddingCostInMillice
 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 countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
@@ -91,16 +92,24 @@ class OpenAITextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         return (0, countTokens_js_1.countTokens)(this.tokenizer, input);
     }
     async callAPI(texts, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOpenAITextEmbeddingAPI({
-                ...this.settings,
-                user: this.settings.isUserIdForwardingEnabled
-                    ? options?.run?.userId
-                    : undefined,
-                abortSignal: options?.run?.abortSignal,
-                input: texts,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl("/embeddings"),
+                headers: api.headers,
+                body: {
+                    model: this.modelName,
+                    input: texts,
+                    user: this.settings.isUserIdForwardingEnabled
+                        ? options?.run?.userId
+                        : undefined,
+                },
+                failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAITextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -135,17 +144,3 @@ const openAITextEmbeddingResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-async function callOpenAITextEmbeddingAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, model, input, user, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl("/embeddings"),
-        headers: api.headers,
-        body: {
-            model,
-            input,
-            user,
-        },
-        failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(openAITextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}

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

@@ -57,11 +57,11 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
                 embedding: number[];
                 index: number;
             }[];
+            model: string;
             usage: {
                 prompt_tokens: number;
                 total_tokens: number;
             };
-            model: string;
         };
         embeddings: number[][];
     }>;
@@ -100,11 +100,11 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
 }, {
     object: "list";
     data: {
@@ -112,11 +112,11 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
 }>;
 export type OpenAITextEmbeddingResponse = z.infer<typeof openAITextEmbeddingResponseSchema>;
 export {};

package/model-provider/openai/OpenAITextEmbeddingModel.js

@@ -1,6 +1,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 { AbstractModel } from "../../model-function/AbstractModel.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
@@ -86,16 +87,24 @@ export class OpenAITextEmbeddingModel extends AbstractModel {
         return countTokens(this.tokenizer, input);
     }
     async callAPI(texts, options) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callOpenAITextEmbeddingAPI({
-                ...this.settings,
-                user: this.settings.isUserIdForwardingEnabled
-                    ? options?.run?.userId
-                    : undefined,
-                abortSignal: options?.run?.abortSignal,
-                input: texts,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl("/embeddings"),
+                headers: api.headers,
+                body: {
+                    model: this.modelName,
+                    input: texts,
+                    user: this.settings.isUserIdForwardingEnabled
+                        ? options?.run?.userId
+                        : undefined,
+                },
+                failedResponseHandler: failedOpenAICallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(openAITextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -129,17 +138,3 @@ const openAITextEmbeddingResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAITextEmbeddingAPI({ api = new OpenAIApiConfiguration(), abortSignal, model, input, user, }) {
-    return postJsonToApi({
-        url: api.assembleUrl("/embeddings"),
-        headers: api.headers,
-        body: {
-            model,
-            input,
-            user,
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: createJsonResponseHandler(openAITextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}