modelfusion 0.43.0 → 0.44.0

package/README.md

@@ -476,19 +476,17 @@ const result = await guard(
   [
     // ...
   ],
-  [
-    fixStructure({
-      modifyInputForRetry: async ({ input, error }) => [
-        ...input,
-        OpenAIChatMessage.functionCall(null, {
-          name: error.structureName,
-          arguments: error.valueText,
-        }),
-        OpenAIChatMessage.user(error.message),
-        OpenAIChatMessage.user("Please fix the error and try again."),
-      ],
-    }),
-  ]
+  fixStructure({
+    modifyInputForRetry: async ({ input, error }) => [
+      ...input,
+      OpenAIChatMessage.functionCall(null, {
+        name: error.structureName,
+        arguments: error.valueText,
+      }),
+      OpenAIChatMessage.user(error.message),
+      OpenAIChatMessage.user("Please fix the error and try again."),
+    ],
+  })
 );
 ```
 

package/core/getRun.cjs

@@ -0,0 +1,60 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withRun = exports.getRun = void 0;
+let runStorage;
+const isNode = typeof process !== "undefined" &&
+    process.versions != null &&
+    process.versions.node != null;
+async function ensureLoaded() {
+    if (!isNode)
+        return Promise.resolve();
+    if (!runStorage) {
+        const { AsyncLocalStorage } = await Promise.resolve().then(() => __importStar(require("node:async_hooks")));
+        runStorage = new AsyncLocalStorage();
+    }
+    return Promise.resolve();
+}
+/**
+ * Returns the run stored in an AsyncLocalStorage if running in Node.js. It can be set with `withRun()`.
+ */
+async function getRun(run) {
+    await ensureLoaded();
+    return run ?? runStorage?.getStore();
+}
+exports.getRun = getRun;
+/**
+ * Stores the run in an AsyncLocalStorage if running in Node.js. It can be retrieved with `getRun()`.
+ */
+async function withRun(run, callback) {
+    await ensureLoaded();
+    if (runStorage != null) {
+        await runStorage.run(run, callback);
+    }
+    else {
+        await callback();
+    }
+}
+exports.withRun = withRun;

package/core/getRun.d.ts

@@ -0,0 +1,9 @@
+import { Run } from "./Run";
+/**
+ * Returns the run stored in an AsyncLocalStorage if running in Node.js. It can be set with `withRun()`.
+ */
+export declare function getRun(run?: Run): Promise<Run | undefined>;
+/**
+ * Stores the run in an AsyncLocalStorage if running in Node.js. It can be retrieved with `getRun()`.
+ */
+export declare function withRun(run: Run, callback: () => PromiseLike<void>): Promise<void>;

package/core/getRun.js

@@ -0,0 +1,32 @@
+let runStorage;
+const isNode = typeof process !== "undefined" &&
+    process.versions != null &&
+    process.versions.node != null;
+async function ensureLoaded() {
+    if (!isNode)
+        return Promise.resolve();
+    if (!runStorage) {
+        const { AsyncLocalStorage } = await import("node:async_hooks");
+        runStorage = new AsyncLocalStorage();
+    }
+    return Promise.resolve();
+}
+/**
+ * Returns the run stored in an AsyncLocalStorage if running in Node.js. It can be set with `withRun()`.
+ */
+export async function getRun(run) {
+    await ensureLoaded();
+    return run ?? runStorage?.getStore();
+}
+/**
+ * Stores the run in an AsyncLocalStorage if running in Node.js. It can be retrieved with `getRun()`.
+ */
+export async function withRun(run, callback) {
+    await ensureLoaded();
+    if (runStorage != null) {
+        await runStorage.run(run, callback);
+    }
+    else {
+        await callback();
+    }
+}

package/core/index.cjs

@@ -24,4 +24,5 @@ __exportStar(require("./GlobalFunctionObservers.cjs"), exports);
 __exportStar(require("./Run.cjs"), exports);
 __exportStar(require("./Vector.cjs"), exports);
 __exportStar(require("./api/index.cjs"), exports);
+__exportStar(require("./getRun.cjs"), exports);
 __exportStar(require("./structure/index.cjs"), exports);

package/core/index.d.ts

@@ -8,4 +8,5 @@ export * from "./GlobalFunctionObservers.js";
 export * from "./Run.js";
 export * from "./Vector.js";
 export * from "./api/index.js";
+export * from "./getRun.js";
 export * from "./structure/index.js";

package/core/index.js

@@ -8,4 +8,5 @@ export * from "./GlobalFunctionObservers.js";
 export * from "./Run.js";
 export * from "./Vector.js";
 export * from "./api/index.js";
+export * from "./getRun.js";
 export * from "./structure/index.js";

package/guard/guard.cjs

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.guard = void 0;
 async function guard(execute, input, guards, options) {
+    if (typeof guards === "function") {
+        guards = [guards];
+    }
     const maxRetries = options?.maxRetries ?? 1;
     let attempts = 0;
     while (attempts <= maxRetries) {

package/guard/guard.d.ts

@@ -22,7 +22,7 @@ export type Guard<INPUT, OUTPUT> = ({ type, input, output, error, }: OutputResul
 } | {
     action: "passThrough";
 } | undefined>;
-export declare function guard<INPUT, OUTPUT>(execute: (input: INPUT) => PromiseLike<OUTPUT>, input: INPUT, guards: Array<Guard<INPUT, OUTPUT>>, options?: {
+export declare function guard<INPUT, OUTPUT>(execute: (input: INPUT) => PromiseLike<OUTPUT>, input: INPUT, guards: Array<Guard<INPUT, OUTPUT>> | Guard<INPUT, OUTPUT>, options?: {
     maxRetries: number;
 }): Promise<OUTPUT | undefined>;
 export {};

package/guard/guard.js

@@ -1,4 +1,7 @@
 export async function guard(execute, input, guards, options) {
+    if (typeof guards === "function") {
+        guards = [guards];
+    }
     const maxRetries = options?.maxRetries ?? 1;
     let attempts = 0;
     while (attempts <= maxRetries) {

package/model-function/executeCall.cjs

@@ -7,6 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
 const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
+const getRun_js_1 = require("../core/getRun.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
 class ModelFunctionPromise extends Promise {
@@ -54,7 +55,7 @@ function executeCall({ model, options, input, functionType, generateResponse, })
 }
 exports.executeCall = executeCall;
 async function doExecuteCall({ model, options, input, functionType, generateResponse, }) {
-    const run = options?.run;
+    const run = await (0, getRun_js_1.getRun)(options?.run);
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
@@ -84,7 +85,12 @@ async function doExecuteCall({ model, options, input, functionType, generateResp
         eventType: "started",
         ...startMetadata,
     });
-    const result = await (0, runSafe_js_1.runSafe)(() => generateResponse(options));
+    const result = await (0, runSafe_js_1.runSafe)(() => generateResponse({
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         eventType: "finished",
         ...startMetadata,

package/model-function/executeCall.js

@@ -4,6 +4,7 @@ import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
+import { getRun } from "../core/getRun.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { runSafe } from "../util/runSafe.js";
 export class ModelFunctionPromise extends Promise {
@@ -49,7 +50,7 @@ export function executeCall({ model, options, input, functionType, generateRespo
     }));
 }
 async function doExecuteCall({ model, options, input, functionType, generateResponse, }) {
-    const run = options?.run;
+    const run = await getRun(options?.run);
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
@@ -79,7 +80,12 @@ async function doExecuteCall({ model, options, input, functionType, generateResp
         eventType: "started",
         ...startMetadata,
     });
-    const result = await runSafe(() => generateResponse(options));
+    const result = await runSafe(() => generateResponse({
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         eventType: "finished",
         ...startMetadata,

package/model-function/generate-structure/streamStructure.cjs

@@ -11,6 +11,7 @@ const GlobalFunctionLogging_js_1 = require("../../core/GlobalFunctionLogging.cjs
 const GlobalFunctionObservers_js_1 = require("../../core/GlobalFunctionObservers.cjs");
 const AbortError_js_1 = require("../../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../../core/getFunctionCallLogger.cjs");
+const getRun_js_1 = require("../../core/getRun.cjs");
 const DurationMeasurement_js_1 = require("../../util/DurationMeasurement.cjs");
 const runSafe_js_1 = require("../../util/runSafe.cjs");
 const AsyncIterableResultPromise_js_1 = require("../AsyncIterableResultPromise.cjs");
@@ -19,7 +20,7 @@ function streamStructure(model, structureDefinition, prompt, options) {
 }
 exports.streamStructure = streamStructure;
 async function doStreamStructure(model, structureDefinition, prompt, options) {
-    const run = options?.run;
+    const run = await (0, getRun_js_1.getRun)(options?.run);
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
@@ -50,7 +51,12 @@ async function doStreamStructure(model, structureDefinition, prompt, options) {
         ...startMetadata,
     });
     const result = await (0, runSafe_js_1.runSafe)(async () => {
-        const deltaIterable = await model.doStreamStructure(structureDefinition, prompt, options);
+        const deltaIterable = await model.doStreamStructure(structureDefinition, prompt, {
+            functionId: options?.functionId,
+            logging: options?.logging,
+            observers: options?.observers,
+            run,
+        });
         return (async function* () {
             function reportError(error) {
                 const finishMetadata = {

package/model-function/generate-structure/streamStructure.js

@@ -5,6 +5,7 @@ import { getGlobalFunctionLogging } from "../../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../../core/GlobalFunctionObservers.js";
 import { AbortError } from "../../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
+import { getRun } from "../../core/getRun.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
 import { runSafe } from "../../util/runSafe.js";
 import { AsyncIterableResultPromise } from "../AsyncIterableResultPromise.js";
@@ -12,7 +13,7 @@ export function streamStructure(model, structureDefinition, prompt, options) {
     return new AsyncIterableResultPromise(doStreamStructure(model, structureDefinition, prompt, options));
 }
 async function doStreamStructure(model, structureDefinition, prompt, options) {
-    const run = options?.run;
+    const run = await getRun(options?.run);
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
@@ -43,7 +44,12 @@ async function doStreamStructure(model, structureDefinition, prompt, options) {
         ...startMetadata,
     });
     const result = await runSafe(async () => {
-        const deltaIterable = await model.doStreamStructure(structureDefinition, prompt, options);
+        const deltaIterable = await model.doStreamStructure(structureDefinition, prompt, {
+            functionId: options?.functionId,
+            logging: options?.logging,
+            observers: options?.observers,
+            run,
+        });
         return (async function* () {
             function reportError(error) {
                 const finishMetadata = {

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

@@ -7,6 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../../core/GlobalFunctionLogging.cjs
 const GlobalFunctionObservers_js_1 = require("../../core/GlobalFunctionObservers.cjs");
 const AbortError_js_1 = require("../../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../../core/getFunctionCallLogger.cjs");
+const getRun_js_1 = require("../../core/getRun.cjs");
 const DurationMeasurement_js_1 = require("../../util/DurationMeasurement.cjs");
 const runSafe_js_1 = require("../../util/runSafe.cjs");
 const AsyncIterableResultPromise_js_1 = require("../AsyncIterableResultPromise.cjs");
@@ -15,7 +16,7 @@ function streamText(model, prompt, options) {
 }
 exports.streamText = streamText;
 async function doStreamText(model, prompt, options) {
-    const run = options?.run;
+    const run = await (0, getRun_js_1.getRun)(options?.run);
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
             ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
@@ -45,7 +46,12 @@ async function doStreamText(model, prompt, options) {
         ...startMetadata,
     });
     const result = await (0, runSafe_js_1.runSafe)(async () => {
-        const deltaIterable = await model.doStreamText(prompt, options);
+        const deltaIterable = await model.doStreamText(prompt, {
+            functionId: options?.functionId,
+            logging: options?.logging,
+            observers: options?.observers,
+            run,
+        });
         return (async function* () {
             let accumulatedText = "";
             let lastFullDelta;

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

@@ -4,6 +4,7 @@ import { getGlobalFunctionLogging } from "../../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../../core/GlobalFunctionObservers.js";
 import { AbortError } from "../../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
+import { getRun } from "../../core/getRun.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
 import { runSafe } from "../../util/runSafe.js";
 import { AsyncIterableResultPromise } from "../AsyncIterableResultPromise.js";
@@ -11,7 +12,7 @@ export function streamText(model, prompt, options) {
     return new AsyncIterableResultPromise(doStreamText(model, prompt, options));
 }
 async function doStreamText(model, prompt, options) {
-    const run = options?.run;
+    const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [
             ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
@@ -41,7 +42,12 @@ async function doStreamText(model, prompt, options) {
         ...startMetadata,
     });
     const result = await runSafe(async () => {
-        const deltaIterable = await model.doStreamText(prompt, options);
+        const deltaIterable = await model.doStreamText(prompt, {
+            functionId: options?.functionId,
+            logging: options?.logging,
+            observers: options?.observers,
+            run,
+        });
         return (async function* () {
             let accumulatedText = "";
             let lastFullDelta;

package/package.json

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

package/retriever/retrieve.cjs

@@ -7,10 +7,11 @@ const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
 const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
+const getRun_js_1 = require("../core/getRun.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
 async function retrieve(retriever, query, options) {
-    const run = options?.run;
+    const run = await (0, getRun_js_1.getRun)(options?.run);
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
             ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
@@ -36,7 +37,12 @@ async function retrieve(retriever, query, options) {
         eventType: "started",
         ...startMetadata,
     });
-    const result = await (0, runSafe_js_1.runSafe)(() => retriever.retrieve(query, options));
+    const result = await (0, runSafe_js_1.runSafe)(() => retriever.retrieve(query, {
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         eventType: "finished",
         ...startMetadata,

package/retriever/retrieve.js

@@ -4,10 +4,11 @@ import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
+import { getRun } from "../core/getRun.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { runSafe } from "../util/runSafe.js";
 export async function retrieve(retriever, query, options) {
-    const run = options?.run;
+    const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [
             ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
@@ -33,7 +34,12 @@ export async function retrieve(retriever, query, options) {
         eventType: "started",
         ...startMetadata,
     });
-    const result = await runSafe(() => retriever.retrieve(query, options));
+    const result = await runSafe(() => retriever.retrieve(query, {
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         eventType: "finished",
         ...startMetadata,

package/tool/executeTool.cjs

@@ -7,6 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
 const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
+const getRun_js_1 = require("../core/getRun.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
 const ToolExecutionError_js_1 = require("./ToolExecutionError.cjs");
@@ -54,7 +55,7 @@ function executeTool(tool, input, options) {
 exports.executeTool = executeTool;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function doExecuteTool(tool, input, options) {
-    const run = options?.run;
+    const run = await (0, getRun_js_1.getRun)(options?.run);
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
             ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
@@ -81,7 +82,12 @@ async function doExecuteTool(tool, input, options) {
         timestamp: durationMeasurement.startDate,
         startTimestamp: durationMeasurement.startDate,
     });
-    const result = await (0, runSafe_js_1.runSafe)(() => tool.execute(input, options));
+    const result = await (0, runSafe_js_1.runSafe)(() => tool.execute(input, {
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         ...metadata,
         eventType: "finished",

package/tool/executeTool.js

@@ -4,6 +4,7 @@ import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
+import { getRun } from "../core/getRun.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { runSafe } from "../util/runSafe.js";
 import { ToolExecutionError } from "./ToolExecutionError.js";
@@ -49,7 +50,7 @@ export function executeTool(tool, input, options) {
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function doExecuteTool(tool, input, options) {
-    const run = options?.run;
+    const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [
             ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
@@ -76,7 +77,12 @@ async function doExecuteTool(tool, input, options) {
         timestamp: durationMeasurement.startDate,
         startTimestamp: durationMeasurement.startDate,
     });
-    const result = await runSafe(() => tool.execute(input, options));
+    const result = await runSafe(() => tool.execute(input, {
+        functionId: options?.functionId,
+        logging: options?.logging,
+        observers: options?.observers,
+        run,
+    }));
     const finishMetadata = {
         ...metadata,
         eventType: "finished",