modelfusion 0.90.0 → 0.92.0

package/model-function/executeStandardCall.js

@@ -1,7 +1,7 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
+import { getLogFormat } from "../core/ModelFusionConfiguration.js";
+import { getFunctionObservers } from "../core/ModelFusionConfiguration.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { getRun } from "../core/getRun.js";
@@ -12,8 +12,8 @@ export async function executeStandardCall({ model, options, input, functionType,
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-function/executeStreamCall.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeStreamCall = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
+const ModelFusionConfiguration_js_1 = require("../core/ModelFusionConfiguration.cjs");
+const ModelFusionConfiguration_js_2 = require("../core/ModelFusionConfiguration.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");
@@ -16,8 +16,8 @@ async function executeStreamCall({ model, options, input, functionType, startStr
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
-            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, ModelFusionConfiguration_js_1.getLogFormat)()),
+            ...(0, ModelFusionConfiguration_js_2.getFunctionObservers)(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-function/executeStreamCall.js

@@ -1,7 +1,7 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
+import { getLogFormat } from "../core/ModelFusionConfiguration.js";
+import { getFunctionObservers } from "../core/ModelFusionConfiguration.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { getRun } from "../core/getRun.js";
@@ -13,8 +13,8 @@ export async function executeStreamCall({ model, options, input, functionType, s
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-provider/index.cjs

@@ -25,3 +25,4 @@ __exportStar(require("./ollama/index.cjs"), exports);
 __exportStar(require("./openai/index.cjs"), exports);
 __exportStar(require("./openai-compatible/index.cjs"), exports);
 __exportStar(require("./stability/index.cjs"), exports);
+__exportStar(require("./whispercpp/index.cjs"), exports);

package/model-provider/index.d.ts

@@ -9,3 +9,4 @@ export * from "./ollama/index.js";
 export * from "./openai/index.js";
 export * from "./openai-compatible/index.js";
 export * from "./stability/index.js";
+export * from "./whispercpp/index.js";

package/model-provider/index.js

@@ -9,3 +9,4 @@ export * from "./ollama/index.js";
 export * from "./openai/index.js";
 export * from "./openai-compatible/index.js";
 export * from "./stability/index.js";
+export * from "./whispercpp/index.js";

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

@@ -50,7 +50,7 @@ const chatResponseStreamEventSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.union
     chatCompletionChunkSchema,
     zod_1.z.object({
         object: zod_1.z.string().refine((obj) => obj !== "chat.completion.chunk", {
-            message: "Object must not be 'chat.completion.chunk'",
+            message: "Object must be 'chat.completion.chunk'",
         }),
     }),
 ]));

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

@@ -47,7 +47,7 @@ const chatResponseStreamEventSchema = new ZodSchema(z.union([
     chatCompletionChunkSchema,
     z.object({
         object: z.string().refine((obj) => obj !== "chat.completion.chunk", {
-            message: "Object must not be 'chat.completion.chunk'",
+            message: "Object must be 'chat.completion.chunk'",
         }),
     }),
 ]));

package/model-provider/whispercpp/WhisperCppApiConfiguration.cjs

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhisperCppApiConfiguration = void 0;
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+class WhisperCppApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
+    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            headers: {},
+            retry,
+            throttle,
+        });
+    }
+}
+exports.WhisperCppApiConfiguration = WhisperCppApiConfiguration;

package/model-provider/whispercpp/WhisperCppApiConfiguration.d.ts

@@ -0,0 +1,11 @@
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export type WhisperCppApiConfigurationSettings = {
+    baseUrl?: string;
+    retry?: RetryFunction;
+    throttle?: ThrottleFunction;
+};
+export declare class WhisperCppApiConfiguration extends BaseUrlApiConfiguration {
+    constructor({ baseUrl, retry, throttle, }?: WhisperCppApiConfigurationSettings);
+}

package/model-provider/whispercpp/WhisperCppApiConfiguration.js

@@ -0,0 +1,11 @@
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+export class WhisperCppApiConfiguration extends BaseUrlApiConfiguration {
+    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            headers: {},
+            retry,
+            throttle,
+        });
+    }
+}

