modelfusion 0.126.0 → 0.128.0

package/model-provider/openai-compatible/OpenAICompatibleChatModel.d.ts

@@ -1,4 +1,3 @@
-import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
@@ -7,9 +6,9 @@ import { TextGenerationPromptTemplate } from "../../model-function/generate-text
 import { ToolCallGenerationModel } from "../../tool/generate-tool-call/ToolCallGenerationModel.js";
 import { ToolCallsGenerationModel } from "../../tool/generate-tool-calls/ToolCallsGenerationModel.js";
 import { AbstractOpenAIChatModel, AbstractOpenAIChatSettings, OpenAIChatPrompt } from "../openai/AbstractOpenAIChatModel.js";
-import { OpenAICompatibleProviderName } from "./OpenAICompatibleProviderName.js";
+import { OpenAICompatibleApiConfiguration, OpenAICompatibleProviderName } from "./OpenAICompatibleApiConfiguration.js";
 export interface OpenAICompatibleChatSettings extends AbstractOpenAIChatSettings {
-    api: ApiConfiguration;
+    api: OpenAICompatibleApiConfiguration;
     provider?: OpenAICompatibleProviderName;
 }
 /**

package/model-provider/openai-compatible/OpenAICompatibleChatModel.js

@@ -34,7 +34,7 @@ export class OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
         });
     }
     get provider() {
-        return this.settings.provider ?? "openaicompatible";
+        return (this.settings.provider ?? this.settings.api.provider ?? "openaicompatible");
     }
     get modelName() {
         return this.settings.model;

package/model-provider/openai-compatible/OpenAICompatibleCompletionModel.cjs

@@ -36,7 +36,7 @@ class OpenAICompatibleCompletionModel extends AbstractOpenAICompletionModel_js_1
         });
     }
     get provider() {
-        return this.settings.provider ?? "openaicompatible";
+        return (this.settings.provider ?? this.settings.api.provider ?? "openaicompatible");
     }
     get modelName() {
         return this.settings.model;

package/model-provider/openai-compatible/OpenAICompatibleCompletionModel.d.ts

@@ -1,11 +1,10 @@
-import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextStreamingBaseModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { AbstractOpenAICompletionModel, AbstractOpenAICompletionModelSettings } from "../openai/AbstractOpenAICompletionModel.js";
-import { OpenAICompatibleProviderName } from "./OpenAICompatibleProviderName.js";
+import { OpenAICompatibleApiConfiguration, OpenAICompatibleProviderName } from "./OpenAICompatibleApiConfiguration.js";
 export interface OpenAICompatibleCompletionModelSettings extends AbstractOpenAICompletionModelSettings {
-    api: ApiConfiguration;
+    api: OpenAICompatibleApiConfiguration;
     provider?: OpenAICompatibleProviderName;
 }
 /**

package/model-provider/openai-compatible/OpenAICompatibleCompletionModel.js

@@ -33,7 +33,7 @@ export class OpenAICompatibleCompletionModel extends AbstractOpenAICompletionMod
         });
     }
     get provider() {
-        return this.settings.provider ?? "openaicompatible";
+        return (this.settings.provider ?? this.settings.api.provider ?? "openaicompatible");
     }
     get modelName() {
         return this.settings.model;

package/model-provider/openai-compatible/OpenAICompatibleTextEmbeddingModel.cjs

@@ -7,7 +7,7 @@ class OpenAICompatibleTextEmbeddingModel extends AbstractOpenAITextEmbeddingMode
         super(settings);
     }
     get provider() {
-        return this.settings.provider ?? "openaicompatible";
+        return (this.settings.provider ?? this.settings.api.provider ?? "openaicompatible");
     }
     get modelName() {
         return this.settings.model;

package/model-provider/openai-compatible/OpenAICompatibleTextEmbeddingModel.d.ts

@@ -1,9 +1,8 @@
-import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { EmbeddingModel } from "../../model-function/embed/EmbeddingModel.js";
 import { AbstractOpenAITextEmbeddingModel, AbstractOpenAITextEmbeddingModelSettings } from "../openai/AbstractOpenAITextEmbeddingModel.js";
-import { OpenAICompatibleProviderName } from "./OpenAICompatibleProviderName.js";
+import { OpenAICompatibleApiConfiguration, OpenAICompatibleProviderName } from "./OpenAICompatibleApiConfiguration.js";
 export interface OpenAICompatibleTextEmbeddingModelSettings extends AbstractOpenAITextEmbeddingModelSettings {
-    api: ApiConfiguration;
+    api: OpenAICompatibleApiConfiguration;
     provider?: OpenAICompatibleProviderName;
     model: string;
     embeddingDimensions?: number;

package/model-provider/openai-compatible/OpenAICompatibleTextEmbeddingModel.js

@@ -4,7 +4,7 @@ export class OpenAICompatibleTextEmbeddingModel extends AbstractOpenAITextEmbedd
         super(settings);
     }
     get provider() {
-        return this.settings.provider ?? "openaicompatible";
+        return (this.settings.provider ?? this.settings.api.provider ?? "openaicompatible");
     }
     get modelName() {
         return this.settings.model;

package/model-provider/openai-compatible/PerplexityApiConfiguration.cjs

@@ -28,6 +28,12 @@ class PerplexityApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApi
                 path: "",
             },
         });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "openaicompatible-perplexity"
+        });
     }
 }
 exports.PerplexityApiConfiguration = PerplexityApiConfiguration;

package/model-provider/openai-compatible/PerplexityApiConfiguration.d.ts

@@ -1,4 +1,5 @@
 import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { OpenAICompatibleApiConfiguration } from "./OpenAICompatibleApiConfiguration.js";
 /**
  * Configuration for the Perplexity API.
  *
@@ -6,8 +7,9 @@ import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfiguratio
  *
  * @see https://docs.perplexity.ai/reference/post_chat_completions
  */
