modelfusion 0.109.0 → 0.111.0

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

@@ -1,11 +1,8 @@
-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);
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export declare class WhisperCppApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions);
 }

package/model-provider/whispercpp/WhisperCppApiConfiguration.js

@@ -1,11 +1,18 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-export class WhisperCppApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export class WhisperCppApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "8080",
+                path: "",
+            },
         });
     }
 }

package/model-provider/whispercpp/WhisperCppFacade.cjs

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Api = exports.Transcriber = void 0;
+exports.Transcriber = exports.Api = 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;
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
 function Api(settings) {
     return new WhisperCppApiConfiguration_js_1.WhisperCppApiConfiguration(settings);
 }
 exports.Api = Api;
+function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel_js_1.WhisperCppTranscriptionModel(settings);
+}
+exports.Transcriber = Transcriber;

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

@@ -1,4 +1,9 @@
-import { WhisperCppApiConfiguration, WhisperCppApiConfigurationSettings } from "./WhisperCppApiConfiguration.js";
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
 import { WhisperCppTranscriptionModel, WhisperCppTranscriptionModelSettings } from "./WhisperCppTranscriptionModel.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions): WhisperCppApiConfiguration;
 export declare function Transcriber(settings?: WhisperCppTranscriptionModelSettings): WhisperCppTranscriptionModel;
-export declare function Api(settings: WhisperCppApiConfigurationSettings): WhisperCppApiConfiguration;

package/model-provider/whispercpp/WhisperCppFacade.js

@@ -1,8 +1,12 @@
-import { WhisperCppApiConfiguration, } from "./WhisperCppApiConfiguration.js";
+import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
 import { WhisperCppTranscriptionModel, } from "./WhisperCppTranscriptionModel.js";
-export function Transcriber(settings = {}) {
-    return new WhisperCppTranscriptionModel(settings);
-}
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
 export function Api(settings) {
     return new WhisperCppApiConfiguration(settings);
 }
+export function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel(settings);
+}

package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs

@@ -73,12 +73,15 @@ class WhisperCppTranscriptionModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.WhisperCppTranscriptionModel = WhisperCppTranscriptionModel;
-const whisperCppTranscriptionJsonSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.union([zod_1.z.object({ text: zod_1.z.string() }), zod_1.z.object({ error: zod_1.z.string() })]));
+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: whisperCppTranscriptionJsonSchema,
+        schema: (0, ZodSchema_js_1.zodSchema)(whisperCppTranscriptionJsonSchema),
     });
     if (!parsedResult.success) {
         throw new ApiCallError_js_1.ApiCallError({

package/model-provider/whispercpp/WhisperCppTranscriptionModel.js

@@ -2,7 +2,7 @@ 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 { 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";
@@ -69,12 +69,15 @@ export class WhisperCppTranscriptionModel extends AbstractModel {
         return new WhisperCppTranscriptionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const whisperCppTranscriptionJsonSchema = new ZodSchema(z.union([z.object({ text: z.string() }), z.object({ error: z.string() })]));
+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: whisperCppTranscriptionJsonSchema,
+        schema: zodSchema(whisperCppTranscriptionJsonSchema),
     });
     if (!parsedResult.success) {
         throw new ApiCallError({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.109.0",
+  "version": "0.111.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -42,10 +42,10 @@
       "import": "./index.js",
       "require": "./index.cjs"
     },
-    "./extension": {
-      "types": "./extension/index.d.ts",
-      "import": "./extension/index.js",
-      "require": "./extension/index.cjs"
+    "./internal": {
+      "types": "./internal/index.d.ts",
+      "import": "./internal/index.js",
+      "require": "./internal/index.cjs"
     }
   },
   "scripts": {

package/tool/WebSearchTool.cjs

@@ -4,7 +4,7 @@ exports.WebSearchTool = void 0;
 const zod_1 = require("zod");
 const ZodSchema_js_1 = require("../core/schema/ZodSchema.cjs");
 const Tool_js_1 = require("./Tool.cjs");
-const RETURN_TYPE_SCHEMA = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const RETURN_TYPE_SCHEMA = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     results: zod_1.z.array(zod_1.z.object({
         title: zod_1.z.string(),
         link: zod_1.z.string().url(),
@@ -14,7 +14,7 @@ const RETURN_TYPE_SCHEMA = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
 // expose the schemas to library consumers:
 const createParameters = (description) => 
 // same structure, but with description:
-new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+(0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     query: zod_1.z.string().describe(description),
 }));
 /**

package/tool/WebSearchTool.d.ts

@@ -1,7 +1,6 @@
 import { FunctionOptions } from "../core/FunctionOptions.js";
-import { ZodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
-declare const RETURN_TYPE_SCHEMA: ZodSchema<{
+declare const RETURN_TYPE_SCHEMA: import("../core/schema/ZodSchema.js").ZodSchema<{
     results: {
         link: string;
         title: string;

package/tool/WebSearchTool.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { ZodSchema } from "../core/schema/ZodSchema.js";
+import { zodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
-const RETURN_TYPE_SCHEMA = new ZodSchema(z.object({
+const RETURN_TYPE_SCHEMA = zodSchema(z.object({
     results: z.array(z.object({
         title: z.string(),
         link: z.string().url(),
@@ -11,7 +11,7 @@ const RETURN_TYPE_SCHEMA = new ZodSchema(z.object({
 // expose the schemas to library consumers:
 const createParameters = (description) => 
 // same structure, but with description:
-new ZodSchema(z.object({
+zodSchema(z.object({
     query: z.string().describe(description),
 }));
 /**

package/vector-index/memory/MemoryVectorIndex.cjs

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryVectorIndex = void 0;
 const zod_1 = require("zod");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const cosineSimilarity_js_1 = require("../../util/cosineSimilarity.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-const jsonDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.array(zod_1.z.object({
+const cosineSimilarity_js_1 = require("../../util/cosineSimilarity.cjs");
+const jsonDataSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.array(zod_1.z.object({
     id: zod_1.z.string(),
     vector: zod_1.z.array(zod_1.z.number()),
     data: zod_1.z.unknown(),

package/vector-index/memory/MemoryVectorIndex.js

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { cosineSimilarity } from "../../util/cosineSimilarity.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
-const jsonDataSchema = new ZodSchema(z.array(z.object({
+import { cosineSimilarity } from "../../util/cosineSimilarity.js";
+const jsonDataSchema = zodSchema(z.array(z.object({
     id: z.string(),
     vector: z.array(z.number()),
     data: z.unknown(),

package/core/api/BaseUrlPartsApiConfiguration.cjs

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseUrlPartsApiConfiguration = void 0;
-const AbstractApiConfiguration_js_1 = require("./AbstractApiConfiguration.cjs");
-/**
- * An API configuration that uses different URL parts and a set of headers.
- *
- * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
- */
-class BaseUrlPartsApiConfiguration extends AbstractApiConfiguration_js_1.AbstractApiConfiguration {
-    constructor({ protocol, host, port, path, headers, retry, throttle, }) {
-        super({ retry, throttle });
-        Object.defineProperty(this, "protocol", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "host", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "port", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "path", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "headers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.protocol = protocol;
-        this.host = host;
-        this.port = port;
-        this.path = path;
-        this.headers = headers;
-    }
-    assembleUrl(path) {
-        return `${this.protocol}://${this.host}:${this.port}${this.path}${path}`;
-    }
-}
-exports.BaseUrlPartsApiConfiguration = BaseUrlPartsApiConfiguration;

package/core/api/BaseUrlPartsApiConfiguration.d.ts

@@ -1,26 +0,0 @@
-import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
-import { RetryFunction } from "./RetryFunction.js";
-import { ThrottleFunction } from "./ThrottleFunction.js";
-export type BaseUrlPartsApiConfigurationOptions = {
-    protocol: string;
-    host: string;
-    port: string;
-    path: string;
-    headers: Record<string, string>;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-};
-/**
- * An API configuration that uses different URL parts and a set of headers.
- *
- * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
- */
-export declare class BaseUrlPartsApiConfiguration extends AbstractApiConfiguration {
-    readonly protocol: string;
-    readonly host: string;
-    readonly port: string;
-    readonly path: string;
-    readonly headers: Record<string, string>;
-    constructor({ protocol, host, port, path, headers, retry, throttle, }: BaseUrlPartsApiConfigurationOptions);
-    assembleUrl(path: string): string;
-}

package/core/api/BaseUrlPartsApiConfiguration.js

@@ -1,49 +0,0 @@
-import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
-/**
- * An API configuration that uses different URL parts and a set of headers.
- *
- * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
- */
-export class BaseUrlPartsApiConfiguration extends AbstractApiConfiguration {
-    constructor({ protocol, host, port, path, headers, retry, throttle, }) {
-        super({ retry, throttle });
-        Object.defineProperty(this, "protocol", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "host", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "port", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "path", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "headers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.protocol = protocol;
-        this.host = host;
-        this.port = port;
-        this.path = path;
-        this.headers = headers;
-    }
-    assembleUrl(path) {
-        return `${this.protocol}://${this.host}:${this.port}${this.path}${path}`;
-    }
-}

package/core/api/throttleUnlimitedConcurrency.cjs

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.throttleUnlimitedConcurrency = void 0;
-/**
- * The `throttleUnlimitedConcurrency` strategy does not limit parallel API calls.
- */
-const throttleUnlimitedConcurrency = () => (fn) => fn();
-exports.throttleUnlimitedConcurrency = throttleUnlimitedConcurrency;

package/core/api/throttleUnlimitedConcurrency.d.ts

@@ -1,5 +0,0 @@
-import { ThrottleFunction } from "./ThrottleFunction.js";
-/**
- * The `throttleUnlimitedConcurrency` strategy does not limit parallel API calls.
- */
-export declare const throttleUnlimitedConcurrency: () => ThrottleFunction;

package/core/api/throttleUnlimitedConcurrency.js

@@ -1,4 +0,0 @@
-/**
- * The `throttleUnlimitedConcurrency` strategy does not limit parallel API calls.
- */
-export const throttleUnlimitedConcurrency = () => (fn) => fn();

package/model-provider/elevenlabs/ElevenLabsError.cjs

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedElevenLabsCallResponseHandler = void 0;
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
-const failedElevenLabsCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        return new ApiCallError_js_1.ApiCallError({
-            message: responseBody,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError_js_1.ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError_js_1.ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};
-exports.failedElevenLabsCallResponseHandler = failedElevenLabsCallResponseHandler;

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

@@ -1,3 +0,0 @@
-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,26 +0,0 @@
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-export const failedElevenLabsCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        return new ApiCallError({
-            message: responseBody,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};

package/model-provider/lmnt/LmntError.cjs

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedLmntCallResponseHandler = void 0;
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
-const failedLmntCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        return new ApiCallError_js_1.ApiCallError({
-            message: responseBody,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError_js_1.ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError_js_1.ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};
-exports.failedLmntCallResponseHandler = failedLmntCallResponseHandler;

package/model-provider/lmnt/LmntError.d.ts

@@ -1,3 +0,0 @@
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { ResponseHandler } from "../../core/api/postToApi.js";
-export declare const failedLmntCallResponseHandler: ResponseHandler<ApiCallError>;

package/model-provider/lmnt/LmntError.js

@@ -1,26 +0,0 @@
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-export const failedLmntCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        return new ApiCallError({
-            message: responseBody,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};