modelfusion 0.27.3 → 0.29.0

package/model-provider/openai/AzureOpenAIApiConfiguration.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureOpenAIApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
+const AbstractApiConfiguration_js_1 = require("../../core/api/AbstractApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
 /**
  * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
  * It creates URLs of the form
@@ -10,13 +10,9 @@ const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
  *
  * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
  */
-class AzureOpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+class AzureOpenAIApiConfiguration extends AbstractApiConfiguration_js_1.AbstractApiConfiguration {
     constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }) {
-        super({
-            baseUrl: `https://${resourceName}.openai.azure.com/openai/deployments/${deploymentId}`,
-            retry,
-            throttle,
-        });
+        super({ retry, throttle });
         Object.defineProperty(this, "resourceName", {
             enumerable: true,
             configurable: true,
@@ -35,7 +31,7 @@ class AzureOpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiCon
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "apiKey", {
+        Object.defineProperty(this, "headers", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -44,19 +40,16 @@ class AzureOpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiCon
         this.resourceName = resourceName;
         this.deploymentId = deploymentId;
         this.apiVersion = apiVersion;
-        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey,
-            environmentVariableName: "AZURE_OPENAI_API_KEY",
-            description: "Azure OpenAI",
-        });
+        this.headers = {
+            "api-key": (0, loadApiKey_js_1.loadApiKey)({
+                apiKey,
+                environmentVariableName: "AZURE_OPENAI_API_KEY",
+                description: "Azure OpenAI",
+            }),
+        };
     }
     assembleUrl(path) {
-        return `${this.baseUrl}${path}?api-version=${this.apiVersion}`;
-    }
-    get headers() {
-        return {
-            "api-key": this.apiKey,
-        };
+        return `https://${this.resourceName}.openai.azure.com/openai/deployments/${this.deploymentId}${path}?api-version=${this.apiVersion}`;
     }
 }
 exports.AzureOpenAIApiConfiguration = AzureOpenAIApiConfiguration;

package/model-provider/openai/AzureOpenAIApiConfiguration.d.ts

@@ -1,6 +1,6 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
+import { AbstractApiConfiguration } from "../../core/api/AbstractApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
 /**
  * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
  * It creates URLs of the form
@@ -8,11 +8,11 @@ import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
  *
  * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
  */
-export declare class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
+export declare class AzureOpenAIApiConfiguration extends AbstractApiConfiguration {
     readonly resourceName: string;
     readonly deploymentId: string;
     readonly apiVersion: string;
-    readonly apiKey: string;
+    readonly headers: Record<string, string>;
     constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }: {
         resourceName: string;
         deploymentId: string;
@@ -22,5 +22,4 @@ export declare class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
         throttle?: ThrottleFunction;
     });
     assembleUrl(path: string): string;
-    get headers(): Record<string, string>;
 }

package/model-provider/openai/AzureOpenAIApiConfiguration.js

@@ -1,5 +1,5 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
+import { AbstractApiConfiguration } from "../../core/api/AbstractApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
 /**
  * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
  * It creates URLs of the form
@@ -7,13 +7,9 @@ import { loadApiKey } from "../../util/api/loadApiKey.js";
  *
  * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
  */
-export class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
+export class AzureOpenAIApiConfiguration extends AbstractApiConfiguration {
     constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }) {
-        super({
-            baseUrl: `https://${resourceName}.openai.azure.com/openai/deployments/${deploymentId}`,
-            retry,
-            throttle,
-        });
+        super({ retry, throttle });
         Object.defineProperty(this, "resourceName", {
             enumerable: true,
             configurable: true,
@@ -32,7 +28,7 @@ export class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "apiKey", {
+        Object.defineProperty(this, "headers", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -41,18 +37,15 @@ export class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
         this.resourceName = resourceName;
         this.deploymentId = deploymentId;
         this.apiVersion = apiVersion;
-        this.apiKey = loadApiKey({
-            apiKey,
-            environmentVariableName: "AZURE_OPENAI_API_KEY",
-            description: "Azure OpenAI",
-        });
+        this.headers = {
+            "api-key": loadApiKey({
+                apiKey,
+                environmentVariableName: "AZURE_OPENAI_API_KEY",
+                description: "Azure OpenAI",
+            }),
+        };
     }
     assembleUrl(path) {
-        return `${this.baseUrl}${path}?api-version=${this.apiVersion}`;
-    }
-    get headers() {
-        return {
-            "api-key": this.apiKey,
-        };
+        return `https://${this.resourceName}.openai.azure.com/openai/deployments/${this.deploymentId}${path}?api-version=${this.apiVersion}`;
     }
 }

package/model-provider/openai/OpenAIApiConfiguration.cjs

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

package/model-provider/openai/OpenAIApiConfiguration.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 OpenAIApiConfiguration 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 OpenAIApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, apiKey, retry, throttle, }?: {
         baseUrl?: string;
         apiKey?: string;
         retry?: RetryFunction;
         throttle?: ThrottleFunction;
     });
-    get headers(): Record<string, string>;
 }