-export declare class PerplexityApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+export declare class PerplexityApiConfiguration extends BaseUrlApiConfigurationWithDefaults implements OpenAICompatibleApiConfiguration {
     constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
     });
+    readonly provider = "openaicompatible-perplexity";
 }

package/model-provider/openai-compatible/PerplexityApiConfiguration.js

@@ -25,5 +25,11 @@ export class PerplexityApiConfiguration extends BaseUrlApiConfigurationWithDefau
                 path: "",
             },
         });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "openaicompatible-perplexity"
+        });
     }
 }

package/model-provider/openai-compatible/TogetherAIApiConfiguration.cjs

@@ -28,6 +28,12 @@ class TogetherAIApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApi
                 path: "/v1",
             },
         });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "openaicompatible-togetherai"
+        });
     }
 }
 exports.TogetherAIApiConfiguration = TogetherAIApiConfiguration;

package/model-provider/openai-compatible/TogetherAIApiConfiguration.d.ts

@@ -1,4 +1,5 @@
 import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { OpenAICompatibleApiConfiguration } from "./OpenAICompatibleApiConfiguration.js";
 /**
  * Configuration for the Together.ai API.
  *
@@ -6,8 +7,9 @@ import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfiguratio
  *
  * @see https://docs.together.ai/docs/openai-api-compatibility
  */
-export declare class TogetherAIApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+export declare class TogetherAIApiConfiguration extends BaseUrlApiConfigurationWithDefaults implements OpenAICompatibleApiConfiguration {
     constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
     });
+    readonly provider = "openaicompatible-togetherai";
 }

package/model-provider/openai-compatible/TogetherAIApiConfiguration.js

@@ -25,5 +25,11 @@ export class TogetherAIApiConfiguration extends BaseUrlApiConfigurationWithDefau
                 path: "/v1",
             },
         });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "openaicompatible-togetherai"
