modelfusion 0.101.0 → 0.103.0

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -57,7 +57,7 @@ export const calculateOpenAIImageGenerationCostInMillicents = ({ model, settings
     if (cost == null) {
         return null;
     }
-    return (settings.n ?? 1) * cost;
+    return (settings.numberOfGenerations ?? 1) * cost;
 };
 /**
  * Create an image generation model that calls the OpenAI AI image creation API.
@@ -84,38 +84,48 @@ export class OpenAIImageGenerationModel extends AbstractModel {
         return this.settings.model;
     }
     async callAPI(prompt, options) {
-        const run = options?.run;
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
+        const userId = options?.run?.userId;
         const responseFormat = options?.responseFormat;
-        const callSettings = {
-            ...this.settings,
-            user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-            abortSignal: run?.abortSignal,
-            responseFormat,
-            prompt,
-        };
         return callWithRetryAndThrottle({
-            retry: callSettings.api?.retry,
-            throttle: callSettings.api?.throttle,
-            call: async () => callOpenAIImageGenerationAPI(callSettings),
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => {
+                return postJsonToApi({
+                    url: api.assembleUrl("/images/generations"),
+                    headers: api.headers,
+                    body: {
+                        prompt,
+                        n: this.settings.numberOfGenerations,
+                        size: this.settings.size,
+                        response_format: responseFormat.type,
+                        user: this.settings.isUserIdForwardingEnabled ? userId : undefined,
+                    },
+                    failedResponseHandler: failedOpenAICallResponseHandler,
+                    successfulResponseHandler: responseFormat?.handler,
+                    abortSignal,
+                });
+            },
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "n",
+            "numberOfGenerations",
             "size",
             "quality",
             "style",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    async doGenerateImage(prompt, options) {
+    async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, {
             responseFormat: OpenAIImageGenerationResponseFormat.base64Json,
             ...options,
         });
         return {
             response,
-            base64Image: response.data[0].b64_json,
+            base64Images: response.data.map((item) => item.b64_json),
         };
     }
     withPromptTemplate(promptTemplate) {
@@ -150,19 +160,3 @@ export const OpenAIImageGenerationResponseFormat = {
         handler: createJsonResponseHandler(openAIImageGenerationBase64JsonSchema),
     },
 };
-async function callOpenAIImageGenerationAPI({ api = new OpenAIApiConfiguration(), abortSignal, prompt, n, size, responseFormat, user, }) {
-    return postJsonToApi({
-        url: api.assembleUrl("/images/generations"),
-        headers: api.headers,
-        body: {
-            prompt,
-            n,
-            size,
-            response_format: responseFormat.type,
-            user,
-        },
-        failedResponseHandler: failedOpenAICallResponseHandler,
-        successfulResponseHandler: responseFormat?.handler,
-        abortSignal,
-    });
-}

package/model-provider/openai/chat/AbstractOpenAIChatModel.cjs

@@ -80,10 +80,28 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content ?? ""),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content ?? "",
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/AbstractOpenAIChatModel.d.ts

@@ -5,6 +5,7 @@ import { ResponseHandler } from "../../../core/api/postToApi.js";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { Delta } from "../../../model-function/Delta.js";
 import { TextGenerationModelSettings } from "../../../model-function/generate-text/TextGenerationModel.js";
+import { TextGenerationFinishReason } from "../../../model-function/generate-text/TextGenerationResult.js";
 import { ToolDefinition } from "../../../tool/ToolDefinition.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 export interface AbstractOpenAIChatCallSettings {
@@ -126,13 +127,17 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             }[];
             system_fingerprint?: string | null | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {

package/model-provider/openai/chat/AbstractOpenAIChatModel.js

@@ -77,10 +77,28 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content ?? ""),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content ?? "",
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatModel = exports.calculateOpenAIChatCostInMillicents = exports.isOpenAIChatModel = exports.getOpenAIChatModelInformation = exports.OPENAI_CHAT_MODELS = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../../model-function/generate-text/TextGenerationModel.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");
 const AbstractOpenAIChatModel_js_1 = require("./AbstractOpenAIChatModel.cjs");
 const OpenAIChatFunctionCallStructureGenerationModel_js_1 = require("./OpenAIChatFunctionCallStructureGenerationModel.cjs");
@@ -196,9 +197,7 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

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

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../../model-function/generate-text/TextGenerationModel.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
 import { AbstractOpenAIChatModel, } from "./AbstractOpenAIChatModel.js";
 import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
@@ -190,9 +191,7 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICompatibleChatModel = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AbstractOpenAIChatModel_js_1 = require("../openai/chat/AbstractOpenAIChatModel.cjs");
 const OpenAIChatPromptTemplate_js_1 = require("../openai/chat/OpenAIChatPromptTemplate.cjs");
 /**
@@ -43,9 +44,7 @@ class OpenAICompatibleChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpe
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

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

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AbstractOpenAIChatModel, } from "../openai/chat/AbstractOpenAIChatModel.js";
 import { chat, instruction, text, } from "../openai/chat/OpenAIChatPromptTemplate.js";
 /**
@@ -40,9 +41,7 @@ export class OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/stability/StabilityApiConfiguration.cjs

@@ -1,13 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StabilityApiConfiguration = void 0;
-const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const BaseUrlPartsApiConfiguration_js_1 = require("../../core/api/BaseUrlPartsApiConfiguration.cjs");
 const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
-class StabilityApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.stability.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+class StabilityApiConfiguration extends BaseUrlPartsApiConfiguration_js_1.BaseUrlPartsApiConfiguration {
+    constructor({ protocol = "https", host = "api.stability.ai", port = "443", path = "/v1", apiKey, headers, retry, throttle, } = {}) {
         super({
-            baseUrl,
-            headers: {
+            protocol,
+            host,
+            port,
+            path,
+            headers: headers ?? {
                 Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
                     apiKey,
                     environmentVariableName: "STABILITY_API_KEY",

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

@@ -1,11 +1,10 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export declare class StabilityApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, apiKey, retry, throttle, }?: {
-        baseUrl?: string;
+import { BaseUrlPartsApiConfiguration, BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+export declare class StabilityApiConfiguration extends BaseUrlPartsApiConfiguration {
+    constructor({ protocol, host, port, path, apiKey, headers, retry, throttle, }?: Partial<BaseUrlPartsApiConfigurationOptions> & {
         apiKey?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
     });
 }

package/model-provider/stability/StabilityApiConfiguration.js

@@ -1,10 +1,17 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { BaseUrlPartsApiConfiguration, } from "../../core/api/BaseUrlPartsApiConfiguration.js";
 import { loadApiKey } from "../../core/api/loadApiKey.js";
-export class StabilityApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.stability.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+export class StabilityApiConfiguration extends BaseUrlPartsApiConfiguration {
+    constructor({ protocol = "https", host = "api.stability.ai", port = "443", path = "/v1", apiKey, headers, retry, throttle, } = {}) {
         super({
-            baseUrl,
-            headers: {
+            protocol,
+            host,
+            port,
+            path,
+            headers: headers ?? {
                 Authorization: `Bearer ${loadApiKey({
                     apiKey,
                     environmentVariableName: "STABILITY_API_KEY",

package/model-provider/stability/StabilityError.cjs

@@ -1,37 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedStabilityCallResponseHandler = exports.StabilityError = exports.stabilityErrorDataSchema = void 0;
+exports.failedStabilityCallResponseHandler = void 0;
 const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-exports.stabilityErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const stabilityErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     message: zod_1.z.string(),
 }));
-class StabilityError extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.StabilityError = StabilityError;
-const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    const parsedError = (0, parseJSON_js_1.parseJSON)({
-        text: responseBody,
-        schema: exports.stabilityErrorDataSchema,
-    });
-    return new StabilityError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
-exports.failedStabilityCallResponseHandler = failedStabilityCallResponseHandler;
+exports.failedStabilityCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
+    errorSchema: stabilityErrorDataSchema,
+    errorToMessage: (error) => error.message,
+});

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

@@ -1,18 +1,9 @@
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const stabilityErrorDataSchema: ZodSchema<{
+declare const stabilityErrorDataSchema: ZodSchema<{
     message: string;
 }>;
 export type StabilityErrorData = (typeof stabilityErrorDataSchema)["_type"];
-export declare class StabilityError extends ApiCallError {
-    readonly data: StabilityErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: StabilityErrorData;
-    });
-}
 export declare const failedStabilityCallResponseHandler: ResponseHandler<ApiCallError>;
+export {};

package/model-provider/stability/StabilityError.js

@@ -1,32 +1,10 @@
 import { z } from "zod";
-import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { createJsonErrorResponseHandler, } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
-export const stabilityErrorDataSchema = new ZodSchema(z.object({
+const stabilityErrorDataSchema = new ZodSchema(z.object({
     message: z.string(),
 }));
-export class StabilityError extends ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-export const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    const parsedError = parseJSON({
-        text: responseBody,
-        schema: stabilityErrorDataSchema,
-    });
-    return new StabilityError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
+export const failedStabilityCallResponseHandler = createJsonErrorResponseHandler({
+    errorSchema: stabilityErrorDataSchema,
+    errorToMessage: (error) => error.message,
+});

package/model-provider/stability/StabilityFacade.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageGenerator = void 0;
+exports.Api = exports.ImageGenerator = void 0;
+const StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
 const StabilityImageGenerationModel_js_1 = require("./StabilityImageGenerationModel.cjs");
 /**
  * Create an image generation model that calls the Stability AI image generation API.
@@ -10,12 +11,11 @@ const StabilityImageGenerationModel_js_1 = require("./StabilityImageGenerationMo
  * @example
  * const image = await generateImage(
  *   stability.ImageGenerator({
- *     model: "stable-diffusion-512-v2-1",
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -30,3 +30,11 @@ function ImageGenerator(settings) {
     return new StabilityImageGenerationModel_js_1.StabilityImageGenerationModel(settings);
 }
 exports.ImageGenerator = ImageGenerator;
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+function Api(settings) {
+    return new StabilityApiConfiguration_js_1.StabilityApiConfiguration(settings);
+}
+exports.Api = Api;

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

@@ -1,3 +1,5 @@
+import { BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { StabilityImageGenerationModel, StabilityImageGenerationSettings } from "./StabilityImageGenerationModel.js";
 /**
  * Create an image generation model that calls the Stability AI image generation API.
@@ -7,12 +9,11 @@ import { StabilityImageGenerationModel, StabilityImageGenerationSettings } from
  * @example
  * const image = await generateImage(
  *   stability.ImageGenerator({
- *     model: "stable-diffusion-512-v2-1",
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -24,3 +25,10 @@ import { StabilityImageGenerationModel, StabilityImageGenerationSettings } from
  * @returns A new instance of {@link StabilityImageGenerationModel}.
  */
 export declare function ImageGenerator(settings: StabilityImageGenerationSettings): StabilityImageGenerationModel;
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+export declare function Api(settings: Partial<BaseUrlPartsApiConfigurationOptions> & {
+    apiKey?: string;
+}): StabilityApiConfiguration;

package/model-provider/stability/StabilityFacade.js

@@ -1,3 +1,4 @@
+import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { StabilityImageGenerationModel, } from "./StabilityImageGenerationModel.js";
 /**
  * Create an image generation model that calls the Stability AI image generation API.
@@ -7,12 +8,11 @@ import { StabilityImageGenerationModel, } from "./StabilityImageGenerationModel.
  * @example
  * const image = await generateImage(
  *   stability.ImageGenerator({
- *     model: "stable-diffusion-512-v2-1",
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -26,3 +26,10 @@ import { StabilityImageGenerationModel, } from "./StabilityImageGenerationModel.
 export function ImageGenerator(settings) {
     return new StabilityImageGenerationModel(settings);
 }
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default.
+ */
+export function Api(settings) {
+    return new StabilityApiConfiguration(settings);
+}