modelfusion 0.109.0 → 0.111.0

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.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,
-    });
-}

package/model-provider/openai/OpenAITranscriptionModel.cjs

@@ -4,6 +4,7 @@ exports.OpenAITranscriptionResponseFormat = exports.OpenAITranscriptionModel = e
 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 OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
@@ -65,19 +66,46 @@ class OpenAITranscriptionModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async callAPI(data, 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 () => callOpenAITranscriptionAPI({
-                ...this.settings,
-                // other settings:
-                abortSignal: options?.run?.abortSignal,
-                file: {
-                    name: `audio.${data.type}`,
-                    data: data.data,
-                },
-                responseFormat: options?.responseFormat,
-            }),
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                const fileName = `audio.${data.type}`;
+                const formData = new FormData();
+                formData.append("file", new Blob([data.data]), fileName);
+                formData.append("model", this.settings.model);
+                if (this.settings.prompt != null) {
+                    formData.append("prompt", this.settings.prompt);
+                }
+                if (options.responseFormat != null) {
+                    formData.append("response_format", options.responseFormat.type);
+                }
+                if (this.settings.temperature != null) {
+                    formData.append("temperature", this.settings.temperature.toString());
+                }
+                if (this.settings.language != null) {
+                    formData.append("language", this.settings.language);
+                }
+                return (0, postToApi_js_1.postToApi)({
+                    url: api.assembleUrl("/audio/transcriptions"),
+                    headers: api.headers,
+                    body: {
+                        content: formData,
+                        values: {
+                            model: this.settings.model,
+                            prompt: this.settings.prompt,
+                            response_format: options.responseFormat,
+                            temperature: this.settings.temperature,
+                            language: this.settings.language,
+                        },
+                    },
+                    failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                    successfulResponseHandler: options.responseFormat.handler,
+                    abortSignal,
+                });
+            },
         });
     }
     get settingsForEvent() {
@@ -91,40 +119,6 @@ class OpenAITranscriptionModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.OpenAITranscriptionModel = OpenAITranscriptionModel;
-async function callOpenAITranscriptionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, model, file, prompt, responseFormat, temperature, language, }) {
-    const formData = new FormData();
-    formData.append("file", new Blob([file.data]), file.name);
-    formData.append("model", model);
-    if (prompt) {
-        formData.append("prompt", prompt);
-    }
-    if (responseFormat) {
-        formData.append("response_format", responseFormat.type);
-    }
-    if (temperature) {
-        formData.append("temperature", temperature.toString());
-    }
-    if (language) {
-        formData.append("language", language);
-    }
-    return (0, postToApi_js_1.postToApi)({
-        url: api.assembleUrl("/audio/transcriptions"),
-        headers: api.headers,
-        body: {
-            content: formData,
-            values: {
-                model,
-                prompt,
-                response_format: responseFormat,
-                temperature,
-                language,
-            },
-        },
-        failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 const openAITranscriptionJsonSchema = zod_1.z.object({
     text: zod_1.z.string(),
 });
@@ -150,11 +144,11 @@ const openAITranscriptionVerboseJsonSchema = zod_1.z.object({
 exports.OpenAITranscriptionResponseFormat = {
     json: {
         type: "json",
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAITranscriptionJsonSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAITranscriptionJsonSchema)),
     },
     verboseJson: {
         type: "verbose_json",
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAITranscriptionVerboseJsonSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAITranscriptionVerboseJsonSchema)),
     },
     text: {
         type: "text",

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

@@ -36,6 +36,10 @@ export interface OpenAITranscriptionModelSettings extends TranscriptionModelSett
      * increase the temperature until certain thresholds are hit.
      */
     temperature?: number;
+    /**
+     * An optional text to guide the model's style or continue a previous audio segment. The prompt should match the audio language.
+     */
+    prompt?: string;
 }
 export type OpenAITranscriptionInput = {
     type: "flac" | "m4a" | "mp3" | "mp4" | "mpeg" | "mpga" | "ogg" | "wav" | "webm";
@@ -64,16 +68,16 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
     doTranscribe(data: OpenAITranscriptionInput, options?: FunctionOptions): Promise<{
         response: {
             text: string;
+            duration: number;
             task: "transcribe";
             language: string;
-            duration: number;
             segments: {
                 text: string;
                 id: number;
                 temperature: number;
                 tokens: number[];
-                seek: number;
                 start: number;
+                seek: number;
                 end: number;
                 avg_logprob: number;
                 compression_ratio: number;
@@ -118,8 +122,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         id: number;
         temperature: number;
         tokens: number[];
-        seek: number;
         start: number;
+        seek: number;
         end: number;
         avg_logprob: number;
         compression_ratio: number;
@@ -130,8 +134,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         id: number;
         temperature: number;
         tokens: number[];
-        seek: number;
         start: number;
+        seek: number;
         end: number;
         avg_logprob: number;
         compression_ratio: number;
@@ -141,16 +145,16 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     text: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     text: string;
+    duration: number;
     task: "transcribe";
     language: string;
-    duration: number;
     segments: {
         text: string;
         id: number;
         temperature: number;
         tokens: number[];
-        seek: number;
         start: number;
+        seek: number;
         end: number;
         avg_logprob: number;
         compression_ratio: number;
@@ -159,16 +163,16 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     }[];
 }, {
     text: string;
+    duration: number;
     task: "transcribe";
     language: string;
-    duration: number;
     segments: {
         text: string;
         id: number;
         temperature: number;
         tokens: number[];
-        seek: number;
         start: number;
+        seek: number;
         end: number;
         avg_logprob: number;
         compression_ratio: number;
@@ -192,16 +196,16 @@ export declare const OpenAITranscriptionResponseFormat: {
         type: "verbose_json";
         handler: ResponseHandler<{
             text: string;
+            duration: number;
             task: "transcribe";
             language: string;
-            duration: number;
             segments: {
                 text: string;
                 id: number;
                 temperature: number;
                 tokens: number[];
-                seek: number;
                 start: number;
+                seek: number;
                 end: number;
                 avg_logprob: number;
                 compression_ratio: number;

package/model-provider/openai/OpenAITranscriptionModel.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, createTextResponseHandler, postToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
@@ -61,19 +62,46 @@ export class OpenAITranscriptionModel extends AbstractModel {
         };
     }
     async callAPI(data, 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 () => callOpenAITranscriptionAPI({
-                ...this.settings,
-                // other settings:
-                abortSignal: options?.run?.abortSignal,
-                file: {
-                    name: `audio.${data.type}`,
-                    data: data.data,
-                },
-                responseFormat: options?.responseFormat,
-            }),
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                const fileName = `audio.${data.type}`;
+                const formData = new FormData();
+                formData.append("file", new Blob([data.data]), fileName);
+                formData.append("model", this.settings.model);
+                if (this.settings.prompt != null) {
+                    formData.append("prompt", this.settings.prompt);
+                }
+                if (options.responseFormat != null) {
+                    formData.append("response_format", options.responseFormat.type);
+                }
+                if (this.settings.temperature != null) {
+                    formData.append("temperature", this.settings.temperature.toString());
+                }
+                if (this.settings.language != null) {
+                    formData.append("language", this.settings.language);
+                }
+                return postToApi({
+                    url: api.assembleUrl("/audio/transcriptions"),
+                    headers: api.headers,
+                    body: {
+                        content: formData,
+                        values: {
+                            model: this.settings.model,
+                            prompt: this.settings.prompt,
+                            response_format: options.responseFormat,
+                            temperature: this.settings.temperature,
+                            language: this.settings.language,
+                        },
+                    },
+                    failedResponseHandler: failedOpenAICallResponseHandler,
+                    successfulResponseHandler: options.responseFormat.handler,
+                    abortSignal,
+                });
+            },
         });
     }
     get settingsForEvent() {
@@ -86,40 +114,6 @@ export class OpenAITranscriptionModel extends AbstractModel {
         return new OpenAITranscriptionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-async function callOpenAITranscriptionAPI({ api = new OpenAIApiConfiguration(), abortSignal, model, file, prompt, responseFormat, temperature, language, }) {
-    const formData = new FormData();
-    formData.append("file", new Blob([file.data]), file.name);
-    formData.append("model", model);
-    if (prompt) {
-        formData.append("prompt", prompt);
-    }
-    if (responseFormat) {
-        formData.append("response_format", responseFormat.type);
-    }
-    if (temperature) {
-        formData.append("temperature", temperature.toString());
-    }
-    if (language) {
-        formData.append("language", language);
-    }
-    return postToApi({
-        url: api.assembleUrl("/audio/transcriptions"),
-        headers: api.headers,
-        body: {
-            content: formData,
-            values: {
-                model,
-                prompt,
-                response_format: responseFormat,
-                temperature,
-                language,
-            },
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 const openAITranscriptionJsonSchema = z.object({
     text: z.string(),
 });
@@ -145,11 +139,11 @@ const openAITranscriptionVerboseJsonSchema = z.object({
 export const OpenAITranscriptionResponseFormat = {
     json: {
         type: "json",
-        handler: createJsonResponseHandler(openAITranscriptionJsonSchema),
+        handler: createJsonResponseHandler(zodSchema(openAITranscriptionJsonSchema)),
     },
     verboseJson: {
         type: "verbose_json",
-        handler: createJsonResponseHandler(openAITranscriptionVerboseJsonSchema),
+        handler: createJsonResponseHandler(zodSchema(openAITranscriptionVerboseJsonSchema)),
     },
     text: {
         type: "text",

package/model-provider/openai/TikTokenTokenizer.cjs

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TikTokenTokenizer = void 0;
 const lite_1 = require("js-tiktoken/lite");
 const cl100k_base_1 = __importDefault(require("js-tiktoken/ranks/cl100k_base"));
-const p50k_base_1 = __importDefault(require("js-tiktoken/ranks/p50k_base"));
-const r50k_base_1 = __importDefault(require("js-tiktoken/ranks/r50k_base"));
 const never_js_1 = require("../../util/never.cjs");
 /**
  * TikToken tokenizer for OpenAI language models.
@@ -56,22 +54,6 @@ exports.TikTokenTokenizer = TikTokenTokenizer;
 // when new models are released
 function getTiktokenBPE(model) {
     switch (model) {
-        case "code-davinci-002":
-        case "text-davinci-002":
-        case "text-davinci-003": {
-            return p50k_base_1.default;
-        }
-        case "ada":
-        case "babbage":
-        case "curie":
-        case "davinci":
-        case "text-ada-001":
-        case "text-babbage-001":
-        case "text-curie-001": {
-            return r50k_base_1.default;
-        }
-        case "babbage-002":
-        case "davinci-002":
         case "gpt-3.5-turbo":
         case "gpt-3.5-turbo-0301":
         case "gpt-3.5-turbo-0613":