modelfusion 0.27.3 → 0.28.0

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

@@ -8,8 +8,8 @@ const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = __importDefault(require("zod"));
 const AbstractModel_js_1 = require("../../../model-function/AbstractModel.cjs");
 const PromptFormatTextGenerationModel_js_1 = require("../../../prompt/PromptFormatTextGenerationModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../../core/api/postToApi.cjs");
 const OpenAIApiConfiguration_js_1 = require("../OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("../OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");

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

@@ -1,14 +1,14 @@
 import z from "zod";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { ModelFunctionOptions } from "../../../model-function/ModelFunctionOptions.js";
-import { ApiConfiguration } from "../../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../../core/api/ApiConfiguration.js";
 import { JsonGenerationModel } from "../../../model-function/generate-json/JsonGenerationModel.js";
 import { JsonOrTextGenerationModel } from "../../../model-function/generate-json/JsonOrTextGenerationModel.js";
 import { DeltaEvent } from "../../../model-function/generate-text/DeltaEvent.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../../model-function/generate-text/TextGenerationModel.js";
 import { PromptFormat } from "../../../prompt/PromptFormat.js";
 import { PromptFormatTextGenerationModel } from "../../../prompt/PromptFormatTextGenerationModel.js";
-import { ResponseHandler } from "../../../util/api/postToApi.js";
+import { ResponseHandler } from "../../../core/api/postToApi.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 import { OpenAIChatAutoFunctionPrompt, OpenAIChatSingleFunctionPrompt, OpenAIFunctionDescription } from "./OpenAIChatPrompt.js";

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

@@ -2,8 +2,8 @@ import SecureJSON from "secure-json-parse";
 import z from "zod";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { PromptFormatTextGenerationModel } from "../../../prompt/PromptFormatTextGenerationModel.js";
-import { callWithRetryAndThrottle } from "../../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../../core/api/postToApi.js";
 import { OpenAIApiConfiguration } from "../OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "../OpenAIError.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";

package/model-provider/stability/StabilityApiConfiguration.cjs

@@ -1,31 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StabilityApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
-class StabilityApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
+class StabilityApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.stability.ai/v1", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
+                    apiKey,
+                    environmentVariableName: "STABILITY_API_KEY",
+                    description: "Stability",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey,
-            environmentVariableName: "STABILITY_API_KEY",
-            description: "Stability",
-        });
-    }
-    get headers() {
-        return {
-            Authorization: `Bearer ${this.apiKey}`,
-        };
     }
 }
 exports.StabilityApiConfiguration = StabilityApiConfiguration;

package/model-provider/stability/StabilityApiConfiguration.d.ts

@@ -1,13 +1,11 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export declare class StabilityApiConfiguration extends BasicApiConfiguration {
-    readonly apiKey: string;
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export declare class StabilityApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, apiKey, retry, throttle, }?: {
         baseUrl?: string;
         apiKey?: string;
         retry?: RetryFunction;
         throttle?: ThrottleFunction;
     });
-    get headers(): Record<string, string>;
 }

package/model-provider/stability/StabilityApiConfiguration.js

@@ -1,27 +1,18 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
-export class StabilityApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
+export class StabilityApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.stability.ai/v1", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${loadApiKey({
+                    apiKey,
+                    environmentVariableName: "STABILITY_API_KEY",
+                    description: "Stability",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = loadApiKey({
-            apiKey,
-            environmentVariableName: "STABILITY_API_KEY",
-            description: "Stability",
-        });
-    }
-    get headers() {
-        return {
-            Authorization: `Bearer ${this.apiKey}`,
-        };
     }
 }

package/model-provider/stability/StabilityError.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedStabilityCallResponseHandler = exports.StabilityError = exports.stabilityErrorDataSchema = void 0;
 const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../util/api/ApiCallError.cjs");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 exports.stabilityErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
 });

