modelfusion 0.27.2 → 0.28.0

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -1,12 +1,12 @@
 import { z } from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.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 { CohereTokenizer } from "./CohereTokenizer.js";
 export declare const COHERE_TEXT_GENERATION_MODELS: {
     command: {

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -4,8 +4,8 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { AsyncQueue } from "../../model-function/generate-text/AsyncQueue.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 { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";

package/model-provider/cohere/CohereTokenizer.cjs

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CohereTokenizer = void 0;
 const zod_1 = __importDefault(require("zod"));
-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 CohereError_js_1 = require("./CohereError.cjs");
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 /**

package/model-provider/cohere/CohereTokenizer.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { Run } from "../../core/Run.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { CohereTextEmbeddingModelType } from "./CohereTextEmbeddingModel.js";
 import { CohereTextGenerationModelType } from "./CohereTextGenerationModel.js";

package/model-provider/cohere/CohereTokenizer.js

@@ -1,6 +1,6 @@
 import z from "zod";
-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 { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 /**

package/model-provider/elevenlabs/ElevenLabsApiConfiguration.cjs

@@ -1,29 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElevenLabsApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
-class ElevenLabsApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
+class ElevenLabsApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.elevenlabs.io/v1", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                "xi-api-key": (0, loadApiKey_js_1.loadApiKey)({
+                    apiKey,
+                    environmentVariableName: "ELEVENLABS_API_KEY",
+                    description: "ElevenLabs",
+                }),
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey,
-            environmentVariableName: "ELEVENLABS_API_KEY",
-            description: "ElevenLabs",
-        });
-    }
-    get headers() {
-        return { "xi-api-key": this.apiKey };
     }
 }
 exports.ElevenLabsApiConfiguration = ElevenLabsApiConfiguration;

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

package/model-provider/elevenlabs/ElevenLabsApiConfiguration.js

@@ -1,25 +1,18 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
-export class ElevenLabsApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
+export class ElevenLabsApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.elevenlabs.io/v1", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                "xi-api-key": loadApiKey({
+                    apiKey,
+                    environmentVariableName: "ELEVENLABS_API_KEY",
+                    description: "ElevenLabs",
+                }),
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = loadApiKey({
-            apiKey,
-            environmentVariableName: "ELEVENLABS_API_KEY",
-            description: "ElevenLabs",
-        });
-    }
-    get headers() {
-        return { "xi-api-key": this.apiKey };
     }
 }

package/model-provider/elevenlabs/ElevenLabsError.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedElevenLabsCallResponseHandler = void 0;
-const ApiCallError_js_1 = require("../../util/api/ApiCallError.cjs");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const failedElevenLabsCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     try {

package/model-provider/elevenlabs/ElevenLabsError.d.ts

@@ -1,3 +1,3 @@
-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 failedElevenLabsCallResponseHandler: ResponseHandler<ApiCallError>;

package/model-provider/elevenlabs/ElevenLabsError.js

@@ -1,4 +1,4 @@
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export const failedElevenLabsCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     try {

package/model-provider/elevenlabs/ElevenLabsSpeechSynthesisModel.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElevenLabsSpeechSynthesisModel = void 0;
+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 callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
 const ElevenLabsApiConfiguration_js_1 = require("./ElevenLabsApiConfiguration.cjs");
 const ElevenLabsError_js_1 = require("./ElevenLabsError.cjs");
 /**

package/model-provider/elevenlabs/ElevenLabsSpeechSynthesisModel.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { SpeechSynthesisModel, SpeechSynthesisModelSettings } from "../../model-function/synthesize-speech/SpeechSynthesisModel.js";
 export interface ElevenLabsSpeechSynthesisModelSettings extends SpeechSynthesisModelSettings {

package/model-provider/elevenlabs/ElevenLabsSpeechSynthesisModel.js

@@ -1,6 +1,6 @@
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createAudioMpegResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createAudioMpegResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
 import { ElevenLabsApiConfiguration } from "./ElevenLabsApiConfiguration.js";
 import { failedElevenLabsCallResponseHandler } from "./ElevenLabsError.js";
 /**

package/model-provider/huggingface/HuggingFaceApiConfiguration.cjs

@@ -1,29 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HuggingFaceApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
-class HuggingFaceApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
+class HuggingFaceApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api-inference.huggingface.co/models", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
+                    apiKey,
+                    environmentVariableName: "HUGGINGFACE_API_KEY",
+                    description: "Hugging Face",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey,
-            environmentVariableName: "HUGGINGFACE_API_KEY",
-            description: "Hugging Face",
-        });
-    }
-    get headers() {
-        return { Authorization: `Bearer ${this.apiKey}` };
     }
 }
 exports.HuggingFaceApiConfiguration = HuggingFaceApiConfiguration;

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

package/model-provider/huggingface/HuggingFaceApiConfiguration.js

@@ -1,25 +1,18 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
-export class HuggingFaceApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
+export class HuggingFaceApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api-inference.huggingface.co/models", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                Authorization: `Bearer ${loadApiKey({
+                    apiKey,
+                    environmentVariableName: "HUGGINGFACE_API_KEY",
+                    description: "Hugging Face",
+                })}`,
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = loadApiKey({
-            apiKey,
-            environmentVariableName: "HUGGINGFACE_API_KEY",
-            description: "Hugging Face",
-        });
-    }
-    get headers() {
-        return { Authorization: `Bearer ${this.apiKey}` };
     }
 }

package/model-provider/huggingface/HuggingFaceError.cjs

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

package/model-provider/huggingface/HuggingFaceError.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 huggingFaceErrorDataSchema: z.ZodObject<{
     error: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {

package/model-provider/huggingface/HuggingFaceError.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 huggingFaceErrorDataSchema = z.object({
     error: z.array(z.string()),
 });

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HuggingFaceTextEmbeddingModel = 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 HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 /**

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
 export interface HuggingFaceTextEmbeddingModelSettings extends TextEmbeddingModelSettings {

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.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 { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 /**

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -7,8 +7,8 @@ exports.HuggingFaceTextGenerationModel = void 0;
 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 HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 /**

package/model-provider/huggingface/HuggingFaceTextGenerationModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
 import { PromptFormat } from "../../prompt/PromptFormat.js";

package/model-provider/huggingface/HuggingFaceTextGenerationModel.js

@@ -1,8 +1,8 @@
 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 { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 /**

package/model-provider/llamacpp/LlamaCppApiConfiguration.cjs

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

package/model-provider/llamacpp/LlamaCppApiConfiguration.d.ts

@@ -1,7 +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 LlamaCppApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export declare class LlamaCppApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, retry, throttle, }?: {
         baseUrl?: string;
         retry?: RetryFunction;

package/model-provider/llamacpp/LlamaCppApiConfiguration.js

@@ -1,8 +1,9 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-export class LlamaCppApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+export class LlamaCppApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {},
             retry,
             throttle,
         });

package/model-provider/llamacpp/LlamaCppError.cjs

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

package/model-provider/llamacpp/LlamaCppError.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 llamaCppErrorDataSchema: z.ZodObject<{
     error: z.ZodString;
 }, "strip", z.ZodTypeAny, {

package/model-provider/llamacpp/LlamaCppError.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 llamaCppErrorDataSchema = z.object({
     error: z.string(),
 });

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTextEmbeddingModel = 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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
 export interface LlamaCppTextEmbeddingModelSettings extends TextEmbeddingModelSettings {

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.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 { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -10,8 +10,8 @@ const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const AsyncQueue_js_1 = require("../../model-function/generate-text/AsyncQueue.cjs");
 const parseEventSourceReadableStream_js_1 = require("../../model-function/generate-text/parseEventSourceReadableStream.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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -1,12 +1,12 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.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 { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -4,8 +4,8 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { AsyncQueue } from "../../model-function/generate-text/AsyncQueue.js";
 import { parseEventSourceReadableStream } from "../../model-function/generate-text/parseEventSourceReadableStream.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 { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/LlamaCppTokenizer.cjs

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTokenizer = void 0;
 const zod_1 = __importDefault(require("zod"));
-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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 /**

package/model-provider/llamacpp/LlamaCppTokenizer.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { Run } from "../../core/Run.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { BasicTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 /**
  * Tokenizer for LlamaCpp.

package/model-provider/llamacpp/LlamaCppTokenizer.js

@@ -1,6 +1,6 @@
 import z from "zod";
-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 { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 /**