package/model-provider/whispercpp/WhisperCppFacade.cjs

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Api = exports.Transcriber = void 0;
+const WhisperCppApiConfiguration_js_1 = require("./WhisperCppApiConfiguration.cjs");
+const WhisperCppTranscriptionModel_js_1 = require("./WhisperCppTranscriptionModel.cjs");
+function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel_js_1.WhisperCppTranscriptionModel(settings);
+}
+exports.Transcriber = Transcriber;
+function Api(settings) {
+    return new WhisperCppApiConfiguration_js_1.WhisperCppApiConfiguration(settings);
+}
+exports.Api = Api;

package/model-provider/whispercpp/WhisperCppFacade.d.ts

@@ -0,0 +1,4 @@
+import { WhisperCppApiConfiguration, WhisperCppApiConfigurationSettings } from "./WhisperCppApiConfiguration.js";
+import { WhisperCppTranscriptionModel, WhisperCppTranscriptionModelSettings } from "./WhisperCppTranscriptionModel.js";
+export declare function Transcriber(settings?: WhisperCppTranscriptionModelSettings): WhisperCppTranscriptionModel;
+export declare function Api(settings: WhisperCppApiConfigurationSettings): WhisperCppApiConfiguration;

package/model-provider/whispercpp/WhisperCppFacade.js

@@ -0,0 +1,8 @@
+import { WhisperCppApiConfiguration, } from "./WhisperCppApiConfiguration.js";
+import { WhisperCppTranscriptionModel, } from "./WhisperCppTranscriptionModel.js";
+export function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel(settings);
+}
+export function Api(settings) {
+    return new WhisperCppApiConfiguration(settings);
+}

package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhisperCppTranscriptionModel = void 0;
+const zod_1 = require("zod");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const WhisperCppApiConfiguration_js_1 = require("./WhisperCppApiConfiguration.cjs");
+class WhisperCppTranscriptionModel extends AbstractModel_js_1.AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "whispercpp"
+        });
+        Object.defineProperty(this, "modelName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+    }
+    async doTranscribe(data, options) {
+        const response = await this.callAPI(data, {
+            functionId: options?.functionId,
+            run: options?.run,
+        });
+        return {
+            response,
+            transcription: response.text,
+        };
+    }
+    async callAPI(data, options) {
+        const { temperature } = this.settings;
+        const api = this.settings.api ?? new WhisperCppApiConfiguration_js_1.WhisperCppApiConfiguration();
+        return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                const formData = new FormData();
+                formData.append("file", new Blob([data.data]), `audio.${data.type}`);
+                formData.append("response_format", "json");
+                if (temperature != null) {
+                    formData.append("temperature", temperature.toString());
+                }
+                return (0, postToApi_js_1.postToApi)({
+                    url: api.assembleUrl("/inference"),
+                    headers: api.headers,
+                    body: {
+                        content: formData,
+                        values: { temperature },
+                    },
+                    failedResponseHandler,
+                    successfulResponseHandler,
+                    abortSignal: options?.run?.abortSignal,
+                });
+            },
+        });
+    }
+    get settingsForEvent() {
+        return {
+            temperature: this.settings.temperature,
+        };
+    }
+    withSettings(additionalSettings) {
+        return new WhisperCppTranscriptionModel(Object.assign({}, this.settings, additionalSettings));
+    }
+}
+exports.WhisperCppTranscriptionModel = WhisperCppTranscriptionModel;
+const whisperCppTranscriptionJsonSchema = zod_1.z.union([
+    zod_1.z.object({ text: zod_1.z.string() }),
+    zod_1.z.object({ error: zod_1.z.string() }),
+]);
+const successfulResponseHandler = async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
+        text: responseBody,
+        schema: new ZodSchema_js_1.ZodSchema(whisperCppTranscriptionJsonSchema),
+    });
+    if (!parsedResult.success) {
+        throw new ApiCallError_js_1.ApiCallError({
+            message: "Invalid JSON response",
+            cause: parsedResult.error,
+            statusCode: response.status,
+            responseBody,
+            url,
+            requestBodyValues,
+        });
+    }
+    if ("error" in parsedResult.data) {
+        throw new ApiCallError_js_1.ApiCallError({
+            message: parsedResult.data.error,
+            statusCode: response.status,
+            responseBody,
+            url,
+            requestBodyValues,
+        });
+    }
+    return {
+        text: parsedResult.data.text.trim(),
+    };
+};
+const failedResponseHandler = async ({ response, url, requestBodyValues, }) => {
+    const message = await response.text();
+    return new ApiCallError_js_1.ApiCallError({
+        message,
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        responseBody: message,
+    });
+};

