modelfusion 0.48.0 → 0.49.0

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postToApi, } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatTextGenerationModel } from "../../model-function/generate-text/PromptFormatTextGenerationModel.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 /**
@@ -18,6 +19,18 @@ export class HuggingFaceImageDescriptionModel extends AbstractModel {
             writable: true,
             value: "huggingface"
         });
+        Object.defineProperty(this, "contextWindowSize", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+        Object.defineProperty(this, "tokenizer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
         Object.defineProperty(this, "countPromptTokens", {
             enumerable: true,
             configurable: true,
@@ -42,13 +55,19 @@ export class HuggingFaceImageDescriptionModel extends AbstractModel {
     get settingsForEvent() {
         return {};
     }
-    async doDescribeImage(data, options) {
+    async doGenerateText(data, options) {
         const response = await this.callAPI(data, options);
         return {
             response,
-            description: response[0].generated_text,
+            text: response[0].generated_text,
         };
     }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatTextGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new HuggingFaceImageDescriptionModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/lmnt/{LmntSpeechSynthesisModel.cjs → LmntSpeechModel.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LmntSpeechSynthesisModel = void 0;
+exports.LmntSpeechModel = void 0;
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
@@ -11,7 +11,7 @@ const LmntError_js_1 = require("./LmntError.cjs");
  *
  * @see https://www.lmnt.com/docs/rest/#synthesize-speech
  */
-class LmntSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
+class LmntSpeechModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -43,17 +43,17 @@ class LmntSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
             length: this.settings.length,
         };
     }
-    doSynthesizeSpeechStandard(text, options) {
+    doGenerateSpeechStandard(text, options) {
         return this.callAPI(text, options);
     }
     withSettings(additionalSettings) {
-        return new LmntSpeechSynthesisModel({
+        return new LmntSpeechModel({
             ...this.settings,
             ...additionalSettings,
         });
     }
 }
-exports.LmntSpeechSynthesisModel = LmntSpeechSynthesisModel;
+exports.LmntSpeechModel = LmntSpeechModel;
 async function callLmntTextToSpeechAPI({ api = new LmntApiConfiguration_js_1.LmntApiConfiguration(), abortSignal, text, voice, speed, seed, length, }) {
     const formData = new FormData();
     formData.append("text", text);

package/model-provider/lmnt/LmntSpeechModel.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { SpeechGenerationModel, SpeechGenerationModelSettings } from "../../model-function/generate-speech/SpeechGenerationModel.js";
+export interface LmntSpeechModelSettings extends SpeechGenerationModelSettings {
+    api?: ApiConfiguration;
+    voice: string;
+    speed?: number;
+    seed?: number;
+    length?: number;
+}
+/**
+ * Synthesize speech using the LMNT API.
+ *
+ * @see https://www.lmnt.com/docs/rest/#synthesize-speech
+ */
+export declare class LmntSpeechModel extends AbstractModel<LmntSpeechModelSettings> implements SpeechGenerationModel<LmntSpeechModelSettings> {
+    constructor(settings: LmntSpeechModelSettings);
+    readonly provider = "lmnt";
+    get modelName(): string;
+    private callAPI;
+    get settingsForEvent(): Partial<LmntSpeechModelSettings>;
+    doGenerateSpeechStandard(text: string, options?: FunctionOptions): Promise<Buffer>;
+    withSettings(additionalSettings: Partial<LmntSpeechModelSettings>): this;
+}

package/model-provider/lmnt/{LmntSpeechSynthesisModel.js → LmntSpeechModel.js}

@@ -8,7 +8,7 @@ import { failedLmntCallResponseHandler } from "./LmntError.js";
  *
  * @see https://www.lmnt.com/docs/rest/#synthesize-speech
  */
-export class LmntSpeechSynthesisModel extends AbstractModel {
+export class LmntSpeechModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -40,11 +40,11 @@ export class LmntSpeechSynthesisModel extends AbstractModel {
             length: this.settings.length,
         };
     }
-    doSynthesizeSpeechStandard(text, options) {
+    doGenerateSpeechStandard(text, options) {
         return this.callAPI(text, options);
     }
     withSettings(additionalSettings) {
-        return new LmntSpeechSynthesisModel({
+        return new LmntSpeechModel({
             ...this.settings,
             ...additionalSettings,
         });

package/model-provider/lmnt/index.cjs

@@ -15,4 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./LmntApiConfiguration.cjs"), exports);
-__exportStar(require("./LmntSpeechSynthesisModel.cjs"), exports);
+__exportStar(require("./LmntSpeechModel.cjs"), exports);

package/model-provider/lmnt/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./LmntApiConfiguration.js";
-export * from "./LmntSpeechSynthesisModel.js";
+export * from "./LmntSpeechModel.js";

package/model-provider/lmnt/index.js

@@ -1,2 +1,2 @@
 export * from "./LmntApiConfiguration.js";
-export * from "./LmntSpeechSynthesisModel.js";
+export * from "./LmntSpeechModel.js";

package/model-provider/openai/{OpenAITextGenerationModel.cjs → OpenAICompletionModel.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAITextResponseFormat = exports.OpenAITextGenerationModel = exports.calculateOpenAITextGenerationCostInMillicents = exports.isOpenAITextGenerationModel = exports.getOpenAITextGenerationModelInformation = exports.OPENAI_TEXT_GENERATION_MODELS = void 0;
+exports.OpenAITextResponseFormat = exports.OpenAICompletionModel = exports.calculateOpenAICompletionCostInMillicents = exports.isOpenAICompletionModel = exports.getOpenAICompletionModelInformation = exports.OPENAI_TEXT_GENERATION_MODELS = void 0;
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
@@ -87,7 +87,7 @@ exports.OPENAI_TEXT_GENERATION_MODELS = {
         completionTokenCostInMillicents: 0.04,
     },
 };
-function getOpenAITextGenerationModelInformation(model) {
+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];
@@ -114,26 +114,26 @@ function getOpenAITextGenerationModelInformation(model) {
     }
     throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
 }
-exports.getOpenAITextGenerationModelInformation = getOpenAITextGenerationModelInformation;
-const isOpenAITextGenerationModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS ||
+exports.getOpenAICompletionModelInformation = getOpenAICompletionModelInformation;
+const isOpenAICompletionModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS ||
     model.startsWith("ft:davinci-002:") ||
     model.startsWith("ft:babbage-002:");
-exports.isOpenAITextGenerationModel = isOpenAITextGenerationModel;
-const calculateOpenAITextGenerationCostInMillicents = ({ model, response, }) => {
-    const modelInformation = getOpenAITextGenerationModelInformation(model);
+exports.isOpenAICompletionModel = isOpenAICompletionModel;
+const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
+    const modelInformation = getOpenAICompletionModelInformation(model);
     return (response.usage.prompt_tokens *
         modelInformation.promptTokenCostInMillicents +
         response.usage.completion_tokens *
             modelInformation.completionTokenCostInMillicents);
 };
-exports.calculateOpenAITextGenerationCostInMillicents = calculateOpenAITextGenerationCostInMillicents;
+exports.calculateOpenAICompletionCostInMillicents = calculateOpenAICompletionCostInMillicents;
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *
  * @see https://platform.openai.com/docs/api-reference/completions/create
  *
  * @example
- * const model = new OpenAITextGenerationModel({
+ * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
  *   maxCompletionTokens: 500,
@@ -145,7 +145,7 @@ exports.calculateOpenAITextGenerationCostInMillicents = calculateOpenAITextGener
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-class OpenAITextGenerationModel extends AbstractModel_js_1.AbstractModel {
+class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -166,7 +166,7 @@ class OpenAITextGenerationModel extends AbstractModel_js_1.AbstractModel {
             writable: true,
             value: void 0
         });
-        const modelInformation = getOpenAITextGenerationModelInformation(this.settings.model);
+        const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer_js_1.TikTokenTokenizer({
             model: modelInformation.baseModel,
         });
@@ -195,7 +195,7 @@ class OpenAITextGenerationModel extends AbstractModel_js_1.AbstractModel {
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: callSettings.api?.retry,
             throttle: callSettings.api?.throttle,
-            call: async () => callOpenAITextGenerationAPI(callSettings),
+            call: async () => callOpenAICompletionAPI(callSettings),
         });
     }
     get settingsForEvent() {
@@ -260,11 +260,11 @@ class OpenAITextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     withSettings(additionalSettings) {
-        return new OpenAITextGenerationModel(Object.assign({}, this.settings, additionalSettings));
+        return new OpenAICompletionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-exports.OpenAITextGenerationModel = OpenAITextGenerationModel;
-const openAITextGenerationResponseSchema = zod_1.z.object({
+exports.OpenAICompletionModel = OpenAICompletionModel;
+const OpenAICompletionResponseSchema = zod_1.z.object({
     id: zod_1.z.string(),
     object: zod_1.z.literal("text_completion"),
     created: zod_1.z.number(),
@@ -281,7 +281,7 @@ const openAITextGenerationResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-async function callOpenAITextGenerationAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
+async function callOpenAICompletionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
     // empty arrays are not allowed for stop:
     if (stop != null && Array.isArray(stop) && stop.length === 0) {
         stop = undefined;
@@ -318,7 +318,7 @@ exports.OpenAITextResponseFormat = {
      */
     json: {
         stream: false,
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(openAITextGenerationResponseSchema),
+        handler: (0, postToApi_js_1.createJsonResponseHandler)(OpenAICompletionResponseSchema),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

package/model-provider/openai/{OpenAITextGenerationModel.d.ts → OpenAICompletionModel.d.ts}

@@ -81,25 +81,25 @@ export declare const OPENAI_TEXT_GENERATION_MODELS: {
         completionTokenCostInMillicents: number;
     };
 };
-export declare function getOpenAITextGenerationModelInformation(model: OpenAITextGenerationModelType): {
-    baseModel: OpenAITextGenerationBaseModelType;
+export declare function getOpenAICompletionModelInformation(model: OpenAICompletionModelType): {
+    baseModel: OpenAICompletionBaseModelType;
     isFineTuned: boolean;
     contextWindowSize: number;
     promptTokenCostInMillicents: number;
     completionTokenCostInMillicents: number;
 };
-type FineTuneableOpenAITextGenerationModelType = "davinci-002" | "babbage-002";
-type FineTunedOpenAITextGenerationModelType = `ft:${FineTuneableOpenAITextGenerationModelType}:${string}:${string}:${string}`;
-export type OpenAITextGenerationBaseModelType = keyof typeof OPENAI_TEXT_GENERATION_MODELS;
-export type OpenAITextGenerationModelType = OpenAITextGenerationBaseModelType | FineTunedOpenAITextGenerationModelType;
-export declare const isOpenAITextGenerationModel: (model: string) => model is OpenAITextGenerationModelType;
-export declare const calculateOpenAITextGenerationCostInMillicents: ({ model, response, }: {
-    model: OpenAITextGenerationModelType;
-    response: OpenAITextGenerationResponse;
+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 declare const calculateOpenAICompletionCostInMillicents: ({ model, response, }: {
+    model: OpenAICompletionModelType;
+    response: OpenAICompletionResponse;
 }) => number;
-export interface OpenAITextGenerationCallSettings {
+export interface OpenAICompletionCallSettings {
     api?: ApiConfiguration;
-    model: OpenAITextGenerationModelType;
+    model: OpenAICompletionModelType;
     suffix?: string;
     maxTokens?: number;
     temperature?: number;
@@ -113,7 +113,7 @@ export interface OpenAITextGenerationCallSettings {
     bestOf?: number;
     logitBias?: Record<number, number>;
 }
-export interface OpenAITextGenerationModelSettings extends TextGenerationModelSettings, Omit<OpenAITextGenerationCallSettings, "stop" | "maxTokens"> {
+export interface OpenAICompletionModelSettings extends TextGenerationModelSettings, Omit<OpenAICompletionCallSettings, "stop" | "maxTokens"> {
     isUserIdForwardingEnabled?: boolean;
 }
 /**
@@ -122,7 +122,7 @@ export interface OpenAITextGenerationModelSettings extends TextGenerationModelSe
  * @see https://platform.openai.com/docs/api-reference/completions/create
  *
  * @example
- * const model = new OpenAITextGenerationModel({
+ * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
  *   maxCompletionTokens: 500,
@@ -134,17 +134,17 @@ export interface OpenAITextGenerationModelSettings extends TextGenerationModelSe
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-export declare class OpenAITextGenerationModel extends AbstractModel<OpenAITextGenerationModelSettings> implements TextStreamingModel<string, OpenAITextGenerationModelSettings> {
-    constructor(settings: OpenAITextGenerationModelSettings);
+export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletionModelSettings> implements TextStreamingModel<string, OpenAICompletionModelSettings> {
+    constructor(settings: OpenAICompletionModelSettings);
     readonly provider: "openai";
-    get modelName(): OpenAITextGenerationModelType;
+    get modelName(): OpenAICompletionModelType;
     readonly contextWindowSize: number;
     readonly tokenizer: TikTokenTokenizer;
     countPromptTokens(input: string): Promise<number>;
     callAPI<RESULT>(prompt: string, options: {
         responseFormat: OpenAITextResponseFormatType<RESULT>;
     } & FunctionOptions): Promise<RESULT>;
-    get settingsForEvent(): Partial<OpenAITextGenerationModelSettings>;
+    get settingsForEvent(): Partial<OpenAICompletionModelSettings>;
     doGenerateText(prompt: string, options?: FunctionOptions): Promise<{
         response: {
             object: "text_completion";
@@ -174,18 +174,18 @@ export declare class OpenAITextGenerationModel extends AbstractModel<OpenAITextG
     /**
      * Returns this model with an instruction prompt format.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").InstructionPrompt, string, OpenAITextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").InstructionPrompt, string, OpenAICompletionModelSettings, this>;
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(options?: {
         user?: string;
         ai?: string;
-    }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, OpenAITextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAITextGenerationModelSettings, this>;
-    withSettings(additionalSettings: Partial<OpenAITextGenerationModelSettings>): this;
+    }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, OpenAICompletionModelSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
+    withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }
-declare const openAITextGenerationResponseSchema: z.ZodObject<{
+declare const OpenAICompletionResponseSchema: z.ZodObject<{
     id: z.ZodString;
     object: z.ZodLiteral<"text_completion">;
     created: z.ZodNumber;
@@ -252,7 +252,7 @@ declare const openAITextGenerationResponseSchema: z.ZodObject<{
         logprobs?: any;
     }[];
 }>;
-export type OpenAITextGenerationResponse = z.infer<typeof openAITextGenerationResponseSchema>;
+export type OpenAICompletionResponse = z.infer<typeof OpenAICompletionResponseSchema>;
 export type OpenAITextResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;
@@ -292,7 +292,7 @@ export declare const OpenAITextResponseFormat: {
         }) => Promise<AsyncIterable<Delta<string>>>;
     };
 };
-export type OpenAITextGenerationDelta = Array<{
+export type OpenAICompletionDelta = Array<{
     content: string;
     isComplete: boolean;
     delta: string;

package/model-provider/openai/{OpenAITextGenerationModel.js → OpenAICompletionModel.js}

@@ -84,7 +84,7 @@ export const OPENAI_TEXT_GENERATION_MODELS = {
         completionTokenCostInMillicents: 0.04,
     },
 };
-export function getOpenAITextGenerationModelInformation(model) {
+export function getOpenAICompletionModelInformation(model) {
     // Model is already a base model:
     if (model in OPENAI_TEXT_GENERATION_MODELS) {
         const baseModelInformation = OPENAI_TEXT_GENERATION_MODELS[model];
@@ -111,11 +111,11 @@ export function getOpenAITextGenerationModelInformation(model) {
     }
     throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
 }
-export const isOpenAITextGenerationModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
+export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
     model.startsWith("ft:davinci-002:") ||
     model.startsWith("ft:babbage-002:");
-export const calculateOpenAITextGenerationCostInMillicents = ({ model, response, }) => {
-    const modelInformation = getOpenAITextGenerationModelInformation(model);
+export const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
+    const modelInformation = getOpenAICompletionModelInformation(model);
     return (response.usage.prompt_tokens *
         modelInformation.promptTokenCostInMillicents +
         response.usage.completion_tokens *
@@ -127,7 +127,7 @@ export const calculateOpenAITextGenerationCostInMillicents = ({ model, response,
  * @see https://platform.openai.com/docs/api-reference/completions/create
  *
  * @example
- * const model = new OpenAITextGenerationModel({
+ * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
  *   maxCompletionTokens: 500,
@@ -139,7 +139,7 @@ export const calculateOpenAITextGenerationCostInMillicents = ({ model, response,
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-export class OpenAITextGenerationModel extends AbstractModel {
+export class OpenAICompletionModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -160,7 +160,7 @@ export class OpenAITextGenerationModel extends AbstractModel {
             writable: true,
             value: void 0
         });
-        const modelInformation = getOpenAITextGenerationModelInformation(this.settings.model);
+        const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer({
             model: modelInformation.baseModel,
         });
@@ -189,7 +189,7 @@ export class OpenAITextGenerationModel extends AbstractModel {
         return callWithRetryAndThrottle({
             retry: callSettings.api?.retry,
             throttle: callSettings.api?.throttle,
-            call: async () => callOpenAITextGenerationAPI(callSettings),
+            call: async () => callOpenAICompletionAPI(callSettings),
         });
     }
     get settingsForEvent() {
@@ -254,10 +254,10 @@ export class OpenAITextGenerationModel extends AbstractModel {
         });
     }
     withSettings(additionalSettings) {
-        return new OpenAITextGenerationModel(Object.assign({}, this.settings, additionalSettings));
+        return new OpenAICompletionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const openAITextGenerationResponseSchema = z.object({
+const OpenAICompletionResponseSchema = z.object({
     id: z.string(),
     object: z.literal("text_completion"),
     created: z.number(),
@@ -274,7 +274,7 @@ const openAITextGenerationResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAITextGenerationAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
+async function callOpenAICompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
     // empty arrays are not allowed for stop:
     if (stop != null && Array.isArray(stop) && stop.length === 0) {
         stop = undefined;
@@ -311,7 +311,7 @@ export const OpenAITextResponseFormat = {
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(openAITextGenerationResponseSchema),
+        handler: createJsonResponseHandler(OpenAICompletionResponseSchema),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

package/model-provider/openai/OpenAICostCalculator.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICostCalculator = void 0;
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
-const OpenAITextGenerationModel_js_1 = require("./OpenAITextGenerationModel.cjs");
+const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
 const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
 class OpenAICostCalculator {
@@ -50,8 +50,8 @@ class OpenAICostCalculator {
                         response: call.result.response,
                     });
                 }
-                if ((0, OpenAITextGenerationModel_js_1.isOpenAITextGenerationModel)(model)) {
-                    return (0, OpenAITextGenerationModel_js_1.calculateOpenAITextGenerationCostInMillicents)({
+                if ((0, OpenAICompletionModel_js_1.isOpenAICompletionModel)(model)) {
+                    return (0, OpenAICompletionModel_js_1.calculateOpenAICompletionCostInMillicents)({
                         model,
                         response: call.result.response,
                     });

package/model-provider/openai/OpenAICostCalculator.js

@@ -1,6 +1,6 @@
 import { calculateOpenAIImageGenerationCostInMillicents, } from "./OpenAIImageGenerationModel.js";
 import { calculateOpenAIEmbeddingCostInMillicents, isOpenAIEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
-import { calculateOpenAITextGenerationCostInMillicents, isOpenAITextGenerationModel, } from "./OpenAITextGenerationModel.js";
+import { calculateOpenAICompletionCostInMillicents, isOpenAICompletionModel, } from "./OpenAICompletionModel.js";
 import { calculateOpenAITranscriptionCostInMillicents, } from "./OpenAITranscriptionModel.js";
 import { calculateOpenAIChatCostInMillicents, isOpenAIChatModel, } from "./chat/OpenAIChatModel.js";
 export class OpenAICostCalculator {
@@ -47,8 +47,8 @@ export class OpenAICostCalculator {
                         response: call.result.response,
                     });
                 }
-                if (isOpenAITextGenerationModel(model)) {
-                    return calculateOpenAITextGenerationCostInMillicents({
+                if (isOpenAICompletionModel(model)) {
+                    return calculateOpenAICompletionCostInMillicents({
                         model,
                         response: call.result.response,
                     });

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

@@ -4,7 +4,7 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/transcribe-speech/TranscriptionModel.js";
+import { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/generate-transcription/TranscriptionModel.js";
 /**
  * @see https://openai.com/pricing
  */

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

@@ -1,6 +1,6 @@
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
-import { OpenAITextGenerationBaseModelType } from "./OpenAITextGenerationModel.js";
+import { OpenAICompletionBaseModelType } from "./OpenAICompletionModel.js";
 import { OpenAIChatBaseModelType } from "./chat/OpenAIChatModel.js";
 /**
  * TikToken tokenizer for OpenAI language models.
@@ -22,7 +22,7 @@ export declare class TikTokenTokenizer implements FullTokenizer {
      * Get a TikToken tokenizer for a specific model or encoding.
      */
     constructor(options: {
-        model: OpenAIChatBaseModelType | OpenAITextGenerationBaseModelType | OpenAITextEmbeddingModelType;
+        model: OpenAIChatBaseModelType | OpenAICompletionBaseModelType | OpenAITextEmbeddingModelType;
     });
     private readonly tiktoken;
     tokenize(text: string): Promise<number[]>;

package/model-provider/openai/index.cjs

@@ -22,7 +22,7 @@ var OpenAIError_js_1 = require("./OpenAIError.cjs");
 Object.defineProperty(exports, "OpenAIError", { enumerable: true, get: function () { return OpenAIError_js_1.OpenAIError; } });
 __exportStar(require("./OpenAIImageGenerationModel.cjs"), exports);
 __exportStar(require("./OpenAITextEmbeddingModel.cjs"), exports);
-__exportStar(require("./OpenAITextGenerationModel.cjs"), exports);
+__exportStar(require("./OpenAICompletionModel.cjs"), exports);
 __exportStar(require("./OpenAITranscriptionModel.cjs"), exports);
 __exportStar(require("./TikTokenTokenizer.cjs"), exports);
 __exportStar(require("./chat/OpenAIChatMessage.cjs"), exports);

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

@@ -4,7 +4,7 @@ export * from "./OpenAICostCalculator.js";
 export { OpenAIError, OpenAIErrorData } from "./OpenAIError.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAITextEmbeddingModel.js";
-export * from "./OpenAITextGenerationModel.js";
+export * from "./OpenAICompletionModel.js";
 export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";

package/model-provider/openai/index.js

@@ -4,7 +4,7 @@ export * from "./OpenAICostCalculator.js";
 export { OpenAIError } from "./OpenAIError.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAITextEmbeddingModel.js";
-export * from "./OpenAITextGenerationModel.js";
+export * from "./OpenAICompletionModel.js";
 export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/model-function/describe-image/ImageDescriptionEvent.d.ts

@@ -1,18 +0,0 @@
-import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
-export interface ImageDescriptionStartedEvent extends BaseModelCallStartedEvent {
-    functionType: "image-description";
-}
-export type ImageDescriptionFinishedEventResult = {
-    status: "success";
-    response: unknown;
-    value: string;
-} | {
-    status: "error";
-    error: unknown;
-} | {
-    status: "abort";
-};
-export interface ImageDescriptionFinishedEvent extends BaseModelCallFinishedEvent {
-    functionType: "image-description";
-    result: ImageDescriptionFinishedEventResult;
-}

package/model-function/describe-image/ImageDescriptionModel.d.ts

@@ -1,10 +0,0 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { Model, ModelSettings } from "../Model.js";
-export interface ImageDescriptionModelSettings extends ModelSettings {
-}
-export interface ImageDescriptionModel<DATA, SETTINGS extends ImageDescriptionModelSettings = ImageDescriptionModelSettings> extends Model<SETTINGS> {
-    doDescribeImage: (data: DATA, options?: FunctionOptions) => PromiseLike<{
-        response: unknown;
-        description: string;
-    }>;
-}

package/model-function/describe-image/describeImage.cjs

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.describeImage = void 0;
-const executeCall_js_1 = require("../executeCall.cjs");
-const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
-/**
- * Describe an image as text.
- *
- * Depending on the model, this can be used for image captioning, for describing the contents of an image, or for OCR.
- */
-function describeImage(model, data, options) {
-    return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeCall_js_1.executeCall)({
-        functionType: "image-description",
-        input: data,
-        model,
-        options,
-        generateResponse: async (options) => {
-            const result = await model.doDescribeImage(data, options);
-            return {
-                response: result.response,
-                extractedValue: result.description,
-            };
-        },
-    }));
-}
-exports.describeImage = describeImage;