+        });
     }
 }

package/model-provider/openai-compatible/index.cjs

@@ -28,10 +28,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openaicompatible = void 0;
 __exportStar(require("./FireworksAIApiConfiguration.cjs"), exports);
+__exportStar(require("./OpenAICompatibleApiConfiguration.cjs"), exports);
 __exportStar(require("./OpenAICompatibleChatModel.cjs"), exports);
 __exportStar(require("./OpenAICompatibleCompletionModel.cjs"), exports);
 exports.openaicompatible = __importStar(require("./OpenAICompatibleFacade.cjs"));
-__exportStar(require("./OpenAICompatibleProviderName.cjs"), exports);
 __exportStar(require("./OpenAICompatibleTextEmbeddingModel.cjs"), exports);
 __exportStar(require("./PerplexityApiConfiguration.cjs"), exports);
 __exportStar(require("./TogetherAIApiConfiguration.cjs"), exports);

package/model-provider/openai-compatible/index.d.ts

@@ -1,8 +1,8 @@
 export * from "./FireworksAIApiConfiguration.js";
+export * from "./OpenAICompatibleApiConfiguration.js";
 export * from "./OpenAICompatibleChatModel.js";
 export * from "./OpenAICompatibleCompletionModel.js";
 export * as openaicompatible from "./OpenAICompatibleFacade.js";
-export * from "./OpenAICompatibleProviderName.js";
 export * from "./OpenAICompatibleTextEmbeddingModel.js";
 export * from "./PerplexityApiConfiguration.js";
 export * from "./TogetherAIApiConfiguration.js";

package/model-provider/openai-compatible/index.js

@@ -1,8 +1,8 @@
 export * from "./FireworksAIApiConfiguration.js";
+export * from "./OpenAICompatibleApiConfiguration.js";
 export * from "./OpenAICompatibleChatModel.js";
 export * from "./OpenAICompatibleCompletionModel.js";
 export * as openaicompatible from "./OpenAICompatibleFacade.js";
-export * from "./OpenAICompatibleProviderName.js";
 export * from "./OpenAICompatibleTextEmbeddingModel.js";
 export * from "./PerplexityApiConfiguration.js";
 export * from "./TogetherAIApiConfiguration.js";

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

@@ -69,9 +69,9 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     doGenerateImages(prompt: StabilityImageGenerationPrompt, callOptions: FunctionCallOptions): Promise<{
         rawResponse: {
             artifacts: {
-                base64: string;
                 finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
                 seed: number;
+                base64: string;
             }[];
         };
         base64Images: string[];
@@ -86,25 +86,25 @@ declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
         seed: z.ZodNumber;
         finishReason: z.ZodEnum<["SUCCESS", "ERROR", "CONTENT_FILTERED"]>;
     }, "strip", z.ZodTypeAny, {
-        base64: string;
         finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
-    }, {
         base64: string;
+    }, {
         finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
+        base64: string;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     artifacts: {
-        base64: string;
         finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
+        base64: string;
     }[];
 }, {
     artifacts: {
-        base64: string;
         finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
+        base64: string;
     }[];
 }>;
 export type StabilityImageGenerationResponse = z.infer<typeof stabilityImageGenerationResponseSchema>;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
@@ -9,7 +8,7 @@ export interface WhisperCppTranscriptionModelSettings extends TranscriptionModel
 }
 export type WhisperCppTranscriptionInput = {
     type: "wav";
-    data: Buffer;
+    data: Uint8Array;
 };
 export declare class WhisperCppTranscriptionModel extends AbstractModel<WhisperCppTranscriptionModelSettings> implements TranscriptionModel<WhisperCppTranscriptionInput, WhisperCppTranscriptionModelSettings> {
     constructor(settings: WhisperCppTranscriptionModelSettings);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building AI applications.",
-  "version": "0.126.0",
+  "version": "0.128.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -80,6 +80,7 @@
     "@vitest/ui": "1.1.0",
     "eslint": "^8.45.0",
     "eslint-config-prettier": "9.1.0",
-    "msw": "2.0.11"
+    "msw": "2.0.11",
+    "type-fest": "4.9.0"
   }
 }

