modelfusion 0.42.0 → 0.44.0

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructureParseError = void 0;
+const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
+class StructureParseError extends Error {
+    constructor({ structureName, valueText, cause, }) {
+        super(`Structure parsing failed for '${structureName}'. ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
+        Object.defineProperty(this, "structureName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "StructureParseError";
+        this.structureName = structureName;
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+}
+exports.StructureParseError = StructureParseError;

package/model-function/generate-structure/StructureParseError.d.ts

@@ -0,0 +1,10 @@
+export declare class StructureParseError extends Error {
+    readonly structureName: string;
+    readonly cause: unknown;
+    readonly valueText: string;
+    constructor({ structureName, valueText, cause, }: {
+        structureName: string;
+        valueText: string;
+        cause: unknown;
+    });
+}

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

@@ -0,0 +1,30 @@
+import { getErrorMessage } from "../../util/getErrorMessage.js";
+export class StructureParseError extends Error {
+    constructor({ structureName, valueText, cause, }) {
+        super(`Structure parsing failed for '${structureName}'. ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${getErrorMessage(cause)}`);
+        Object.defineProperty(this, "structureName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "StructureParseError";
+        this.structureName = structureName;
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+}

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureValidationError = void 0;
 const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
 class StructureValidationError extends Error {
-    constructor({ structureName, value, cause, }) {
-        super(`Structure validation error for '${structureName}'. ` +
-            `Value: ${JSON.stringify(value)}.\n` +
+    constructor({ structureName, value, valueText, cause, }) {
+        super(`Structure validation failed for '${structureName}'. ` +
+            `Value: ${valueText}.\n` +
             `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
         Object.defineProperty(this, "structureName", {
             enumerable: true,
@@ -19,6 +19,12 @@ class StructureValidationError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "value", {
             enumerable: true,
             configurable: true,
@@ -29,6 +35,7 @@ class StructureValidationError extends Error {
         this.structureName = structureName;
         this.cause = cause;
         this.value = value;
+        this.valueText = valueText;
     }
 }
 exports.StructureValidationError = StructureValidationError;

package/model-function/generate-structure/StructureValidationError.d.ts

@@ -1,10 +1,12 @@
 export declare class StructureValidationError extends Error {
     readonly structureName: string;
     readonly cause: unknown;
+    readonly valueText: string;
     readonly value: unknown;
-    constructor({ structureName, value, cause, }: {
+    constructor({ structureName, value, valueText, cause, }: {
         structureName: string;
         value: unknown;
+        valueText: string;
         cause: unknown;
     });
 }

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

@@ -1,8 +1,8 @@
 import { getErrorMessage } from "../../util/getErrorMessage.js";
 export class StructureValidationError extends Error {
-    constructor({ structureName, value, cause, }) {
-        super(`Structure validation error for '${structureName}'. ` +
-            `Value: ${JSON.stringify(value)}.\n` +
+    constructor({ structureName, value, valueText, cause, }) {
+        super(`Structure validation failed for '${structureName}'. ` +
+            `Value: ${valueText}.\n` +
             `Error message: ${getErrorMessage(cause)}`);
         Object.defineProperty(this, "structureName", {
             enumerable: true,
@@ -16,6 +16,12 @@ export class StructureValidationError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "value", {
             enumerable: true,
             configurable: true,
@@ -26,5 +32,6 @@ export class StructureValidationError extends Error {
         this.structureName = structureName;
         this.cause = cause;
         this.value = value;
+        this.valueText = valueText;
     }
 }

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

@@ -15,11 +15,12 @@ function generateStructure(model, structureDefinition, prompt, options) {
         options,
         generateResponse: async (options) => {
             const result = await model.doGenerateStructure(structureDefinition, expandedPrompt, options);
-            const structure = result.structure;
+            const structure = result.value;
             const parseResult = structureDefinition.schema.validate(structure);
             if (!parseResult.success) {
                 throw new StructureValidationError_js_1.StructureValidationError({
                     structureName: structureDefinition.name,
+                    valueText: result.valueText,
                     value: structure,
                     cause: parseResult.error,
                 });

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

@@ -12,11 +12,12 @@ export function generateStructure(model, structureDefinition, prompt, options) {
         options,
         generateResponse: async (options) => {
             const result = await model.doGenerateStructure(structureDefinition, expandedPrompt, options);
-            const structure = result.structure;
+            const structure = result.value;
             const parseResult = structureDefinition.schema.validate(structure);
             if (!parseResult.success) {
                 throw new StructureValidationError({
                     structureName: structureDefinition.name,
+                    valueText: result.valueText,
                     value: structure,
                     cause: parseResult.error,
                 });

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

@@ -34,6 +34,7 @@ function generateStructureOrText(model, structureDefinitions, prompt, options) {
                 throw new StructureValidationError_js_1.StructureValidationError({
                     structureName: structure,
                     value,
+                    valueText: result.structureAndText.valueText,
                     cause: parseResult.error,
                 });
             }

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

@@ -31,6 +31,7 @@ export function generateStructureOrText(model, structureDefinitions, prompt, opt
                 throw new StructureValidationError({
                     structureName: structure,
                     value,
+                    valueText: result.structureAndText.valueText,
                     cause: parseResult.error,
                 });
             }

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/model-function/index.cjs

@@ -34,6 +34,7 @@ __exportStar(require("./generate-structure/StructureFromTextGenerationModel.cjs"
 __exportStar(require("./generate-structure/StructureGenerationEvent.cjs"), exports);
 __exportStar(require("./generate-structure/StructureGenerationModel.cjs"), exports);
 __exportStar(require("./generate-structure/StructureOrTextGenerationModel.cjs"), exports);
+__exportStar(require("./generate-structure/StructureParseError.cjs"), exports);
 __exportStar(require("./generate-structure/StructureStreamingEvent.cjs"), exports);
 __exportStar(require("./generate-structure/StructureValidationError.cjs"), exports);
 __exportStar(require("./generate-structure/generateStructure.cjs"), exports);

package/model-function/index.d.ts

@@ -18,6 +18,7 @@ export * from "./generate-structure/StructureFromTextGenerationModel.js";
 export * from "./generate-structure/StructureGenerationEvent.js";
 export * from "./generate-structure/StructureGenerationModel.js";
 export * from "./generate-structure/StructureOrTextGenerationModel.js";
+export * from "./generate-structure/StructureParseError.js";
 export * from "./generate-structure/StructureStreamingEvent.js";
 export * from "./generate-structure/StructureValidationError.js";
 export * from "./generate-structure/generateStructure.js";

package/model-function/index.js

@@ -18,6 +18,7 @@ export * from "./generate-structure/StructureFromTextGenerationModel.js";
 export * from "./generate-structure/StructureGenerationEvent.js";
 export * from "./generate-structure/StructureGenerationModel.js";
 export * from "./generate-structure/StructureOrTextGenerationModel.js";
+export * from "./generate-structure/StructureParseError.js";
 export * from "./generate-structure/StructureStreamingEvent.js";
 export * from "./generate-structure/StructureValidationError.js";
 export * from "./generate-structure/generateStructure.js";

package/model-provider/openai/chat/OpenAIChatModel.cjs

@@ -9,6 +9,7 @@ const zod_1 = __importDefault(require("zod"));
 const callWithRetryAndThrottle_js_1 = require("../../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../../core/api/postToApi.cjs");
 const AbstractModel_js_1 = require("../../../model-function/AbstractModel.cjs");
+const StructureParseError_js_1 = require("../../../model-function/generate-structure/StructureParseError.cjs");
 const parsePartialJson_js_1 = require("../../../model-function/generate-structure/parsePartialJson.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../../prompt/PromptFormatTextStreamingModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("../OpenAIApiConfiguration.cjs");
@@ -256,11 +257,22 @@ class OpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                 },
             ],
         });
-        return {
-            response,
-            structure: secure_json_parse_1.default.parse(response.choices[0].message.function_call.arguments),
-            usage: this.extractUsage(response),
-        };
+        const valueText = response.choices[0].message.function_call.arguments;
+        try {
+            return {
+                response,
+                valueText,
+                value: secure_json_parse_1.default.parse(valueText),
+                usage: this.extractUsage(response),
+            };
+        }
+        catch (error) {
+            throw new StructureParseError_js_1.StructureParseError({
+                structureName: structureDefinition.name,
+                valueText: valueText,
+                cause: error,
+            });
+        }
     }
     async doStreamStructure(structureDefinition, prompt, options) {
         return this.callAPI(prompt, {
@@ -290,22 +302,37 @@ class OpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         const message = response.choices[0].message;
         const content = message.content;
         const functionCall = message.function_call;
-        const structureAndText = functionCall == null
-            ? {
-                structure: null,
-                value: null,
-                text: content ?? "",
-            }
-            : {
-                structure: functionCall.name,
-                value: secure_json_parse_1.default.parse(functionCall.arguments),
-                text: content,
+        if (functionCall == null) {
+            return {
+                response,
+                structureAndText: {
+                    structure: null,
+                    value: null,
+                    valueText: null,
+                    text: content ?? "",
+                },
+                usage: this.extractUsage(response),
             };
-        return {
-            response,
-            structureAndText,
-            usage: this.extractUsage(response),
-        };
+        }
+        try {
+            return {
+                response,
+                structureAndText: {
+                    structure: functionCall.name,
+                    value: secure_json_parse_1.default.parse(functionCall.arguments),
+                    valueText: functionCall.arguments,
+                    text: content,
+                },
+                usage: this.extractUsage(response),
+            };
+        }
+        catch (error) {
+            throw new StructureParseError_js_1.StructureParseError({
+                structureName: functionCall.name,
+                valueText: functionCall.arguments,
+                cause: error,
+            });
+        }
     }
     extractUsage(response) {
         return {

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

@@ -220,7 +220,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
                 logprobs?: any;
             }[];
         };
-        structure: any;
+        valueText: string;
+        value: any;
         usage: {
             promptTokens: number;
             completionTokens: number;
@@ -256,10 +257,43 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
         structureAndText: {
             structure: null;
             value: null;
+            valueText: null;
             text: string;
-        } | {
+        };
+        usage: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        };
+    } | {
+        response: {
+            object: "chat.completion";
+            model: string;
+            usage: {
+                prompt_tokens: number;
+                completion_tokens: number;
+                total_tokens: number;
+            };
+            id: string;
+            created: number;
+            choices: {
+                message: {
+                    content: string | null;
+                    role: "assistant";
+                    function_call?: {
+                        name: string;
+                        arguments: string;
+                    } | undefined;
+                };
+                finish_reason: string;
+                index: number;
+                logprobs?: any;
+            }[];
+        };
+        structureAndText: {
             structure: string;
             value: any;
+            valueText: string;
             text: string | null;
         };
         usage: {

package/model-provider/openai/chat/OpenAIChatModel.js

@@ -3,6 +3,7 @@ import z from "zod";
 import { callWithRetryAndThrottle } from "../../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../../core/api/postToApi.js";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
+import { StructureParseError } from "../../../model-function/generate-structure/StructureParseError.js";
 import { parsePartialJson } from "../../../model-function/generate-structure/parsePartialJson.js";
 import { PromptFormatTextStreamingModel } from "../../../prompt/PromptFormatTextStreamingModel.js";
 import { OpenAIApiConfiguration } from "../OpenAIApiConfiguration.js";
@@ -247,11 +248,22 @@ export class OpenAIChatModel extends AbstractModel {
                 },
             ],
         });
-        return {
-            response,
-            structure: SecureJSON.parse(response.choices[0].message.function_call.arguments),
-            usage: this.extractUsage(response),
-        };
+        const valueText = response.choices[0].message.function_call.arguments;
+        try {
+            return {
+                response,
+                valueText,
+                value: SecureJSON.parse(valueText),
+                usage: this.extractUsage(response),
+            };
+        }
+        catch (error) {
+            throw new StructureParseError({
+                structureName: structureDefinition.name,
+                valueText: valueText,
+                cause: error,
+            });
+        }
     }
     async doStreamStructure(structureDefinition, prompt, options) {
         return this.callAPI(prompt, {
@@ -281,22 +293,37 @@ export class OpenAIChatModel extends AbstractModel {
         const message = response.choices[0].message;
         const content = message.content;
         const functionCall = message.function_call;
-        const structureAndText = functionCall == null
-            ? {
-                structure: null,
-                value: null,
-                text: content ?? "",
-            }
-            : {
-                structure: functionCall.name,
-                value: SecureJSON.parse(functionCall.arguments),
-                text: content,
+        if (functionCall == null) {
+            return {
+                response,
+                structureAndText: {
+                    structure: null,
+                    value: null,
+                    valueText: null,
+                    text: content ?? "",
+                },
+                usage: this.extractUsage(response),
             };
-        return {
-            response,
-            structureAndText,
-            usage: this.extractUsage(response),
-        };
+        }
+        try {
+            return {
+                response,
+                structureAndText: {
+                    structure: functionCall.name,
+                    value: SecureJSON.parse(functionCall.arguments),
+                    valueText: functionCall.arguments,
+                    text: content,
+                },
+                usage: this.extractUsage(response),
+            };
+        }
+        catch (error) {
+            throw new StructureParseError({
+                structureName: functionCall.name,
+                valueText: functionCall.arguments,
+                cause: error,
+            });
+        }
     }
     extractUsage(response) {
         return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.42.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,