modelfusion 0.7.0 → 0.9.0

package/README.md

@@ -11,7 +11,7 @@
 [Introduction](#introduction) | [Quick Install](#quick-install) | [Usage](#usage-examples) | [Features](#features) | [Integrations](#integrations) | [Documentation](#documentation) | [Examples](#more-examples) | [modelfusion.dev](https://modelfusion.dev)
 
 > [!NOTE]
-> ModelFusion is in its initial development phase. Until version 1.0 there may be breaking changes, because we are still exploring the API design. We welcome your feedback and suggestions.
+> ModelFusion is in its initial development phase. Until version 1.0 there may be breaking changes, because I am still exploring the API design. Feedback and suggestions are welcome.
 
 ## Introduction
 
@@ -106,13 +106,23 @@ const textStream = await streamText(
 ModelFusion model functions return rich results that include the original response and metadata when you set the `fullResponse` option to `true`.
 
 ```ts
-const { text, response, metadata } = await generateText(
+// access the full response and the metadata:
+// the response type is specific to the model that's being used
+const { response, metadata } = await generateText(
   new OpenAITextGenerationModel({
     model: "text-davinci-003",
+    maxTokens: 1000,
+    n: 2, // generate 2 completions
   }),
   "Write a short story about a robot learning to love:\n\n",
   { fullResponse: true }
 );
+
+for (const choice of response.choices) {
+  console.log(choice.text);
+}
+
+console.log(`Duration: ${metadata.durationInMs}ms`);
 ```
 
 ### [Generate JSON](https://modelfusion.dev/guide/function/generate-json)
@@ -437,9 +447,9 @@ Record audio with push-to-talk and transcribe it using Whisper, implemented as a
 
 ### [BabyAGI Agent](https://github.com/lgrammel/modelfusion/tree/main/examples/babyagi-agent)
 
-> _terminal app_, _agent_, _BabyAGI_, _OpenAI text-davinci-003_
+> _terminal app_, _agent_, _BabyAGI_
 
-TypeScript implementation of the classic [BabyAGI](https://github.com/yoheinakajima/babyagi/blob/main/classic/babyagi.py) by [@yoheinakajima](https://twitter.com/yoheinakajima) without embeddings.
+TypeScript implementation of the BabyAGI classic and BabyBeeAGI.
 
 ### [Middle school math agent](https://github.com/lgrammel/modelfusion/tree/main/examples/middle-school-math-agent)
 

package/composed-function/index.cjs

@@ -14,9 +14,6 @@ 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 });
-__exportStar(require("./use-tool/NoSuchToolError.cjs"), exports);
-__exportStar(require("./use-tool/Tool.cjs"), exports);
-__exportStar(require("./use-tool/useTool.cjs"), exports);
 __exportStar(require("./summarize/SummarizationFunction.cjs"), exports);
 __exportStar(require("./summarize/summarizeRecursively.cjs"), exports);
 __exportStar(require("./summarize/summarizeRecursivelyWithTextGenerationAndTokenSplitting.cjs"), exports);

package/composed-function/index.d.ts

@@ -1,6 +1,3 @@
-export * from "./use-tool/NoSuchToolError.js";
-export * from "./use-tool/Tool.js";
-export * from "./use-tool/useTool.js";
 export * from "./summarize/SummarizationFunction.js";
 export * from "./summarize/summarizeRecursively.js";
 export * from "./summarize/summarizeRecursivelyWithTextGenerationAndTokenSplitting.js";

package/composed-function/index.js

@@ -1,6 +1,3 @@
-export * from "./use-tool/NoSuchToolError.js";
-export * from "./use-tool/Tool.js";
-export * from "./use-tool/useTool.js";
 export * from "./summarize/SummarizationFunction.js";
 export * from "./summarize/summarizeRecursively.js";
 export * from "./summarize/summarizeRecursivelyWithTextGenerationAndTokenSplitting.js";

package/index.cjs

@@ -21,5 +21,6 @@ __exportStar(require("./model-provider/index.cjs"), exports);
 __exportStar(require("./prompt/index.cjs"), exports);
 __exportStar(require("./run/index.cjs"), exports);
 __exportStar(require("./text-chunk/index.cjs"), exports);
+__exportStar(require("./tool/index.cjs"), exports);
 __exportStar(require("./util/index.cjs"), exports);
 __exportStar(require("./vector-index/index.cjs"), exports);

package/index.d.ts

@@ -5,5 +5,6 @@ export * from "./model-provider/index.js";
 export * from "./prompt/index.js";
 export * from "./run/index.js";
 export * from "./text-chunk/index.js";
+export * from "./tool/index.js";
 export * from "./util/index.js";
 export * from "./vector-index/index.js";

package/index.js

@@ -5,5 +5,6 @@ export * from "./model-provider/index.js";
 export * from "./prompt/index.js";
 export * from "./run/index.js";
 export * from "./text-chunk/index.js";
+export * from "./tool/index.js";
 export * from "./util/index.js";
 export * from "./vector-index/index.js";

package/model-function/Model.d.ts

@@ -1,7 +1,7 @@
 import { ModelInformation } from "./ModelInformation.js";
-import { ModelCallObserver } from "./ModelCallObserver.js";
+import { RunFunctionObserver } from "../run/RunFunctionObserver.js";
 export interface ModelSettings {
-    observers?: Array<ModelCallObserver>;
+    observers?: Array<RunFunctionObserver>;
 }
 export interface Model<SETTINGS> {
     modelInformation: ModelInformation;

package/model-function/ModelCallEvent.d.ts

@@ -1,4 +1,4 @@
-import { IdMetadata } from "../run/IdMetadata.js";
+import { RunFunctionFinishedEventMetadata, RunFunctionStartedEventMetadata } from "../run/RunFunctionEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
 import { TextEmbeddingFinishedEvent, TextEmbeddingStartedEvent } from "./embed-text/TextEmbeddingEvent.js";
 import { ImageGenerationFinishedEvent, ImageGenerationStartedEvent } from "./generate-image/ImageGenerationEvent.js";
@@ -6,13 +6,11 @@ import { JsonGenerationFinishedEvent, JsonGenerationStartedEvent } from "./gener
 import { TextGenerationFinishedEvent, TextGenerationStartedEvent } from "./generate-text/TextGenerationEvent.js";
 import { TextStreamingFinishedEvent, TextStreamingStartedEvent } from "./generate-text/TextStreamingEvent.js";
 import { TranscriptionFinishedEvent, TranscriptionStartedEvent } from "./transcribe-audio/TranscriptionEvent.js";
-export type ModelCallEvent = ModelCallStartedEvent | ModelCallFinishedEvent;
-export type ModelCallStartedEventMetadata = IdMetadata & {
+export type ModelCallStartedEventMetadata = RunFunctionStartedEventMetadata & {
     model: ModelInformation;
-    startEpochSeconds: number;
 };
 export type ModelCallStartedEvent = ImageGenerationStartedEvent | JsonGenerationStartedEvent | TextEmbeddingStartedEvent | TextGenerationStartedEvent | TextStreamingStartedEvent | TranscriptionStartedEvent;
-export type ModelCallFinishedEventMetadata = ModelCallStartedEventMetadata & {
-    durationInMs: number;
+export type ModelCallFinishedEventMetadata = RunFunctionFinishedEventMetadata & {
+    model: ModelInformation;
 };
 export type ModelCallFinishedEvent = ImageGenerationFinishedEvent | JsonGenerationFinishedEvent | TextEmbeddingFinishedEvent | TextGenerationFinishedEvent | TextStreamingFinishedEvent | TranscriptionFinishedEvent;

package/model-function/SuccessfulModelCall.cjs

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractSuccessfulModelCalls = void 0;
-function extractSuccessfulModelCalls(modelCallEvents) {
-    return modelCallEvents
-        .filter((event) => "status" in event && event.status === "success")
+function extractSuccessfulModelCalls(runFunctionEvents) {
+    return runFunctionEvents
+        .filter((event) => Object.keys(eventTypeToCostType).includes(event.type) &&
+        "status" in event &&
+        event.status === "success")
         .map((event) => ({
         model: event.metadata.model,
         settings: event.settings,
@@ -15,6 +17,7 @@ exports.extractSuccessfulModelCalls = extractSuccessfulModelCalls;
 const eventTypeToCostType = {
     "image-generation-finished": "image-generation",
     "json-generation-finished": "json-generation",
+    "json-or-text-generation-finished": "json-or-text-generation",
     "text-embedding-finished": "text-embedding",
     "text-generation-finished": "text-generation",
     "text-streaming-finished": "text-streaming",

package/model-function/SuccessfulModelCall.d.ts

@@ -1,9 +1,9 @@
-import { ModelCallFinishedEvent, ModelCallStartedEvent } from "./ModelCallEvent.js";
+import { RunFunctionEvent } from "../run/RunFunctionEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
 export type SuccessfulModelCall = {
-    type: "image-generation" | "json-generation" | "text-embedding" | "text-generation" | "text-streaming" | "transcription";
+    type: "image-generation" | "json-generation" | "json-or-text-generation" | "text-embedding" | "text-generation" | "text-streaming" | "transcription";
     model: ModelInformation;
     settings: unknown;
     response: unknown;
 };
-export declare function extractSuccessfulModelCalls(modelCallEvents: (ModelCallFinishedEvent | ModelCallStartedEvent)[]): SuccessfulModelCall[];
+export declare function extractSuccessfulModelCalls(runFunctionEvents: RunFunctionEvent[]): SuccessfulModelCall[];

package/model-function/SuccessfulModelCall.js

@@ -1,6 +1,8 @@
-export function extractSuccessfulModelCalls(modelCallEvents) {
-    return modelCallEvents
-        .filter((event) => "status" in event && event.status === "success")
+export function extractSuccessfulModelCalls(runFunctionEvents) {
+    return runFunctionEvents
+        .filter((event) => Object.keys(eventTypeToCostType).includes(event.type) &&
+        "status" in event &&
+        event.status === "success")
         .map((event) => ({
         model: event.metadata.model,
         settings: event.settings,
@@ -11,6 +13,7 @@ export function extractSuccessfulModelCalls(modelCallEvents) {
 const eventTypeToCostType = {
     "image-generation-finished": "image-generation",
     "json-generation-finished": "json-generation",
+    "json-or-text-generation-finished": "json-or-text-generation",
     "text-embedding-finished": "text-embedding",
     "text-generation-finished": "text-generation",
     "text-streaming-finished": "text-streaming",

package/model-function/executeCall.cjs

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCall = void 0;
 const nanoid_1 = require("nanoid");
+const RunFunctionEventSource_js_1 = require("../run/RunFunctionEventSource.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");
-const ModelCallEventSource_js_1 = require("./ModelCallEventSource.cjs");
 async function executeCall({ model, options, getStartEvent, getAbortEvent, getFailureEvent, getSuccessEvent, generateResponse, extractOutputValue, }) {
     if (options?.settings != null) {
         model = model.withSettings(options.settings);
@@ -16,7 +16,7 @@ async function executeCall({ model, options, getStartEvent, getAbortEvent, getFa
     }
     const run = options?.run;
     const settings = model.settings;
-    const eventSource = new ModelCallEventSource_js_1.ModelCallEventSource({
+    const eventSource = new RunFunctionEventSource_js_1.RunFunctionEventSource({
         observers: [...(settings.observers ?? []), ...(run?.observers ?? [])],
         errorHandler: run?.errorHandler,
     });
@@ -30,7 +30,7 @@ async function executeCall({ model, options, getStartEvent, getAbortEvent, getFa
         model: model.modelInformation,
         startEpochSeconds: durationMeasurement.startEpochSeconds,
     };
-    eventSource.notifyModelCallStarted(getStartEvent(startMetadata, settings));
+    eventSource.notifyRunFunctionStarted(getStartEvent(startMetadata, settings));
     const result = await (0, runSafe_js_1.runSafe)(() => generateResponse({
         functionId: options?.functionId,
         settings,
@@ -42,15 +42,15 @@ async function executeCall({ model, options, getStartEvent, getAbortEvent, getFa
     };
     if (!result.ok) {
         if (result.isAborted) {
-            eventSource.notifyModelCallFinished(getAbortEvent(finishMetadata, settings));
+            eventSource.notifyRunFunctionFinished(getAbortEvent(finishMetadata, settings));
             throw new AbortError_js_1.AbortError();
         }
-        eventSource.notifyModelCallFinished(getFailureEvent(finishMetadata, settings, result.error));
+        eventSource.notifyRunFunctionFinished(getFailureEvent(finishMetadata, settings, result.error));
         throw result.error;
     }
     const response = result.output;
     const output = extractOutputValue(response);
-    eventSource.notifyModelCallFinished(getSuccessEvent(finishMetadata, settings, response, output));
+    eventSource.notifyRunFunctionFinished(getSuccessEvent(finishMetadata, settings, response, output));
     return {
         output,
         response,

package/model-function/executeCall.js

@@ -1,8 +1,8 @@
 import { nanoid as createId } from "nanoid";
+import { RunFunctionEventSource } from "../run/RunFunctionEventSource.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { AbortError } from "../util/api/AbortError.js";
 import { runSafe } from "../util/runSafe.js";
-import { ModelCallEventSource } from "./ModelCallEventSource.js";
 export async function executeCall({ model, options, getStartEvent, getAbortEvent, getFailureEvent, getSuccessEvent, generateResponse, extractOutputValue, }) {
     if (options?.settings != null) {
         model = model.withSettings(options.settings);
@@ -13,7 +13,7 @@ export async function executeCall({ model, options, getStartEvent, getAbortEvent
     }
     const run = options?.run;
     const settings = model.settings;
-    const eventSource = new ModelCallEventSource({
+    const eventSource = new RunFunctionEventSource({
         observers: [...(settings.observers ?? []), ...(run?.observers ?? [])],
         errorHandler: run?.errorHandler,
     });
@@ -27,7 +27,7 @@ export async function executeCall({ model, options, getStartEvent, getAbortEvent
         model: model.modelInformation,
         startEpochSeconds: durationMeasurement.startEpochSeconds,
     };
-    eventSource.notifyModelCallStarted(getStartEvent(startMetadata, settings));
+    eventSource.notifyRunFunctionStarted(getStartEvent(startMetadata, settings));
     const result = await runSafe(() => generateResponse({
         functionId: options?.functionId,
         settings,
@@ -39,15 +39,15 @@ export async function executeCall({ model, options, getStartEvent, getAbortEvent
     };
     if (!result.ok) {
         if (result.isAborted) {
-            eventSource.notifyModelCallFinished(getAbortEvent(finishMetadata, settings));
+            eventSource.notifyRunFunctionFinished(getAbortEvent(finishMetadata, settings));
             throw new AbortError();
         }
-        eventSource.notifyModelCallFinished(getFailureEvent(finishMetadata, settings, result.error));
+        eventSource.notifyRunFunctionFinished(getFailureEvent(finishMetadata, settings, result.error));
         throw result.error;
     }
     const response = result.output;
     const output = extractOutputValue(response);
-    eventSource.notifyModelCallFinished(getSuccessEvent(finishMetadata, settings, response, output));
+    eventSource.notifyRunFunctionFinished(getSuccessEvent(finishMetadata, settings, response, output));
     return {
         output,
         response,

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

@@ -1,12 +1,12 @@
 import { ModelCallFinishedEventMetadata, ModelCallStartedEventMetadata } from "../ModelCallEvent.js";
 export type JsonGenerationStartedEvent = {
-    type: "json-generation-started";
+    type: "json-generation-started" | "json-or-text-generation-started";
     metadata: ModelCallStartedEventMetadata;
     settings: unknown;
     prompt: unknown;
 };
 export type JsonGenerationFinishedEvent = {
-    type: "json-generation-finished";
+    type: "json-generation-finished" | "json-or-text-generation-finished";
     metadata: ModelCallFinishedEventMetadata;
     settings: unknown;
     prompt: unknown;

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

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

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

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

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamText = void 0;
 const nanoid_1 = require("nanoid");
+const RunFunctionEventSource_js_1 = require("../../run/RunFunctionEventSource.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");
-const ModelCallEventSource_js_1 = require("../ModelCallEventSource.cjs");
 const extractTextDeltas_js_1 = require("./extractTextDeltas.cjs");
 async function streamText(model, prompt, options) {
     if (options?.settings != null) {
@@ -17,7 +17,7 @@ async function streamText(model, prompt, options) {
     }
     const run = options?.run;
     const settings = model.settings;
-    const eventSource = new ModelCallEventSource_js_1.ModelCallEventSource({
+    const eventSource = new RunFunctionEventSource_js_1.RunFunctionEventSource({
         observers: [...(settings.observers ?? []), ...(run?.observers ?? [])],
         errorHandler: run?.errorHandler,
     });
@@ -31,7 +31,7 @@ async function streamText(model, prompt, options) {
         model: model.modelInformation,
         startEpochSeconds: durationMeasurement.startEpochSeconds,
     };
-    eventSource.notifyModelCallStarted({
+    eventSource.notifyRunFunctionStarted({
         type: "text-streaming-started",
         metadata: startMetadata,
         settings,
@@ -49,7 +49,7 @@ async function streamText(model, prompt, options) {
                 ...startMetadata,
                 durationInMs: durationMeasurement.durationInMs,
             };
-            eventSource.notifyModelCallFinished({
+            eventSource.notifyRunFunctionFinished({
                 type: "text-streaming-finished",
                 status: "success",
                 metadata: finishMetadata,
@@ -64,7 +64,7 @@ async function streamText(model, prompt, options) {
                 ...startMetadata,
                 durationInMs: durationMeasurement.durationInMs,
             };
-            eventSource.notifyModelCallFinished(error instanceof AbortError_js_1.AbortError
+            eventSource.notifyRunFunctionFinished(error instanceof AbortError_js_1.AbortError
                 ? {
                     type: "text-streaming-finished",
                     status: "abort",
@@ -88,7 +88,7 @@ async function streamText(model, prompt, options) {
             durationInMs: durationMeasurement.durationInMs,
         };
         if (result.isAborted) {
-            eventSource.notifyModelCallFinished({
+            eventSource.notifyRunFunctionFinished({
                 type: "text-streaming-finished",
                 status: "abort",
                 metadata: finishMetadata,
@@ -97,7 +97,7 @@ async function streamText(model, prompt, options) {
             });
             throw new AbortError_js_1.AbortError();
         }
-        eventSource.notifyModelCallFinished({
+        eventSource.notifyRunFunctionFinished({
             type: "text-streaming-finished",
             status: "failure",
             metadata: finishMetadata,

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

@@ -1,8 +1,8 @@
 import { nanoid as createId } from "nanoid";
+import { RunFunctionEventSource } from "../../run/RunFunctionEventSource.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
 import { AbortError } from "../../util/api/AbortError.js";
 import { runSafe } from "../../util/runSafe.js";
-import { ModelCallEventSource } from "../ModelCallEventSource.js";
 import { extractTextDeltas } from "./extractTextDeltas.js";
 export async function streamText(model, prompt, options) {
     if (options?.settings != null) {
@@ -14,7 +14,7 @@ export async function streamText(model, prompt, options) {
     }
     const run = options?.run;
     const settings = model.settings;
-    const eventSource = new ModelCallEventSource({
+    const eventSource = new RunFunctionEventSource({
         observers: [...(settings.observers ?? []), ...(run?.observers ?? [])],
         errorHandler: run?.errorHandler,
     });
@@ -28,7 +28,7 @@ export async function streamText(model, prompt, options) {
         model: model.modelInformation,
         startEpochSeconds: durationMeasurement.startEpochSeconds,
     };
-    eventSource.notifyModelCallStarted({
+    eventSource.notifyRunFunctionStarted({
         type: "text-streaming-started",
         metadata: startMetadata,
         settings,
@@ -46,7 +46,7 @@ export async function streamText(model, prompt, options) {
                 ...startMetadata,
                 durationInMs: durationMeasurement.durationInMs,
             };
-            eventSource.notifyModelCallFinished({
+            eventSource.notifyRunFunctionFinished({
                 type: "text-streaming-finished",
                 status: "success",
                 metadata: finishMetadata,
@@ -61,7 +61,7 @@ export async function streamText(model, prompt, options) {
                 ...startMetadata,
                 durationInMs: durationMeasurement.durationInMs,
             };
-            eventSource.notifyModelCallFinished(error instanceof AbortError
+            eventSource.notifyRunFunctionFinished(error instanceof AbortError
                 ? {
                     type: "text-streaming-finished",
                     status: "abort",
@@ -85,7 +85,7 @@ export async function streamText(model, prompt, options) {
             durationInMs: durationMeasurement.durationInMs,
         };
         if (result.isAborted) {
-            eventSource.notifyModelCallFinished({
+            eventSource.notifyRunFunctionFinished({
                 type: "text-streaming-finished",
                 status: "abort",
                 metadata: finishMetadata,
@@ -94,7 +94,7 @@ export async function streamText(model, prompt, options) {
             });
             throw new AbortError();
         }
-        eventSource.notifyModelCallFinished({
+        eventSource.notifyRunFunctionFinished({
             type: "text-streaming-finished",
             status: "failure",
             metadata: finishMetadata,

package/model-function/index.cjs

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FunctionOptions.cjs"), exports);
 __exportStar(require("./Model.cjs"), exports);
 __exportStar(require("./ModelCallEvent.cjs"), exports);
-__exportStar(require("./ModelCallObserver.cjs"), exports);
+__exportStar(require("../run/RunFunctionObserver.cjs"), exports);
 __exportStar(require("./ModelInformation.cjs"), exports);
 __exportStar(require("./SuccessfulModelCall.cjs"), exports);
 __exportStar(require("./embed-text/TextEmbeddingEvent.cjs"), exports);

package/model-function/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./FunctionOptions.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
-export * from "./ModelCallObserver.js";
+export * from "../run/RunFunctionObserver.js";
 export * from "./ModelInformation.js";
 export * from "./SuccessfulModelCall.js";
 export * from "./embed-text/TextEmbeddingEvent.js";

package/model-function/index.js

@@ -1,7 +1,7 @@
 export * from "./FunctionOptions.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
-export * from "./ModelCallObserver.js";
+export * from "../run/RunFunctionObserver.js";
 export * from "./ModelInformation.js";
 export * from "./SuccessfulModelCall.js";
 export * from "./embed-text/TextEmbeddingEvent.js";

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

@@ -15,8 +15,8 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     get modelName(): string;
     callAPI(input: A111ImageGenerationPrompt, options?: FunctionOptions<Automatic1111ImageGenerationModelSettings>): Promise<Automatic1111ImageGenerationResponse>;
     generateImageResponse(prompt: A111ImageGenerationPrompt, options?: FunctionOptions<Automatic1111ImageGenerationModelSettings>): Promise<{
-        parameters: {};
         images: string[];
+        parameters: {};
         info: string;
     }>;
     extractBase64Image(response: Automatic1111ImageGenerationResponse): string;
@@ -37,12 +37,12 @@ declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     parameters: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
     info: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    parameters: {};
     images: string[];
+    parameters: {};
     info: string;
 }, {
-    parameters: {};
     images: string[];
+    parameters: {};
     info: string;
 }>;
 export type Automatic1111ImageGenerationResponse = z.infer<typeof Automatic1111ImageGenerationResponseSchema>;

package/model-provider/openai/chat/OpenAIChatPrompt.d.ts

@@ -1,8 +1,8 @@
 import z from "zod";
-import { Tool } from "../../../composed-function/use-tool/Tool.js";
 import { GenerateJsonPrompt } from "../../../model-function/generate-json/GenerateJsonModel.js";
 import { GenerateJsonOrTextPrompt } from "../../../model-function/generate-json/GenerateJsonOrTextModel.js";
 import { SchemaDefinition } from "../../../model-function/generate-json/SchemaDefinition.js";
+import { Tool } from "../../../tool/Tool.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 import { OpenAIChatResponse } from "./OpenAIChatModel.js";
 export type OpenAIFunctionDescription<T> = {

package/package.json

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

package/run/ConsoleLogger.cjs

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 class ConsoleLogger {
-    onModelCallStarted(event) {
+    onRunFunctionStarted(event) {
         console.log(JSON.stringify(event, null, 2));
     }
-    onModelCallFinished(event) {
+    onRunFunctionFinished(event) {
         console.log(JSON.stringify(event, null, 2));
     }
 }

package/run/ConsoleLogger.d.ts

@@ -1,6 +1,6 @@
-import { ModelCallFinishedEvent, ModelCallStartedEvent } from "../model-function/ModelCallEvent.js";
-import { ModelCallObserver } from "../model-function/ModelCallObserver.js";
-export declare class ConsoleLogger implements ModelCallObserver {
-    onModelCallStarted(event: ModelCallStartedEvent): void;
-    onModelCallFinished(event: ModelCallFinishedEvent): void;
+import { RunFunctionFinishedEvent, RunFunctionStartedEvent } from "./RunFunctionEvent.js";
+import { RunFunctionObserver } from "./RunFunctionObserver.js";
+export declare class ConsoleLogger implements RunFunctionObserver {
+    onRunFunctionStarted(event: RunFunctionStartedEvent): void;
+    onRunFunctionFinished(event: RunFunctionFinishedEvent): void;
 }

package/run/ConsoleLogger.js

@@ -1,8 +1,8 @@
 export class ConsoleLogger {
-    onModelCallStarted(event) {
+    onRunFunctionStarted(event) {
         console.log(JSON.stringify(event, null, 2));
     }
-    onModelCallFinished(event) {
+    onRunFunctionFinished(event) {
         console.log(JSON.stringify(event, null, 2));
     }
 }