package/model-provider/stability/StabilityError.d.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 export declare const stabilityErrorDataSchema: z.ZodObject<{
     message: z.ZodString;
 }, "strip", z.ZodTypeAny, {

package/model-provider/stability/StabilityError.js

@@ -1,6 +1,6 @@
 import SecureJSON from "secure-json-parse";
 import { z } from "zod";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export const stabilityErrorDataSchema = z.object({
     message: z.string(),
 });

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StabilityImageGenerationModel = void 0;
 const zod_1 = require("zod");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const StabilityError_js_1 = require("./StabilityError.cjs");
 const StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
 /**

package/model-provider/stability/StabilityImageGenerationModel.d.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 /**
  * Create an image generation model that calls the Stability AI image generation API.

package/model-provider/stability/StabilityImageGenerationModel.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { failedStabilityCallResponseHandler } from "./StabilityError.js";
 import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 /**

package/observability/helicone/HeliconeOpenAIApiConfiguration.cjs

@@ -1,45 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeliconeOpenAIApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
-class HeliconeOpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
+class HeliconeOpenAIApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://oai.hconeai.com/v1", openAIApiKey, heliconeApiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
+                    apiKey: openAIApiKey,
+                    environmentVariableName: "OPENAI_API_KEY",
+                    apiKeyParameterName: "openAIApiKey",
+                    description: "OpenAI",
+                })}`,
+                "Helicone-Auth": `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
+                    apiKey: heliconeApiKey,
+                    environmentVariableName: "HELICONE_API_KEY",
+                    apiKeyParameterName: "heliconeApiKey",
+                    description: "Helicone",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "openAIApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "heliconeApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.openAIApiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey: openAIApiKey,
-            environmentVariableName: "OPENAI_API_KEY",
-            apiKeyParameterName: "openAIApiKey",
-            description: "OpenAI",
-        });
-        this.heliconeApiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey: heliconeApiKey,
-            environmentVariableName: "HELICONE_API_KEY",
-            apiKeyParameterName: "heliconeApiKey",
-            description: "Helicone",
-        });
-    }
-    get headers() {
-        return {
-            Authorization: `Bearer ${this.openAIApiKey}`,
-            "Helicone-Auth": `Bearer ${this.heliconeApiKey}`,
-        };
     }
 }
 exports.HeliconeOpenAIApiConfiguration = HeliconeOpenAIApiConfiguration;

package/observability/helicone/HeliconeOpenAIApiConfiguration.d.ts

@@ -1,9 +1,7 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export declare class HeliconeOpenAIApiConfiguration extends BasicApiConfiguration {
-    readonly openAIApiKey: string;
-    readonly heliconeApiKey: string;
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export declare class HeliconeOpenAIApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, openAIApiKey, heliconeApiKey, retry, throttle, }?: {
         baseUrl?: string;
         openAIApiKey?: string;
@@ -11,5 +9,4 @@ export declare class HeliconeOpenAIApiConfiguration extends BasicApiConfiguratio
         retry?: RetryFunction;
         throttle?: ThrottleFunction;
     });
-    get headers(): Record<string, string>;
 }

package/observability/helicone/HeliconeOpenAIApiConfiguration.js

@@ -1,41 +1,25 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
-export class HeliconeOpenAIApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
+export class HeliconeOpenAIApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://oai.hconeai.com/v1", openAIApiKey, heliconeApiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${loadApiKey({
+                    apiKey: openAIApiKey,
+                    environmentVariableName: "OPENAI_API_KEY",
+                    apiKeyParameterName: "openAIApiKey",
+                    description: "OpenAI",
+                })}`,
+                "Helicone-Auth": `Bearer ${loadApiKey({
+                    apiKey: heliconeApiKey,
+                    environmentVariableName: "HELICONE_API_KEY",
+                    apiKeyParameterName: "heliconeApiKey",
+                    description: "Helicone",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "openAIApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "heliconeApiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.openAIApiKey = loadApiKey({
-            apiKey: openAIApiKey,
-            environmentVariableName: "OPENAI_API_KEY",
-            apiKeyParameterName: "openAIApiKey",
-            description: "OpenAI",
-        });
-        this.heliconeApiKey = loadApiKey({
-            apiKey: heliconeApiKey,
-            environmentVariableName: "HELICONE_API_KEY",
-            apiKeyParameterName: "heliconeApiKey",
-            description: "Helicone",
-        });
-    }
-    get headers() {
-        return {
-            Authorization: `Bearer ${this.openAIApiKey}`,
-            "Helicone-Auth": `Bearer ${this.heliconeApiKey}`,
-        };
     }
 }

package/package.json

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

package/tool/executeTool.cjs

@@ -7,7 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
-const AbortError_js_1 = require("../util/api/AbortError.cjs");
+const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
 const ToolExecutionError_js_1 = require("./ToolExecutionError.cjs");
 class ExecuteToolPromise extends Promise {

package/tool/executeTool.js

@@ -4,7 +4,7 @@ import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
-import { AbortError } from "../util/api/AbortError.js";
+import { AbortError } from "../core/api/AbortError.js";
 import { runSafe } from "../util/runSafe.js";
 import { ToolExecutionError } from "./ToolExecutionError.js";
 export class ExecuteToolPromise extends Promise {

package/util/index.cjs

@@ -14,13 +14,4 @@ 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("./api/AbortError.cjs"), exports);
-__exportStar(require("./api/ApiCallError.cjs"), exports);
-__exportStar(require("./api/RetryError.cjs"), exports);
-__exportStar(require("./api/RetryFunction.cjs"), exports);
-__exportStar(require("./api/ThrottleFunction.cjs"), exports);
-__exportStar(require("./api/retryNever.cjs"), exports);
-__exportStar(require("./api/retryWithExponentialBackoff.cjs"), exports);
-__exportStar(require("./api/throttleMaxConcurrency.cjs"), exports);
-__exportStar(require("./api/throttleUnlimitedConcurrency.cjs"), exports);
 __exportStar(require("./cosineSimilarity.cjs"), exports);

package/util/index.d.ts

@@ -1,10 +1 @@
-export * from "./api/AbortError.js";
-export * from "./api/ApiCallError.js";
-export * from "./api/RetryError.js";
-export * from "./api/RetryFunction.js";
-export * from "./api/ThrottleFunction.js";
-export * from "./api/retryNever.js";
-export * from "./api/retryWithExponentialBackoff.js";
-export * from "./api/throttleMaxConcurrency.js";
-export * from "./api/throttleUnlimitedConcurrency.js";
 export * from "./cosineSimilarity.js";

package/util/index.js

@@ -1,10 +1 @@
-export * from "./api/AbortError.js";
-export * from "./api/ApiCallError.js";
-export * from "./api/RetryError.js";
-export * from "./api/RetryFunction.js";
-export * from "./api/ThrottleFunction.js";
-export * from "./api/retryNever.js";
-export * from "./api/retryWithExponentialBackoff.js";
-export * from "./api/throttleMaxConcurrency.js";
-export * from "./api/throttleUnlimitedConcurrency.js";
 export * from "./cosineSimilarity.js";

package/model-function/ApiConfiguration.d.ts

@@ -1,14 +0,0 @@
-import { RetryFunction } from "../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../util/api/ThrottleFunction.js";
-/**
- * Settings for a REST provider, e.g. OpenAI or Lmnt.
- */
-export interface ApiConfiguration {
-    /**
-     * Creates a full URL given a inner path.
-     */
-    assembleUrl(path: string): string;
-    readonly headers: Record<string, string>;
-    readonly retry?: RetryFunction;
-    readonly throttle?: ThrottleFunction;
-}

package/model-function/BasicApiConfiguration.cjs

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasicApiConfiguration = void 0;
-class BasicApiConfiguration {
-    constructor({ baseUrl, retry, throttle, }) {
-        Object.defineProperty(this, "baseUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "retry", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "throttle", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.baseUrl = baseUrl;
-        this.retry = retry;
-        this.throttle = throttle;
-    }
-    get headers() {
-        return {};
-    }
-    assembleUrl(path) {
-        return `${this.baseUrl}${path}`;
-    }
-}
-exports.BasicApiConfiguration = BasicApiConfiguration;

package/model-function/BasicApiConfiguration.d.ts

@@ -1,15 +0,0 @@
-import { RetryFunction } from "../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../util/api/ThrottleFunction.js";
-import { ApiConfiguration } from "./ApiConfiguration.js";
-export declare class BasicApiConfiguration implements ApiConfiguration {
-    readonly baseUrl: string;
-    readonly retry?: RetryFunction;
-    readonly throttle?: ThrottleFunction;
-    constructor({ baseUrl, retry, throttle, }: {
-        baseUrl: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    });
-    get headers(): Record<string, string>;
-    assembleUrl(path: string): string;
-}