modelfusion 0.20.1 → 0.21.0

package/model-function/generate-image/generateImage.cjs

@@ -24,30 +24,27 @@ function generateImage(model, prompt, options) {
         generateResponse: (options) => model.generateImageResponse(prompt, options),
         extractOutputValue: model.extractBase64Image,
         getStartEvent: (metadata, settings) => ({
-            type: "image-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "image-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "image-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "image-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
             response,

package/model-function/generate-image/generateImage.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "./ImageGenerationModel.js";
 /**
@@ -16,4 +16,4 @@ import { ImageGenerationModel, ImageGenerationModelSettings } from "./ImageGener
  *   ]
  * );
  */
-export declare function generateImage<PROMPT, RESPONSE, SETTINGS extends ImageGenerationModelSettings>(model: ImageGenerationModel<PROMPT, RESPONSE, SETTINGS>, prompt: PROMPT, options?: FunctionOptions<SETTINGS>): ModelFunctionPromise<ImageGenerationModel<PROMPT, RESPONSE, SETTINGS>, string, RESPONSE>;
+export declare function generateImage<PROMPT, RESPONSE, SETTINGS extends ImageGenerationModelSettings>(model: ImageGenerationModel<PROMPT, RESPONSE, SETTINGS>, prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<ImageGenerationModel<PROMPT, RESPONSE, SETTINGS>, string, RESPONSE>;

package/model-function/generate-image/generateImage.js

@@ -21,30 +21,27 @@ export function generateImage(model, prompt, options) {
         generateResponse: (options) => model.generateImageResponse(prompt, options),
         extractOutputValue: model.extractBase64Image,
         getStartEvent: (metadata, settings) => ({
-            type: "image-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "image-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "image-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "image-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "image-generation",
             settings,
             prompt,
             response,

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

@@ -1,8 +1,8 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface GenerateJsonModelSettings extends ModelSettings {
 }
 export interface GenerateJsonModel<PROMPT, RESPONSE, SETTINGS extends GenerateJsonModelSettings> extends Model<SETTINGS> {
-    generateJsonResponse(prompt: PROMPT, options?: FunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
+    generateJsonResponse(prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
     extractJson(response: RESPONSE): unknown;
 }

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

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface GenerateJsonOrTextModelSettings extends ModelSettings {
 }
@@ -14,5 +14,5 @@ export interface GenerateJsonOrTextPrompt<RESPONSE> {
     };
 }
 export interface GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS extends GenerateJsonOrTextModelSettings> extends Model<SETTINGS> {
-    generateJsonResponse(prompt: PROMPT & GenerateJsonOrTextPrompt<RESPONSE>, options?: FunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
+    generateJsonResponse(prompt: PROMPT & GenerateJsonOrTextPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
 }

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

@@ -1,13 +1,11 @@
-import { ModelCallFinishedEventMetadata, ModelCallStartedEventMetadata } from "../ModelCallEvent.js";
-export type JsonGenerationStartedEvent = {
-    type: "json-generation-started" | "json-or-text-generation-started";
-    metadata: ModelCallStartedEventMetadata;
+import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
+export type JsonGenerationStartedEvent = BaseModelCallStartedEvent & {
+    functionType: "json-generation" | "json-or-text-generation";
     settings: unknown;
     prompt: unknown;
 };
-export type JsonGenerationFinishedEvent = {
-    type: "json-generation-finished" | "json-or-text-generation-finished";
-    metadata: ModelCallFinishedEventMetadata;
+export type JsonGenerationFinishedEvent = BaseModelCallFinishedEvent & {
+    functionType: "json-generation" | "json-or-text-generation";
     settings: unknown;
     prompt: unknown;
 } & ({
@@ -15,7 +13,7 @@ export type JsonGenerationFinishedEvent = {
     response: unknown;
     generatedJson: unknown;
 } | {
-    status: "failure";
+    status: "error";
     error: unknown;
 } | {
     status: "abort";

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

@@ -2,7 +2,7 @@ import { TextGenerationModel, TextGenerationModelSettings } from "../generate-te
 import { SchemaDefinition } from "./SchemaDefinition.js";
 import { InstructionWithSchema } from "./InstructionWithSchemaPrompt.js";
 import { GenerateJsonModel } from "./GenerateJsonModel.js";
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 export type JsonTextPromptFormat = {
     createPrompt: (prompt: {
         instruction: string;
@@ -19,7 +19,7 @@ export declare class JsonTextGenerationModel<SETTINGS extends TextGenerationMode
     });
     get modelInformation(): import("../ModelInformation.js").ModelInformation;
     get settings(): SETTINGS;
-    generateJsonResponse(prompt: InstructionWithSchema<string, unknown>, options?: FunctionOptions<SETTINGS> | undefined): Promise<string>;
+    generateJsonResponse(prompt: InstructionWithSchema<string, unknown>, options?: ModelFunctionOptions<SETTINGS> | undefined): Promise<string>;
     extractJson(response: string): unknown;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

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

@@ -22,30 +22,27 @@ function generateJson(model, schemaDefinition, prompt, options) {
             return parseResult.data;
         },
         getStartEvent: (metadata, settings) => ({
-            type: "json-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "json-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "json-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "json-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
             response,

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

@@ -1,5 +1,5 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
 import { GenerateJsonModel, GenerateJsonModelSettings } from "./GenerateJsonModel.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?: FunctionOptions<SETTINGS>): ModelFunctionPromise<GenerateJsonModel<PROMPT, RESPONSE, SETTINGS>, STRUCTURE, RESPONSE>;
+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>;

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

@@ -19,30 +19,27 @@ export function generateJson(model, schemaDefinition, prompt, options) {
             return parseResult.data;
         },
         getStartEvent: (metadata, settings) => ({
-            type: "json-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "json-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "json-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "json-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "json-generation",
             settings,
             prompt,
             response,

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

@@ -35,30 +35,27 @@ function generateJsonOrText(model, schemaDefinitions, prompt, options) {
             };
         },
         getStartEvent: (metadata, settings) => ({
-            type: "json-or-text-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "json-or-text-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "json-or-text-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "json-or-text-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
             response,

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

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
 import { GenerateJsonOrTextModel, GenerateJsonOrTextModelSettings, GenerateJsonOrTextPrompt } from "./GenerateJsonOrTextModel.js";
 import { SchemaDefinition } from "./SchemaDefinition.js";
@@ -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?: FunctionOptions<SETTINGS>): ModelFunctionPromise<GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS>, {
+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>, {
     schema: null;
     value: null;
     text: string;

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

@@ -32,30 +32,27 @@ export function generateJsonOrText(model, schemaDefinitions, prompt, options) {
             };
         },
         getStartEvent: (metadata, settings) => ({
-            type: "json-or-text-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "json-or-text-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "json-or-text-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "json-or-text-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "json-or-text-generation",
             settings,
             prompt,
             response,

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

@@ -1,13 +1,11 @@
-import { ModelCallFinishedEventMetadata, ModelCallStartedEventMetadata } from "../ModelCallEvent.js";
-export type TextGenerationStartedEvent = {
-    type: "text-generation-started";
-    metadata: ModelCallStartedEventMetadata;
+import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
+export type TextGenerationStartedEvent = BaseModelCallStartedEvent & {
+    functionType: "text-generation";
     settings: unknown;
     prompt: unknown;
 };
-export type TextGenerationFinishedEvent = {
-    type: "text-generation-finished";
-    metadata: ModelCallFinishedEventMetadata;
+export type TextGenerationFinishedEvent = BaseModelCallFinishedEvent & {
+    functionType: "text-generation";
     settings: unknown;
     prompt: unknown;
 } & ({
@@ -15,7 +13,7 @@ export type TextGenerationFinishedEvent = {
     response: unknown;
     generatedText: string;
 } | {
-    status: "failure";
+    status: "error";
     error: unknown;
 } | {
     status: "abort";

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

@@ -1,6 +1,6 @@
 import { PromptFormat } from "../../prompt/PromptFormat.js";
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 import { BasicTokenizer, FullTokenizer } from "../tokenize-text/Tokenizer.js";
 import { DeltaEvent } from "./DeltaEvent.js";
@@ -28,12 +28,12 @@ export interface TextGenerationModel<PROMPT, RESPONSE, FULL_DELTA, SETTINGS exte
      * Optional. Implement if you have a tokenizer and want to count the number of tokens in a prompt.
      */
     readonly countPromptTokens: ((prompt: PROMPT) => PromiseLike<number>) | undefined;
-    generateTextResponse(prompt: PROMPT, options?: FunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
+    generateTextResponse(prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
     extractText(response: RESPONSE): string;
     /**
      * Optional. Implement for streaming support.
      */
-    readonly generateDeltaStreamResponse: ((prompt: PROMPT, options: FunctionOptions<SETTINGS>) => PromiseLike<AsyncIterable<DeltaEvent<FULL_DELTA>>>) | undefined;
+    readonly generateDeltaStreamResponse: ((prompt: PROMPT, options: ModelFunctionOptions<SETTINGS>) => PromiseLike<AsyncIterable<DeltaEvent<FULL_DELTA>>>) | undefined;
     /**
      * Optional. Implement for streaming support.
      */

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

@@ -1,13 +1,11 @@
-import { ModelCallFinishedEventMetadata, ModelCallStartedEventMetadata } from "../ModelCallEvent.js";
-export type TextStreamingStartedEvent = {
-    type: "text-streaming-started";
-    metadata: ModelCallStartedEventMetadata;
+import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
+export type TextStreamingStartedEvent = BaseModelCallStartedEvent & {
+    functionType: "text-streaming";
     settings: unknown;
     prompt: unknown;
 };
-export type TextStreamingFinishedEvent = {
-    type: "text-streaming-finished";
-    metadata: ModelCallFinishedEventMetadata;
+export type TextStreamingFinishedEvent = BaseModelCallFinishedEvent & {
+    functionType: "text-streaming";
     settings: unknown;
     prompt: unknown;
 } & ({
@@ -15,7 +13,7 @@ export type TextStreamingFinishedEvent = {
     response: unknown;
     generatedText: string;
 } | {
-    status: "failure";
+    status: "error";
     error: unknown;
 } | {
     status: "abort";

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

@@ -28,30 +28,27 @@ model, prompt, options) {
                 : model.extractText(result);
         },
         getStartEvent: (metadata, settings) => ({
-            type: "text-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "text-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "text-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "text-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
             response,

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

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../FunctionOptions.js";
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
 import { ModelFunctionPromise } from "../executeCall.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
 /**
@@ -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?: FunctionOptions<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<TextGenerationModel<PROMPT, RESPONSE, any, SETTINGS>, string, RESPONSE>;

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

@@ -25,30 +25,27 @@ model, prompt, options) {
                 : model.extractText(result);
         },
         getStartEvent: (metadata, settings) => ({
-            type: "text-generation-started",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
         }),
         getAbortEvent: (metadata, settings) => ({
-            type: "text-generation-finished",
-            status: "abort",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
         }),
         getFailureEvent: (metadata, settings, error) => ({
-            type: "text-generation-finished",
-            status: "failure",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
             error,
         }),
         getSuccessEvent: (metadata, settings, response, output) => ({
-            type: "text-generation-finished",
-            status: "success",
-            metadata,
+            ...metadata,
+            functionType: "text-generation",
             settings,
             prompt,
             response,