modelfusion 0.22.0 → 0.23.0

package/model-function/generate-json/JsonOrTextGenerationModel.d.ts

@@ -0,0 +1,23 @@
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
+import { Model, ModelSettings } from "../Model.js";
+export interface JsonOrTextGenerationModelSettings extends ModelSettings {
+}
+export interface JsonOrTextGenerationPrompt<RESPONSE> {
+    extractJsonAndText(response: RESPONSE): {
+        schema: null;
+        value: null;
+        text: string;
+    } | {
+        schema: string;
+        value: unknown;
+        text: string | null;
+    };
+}
+export interface JsonOrTextGenerationModel<PROMPT, RESPONSE, SETTINGS extends JsonOrTextGenerationModelSettings> extends Model<SETTINGS> {
+    generateJsonResponse(prompt: PROMPT & JsonOrTextGenerationPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
+    extractUsage?(response: RESPONSE): {
+        promptTokens: number;
+        completionTokens: number;
+        totalTokens: number;
+    };
+}

package/model-function/generate-json/JsonTextGenerationModel.cjs

@@ -25,6 +25,9 @@ class JsonTextGenerationModel {
     get settings() {
         return this.model.settings;
     }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
     async generateJsonResponse(prompt, options) {
         return await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt), options);
     }

package/model-function/generate-json/JsonTextGenerationModel.d.ts

@@ -1,7 +1,7 @@
 import { TextGenerationModel, TextGenerationModelSettings } from "../generate-text/TextGenerationModel.js";
 import { SchemaDefinition } from "./SchemaDefinition.js";
 import { InstructionWithSchema } from "./InstructionWithSchemaPrompt.js";
