modelfusion 0.126.0 → 0.128.0

package/model-function/generate-text/streamText.cjs

@@ -46,7 +46,7 @@ async function streamText({ model, prompt, fullResponse, ...options }) {
     return fullResponse
         ? {
             textStream: callResponse.value,
-            text: textPromise,
+            textPromise,
             metadata: callResponse.metadata,
         }
         : callResponse.value;

package/model-function/generate-text/streamText.d.ts

@@ -37,6 +37,6 @@ export declare function streamText<PROMPT>(args: {
     fullResponse: true;
 } & FunctionOptions): Promise<{
     textStream: AsyncIterable<string>;
-    text: PromiseLike<string>;
+    textPromise: PromiseLike<string>;
     metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
 }>;

package/model-function/generate-text/streamText.js

@@ -43,7 +43,7 @@ export async function streamText({ model, prompt, fullResponse, ...options }) {
     return fullResponse
         ? {
             textStream: callResponse.value,
-            text: textPromise,
+            textPromise,
             metadata: callResponse.metadata,
         }
         : callResponse.value;

package/model-provider/elevenlabs/ElevenLabsSpeechModel.cjs

@@ -9,6 +9,7 @@ const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const SimpleWebSocket_js_1 = require("../../util/SimpleWebSocket.cjs");
+const UInt8Utils_js_1 = require("../../util/UInt8Utils.cjs");
 const ElevenLabsApiConfiguration_js_1 = require("./ElevenLabsApiConfiguration.cjs");
 const elevenLabsModels = [
     "eleven_multilingual_v2",
@@ -141,7 +142,7 @@ class ElevenLabsSpeechModel extends AbstractModel_js_1.AbstractModel {
             if (!response.isFinal) {
                 queue.push({
                     type: "delta",
-                    deltaValue: Buffer.from(response.audio, "base64"),
+                    deltaValue: (0, UInt8Utils_js_1.base64ToUint8Array)(response.audio),
                 });
             }
         };

package/model-provider/elevenlabs/ElevenLabsSpeechModel.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";
@@ -37,8 +36,8 @@ export declare class ElevenLabsSpeechModel extends AbstractModel<ElevenLabsSpeec
     get modelName(): string;
     private callAPI;
     get settingsForEvent(): Partial<ElevenLabsSpeechModelSettings>;
-    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Buffer>;
-    doGenerateSpeechStreamDuplex(textStream: AsyncIterable<string>): Promise<AsyncIterable<Delta<Buffer>>>;
+    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Uint8Array>;
+    doGenerateSpeechStreamDuplex(textStream: AsyncIterable<string>): Promise<AsyncIterable<Delta<Uint8Array>>>;
     withSettings(additionalSettings: Partial<ElevenLabsSpeechModelSettings>): this;
 }
 export {};

package/model-provider/elevenlabs/ElevenLabsSpeechModel.js

@@ -6,6 +6,7 @@ import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { createSimpleWebSocket } from "../../util/SimpleWebSocket.js";
+import { base64ToUint8Array } from "../../util/UInt8Utils.js";
 import { ElevenLabsApiConfiguration } from "./ElevenLabsApiConfiguration.js";
 const elevenLabsModels = [
     "eleven_multilingual_v2",
@@ -138,7 +139,7 @@ export class ElevenLabsSpeechModel extends AbstractModel {
             if (!response.isFinal) {
                 queue.push({
                     type: "delta",
-                    deltaValue: Buffer.from(response.audio, "base64"),
+                    deltaValue: base64ToUint8Array(response.audio),
                 });
             }
         };

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs

@@ -46,7 +46,7 @@ function instruction() {
                         }
                         case "image": {
                             text += `[img-${imageCounter}]`;
-                            images[imageCounter.toString()] = content.base64Image;
+                            images[imageCounter.toString()] = (0, ContentPart_js_1.getImageAsBase64)(content.image);
                             imageCounter++;
                             break;
                         }
@@ -85,7 +85,7 @@ function chat() {
                                 }
                                 case "image": {
                                     text += `[img-${imageCounter}]`;
-                                    images[imageCounter.toString()] = part.base64Image;
+                                    images[imageCounter.toString()] = (0, ContentPart_js_1.getImageAsBase64)(part.image);
                                     imageCounter++;
                                     break;
                                 }

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
+import { getImageAsBase64, validateContentIsString, } from "../../model-function/generate-text/prompt-template/ContentPart.js";
 import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
 import { text as vicunaText } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 // default Vicuna 1 system message
@@ -42,7 +42,7 @@ export function instruction() {
                         }
                         case "image": {
                             text += `[img-${imageCounter}]`;
-                            images[imageCounter.toString()] = content.base64Image;
+                            images[imageCounter.toString()] = getImageAsBase64(content.image);
                             imageCounter++;
                             break;
                         }
@@ -80,7 +80,7 @@ export function chat() {
                                 }
                                 case "image": {
                                     text += `[img-${imageCounter}]`;
-                                    images[imageCounter.toString()] = part.base64Image;
+                                    images[imageCounter.toString()] = getImageAsBase64(part.image);
                                     imageCounter++;
                                     break;
                                 }

package/model-provider/lmnt/LmntSpeechModel.cjs

@@ -6,6 +6,7 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const UInt8Utils_js_1 = require("../../util/UInt8Utils.cjs");
 const LmntApiConfiguration_js_1 = require("./LmntApiConfiguration.cjs");
 /**
  * Synthesize speech using the LMNT API.
@@ -81,7 +82,7 @@ class LmntSpeechModel extends AbstractModel_js_1.AbstractModel {
     }
     async doGenerateSpeechStandard(text, options) {
         const response = await this.callAPI(text, options);
-        return Buffer.from(response.audio, "base64");
+        return (0, UInt8Utils_js_1.base64ToUint8Array)(response.audio);
     }
     withSettings(additionalSettings) {
         return new LmntSpeechModel({

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { z } from "zod";
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
@@ -34,7 +33,7 @@ export declare class LmntSpeechModel extends AbstractModel<LmntSpeechModelSettin
     get modelName(): string;
     private callAPI;
     get settingsForEvent(): Partial<LmntSpeechModelSettings>;
-    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Buffer>;
+    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Uint8Array>;
     withSettings(additionalSettings: Partial<LmntSpeechModelSettings>): this;
 }
 declare const lmntSpeechResponseSchema: z.ZodObject<{

package/model-provider/lmnt/LmntSpeechModel.js

@@ -3,6 +3,7 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, createTextErrorResponseHandler, postToApi, } from "../../core/api/postToApi.js";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { base64ToUint8Array } from "../../util/UInt8Utils.js";
 import { LmntApiConfiguration } from "./LmntApiConfiguration.js";
 /**
  * Synthesize speech using the LMNT API.
@@ -78,7 +79,7 @@ export class LmntSpeechModel extends AbstractModel {
     }
     async doGenerateSpeechStandard(text, options) {
         const response = await this.callAPI(text, options);
-        return Buffer.from(response.audio, "base64");
+        return base64ToUint8Array(response.audio);
     }
     withSettings(additionalSettings) {
         return new LmntSpeechModel({

package/model-provider/mistral/MistralChatModel.test.cjs

@@ -44,7 +44,7 @@ describe("streamText", () => {
             ]);
         });
         it("should return text", async () => {
-            const { text } = await (0, streamText_js_1.streamText)({
+            const { textPromise } = await (0, streamText_js_1.streamText)({
                 model: new MistralChatModel_js_1.MistralChatModel({
                     api: new MistralApiConfiguration_js_1.MistralApiConfiguration({ apiKey: "test-key" }),
                     model: "mistral-tiny",
@@ -52,7 +52,7 @@ describe("streamText", () => {
                 prompt: "hello",
                 fullResponse: true,
             });
-            expect(await text).toStrictEqual("Hello, world!");
+            expect(await textPromise).toStrictEqual("Hello, world!");
         });
     });
 });

package/model-provider/mistral/MistralChatModel.test.js

@@ -42,7 +42,7 @@ describe("streamText", () => {
             ]);
         });
         it("should return text", async () => {
-            const { text } = await streamText({
+            const { textPromise } = await streamText({
                 model: new MistralChatModel({
                     api: new MistralApiConfiguration({ apiKey: "test-key" }),
                     model: "mistral-tiny",
@@ -50,7 +50,7 @@ describe("streamText", () => {
                 prompt: "hello",
                 fullResponse: true,
             });
-            expect(await text).toStrictEqual("Hello, world!");
+            expect(await textPromise).toStrictEqual("Hello, world!");
         });
     });
 });

package/model-provider/ollama/OllamaChatModel.cjs

@@ -231,7 +231,7 @@ const ollamaChatStreamChunkSchema = zod_1.z.discriminatedUnion("done", [
         created_at: zod_1.z.string(),
         total_duration: zod_1.z.number(),
         load_duration: zod_1.z.number().optional(),
-        prompt_eval_count: zod_1.z.number(),
+        prompt_eval_count: zod_1.z.number().optional(),
         prompt_eval_duration: zod_1.z.number().optional(),
         eval_count: zod_1.z.number(),
         eval_duration: zod_1.z.number(),

package/model-provider/ollama/OllamaChatModel.d.ts

@@ -94,10 +94,10 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
         done: true;
         created_at: string;
         total_duration: number;
-        prompt_eval_count: number;
         eval_count: number;
         eval_duration: number;
         load_duration?: number | undefined;
+        prompt_eval_count?: number | undefined;
         prompt_eval_duration?: number | undefined;
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
@@ -197,7 +197,7 @@ declare const ollamaChatStreamChunkSchema: z.ZodDiscriminatedUnion<"done", [z.Zo
     created_at: z.ZodString;
     total_duration: z.ZodNumber;
     load_duration: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_count: z.ZodNumber;
+    prompt_eval_count: z.ZodOptional<z.ZodNumber>;
     prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
     eval_count: z.ZodNumber;
     eval_duration: z.ZodNumber;
@@ -206,20 +206,20 @@ declare const ollamaChatStreamChunkSchema: z.ZodDiscriminatedUnion<"done", [z.Zo
     done: true;
     created_at: string;
     total_duration: number;
-    prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
     load_duration?: number | undefined;
+    prompt_eval_count?: number | undefined;
     prompt_eval_duration?: number | undefined;
 }, {
     model: string;
     done: true;
     created_at: string;
     total_duration: number;
-    prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
     load_duration?: number | undefined;
+    prompt_eval_count?: number | undefined;
     prompt_eval_duration?: number | undefined;
 }>]>;
 export type OllamaChatStreamChunk = z.infer<typeof ollamaChatStreamChunkSchema>;
@@ -274,10 +274,10 @@ export declare const OllamaChatResponseFormat: {
             done: true;
             created_at: string;
             total_duration: number;
-            prompt_eval_count: number;
             eval_count: number;
             eval_duration: number;
             load_duration?: number | undefined;
+            prompt_eval_count?: number | undefined;
             prompt_eval_duration?: number | undefined;
         }>>>;
     };

package/model-provider/ollama/OllamaChatModel.js

@@ -227,7 +227,7 @@ const ollamaChatStreamChunkSchema = z.discriminatedUnion("done", [
         created_at: z.string(),
         total_duration: z.number(),
         load_duration: z.number().optional(),
-        prompt_eval_count: z.number(),
+        prompt_eval_count: z.number().optional(),
         prompt_eval_duration: z.number().optional(),
         eval_count: z.number(),
         eval_duration: z.number(),

package/model-provider/ollama/OllamaChatPromptTemplate.cjs

@@ -95,7 +95,7 @@ function extractUserContent(input) {
             content += part.text;
         }
         else {
-            images.push(part.base64Image);
+            images.push((0, ContentPart_js_1.getImageAsBase64)(part.image));
         }
     }
     return { content, images };

package/model-provider/ollama/OllamaChatPromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
+import { getImageAsBase64, validateContentIsString, } from "../../model-function/generate-text/prompt-template/ContentPart.js";
 import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
 /**
  * OllamaChatPrompt identity chat format.
@@ -88,7 +88,7 @@ function extractUserContent(input) {
             content += part.text;
         }
         else {
-            images.push(part.base64Image);
+            images.push(getImageAsBase64(part.image));
         }
     }
     return { content, images };

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -180,7 +180,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.promptTemplate ?? OllamaCompletionPrompt_js_1.Text;
     }
     withJsonOutput() {
-        return this;
+        return this.withSettings({ format: "json" });
     }
     withTextPrompt() {
         return this.withPromptTemplate(this.promptTemplateProvider.text());
@@ -235,7 +235,7 @@ const ollamaCompletionStreamChunkSchema = zod_1.z.discriminatedUnion("done", [
         load_duration: zod_1.z.number().optional(),
         sample_count: zod_1.z.number().optional(),
         sample_duration: zod_1.z.number().optional(),
-        prompt_eval_count: zod_1.z.number(),
+        prompt_eval_count: zod_1.z.number().optional(),
         prompt_eval_duration: zod_1.z.number().optional(),
         eval_count: zod_1.z.number(),
         eval_duration: zod_1.z.number(),

package/model-provider/ollama/OllamaCompletionModel.d.ts

@@ -127,12 +127,12 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         done: true;
         created_at: string;
         total_duration: number;
-        prompt_eval_count: number;
         eval_count: number;
         eval_duration: number;
         load_duration?: number | undefined;
         sample_count?: number | undefined;
         sample_duration?: number | undefined;
+        prompt_eval_count?: number | undefined;
         prompt_eval_duration?: number | undefined;
         context?: number[] | undefined;
     }>>>;
@@ -209,7 +209,7 @@ declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done",
     load_duration: z.ZodOptional<z.ZodNumber>;
     sample_count: z.ZodOptional<z.ZodNumber>;
     sample_duration: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_count: z.ZodNumber;
+    prompt_eval_count: z.ZodOptional<z.ZodNumber>;
     prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
     eval_count: z.ZodNumber;
     eval_duration: z.ZodNumber;
@@ -219,12 +219,12 @@ declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done",
     done: true;
     created_at: string;
     total_duration: number;
-    prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
     load_duration?: number | undefined;
     sample_count?: number | undefined;
     sample_duration?: number | undefined;
+    prompt_eval_count?: number | undefined;
     prompt_eval_duration?: number | undefined;
     context?: number[] | undefined;
 }, {
@@ -232,12 +232,12 @@ declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done",
     done: true;
     created_at: string;
     total_duration: number;
-    prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
     load_duration?: number | undefined;
     sample_count?: number | undefined;
     sample_duration?: number | undefined;
+    prompt_eval_count?: number | undefined;
     prompt_eval_duration?: number | undefined;
     context?: number[] | undefined;
 }>]>;
@@ -288,12 +288,12 @@ export declare const OllamaCompletionResponseFormat: {
             done: true;
             created_at: string;
             total_duration: number;
-            prompt_eval_count: number;
             eval_count: number;
             eval_duration: number;
             load_duration?: number | undefined;
             sample_count?: number | undefined;
             sample_duration?: number | undefined;
+            prompt_eval_count?: number | undefined;
             prompt_eval_duration?: number | undefined;
             context?: number[] | undefined;
         }>>>;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -177,7 +177,7 @@ export class OllamaCompletionModel extends AbstractModel {
         return this.settings.promptTemplate ?? Text;
     }
     withJsonOutput() {
-        return this;
+        return this.withSettings({ format: "json" });
     }
     withTextPrompt() {
         return this.withPromptTemplate(this.promptTemplateProvider.text());
@@ -231,7 +231,7 @@ const ollamaCompletionStreamChunkSchema = z.discriminatedUnion("done", [
         load_duration: z.number().optional(),
         sample_count: z.number().optional(),
         sample_duration: z.number().optional(),
-        prompt_eval_count: z.number(),
+        prompt_eval_count: z.number().optional(),
         prompt_eval_duration: z.number().optional(),
         eval_count: z.number(),
         eval_duration: z.number(),

package/model-provider/ollama/OllamaCompletionModel.test.cjs

@@ -124,13 +124,11 @@ describe("streamStructure", () => {
             schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })),
             prompt: "generate a name",
         });
-        // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
-            { isComplete: false, value: {} },
-            { isComplete: false, value: { name: "" } },
-            { isComplete: false, value: { name: "M" } },
-            { isComplete: false, value: { name: "Mike" } },
-            { isComplete: true, value: { name: "Mike" } },
+            {},
+            { name: "" },
+            { name: "M" },
+            { name: "Mike" },
         ]);
     });
 });

package/model-provider/ollama/OllamaCompletionModel.test.js

@@ -122,13 +122,11 @@ describe("streamStructure", () => {
             schema: zodSchema(z.object({ name: z.string() })),
             prompt: "generate a name",
         });
-        // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
-            { isComplete: false, value: {} },
-            { isComplete: false, value: { name: "" } },
-            { isComplete: false, value: { name: "M" } },
-            { isComplete: false, value: { name: "Mike" } },
-            { isComplete: true, value: { name: "Mike" } },
+            {},
+            { name: "" },
+            { name: "M" },
+            { name: "Mike" },
         ]);
     });
 });

package/model-provider/openai/OpenAIChatMessage.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatMessage = void 0;
+const ContentPart_js_1 = require("../../model-function/generate-text/prompt-template/ContentPart.cjs");
 exports.OpenAIChatMessage = {
     /**
      * Creates a system chat message.
@@ -16,15 +17,15 @@ exports.OpenAIChatMessage = {
             role: "user",
             content: typeof content === "string"
                 ? content
-                : content.map((element) => {
-                    switch (element.type) {
+                : content.map((part) => {
+                    switch (part.type) {
                         case "text": {
-                            return { type: "text", text: element.text };
+                            return { type: "text", text: part.text };
                         }
                         case "image": {
                             return {
                                 type: "image_url",
-                                image_url: `data:${element.mimeType ?? "image/jpeg"};base64,${element.base64Image}`,
+                                image_url: `data:${part.mimeType ?? "image/jpeg"};base64,${(0, ContentPart_js_1.getImageAsBase64)(part.image)}`,
                             };
                         }
                     }

package/model-provider/openai/OpenAIChatMessage.js

@@ -1,3 +1,4 @@
+import { getImageAsBase64, } from "../../model-function/generate-text/prompt-template/ContentPart.js";
 export const OpenAIChatMessage = {
     /**
      * Creates a system chat message.
@@ -13,15 +14,15 @@ export const OpenAIChatMessage = {
             role: "user",
             content: typeof content === "string"
                 ? content
-                : content.map((element) => {
-                    switch (element.type) {
+                : content.map((part) => {
+                    switch (part.type) {
                         case "text": {
-                            return { type: "text", text: element.text };
+                            return { type: "text", text: part.text };
                         }
                         case "image": {
                             return {
                                 type: "image_url",
-                                image_url: `data:${element.mimeType ?? "image/jpeg"};base64,${element.base64Image}`,
+                                image_url: `data:${part.mimeType ?? "image/jpeg"};base64,${getImageAsBase64(part.image)}`,
                             };
                         }
                     }

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

@@ -89,13 +89,11 @@ describe("streamStructure", () => {
             schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })),
             prompt: "generate a name",
         });
-        // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
-            { isComplete: false, value: {} },
-            { isComplete: false, value: { name: "" } },
-            { isComplete: false, value: { name: "M" } },
-            { isComplete: false, value: { name: "Mike" } },
-            { isComplete: true, value: { name: "Mike" } },
+            {},
+            { name: "" },
+            { name: "M" },
+            { name: "Mike" },
         ]);
     });
 });

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

@@ -87,13 +87,11 @@ describe("streamStructure", () => {
             schema: zodSchema(z.object({ name: z.string() })),
             prompt: "generate a name",
         });
-        // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
-            { isComplete: false, value: {} },
-            { isComplete: false, value: { name: "" } },
-            { isComplete: false, value: { name: "M" } },
-            { isComplete: false, value: { name: "Mike" } },
-            { isComplete: true, value: { name: "Mike" } },
+            {},
+            { name: "" },
+            { name: "M" },
+            { name: "Mike" },
         ]);
     });
 });

package/model-provider/openai/OpenAISpeechModel.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";
@@ -46,7 +45,7 @@ export declare class OpenAISpeechModel extends AbstractModel<OpenAISpeechModelSe
     get modelName(): "tts-1" | "tts-1-hd";
     private callAPI;
     get settingsForEvent(): Partial<OpenAISpeechModelSettings>;
-    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Buffer>;
+    doGenerateSpeechStandard(text: string, options: FunctionCallOptions): Promise<Uint8Array>;
     withSettings(additionalSettings: Partial<OpenAISpeechModelSettings>): this;
 }
 export {};

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { z } from "zod";
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
@@ -43,7 +42,7 @@ export interface OpenAITranscriptionModelSettings extends TranscriptionModelSett
 }
 export type OpenAITranscriptionInput = {
     type: "flac" | "m4a" | "mp3" | "mp4" | "mpeg" | "mpga" | "ogg" | "wav" | "webm";
-    data: Buffer;
+    data: Uint8Array;
 };
 /**
  * Create a transcription model that calls the OpenAI transcription API.

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

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

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

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

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

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

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

@@ -0,0 +1,5 @@
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+export type OpenAICompatibleProviderName = `openaicompatible` | `openaicompatible-${string}`;
+export interface OpenAICompatibleApiConfiguration extends ApiConfiguration {
+    provider?: OpenAICompatibleProviderName;
+}

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

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