package/util/UInt8Utils.cjs

@@ -0,0 +1,50 @@
+"use strict";
+/*
+ * MIT License
+ *
+ * Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.toUint8Array = void 0;
+// copied from: https://github.com/sindresorhus/uint8array-extras/blob/main/index.js
+function toUint8Array(value) {
+    if (value instanceof ArrayBuffer) {
+        return new Uint8Array(value);
+    }
+    if (ArrayBuffer.isView(value)) {
+        return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+    }
+    throw new TypeError(`Unsupported value, got \`${typeof value}\`.`);
+}
+exports.toUint8Array = toUint8Array;
+function base64ToUint8Array(base64String) {
+    return Uint8Array.from(globalThis.atob(base64UrlToBase64(base64String)), (x) => x.codePointAt(0));
+}
+exports.base64ToUint8Array = base64ToUint8Array;
+// Reference: https://phuoc.ng/collection/this-vs-that/concat-vs-push/
+const MAX_BLOCK_SIZE = 65535;
+function uint8ArrayToBase64(array) {
+    let base64;
+    if (array.length < MAX_BLOCK_SIZE) {
+        // Required as `btoa` and `atob` don't properly support Unicode: https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
+        base64 = globalThis.btoa(String.fromCodePoint(...array));
+    }
+    else {
+        base64 = "";
+        for (const value of array) {
+            base64 += String.fromCodePoint(value);
+        }
+        base64 = globalThis.btoa(base64);
+    }
+    return base64;
+}
+exports.uint8ArrayToBase64 = uint8ArrayToBase64;
+function base64UrlToBase64(base64url) {
+    return base64url.replaceAll("-", "+").replaceAll("_", "/");
+}

package/util/UInt8Utils.d.ts

@@ -0,0 +1,3 @@
+export declare function toUint8Array(value: unknown): Uint8Array;
+export declare function base64ToUint8Array(base64String: string): Uint8Array;
+export declare function uint8ArrayToBase64(array: Uint8Array): string;

package/util/UInt8Utils.js

@@ -0,0 +1,44 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+// copied from: https://github.com/sindresorhus/uint8array-extras/blob/main/index.js
+export function toUint8Array(value) {
+    if (value instanceof ArrayBuffer) {
+        return new Uint8Array(value);
+    }
+    if (ArrayBuffer.isView(value)) {
+        return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+    }
+    throw new TypeError(`Unsupported value, got \`${typeof value}\`.`);
+}
+export function base64ToUint8Array(base64String) {
+    return Uint8Array.from(globalThis.atob(base64UrlToBase64(base64String)), (x) => x.codePointAt(0));
+}
+// Reference: https://phuoc.ng/collection/this-vs-that/concat-vs-push/
+const MAX_BLOCK_SIZE = 65535;
+export function uint8ArrayToBase64(array) {
+    let base64;
+    if (array.length < MAX_BLOCK_SIZE) {
+        // Required as `btoa` and `atob` don't properly support Unicode: https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
+        base64 = globalThis.btoa(String.fromCodePoint(...array));
+    }
+    else {
+        base64 = "";
+        for (const value of array) {
+            base64 += String.fromCodePoint(value);
+        }
+        base64 = globalThis.btoa(base64);
+    }
+    return base64;
+}
+function base64UrlToBase64(base64url) {
+    return base64url.replaceAll("-", "+").replaceAll("_", "/");
+}

package/model-provider/openai-compatible/OpenAICompatibleProviderName.d.ts

@@ -1 +0,0 @@
-export type OpenAICompatibleProviderName = `openaicompatible` | `openaicompatible-${string}`;