package/model-provider/whispercpp/WhisperCppTranscriptionModel.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/generate-transcription/TranscriptionModel.js";
+export interface WhisperCppTranscriptionModelSettings extends TranscriptionModelSettings {
+    api?: ApiConfiguration;
+    temperature?: number;
+}
+export type WhisperCppTranscriptionInput = {
+    type: "wav";
+    data: Buffer;
+};
+export declare class WhisperCppTranscriptionModel extends AbstractModel<WhisperCppTranscriptionModelSettings> implements TranscriptionModel<WhisperCppTranscriptionInput, WhisperCppTranscriptionModelSettings> {
+    constructor(settings: WhisperCppTranscriptionModelSettings);
+    readonly provider: "whispercpp";
+    readonly modelName: null;
+    doTranscribe(data: WhisperCppTranscriptionInput, options?: FunctionOptions): Promise<{
+        response: {
+            text: string;
+        };
+        transcription: string;
+    }>;
+    callAPI(data: WhisperCppTranscriptionInput, options: FunctionOptions): Promise<{
+        text: string;
+    }>;
+    get settingsForEvent(): Partial<WhisperCppTranscriptionModelSettings>;
+    withSettings(additionalSettings: WhisperCppTranscriptionModelSettings): this;
+}

package/model-provider/whispercpp/WhisperCppTranscriptionModel.js

@@ -0,0 +1,113 @@
+import { z } from "zod";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { postToApi } from "../../core/api/postToApi.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { safeParseJSON } from "../../core/schema/parseJSON.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
+export class WhisperCppTranscriptionModel extends AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "whispercpp"
+        });
+        Object.defineProperty(this, "modelName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+    }
+    async doTranscribe(data, options) {
+        const response = await this.callAPI(data, {
+            functionId: options?.functionId,
+            run: options?.run,
+        });
+        return {
+            response,
+            transcription: response.text,
+        };
+    }
+    async callAPI(data, options) {
+        const { temperature } = this.settings;
+        const api = this.settings.api ?? new WhisperCppApiConfiguration();
+        return callWithRetryAndThrottle({
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                const formData = new FormData();
+                formData.append("file", new Blob([data.data]), `audio.${data.type}`);
+                formData.append("response_format", "json");
+                if (temperature != null) {
+                    formData.append("temperature", temperature.toString());
+                }
+                return postToApi({
+                    url: api.assembleUrl("/inference"),
+                    headers: api.headers,
+                    body: {
+                        content: formData,
+                        values: { temperature },
+                    },
+                    failedResponseHandler,
+                    successfulResponseHandler,
+                    abortSignal: options?.run?.abortSignal,
+                });
+            },
+        });
+    }
+    get settingsForEvent() {
+        return {
+            temperature: this.settings.temperature,
+        };
+    }
+    withSettings(additionalSettings) {
+        return new WhisperCppTranscriptionModel(Object.assign({}, this.settings, additionalSettings));
+    }
+}
+const whisperCppTranscriptionJsonSchema = z.union([
+    z.object({ text: z.string() }),
+    z.object({ error: z.string() }),
+]);
+const successfulResponseHandler = async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    const parsedResult = safeParseJSON({
+        text: responseBody,
+        schema: new ZodSchema(whisperCppTranscriptionJsonSchema),
+    });
+    if (!parsedResult.success) {
+        throw new ApiCallError({
+            message: "Invalid JSON response",
+            cause: parsedResult.error,
+            statusCode: response.status,
+            responseBody,
+            url,
+            requestBodyValues,
+        });
+    }
+    if ("error" in parsedResult.data) {
+        throw new ApiCallError({
+            message: parsedResult.data.error,
+            statusCode: response.status,
+            responseBody,
+            url,
+            requestBodyValues,
+        });
+    }
+    return {
+        text: parsedResult.data.text.trim(),
+    };
+};
+const failedResponseHandler = async ({ response, url, requestBodyValues, }) => {
+    const message = await response.text();
+    return new ApiCallError({
+        message,
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        responseBody: message,
+    });
+};