package/model-provider/openai/OpenAIApiConfiguration.js

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

package/model-provider/openai/OpenAIError.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedOpenAICallResponseHandler = exports.OpenAIError = exports.openAIErrorDataSchema = 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.openAIErrorDataSchema = zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),

package/model-provider/openai/OpenAIError.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 openAIErrorDataSchema: z.ZodObject<{
     error: z.ZodObject<{
         message: z.ZodString;
@@ -8,27 +8,27 @@ export declare const openAIErrorDataSchema: z.ZodObject<{
         param: z.ZodNullable<z.ZodAny>;
         code: z.ZodNullable<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        code: string | null;
         message: string;
+        code: string | null;
         type: string;
         param?: any;
     }, {
-        code: string | null;
         message: string;
+        code: string | null;
         type: string;
         param?: any;
     }>;
 }, "strip", z.ZodTypeAny, {
     error: {
-        code: string | null;
         message: string;
+        code: string | null;
         type: string;
         param?: any;
     };
 }, {
     error: {
-        code: string | null;
         message: string;
+        code: string | null;
         type: string;
         param?: any;
     };

package/model-provider/openai/OpenAIError.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 openAIErrorDataSchema = z.object({
     error: z.object({
         message: z.string(),

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIImageGenerationResponseFormat = exports.OpenAIImageGenerationModel = exports.calculateOpenAIImageGenerationCostInMillicents = 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 OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 /**

package/model-provider/openai/OpenAIImageGenerationModel.d.ts

@@ -1,9 +1,9 @@
 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";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 export interface OpenAIImageGenerationCallSettings {
     n?: number;
     size?: "256x256" | "512x512" | "1024x1024";

package/model-provider/openai/OpenAIImageGenerationModel.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 { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 /**

package/model-provider/openai/OpenAITextEmbeddingModel.cjs

@@ -7,8 +7,8 @@ exports.OpenAITextEmbeddingModel = exports.calculateOpenAIEmbeddingCostInMillice
 const zod_1 = __importDefault(require("zod"));
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.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/OpenAITextEmbeddingModel.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 { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 export declare const OPENAI_TEXT_EMBEDDING_MODELS: {

package/model-provider/openai/OpenAITextEmbeddingModel.js

@@ -1,8 +1,8 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.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/openai/OpenAITextGenerationModel.cjs

@@ -11,8 +11,8 @@ const AsyncQueue_js_1 = require("../../model-function/generate-text/AsyncQueue.c
 const parseEventSourceReadableStream_js_1 = require("../../model-function/generate-text/parseEventSourceReadableStream.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.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/OpenAITextGenerationModel.d.ts

@@ -1,12 +1,12 @@
 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 { 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 { OpenAIImageGenerationCallSettings } from "./OpenAIImageGenerationModel.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**

package/model-provider/openai/OpenAITextGenerationModel.js

@@ -5,8 +5,8 @@ import { AsyncQueue } from "../../model-function/generate-text/AsyncQueue.js";
 import { parseEventSourceReadableStream } from "../../model-function/generate-text/parseEventSourceReadableStream.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.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/openai/OpenAITranscriptionModel.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAITranscriptionResponseFormat = exports.OpenAITranscriptionModel = exports.calculateOpenAITranscriptionCostInMillicents = exports.OPENAI_TRANSCRIPTION_MODELS = void 0;
 const zod_1 = __importDefault(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 OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 /**

package/model-provider/openai/OpenAITranscriptionModel.d.ts

@@ -2,9 +2,9 @@
 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 { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/transcribe-speech/TranscriptionModel.js";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 /**
  * @see https://openai.com/pricing
  */

package/model-provider/openai/OpenAITranscriptionModel.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, createTextResponseHandler, postToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, createTextResponseHandler, postToApi, } from "../../core/api/postToApi.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 /**

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(),
 });