-import { GenerateJsonModel } from "./GenerateJsonModel.js";
+import { JsonGenerationModel } from "./JsonGenerationModel.js";
 import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 export type JsonTextPromptFormat = {
     createPrompt: (prompt: {
@@ -10,7 +10,7 @@ export type JsonTextPromptFormat = {
     }) => string;
     extractJson: (response: string) => unknown;
 };
-export declare class JsonTextGenerationModel<SETTINGS extends TextGenerationModelSettings, MODEL extends TextGenerationModel<string, any, any, SETTINGS>> implements GenerateJsonModel<InstructionWithSchema<string, unknown>, string, SETTINGS> {
+export declare class JsonTextGenerationModel<MODEL extends TextGenerationModel<string, any, any, TextGenerationModelSettings>> implements JsonGenerationModel<InstructionWithSchema<string, unknown>, string, MODEL["settings"]> {
     private readonly model;
     private readonly format;
     constructor({ model, format, }: {
@@ -18,8 +18,9 @@ export declare class JsonTextGenerationModel<SETTINGS extends TextGenerationMode
         format: JsonTextPromptFormat;
     });
     get modelInformation(): import("../ModelInformation.js").ModelInformation;
-    get settings(): SETTINGS;
-    generateJsonResponse(prompt: InstructionWithSchema<string, unknown>, options?: ModelFunctionOptions<SETTINGS> | undefined): Promise<string>;
+    get settings(): TextGenerationModelSettings;
+    get settingsForEvent(): Partial<MODEL["settings"]>;
+    generateJsonResponse(prompt: InstructionWithSchema<string, unknown>, options?: ModelFunctionOptions<MODEL["settings"]> | undefined): Promise<string>;
     extractJson(response: string): unknown;
-    withSettings(additionalSettings: Partial<SETTINGS>): this;
+    withSettings(additionalSettings: Partial<MODEL["settings"]>): this;
 }

package/model-function/generate-json/JsonTextGenerationModel.js

@@ -22,6 +22,9 @@ export class JsonTextGenerationModel {
     get settings() {
         return this.model.settings;
     }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
     async generateJsonResponse(prompt, options) {
         return await generateText(this.model, this.format.createPrompt(prompt), options);
     }

package/model-function/generate-json/generateJson.cjs

@@ -23,6 +23,7 @@ function generateJson(model, schemaDefinition, prompt, options) {
             }
             return parseResult.data;
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }
 exports.generateJson = generateJson;

package/model-function/generate-json/generateJson.d.ts

@@ -1,5 +1,5 @@
 import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
-import { GenerateJsonModel, GenerateJsonModelSettings } from "./GenerateJsonModel.js";
+import { JsonGenerationModel, JsonGenerationModelSettings } from "./JsonGenerationModel.js";
 import { SchemaDefinition } from "./SchemaDefinition.js";
-export declare function generateJson<STRUCTURE, PROMPT, RESPONSE, NAME extends string, SETTINGS extends GenerateJsonModelSettings>(model: GenerateJsonModel<PROMPT, RESPONSE, SETTINGS>, schemaDefinition: SchemaDefinition<NAME, STRUCTURE>, prompt: (schemaDefinition: SchemaDefinition<NAME, STRUCTURE>) => PROMPT, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<GenerateJsonModel<PROMPT, RESPONSE, SETTINGS>, STRUCTURE, RESPONSE>;
+export declare function generateJson<STRUCTURE, PROMPT, RESPONSE, NAME extends string, SETTINGS extends JsonGenerationModelSettings>(model: JsonGenerationModel<PROMPT, RESPONSE, SETTINGS>, schemaDefinition: SchemaDefinition<NAME, STRUCTURE>, prompt: (schemaDefinition: SchemaDefinition<NAME, STRUCTURE>) => PROMPT, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<STRUCTURE, RESPONSE>;

package/model-function/generate-json/generateJson.js

@@ -20,5 +20,6 @@ export function generateJson(model, schemaDefinition, prompt, options) {
             }
             return parseResult.data;
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }

package/model-function/generate-json/generateJsonOrText.cjs

@@ -36,6 +36,7 @@ function generateJsonOrText(model, schemaDefinitions, prompt, options) {
                 text: text, // text is string | null, which is part of the response for schema values
             };
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }
 exports.generateJsonOrText = generateJsonOrText;

package/model-function/generate-json/generateJsonOrText.d.ts

@@ -1,6 +1,6 @@
 import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
-import { GenerateJsonOrTextModel, GenerateJsonOrTextModelSettings, GenerateJsonOrTextPrompt } from "./GenerateJsonOrTextModel.js";
+import { JsonOrTextGenerationModel, JsonOrTextGenerationModelSettings, JsonOrTextGenerationPrompt } from "./JsonOrTextGenerationModel.js";
 import { SchemaDefinition } from "./SchemaDefinition.js";
 type SchemaDefinitionArray<T extends SchemaDefinition<any, any>[]> = T;
 type ToSchemaDefinitionsMap<T extends SchemaDefinitionArray<SchemaDefinition<any, any>[]>> = {
@@ -14,7 +14,7 @@ type ToSchemaUnion<T> = {
     } : never;
 }[keyof T];
 type ToOutputValue<SCHEMAS extends SchemaDefinitionArray<SchemaDefinition<any, any>[]>> = ToSchemaUnion<ToSchemaDefinitionsMap<SCHEMAS>>;
-export declare function generateJsonOrText<SCHEMAS extends SchemaDefinition<any, any>[], PROMPT, RESPONSE, SETTINGS extends GenerateJsonOrTextModelSettings>(model: GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS>, schemaDefinitions: SCHEMAS, prompt: (schemaDefinitions: SCHEMAS) => PROMPT & GenerateJsonOrTextPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS>, {
+export declare function generateJsonOrText<SCHEMAS extends SchemaDefinition<any, any>[], PROMPT, RESPONSE, SETTINGS extends JsonOrTextGenerationModelSettings>(model: JsonOrTextGenerationModel<PROMPT, RESPONSE, SETTINGS>, schemaDefinitions: SCHEMAS, prompt: (schemaDefinitions: SCHEMAS) => PROMPT & JsonOrTextGenerationPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<{
     schema: null;
     value: null;
     text: string;

package/model-function/generate-json/generateJsonOrText.js

@@ -33,5 +33,6 @@ export function generateJsonOrText(model, schemaDefinitions, prompt, options) {
                 text: text, // text is string | null, which is part of the response for schema values
             };
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }

package/model-function/generate-text/TextGenerationEvent.d.ts

@@ -1,12 +1,16 @@
 import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
 export interface TextGenerationStartedEvent extends BaseModelCallStartedEvent {
     functionType: "text-generation";
-    prompt: unknown;
 }
 export type TextGenerationFinishedEventResult = {
     status: "success";
     response: unknown;
     output: string;
+    usage?: {
+        promptTokens: number;
+        completionTokens: number;
+        totalTokens: number;
+    };
 } | {
     status: "error";
     error: unknown;
@@ -15,6 +19,5 @@ export type TextGenerationFinishedEventResult = {
 };
 export interface TextGenerationFinishedEvent extends BaseModelCallFinishedEvent {
     functionType: "text-generation";
-    prompt: unknown;
     result: TextGenerationFinishedEventResult;
 }

package/model-function/generate-text/TextGenerationModel.d.ts

@@ -38,5 +38,10 @@ export interface TextGenerationModel<PROMPT, RESPONSE, FULL_DELTA, SETTINGS exte
      * Optional. Implement for streaming support.
      */
     readonly extractTextDelta: ((fullDelta: FULL_DELTA) => string | undefined) | undefined;
+    extractUsage?(response: RESPONSE): {
+        promptTokens: number;
+        completionTokens: number;
+        totalTokens: number;
+    };
     withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, PROMPT>): PromptFormatTextGenerationModel<INPUT_PROMPT, PROMPT, RESPONSE, FULL_DELTA, SETTINGS, this>;
 }

package/model-function/generate-text/generateText.cjs

@@ -29,6 +29,7 @@ model, prompt, options) {
                 ? model.extractText(result).trim()
                 : model.extractText(result);
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }
 exports.generateText = generateText;

package/model-function/generate-text/generateText.d.ts

@@ -13,4 +13,4 @@ import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerati
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-export declare function generateText<PROMPT, RESPONSE, SETTINGS extends TextGenerationModelSettings>(model: TextGenerationModel<PROMPT, RESPONSE, any, SETTINGS>, prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<TextGenerationModel<PROMPT, RESPONSE, any, SETTINGS>, string, RESPONSE>;
+export declare function generateText<PROMPT, RESPONSE, SETTINGS extends TextGenerationModelSettings>(model: TextGenerationModel<PROMPT, RESPONSE, any, SETTINGS>, prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<string, RESPONSE>;

package/model-function/generate-text/generateText.js

@@ -26,5 +26,6 @@ model, prompt, options) {
                 ? model.extractText(result).trim()
                 : model.extractText(result);
         },
+        extractUsage: (result) => model.extractUsage?.(result),
     });
 }

package/model-function/generate-text/streamText.cjs

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamText = exports.StreamTextPromise = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../../core/FunctionEventSource.cjs");
+const GlobalFunctionLogging_js_1 = require("../../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../../core/GlobalFunctionObservers.cjs");
+const getFunctionCallLogger_js_1 = require("../../core/getFunctionCallLogger.cjs");
 const DurationMeasurement_js_1 = require("../../util/DurationMeasurement.cjs");
 const AbortError_js_1 = require("../../util/api/AbortError.cjs");
 const runSafe_js_1 = require("../../util/runSafe.cjs");
@@ -59,6 +61,7 @@ async function doStreamText(model, prompt, options) {
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
             ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
             ...(settings.observers ?? []),
             ...(run?.observers ?? []),
@@ -68,21 +71,21 @@ async function doStreamText(model, prompt, options) {
     });
     const durationMeasurement = (0, DurationMeasurement_js_1.startDurationMeasurement)();
     const startMetadata = {
+        functionType: "text-streaming",
         callId: `call-${(0, nanoid_1.nanoid)()}`,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
         functionId: options?.functionId,
         model: model.modelInformation,
-        functionType: "text-streaming",
+        settings: model.settingsForEvent,
         input: prompt,
-        settings,
         timestamp: durationMeasurement.startDate,
         startTimestamp: durationMeasurement.startDate,
     };
     eventSource.notify({
-        ...startMetadata,
         eventType: "started",
+        ...startMetadata,
     });
     const result = await (0, runSafe_js_1.runSafe)(async () => (0, extractTextDeltas_js_1.extractTextDeltas)({
         deltaIterable: await model.generateDeltaStreamResponse(prompt, {
@@ -93,8 +96,8 @@ async function doStreamText(model, prompt, options) {
         extractDelta: (fullDelta) => model.extractTextDelta(fullDelta),
         onDone: (fullText, lastFullDelta) => {
             const finishMetadata = {
-                ...startMetadata,
                 eventType: "finished",
+                ...startMetadata,
                 finishTimestamp: new Date(),
                 durationInMs: durationMeasurement.durationInMs,
             };
@@ -109,8 +112,8 @@ async function doStreamText(model, prompt, options) {
         },
         onError: (error) => {
             const finishMetadata = {
-                ...startMetadata,
                 eventType: "finished",
+                ...startMetadata,
                 finishTimestamp: new Date(),
                 durationInMs: durationMeasurement.durationInMs,
             };
@@ -132,8 +135,8 @@ async function doStreamText(model, prompt, options) {
     }));
     if (!result.ok) {
         const finishMetadata = {
-            ...startMetadata,
             eventType: "finished",
+            ...startMetadata,
             finishTimestamp: new Date(),
             durationInMs: durationMeasurement.durationInMs,
         };

package/model-function/generate-text/streamText.d.ts

@@ -1,17 +1,17 @@
 import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
-import { CallMetadata } from "../executeCall.js";
+import { ModelCallMetadata } from "../executeCall.js";
 import { DeltaEvent } from "./DeltaEvent.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
-export declare class StreamTextPromise<PROMPT, FULL_DELTA, SETTINGS extends TextGenerationModelSettings> extends Promise<AsyncIterable<string>> {
+export declare class StreamTextPromise extends Promise<AsyncIterable<string>> {
     private fullPromise;
     private outputPromise;
     constructor(fullPromise: Promise<{
         output: AsyncIterable<string>;
-        metadata: Omit<CallMetadata<TextGenerationModel<PROMPT, unknown, FULL_DELTA, SETTINGS>>, "durationInMs" | "finishTimestamp">;
+        metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
     }>);
     asFullResponse(): Promise<{
         output: AsyncIterable<string>;
-        metadata: Omit<CallMetadata<TextGenerationModel<PROMPT, unknown, FULL_DELTA, SETTINGS>>, "durationInMs" | "finishTimestamp">;
+        metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
     }>;
     then<TResult1 = AsyncIterable<string>, TResult2 = never>(onfulfilled?: ((value: AsyncIterable<string>) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
     catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<AsyncIterable<string> | TResult>;
@@ -20,4 +20,4 @@ export declare class StreamTextPromise<PROMPT, FULL_DELTA, SETTINGS extends Text
 export declare function streamText<PROMPT, FULL_DELTA, SETTINGS extends TextGenerationModelSettings>(model: TextGenerationModel<PROMPT, unknown, FULL_DELTA, SETTINGS> & {
     generateDeltaStreamResponse: (prompt: PROMPT, options: ModelFunctionOptions<SETTINGS>) => PromiseLike<AsyncIterable<DeltaEvent<FULL_DELTA>>>;
     extractTextDelta: (fullDelta: FULL_DELTA) => string | undefined;
-}, prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): StreamTextPromise<PROMPT, FULL_DELTA, SETTINGS>;
+}, prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): StreamTextPromise;

package/model-function/generate-text/streamText.js

@@ -1,6 +1,8 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../../core/FunctionEventSource.js";
+import { getGlobalFunctionLogging } from "../../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../../core/GlobalFunctionObservers.js";
+import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
 import { AbortError } from "../../util/api/AbortError.js";
 import { runSafe } from "../../util/runSafe.js";
@@ -54,6 +56,7 @@ async function doStreamText(model, prompt, options) {
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
+            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
             ...getGlobalFunctionObservers(),
             ...(settings.observers ?? []),
             ...(run?.observers ?? []),
@@ -63,21 +66,21 @@ async function doStreamText(model, prompt, options) {
     });
     const durationMeasurement = startDurationMeasurement();
     const startMetadata = {
+        functionType: "text-streaming",
         callId: `call-${createId()}`,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
         functionId: options?.functionId,
         model: model.modelInformation,
-        functionType: "text-streaming",
+        settings: model.settingsForEvent,
         input: prompt,
-        settings,
         timestamp: durationMeasurement.startDate,
         startTimestamp: durationMeasurement.startDate,
     };
     eventSource.notify({
-        ...startMetadata,
         eventType: "started",
+        ...startMetadata,
     });
     const result = await runSafe(async () => extractTextDeltas({
         deltaIterable: await model.generateDeltaStreamResponse(prompt, {
@@ -88,8 +91,8 @@ async function doStreamText(model, prompt, options) {
         extractDelta: (fullDelta) => model.extractTextDelta(fullDelta),
         onDone: (fullText, lastFullDelta) => {
             const finishMetadata = {
-                ...startMetadata,
                 eventType: "finished",
+                ...startMetadata,
                 finishTimestamp: new Date(),
                 durationInMs: durationMeasurement.durationInMs,
             };
@@ -104,8 +107,8 @@ async function doStreamText(model, prompt, options) {
         },
         onError: (error) => {
             const finishMetadata = {
-                ...startMetadata,
                 eventType: "finished",
+                ...startMetadata,
                 finishTimestamp: new Date(),
                 durationInMs: durationMeasurement.durationInMs,
             };
@@ -127,8 +130,8 @@ async function doStreamText(model, prompt, options) {
     }));
     if (!result.ok) {
         const finishMetadata = {
-            ...startMetadata,
             eventType: "finished",
+            ...startMetadata,
             finishTimestamp: new Date(),
             durationInMs: durationMeasurement.durationInMs,
         };

package/model-function/index.cjs

@@ -25,10 +25,10 @@ __exportStar(require("./embed-text/embedText.cjs"), exports);
 __exportStar(require("./generate-image/ImageGenerationEvent.cjs"), exports);
 __exportStar(require("./generate-image/ImageGenerationModel.cjs"), exports);
 __exportStar(require("./generate-image/generateImage.cjs"), exports);
-__exportStar(require("./generate-json/GenerateJsonModel.cjs"), exports);
-__exportStar(require("./generate-json/GenerateJsonOrTextModel.cjs"), exports);
 __exportStar(require("./generate-json/InstructionWithSchemaPrompt.cjs"), exports);
 __exportStar(require("./generate-json/JsonGenerationEvent.cjs"), exports);
+__exportStar(require("./generate-json/JsonGenerationModel.cjs"), exports);
+__exportStar(require("./generate-json/JsonOrTextGenerationModel.cjs"), exports);
 __exportStar(require("./generate-json/JsonTextGenerationModel.cjs"), exports);
 __exportStar(require("./generate-json/NoSuchSchemaError.cjs"), exports);
 __exportStar(require("./generate-json/SchemaDefinition.cjs"), exports);
@@ -39,6 +39,7 @@ __exportStar(require("./generate-text/DeltaEvent.cjs"), exports);
 __exportStar(require("./generate-text/TextDeltaEventSource.cjs"), exports);
 __exportStar(require("./generate-text/TextGenerationEvent.cjs"), exports);
 __exportStar(require("./generate-text/TextGenerationModel.cjs"), exports);
+__exportStar(require("./generate-text/TextStreamingEvent.cjs"), exports);
 __exportStar(require("./generate-text/generateText.cjs"), exports);
 __exportStar(require("./generate-text/streamText.cjs"), exports);
 __exportStar(require("./synthesize-speech/SpeechSynthesisEvent.cjs"), exports);

package/model-function/index.d.ts

@@ -9,10 +9,10 @@ export * from "./embed-text/embedText.js";
 export * from "./generate-image/ImageGenerationEvent.js";
 export * from "./generate-image/ImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
-export * from "./generate-json/GenerateJsonModel.js";
-export * from "./generate-json/GenerateJsonOrTextModel.js";
 export * from "./generate-json/InstructionWithSchemaPrompt.js";
 export * from "./generate-json/JsonGenerationEvent.js";
+export * from "./generate-json/JsonGenerationModel.js";
+export * from "./generate-json/JsonOrTextGenerationModel.js";
 export * from "./generate-json/JsonTextGenerationModel.js";
 export * from "./generate-json/NoSuchSchemaError.js";
 export * from "./generate-json/SchemaDefinition.js";
@@ -23,6 +23,7 @@ export * from "./generate-text/DeltaEvent.js";
 export * from "./generate-text/TextDeltaEventSource.js";
 export * from "./generate-text/TextGenerationEvent.js";
 export * from "./generate-text/TextGenerationModel.js";
+export * from "./generate-text/TextStreamingEvent.js";
 export * from "./generate-text/generateText.js";
 export * from "./generate-text/streamText.js";
 export * from "./synthesize-speech/SpeechSynthesisEvent.js";

package/model-function/index.js

@@ -9,10 +9,10 @@ export * from "./embed-text/embedText.js";
 export * from "./generate-image/ImageGenerationEvent.js";
 export * from "./generate-image/ImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
-export * from "./generate-json/GenerateJsonModel.js";
-export * from "./generate-json/GenerateJsonOrTextModel.js";
 export * from "./generate-json/InstructionWithSchemaPrompt.js";
 export * from "./generate-json/JsonGenerationEvent.js";
+export * from "./generate-json/JsonGenerationModel.js";
+export * from "./generate-json/JsonOrTextGenerationModel.js";
 export * from "./generate-json/JsonTextGenerationModel.js";
 export * from "./generate-json/NoSuchSchemaError.js";
 export * from "./generate-json/SchemaDefinition.js";
@@ -23,6 +23,7 @@ export * from "./generate-text/DeltaEvent.js";
 export * from "./generate-text/TextDeltaEventSource.js";
 export * from "./generate-text/TextGenerationEvent.js";
 export * from "./generate-text/TextGenerationModel.js";
+export * from "./generate-text/TextStreamingEvent.js";
 export * from "./generate-text/generateText.js";
 export * from "./generate-text/streamText.js";
 export * from "./synthesize-speech/SpeechSynthesisEvent.js";

package/model-function/synthesize-speech/SpeechSynthesisEvent.d.ts

@@ -2,7 +2,7 @@
 import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
 export interface SpeechSynthesisStartedEvent extends BaseModelCallStartedEvent {
     functionType: "speech-synthesis";
-    text: string;
+    input: string;
 }
 export type SpeechSynthesisFinishedEventResult = {
     status: "success";
@@ -16,6 +16,6 @@ export type SpeechSynthesisFinishedEventResult = {
 };
 export interface SpeechSynthesisFinishedEvent extends BaseModelCallFinishedEvent {
     functionType: "speech-synthesis";
-    text: string;
+    input: string;
     result: SpeechSynthesisFinishedEventResult;
 }

package/model-function/synthesize-speech/SpeechSynthesisModel.d.ts

@@ -3,7 +3,7 @@ import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface SpeechSynthesisModelSettings extends ModelSettings {
 }
-export interface SpeechSynthesisModel<SETTINGS> extends Model<SETTINGS> {
+export interface SpeechSynthesisModel<SETTINGS extends SpeechSynthesisModelSettings> extends Model<SETTINGS> {
     /**
      * Generates an mp3 audio buffer that contains the speech for the given text.
      */

package/model-function/synthesize-speech/synthesizeSpeech.d.ts

@@ -5,4 +5,4 @@ import { SpeechSynthesisModel, SpeechSynthesisModelSettings } from "./SpeechSynt
 /**
  * Synthesizes speech from text.
  */
-export declare function synthesizeSpeech<SETTINGS extends SpeechSynthesisModelSettings>(model: SpeechSynthesisModel<SETTINGS>, text: string, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<SpeechSynthesisModel<SETTINGS>, Buffer, Buffer>;
+export declare function synthesizeSpeech<SETTINGS extends SpeechSynthesisModelSettings>(model: SpeechSynthesisModel<SETTINGS>, text: string, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<Buffer, Buffer>;

package/model-function/transcribe-speech/TranscriptionModel.d.ts

@@ -2,7 +2,7 @@ import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface TranscriptionModelSettings extends ModelSettings {
 }
-export interface TranscriptionModel<DATA, RESPONSE, SETTINGS> extends Model<SETTINGS> {
+export interface TranscriptionModel<DATA, RESPONSE, SETTINGS extends TranscriptionModelSettings> extends Model<SETTINGS> {
     generateTranscriptionResponse: (data: DATA, options?: ModelFunctionOptions<SETTINGS>) => PromiseLike<RESPONSE>;
     extractTranscriptionText: (response: RESPONSE) => string;
 }

package/model-function/transcribe-speech/transcribe.d.ts

@@ -15,4 +15,4 @@ import { TranscriptionModel, TranscriptionModelSettings } from "./TranscriptionM
  *   }
  * );
  */
-export declare function transcribe<DATA, RESPONSE, SETTINGS extends TranscriptionModelSettings>(model: TranscriptionModel<DATA, RESPONSE, SETTINGS>, data: DATA, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<TranscriptionModel<DATA, RESPONSE, SETTINGS>, string, RESPONSE>;
+export declare function transcribe<DATA, RESPONSE, SETTINGS extends TranscriptionModelSettings>(model: TranscriptionModel<DATA, RESPONSE, SETTINGS>, data: DATA, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<string, RESPONSE>;

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -38,6 +38,15 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
             call: async () => callAutomatic1111ImageGenerationAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        return {
+            baseUrl: this.settings.baseUrl,
+            height: this.settings.height,
+            width: this.settings.width,
+            sampler: this.settings.sampler,
+            steps: this.settings.steps,
+        };
+    }
     generateImageResponse(prompt, options) {
         return this.callAPI(prompt, options);
     }

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -14,6 +14,7 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     readonly provider: "Automatic1111";
     get modelName(): string;
     callAPI(input: A111ImageGenerationPrompt, options?: ModelFunctionOptions<Automatic1111ImageGenerationModelSettings>): Promise<Automatic1111ImageGenerationResponse>;
+    get settingsForEvent(): Partial<Automatic1111ImageGenerationModelSettings>;
     generateImageResponse(prompt: A111ImageGenerationPrompt, options?: ModelFunctionOptions<Automatic1111ImageGenerationModelSettings>): Promise<{
         images: string[];
         parameters: {};

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -35,6 +35,15 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
             call: async () => callAutomatic1111ImageGenerationAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        return {
+            baseUrl: this.settings.baseUrl,
+            height: this.settings.height,
+            width: this.settings.width,
+            sampler: this.settings.sampler,
+            steps: this.settings.steps,
+        };
+    }
     generateImageResponse(prompt, options) {
         return this.callAPI(prompt, options);
     }

package/model-provider/cohere/CohereTextEmbeddingModel.cjs

@@ -120,6 +120,12 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
             call: async () => callCohereEmbeddingAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        return {
+            baseUrl: this.settings.baseUrl,
+            truncate: this.settings.truncate,
+        };
+    }
     generateEmbeddingResponse(texts, options) {
         return this.callAPI(texts, options);
     }

package/model-provider/cohere/CohereTextEmbeddingModel.d.ts

@@ -62,6 +62,7 @@ export declare class CohereTextEmbeddingModel extends AbstractModel<CohereTextEm
     detokenize(tokens: number[]): Promise<string>;
     private get apiKey();
     callAPI(texts: Array<string>, options?: ModelFunctionOptions<CohereTextEmbeddingModelSettings>): Promise<CohereTextEmbeddingResponse>;
+    get settingsForEvent(): Partial<CohereTextEmbeddingModelSettings>;
     generateEmbeddingResponse(texts: string[], options?: ModelFunctionOptions<CohereTextEmbeddingModelSettings>): Promise<{
         id: string;
         meta: {

package/model-provider/cohere/CohereTextEmbeddingModel.js

@@ -114,6 +114,12 @@ export class CohereTextEmbeddingModel extends AbstractModel {
             call: async () => callCohereEmbeddingAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        return {
+            baseUrl: this.settings.baseUrl,
+            truncate: this.settings.truncate,
+        };
+    }
     generateEmbeddingResponse(texts, options) {
         return this.callAPI(texts, options);
     }

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -102,6 +102,8 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             // to exclude stop tokens from the generated text
             endSequences: combinedSettings.stopSequences,
             maxTokens: combinedSettings.maxCompletionTokens,
+            // mapped name because of conflict with stopSequences:
+            stopSequences: combinedSettings.cohereStopSequences,
             abortSignal: run?.abortSignal,
             prompt,
             responseFormat,
@@ -112,6 +114,24 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             call: async () => callCohereTextGenerationAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        const eventSettingProperties = [
+            "maxCompletionTokens",
+            "stopSequences",
+            "baseUrl",
+            "numGenerations",
+            "temperature",
+            "k",
+            "p",
+            "frequencyPenalty",
+            "presencePenalty",
+            "returnLikelihoods",
+            "logitBias",
+            "truncate",
+            "cohereStopSequences",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+    }
     generateTextResponse(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -40,10 +40,10 @@ export interface CohereTextGenerationModelSettings extends TextGenerationModelSe
     p?: number;
     frequencyPenalty?: number;
     presencePenalty?: number;
-    stopSequences?: string[];
     returnLikelihoods?: "GENERATION" | "ALL" | "NONE";
     logitBias?: Record<string, number>;
     truncate?: "NONE" | "START" | "END";
+    cohereStopSequences?: string[];
 }
 /**
  * Create a text generation model that calls the Cohere Co.Generate API.
@@ -73,6 +73,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     callAPI<RESPONSE>(prompt: string, options: {
         responseFormat: CohereTextGenerationResponseFormatType<RESPONSE>;
     } & ModelFunctionOptions<CohereTextGenerationModelSettings>): Promise<RESPONSE>;
+    get settingsForEvent(): Partial<CohereTextGenerationModelSettings>;
     generateTextResponse(prompt: string, options?: ModelFunctionOptions<CohereTextGenerationModelSettings>): Promise<{
         prompt: string;
         id: string;