package/model-provider/whispercpp/index.cjs

@@ -0,0 +1,32 @@
+"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 __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);
+};
+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.whispercpp = void 0;
+__exportStar(require("./WhisperCppApiConfiguration.cjs"), exports);
+exports.whispercpp = __importStar(require("./WhisperCppFacade.cjs"));
+__exportStar(require("./WhisperCppTranscriptionModel.cjs"), exports);

package/model-provider/whispercpp/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./WhisperCppApiConfiguration.js";
+export * as whispercpp from "./WhisperCppFacade.js";
+export * from "./WhisperCppTranscriptionModel.js";

package/model-provider/whispercpp/index.js

@@ -0,0 +1,3 @@
+export * from "./WhisperCppApiConfiguration.js";
+export * as whispercpp from "./WhisperCppFacade.js";
+export * from "./WhisperCppTranscriptionModel.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.90.0",
+  "version": "0.92.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/execute-tool/executeTool.cjs

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeTool = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../../core/FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("../../core/GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("../../core/GlobalFunctionObservers.cjs");
+const ModelFusionConfiguration_js_1 = require("../../core/ModelFusionConfiguration.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");
@@ -22,8 +21,8 @@ async function doExecuteTool(tool, args, options) {
     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)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, ModelFusionConfiguration_js_1.getLogFormat)()),
+            ...(0, ModelFusionConfiguration_js_1.getFunctionObservers)(),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),
         ],

package/tool/execute-tool/executeTool.js

@@ -1,7 +1,6 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../../core/GlobalFunctionObservers.js";
+import { getFunctionObservers, getLogFormat, } from "../../core/ModelFusionConfiguration.js";
 import { AbortError } from "../../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
 import { getRun } from "../../core/getRun.js";
@@ -18,8 +17,8 @@ async function doExecuteTool(tool, args, options) {
     const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),
         ],

package/core/GlobalFunctionLogging.cjs

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalFunctionLogging = exports.setGlobalFunctionLogging = void 0;
-let globalFunctionLogging = undefined;
-function setGlobalFunctionLogging(logLevel) {
-    globalFunctionLogging = logLevel;
-}
-exports.setGlobalFunctionLogging = setGlobalFunctionLogging;
-function getGlobalFunctionLogging() {
-    return globalFunctionLogging;
-}
-exports.getGlobalFunctionLogging = getGlobalFunctionLogging;

package/core/GlobalFunctionLogging.d.ts

@@ -1,3 +0,0 @@
-import { FunctionLogging } from "./FunctionOptions.js";
-export declare function setGlobalFunctionLogging(logLevel: FunctionLogging): void;
-export declare function getGlobalFunctionLogging(): FunctionLogging;

package/core/GlobalFunctionLogging.js

@@ -1,7 +0,0 @@
-let globalFunctionLogging = undefined;
-export function setGlobalFunctionLogging(logLevel) {
-    globalFunctionLogging = logLevel;
-}
-export function getGlobalFunctionLogging() {
-    return globalFunctionLogging;
-}

package/core/GlobalFunctionObservers.cjs

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalFunctionObservers = exports.setGlobalFunctionObservers = void 0;
-let globalFunctionObservers = [];
-function setGlobalFunctionObservers(functionObservers) {
-    globalFunctionObservers = functionObservers;
-}
-exports.setGlobalFunctionObservers = setGlobalFunctionObservers;
-function getGlobalFunctionObservers() {
-    return globalFunctionObservers;
-}
-exports.getGlobalFunctionObservers = getGlobalFunctionObservers;

package/core/GlobalFunctionObservers.d.ts

@@ -1,3 +0,0 @@
-import { FunctionObserver } from "./FunctionObserver.js";
-export declare function setGlobalFunctionObservers(functionObservers: FunctionObserver[]): void;
-export declare function getGlobalFunctionObservers(): FunctionObserver[];

package/core/GlobalFunctionObservers.js

@@ -1,7 +0,0 @@
-let globalFunctionObservers = [];
-export function setGlobalFunctionObservers(functionObservers) {
-    globalFunctionObservers = functionObservers;
-}
-export function getGlobalFunctionObservers() {
-    return globalFunctionObservers;
-}