modelfusion 0.76.0 → 0.78.0

package/README.md

@@ -124,7 +124,7 @@ import { generateSpeech, lmnt } from "modelfusion";
 
 // `speech` is a Buffer with MP3 audio data
 const speech = await generateSpeech(
-  lmnt.Speech({
+  lmnt.SpeechGenerator({
     voice: "034b632b-df71-46c8-b440-86a42ffc3cf3", // Henry
   }),
   "Good evening, ladies and gentlemen! Exciting news on the airwaves tonight " +
@@ -146,7 +146,7 @@ import { streamSpeech, elevenlabs } from "modelfusion";
 const textStream: AsyncIterable<string>;
 
 const speechStream = await streamSpeech(
-  elevenlabs.Speech({
+  elevenlabs.SpeechGenerator({
     model: "eleven_turbo_v2",
     voice: "pNInz6obpgDQGcFmaJgB", // Adam
     optimizeStreamingLatency: 1,
@@ -173,7 +173,7 @@ Transcribe speech (audio) data into text. Also called speech-to-text (STT).
 import { generateTranscription, openai } from "modelfusion";
 
 const transcription = await generateTranscription(
-  openai.Transcription({ model: "whisper-1" }),
+  openai.Transcriber({ model: "whisper-1" }),
   {
     type: "mp3",
     data: await fs.promises.readFile("data/test.mp3"),

package/model-function/generate-speech/generateSpeech.d.ts

@@ -9,7 +9,7 @@ import { SpeechGenerationModel, SpeechGenerationModelSettings } from "./SpeechGe
  *
  * @example
  * const speech = await generateSpeech(
- *   lmnt.Speech(...),
+ *   lmnt.SpeechGenerator(...),
  *   "Good evening, ladies and gentlemen! Exciting news on the airwaves tonight " +
  *    "as The Rolling Stones unveil 'Hackney Diamonds.'
  * );

package/model-function/generate-speech/streamSpeech.d.ts

@@ -12,7 +12,7 @@ import { SpeechGenerationModelSettings, StreamingSpeechGenerationModel } from ".
  * const textStream = await streamText(...);
  *
  * const speechStream = await streamSpeech(
- *   elevenlabs.Speech(...),
+ *   elevenlabs.SpeechGenerator(...),
  *   textStream
  * );
  *

package/model-function/generate-transcription/generateTranscription.d.ts

@@ -10,7 +10,7 @@ import { TranscriptionModel, TranscriptionModelSettings } from "./TranscriptionM
  * const data = await fs.promises.readFile("data/test.mp3");
  *
  * const transcription = await generateTranscription(
- *   openai.Transcription({ model: "whisper-1" }),
+ *   openai.Transcriber({ model: "whisper-1" }),
  *   { type: "mp3", data }
  * );
  *

package/model-provider/elevenlabs/ElevenLabsFacade.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Speech = void 0;
+exports.SpeechGenerator = void 0;
 const ElevenLabsSpeechModel_js_1 = require("./ElevenLabsSpeechModel.cjs");
 /**
  * Synthesize speech using the ElevenLabs Text to Speech API.
@@ -12,7 +12,7 @@ const ElevenLabsSpeechModel_js_1 = require("./ElevenLabsSpeechModel.cjs");
  *
  * @returns A new instance of {@link ElevenLabsSpeechModel}.
  */
-function Speech(settings) {
+function SpeechGenerator(settings) {
     return new ElevenLabsSpeechModel_js_1.ElevenLabsSpeechModel(settings);
 }
-exports.Speech = Speech;
+exports.SpeechGenerator = SpeechGenerator;

package/model-provider/elevenlabs/ElevenLabsFacade.d.ts

@@ -9,4 +9,4 @@ import { ElevenLabsSpeechModel, ElevenLabsSpeechModelSettings } from "./ElevenLa
  *
  * @returns A new instance of {@link ElevenLabsSpeechModel}.
  */
-export declare function Speech(settings: ElevenLabsSpeechModelSettings): ElevenLabsSpeechModel;
+export declare function SpeechGenerator(settings: ElevenLabsSpeechModelSettings): ElevenLabsSpeechModel;

package/model-provider/elevenlabs/ElevenLabsFacade.js

@@ -9,6 +9,6 @@ import { ElevenLabsSpeechModel, } from "./ElevenLabsSpeechModel.js";
  *
  * @returns A new instance of {@link ElevenLabsSpeechModel}.
  */
-export function Speech(settings) {
+export function SpeechGenerator(settings) {
     return new ElevenLabsSpeechModel(settings);
 }

package/model-provider/lmnt/LmntFacade.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Speech = void 0;
+exports.SpeechGenerator = void 0;
 const LmntSpeechModel_js_1 = require("./LmntSpeechModel.cjs");
 /**
  * Synthesize speech using the LMNT API.
@@ -9,7 +9,7 @@ const LmntSpeechModel_js_1 = require("./LmntSpeechModel.cjs");
  *
  * @returns A new instance of {@link LmntSpeechModel}.
  */
-function Speech(settings) {
+function SpeechGenerator(settings) {
     return new LmntSpeechModel_js_1.LmntSpeechModel(settings);
 }
-exports.Speech = Speech;
+exports.SpeechGenerator = SpeechGenerator;

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

@@ -6,4 +6,4 @@ import { LmntSpeechModel, LmntSpeechModelSettings } from "./LmntSpeechModel.js";
  *
  * @returns A new instance of {@link LmntSpeechModel}.
  */
-export declare function Speech(settings: LmntSpeechModelSettings): LmntSpeechModel;
+export declare function SpeechGenerator(settings: LmntSpeechModelSettings): LmntSpeechModel;

package/model-provider/lmnt/LmntFacade.js

@@ -6,6 +6,6 @@ import { LmntSpeechModel } from "./LmntSpeechModel.js";
  *
  * @returns A new instance of {@link LmntSpeechModel}.
  */
-export function Speech(settings) {
+export function SpeechGenerator(settings) {
     return new LmntSpeechModel(settings);
 }

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -97,7 +97,7 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            model: this,
             format: promptFormat,
         });
     }

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -94,7 +94,7 @@ export class OllamaTextGenerationModel extends AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            model: this,
             format: promptFormat,
         });
     }

package/model-provider/openai/OpenAIFacade.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tokenizer = exports.ImageGenerator = exports.Transcription = exports.Speech = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = void 0;
+exports.Tokenizer = exports.ImageGenerator = exports.Transcriber = exports.SpeechGenerator = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = void 0;
 const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
 const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
@@ -82,10 +82,10 @@ exports.TextEmbedder = TextEmbedder;
  *
  * @returns A new instance of {@link OpenAISpeechModel}.
  */
-function Speech(settings) {
+function SpeechGenerator(settings) {
     return new OpenAISpeechModel_js_1.OpenAISpeechModel(settings);
 }
-exports.Speech = Speech;
+exports.SpeechGenerator = SpeechGenerator;
 /**
  * Create a transcription model that calls the OpenAI transcription API.
  *
@@ -95,7 +95,7 @@ exports.Speech = Speech;
  * const data = await fs.promises.readFile("data/test.mp3");
  *
  * const transcription = await transcribe(
- *   openai.Transcription({ model: "whisper-1" }),
+ *   openai.Transcriber({ model: "whisper-1" }),
  *   {
  *     type: "mp3",
  *     data,
@@ -104,10 +104,10 @@ exports.Speech = Speech;
  *
  * @returns A new instance of {@link OpenAITranscriptionModel}.
  */
-function Transcription(settings) {
+function Transcriber(settings) {
     return new OpenAITranscriptionModel_js_1.OpenAITranscriptionModel(settings);
 }
-exports.Transcription = Transcription;
+exports.Transcriber = Transcriber;
 /**
  * Create an image generation model that calls the OpenAI AI image creation API.
  *

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

@@ -70,7 +70,7 @@ export declare function TextEmbedder(settings: OpenAITextEmbeddingModelSettings)
  *
  * @returns A new instance of {@link OpenAISpeechModel}.
  */
-export declare function Speech(settings: OpenAISpeechModelSettings): OpenAISpeechModel;
+export declare function SpeechGenerator(settings: OpenAISpeechModelSettings): OpenAISpeechModel;
 /**
  * Create a transcription model that calls the OpenAI transcription API.
  *
@@ -80,7 +80,7 @@ export declare function Speech(settings: OpenAISpeechModelSettings): OpenAISpeec
  * const data = await fs.promises.readFile("data/test.mp3");
  *
  * const transcription = await transcribe(
- *   openai.Transcription({ model: "whisper-1" }),
+ *   openai.Transcriber({ model: "whisper-1" }),
  *   {
  *     type: "mp3",
  *     data,
@@ -89,7 +89,7 @@ export declare function Speech(settings: OpenAISpeechModelSettings): OpenAISpeec
  *
  * @returns A new instance of {@link OpenAITranscriptionModel}.
  */
-export declare function Transcription(settings: OpenAITranscriptionModelSettings): OpenAITranscriptionModel;
+export declare function Transcriber(settings: OpenAITranscriptionModelSettings): OpenAITranscriptionModel;
 /**
  * Create an image generation model that calls the OpenAI AI image creation API.
  *

package/model-provider/openai/OpenAIFacade.js

@@ -76,7 +76,7 @@ export function TextEmbedder(settings) {
  *
  * @returns A new instance of {@link OpenAISpeechModel}.
  */
-export function Speech(settings) {
+export function SpeechGenerator(settings) {
     return new OpenAISpeechModel(settings);
 }
 /**
@@ -88,7 +88,7 @@ export function Speech(settings) {
  * const data = await fs.promises.readFile("data/test.mp3");
  *
  * const transcription = await transcribe(
- *   openai.Transcription({ model: "whisper-1" }),
+ *   openai.Transcriber({ model: "whisper-1" }),
  *   {
  *     type: "mp3",
  *     data,
@@ -97,7 +97,7 @@ export function Speech(settings) {
  *
  * @returns A new instance of {@link OpenAITranscriptionModel}.
  */
-export function Transcription(settings) {
+export function Transcriber(settings) {
     return new OpenAITranscriptionModel(settings);
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.76.0",
+  "version": "0.78.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/generate-tool-call/index.cjs

@@ -10,24 +10,10 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FunctionListToolCallPromptFormat = void 0;
-exports.FunctionListToolCallPromptFormat = __importStar(require("./FunctionListToolCallPromptFormat.cjs"));
 __exportStar(require("./TextGenerationToolCallModel.cjs"), exports);
 __exportStar(require("./ToolCallGenerationEvent.cjs"), exports);
 __exportStar(require("./ToolCallGenerationModel.cjs"), exports);

package/tool/generate-tool-call/index.d.ts

@@ -1,4 +1,3 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";

package/tool/generate-tool-call/index.js

@@ -1,4 +1,3 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.cjs

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.instruction = exports.text = void 0;
-const nanoid_1 = require("nanoid");
-const zod_1 = require("zod");
-const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-const functionSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
-    function: zod_1.z.string(),
-    parameters: zod_1.z.any(),
-}));
-const DEFAULT_FUNCTION_CALL_PROMPT = [
-    ``,
-    `Select the most suitable function and parameters ` +
-        `from the list of available functions below, based on the user's input. ` +
-        `Provide your response in JSON format.`,
-    ``,
-    `Available functions:`,
-].join("\n");
-function text({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, } = {}) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return (baseFormat?.format(instructionWithFunctionCall) ??
-                // handled by signature overloading:
-                instructionWithFunctionCall); // eslint-disable-line @typescript-eslint/no-explicit-any
-        },
-        extractToolCall(response) {
-            const json = (0, parseJSON_js_1.parseJSON)({ text: response, schema: functionSchema });
-            return {
-                id: (0, nanoid_1.nanoid)(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-exports.text = text;
-function instruction({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, }) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction.instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return baseFormat.format({
-                ...instruction,
-                instruction: instructionWithFunctionCall,
-            });
-        },
-        extractToolCall(response) {
-            const json = (0, parseJSON_js_1.parseJSON)({ text: response, schema: functionSchema });
-            return {
-                id: (0, nanoid_1.nanoid)(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-exports.instruction = instruction;

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.d.ts

@@ -1,14 +0,0 @@
-import { PromptFormat } from "../../model-function/PromptFormat.js";
-import { InstructionPrompt } from "../../model-function/generate-text/prompt-format/InstructionPrompt.js";
-import { ToolCallPromptFormat } from "./TextGenerationToolCallModel.js";
-export declare function text(options?: {
-    functionCallPrompt?: string;
-}): ToolCallPromptFormat<string, string>;
-export declare function text<TARGET_PROMPT>({ functionCallPrompt, baseFormat, }: {
-    functionCallPrompt?: string;
-    baseFormat: PromptFormat<string, TARGET_PROMPT>;
-}): ToolCallPromptFormat<string, TARGET_PROMPT>;
-export declare function instruction<TARGET_PROMPT>({ functionCallPrompt, baseFormat, }: {
-    functionCallPrompt?: string;
-    baseFormat: PromptFormat<InstructionPrompt, TARGET_PROMPT>;
-}): ToolCallPromptFormat<InstructionPrompt, TARGET_PROMPT>;

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.js

@@ -1,65 +0,0 @@
-import { nanoid } from "nanoid";
-import { z } from "zod";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
-const functionSchema = new ZodSchema(z.object({
-    function: z.string(),
-    parameters: z.any(),
-}));
-const DEFAULT_FUNCTION_CALL_PROMPT = [
-    ``,
-    `Select the most suitable function and parameters ` +
-        `from the list of available functions below, based on the user's input. ` +
-        `Provide your response in JSON format.`,
-    ``,
-    `Available functions:`,
-].join("\n");
-export function text({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, } = {}) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return (baseFormat?.format(instructionWithFunctionCall) ??
-                // handled by signature overloading:
-                instructionWithFunctionCall); // eslint-disable-line @typescript-eslint/no-explicit-any
-        },
-        extractToolCall(response) {
-            const json = parseJSON({ text: response, schema: functionSchema });
-            return {
-                id: nanoid(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-export function instruction({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, }) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction.instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return baseFormat.format({
-                ...instruction,
-                instruction: instructionWithFunctionCall,
-            });
-        },
-        extractToolCall(response) {
-            const json = parseJSON({ text: response, schema: functionSchema });
-            return {
-                id: nanoid(),
-                args: json.parameters,
-            };
-        },
-    };
-}