modelfusion 0.100.0 → 0.102.0

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -9,6 +9,10 @@ const PromptTemplateImageGenerationModel_js_1 = require("../../model-function/ge
 const StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
 const StabilityError_js_1 = require("./StabilityError.cjs");
 const StabilityImageGenerationPrompt_js_1 = require("./StabilityImageGenerationPrompt.cjs");
+const stabilityImageGenerationModels = [
+    "stable-diffusion-v1-6",
+    "stable-diffusion-xl-1024-v1-0",
+];
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -16,13 +20,12 @@ const StabilityImageGenerationPrompt_js_1 = require("./StabilityImageGenerationP
  *
  * @example
  * const image = await generateImage(
- *   new StabilityImageGenerationModel({
- *     model: "stable-diffusion-512-v2-1",
+ *   stability.ImageGenerator({
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -45,37 +48,50 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.model;
     }
     async callAPI(input, options) {
+        const api = this.settings.api ?? new StabilityApiConfiguration_js_1.StabilityApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: this.settings.api?.retry,
             throttle: this.settings.api?.throttle,
-            call: async () => callStabilityImageGenerationAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                engineId: this.settings.model,
-                textPrompts: input,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/generation/${this.settings.model}/text-to-image`),
+                headers: api.headers,
+                body: {
+                    height: this.settings.height,
+                    width: this.settings.width,
+                    text_prompts: input,
+                    cfg_scale: this.settings.cfgScale,
+                    clip_guidance_preset: this.settings.clipGuidancePreset,
+                    sampler: this.settings.sampler,
+                    samples: this.settings.numberOfGenerations,
+                    seed: this.settings.seed,
+                    steps: this.settings.steps,
+                    style_preset: this.settings.stylePreset,
+                },
+                failedResponseHandler: StabilityError_js_1.failedStabilityCallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(stabilityImageGenerationResponseSchema),
+                abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        const eventSettingProperties = [
-            "baseUrl",
-            "height",
-            "width",
-            "cfgScale",
-            "clipGuidancePreset",
-            "sampler",
-            "samples",
-            "seed",
-            "steps",
-            "stylePreset",
-        ];
-        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+        return {
+            numberOfGenerations: this.settings.numberOfGenerations,
+            height: this.settings.height,
+            width: this.settings.width,
+            cfgScale: this.settings.cfgScale,
+            clipGuidancePreset: this.settings.clipGuidancePreset,
+            sampler: this.settings.sampler,
+            seed: this.settings.seed,
+            steps: this.settings.steps,
+            stylePreset: this.settings.stylePreset,
+        };
     }
-    async doGenerateImage(prompt, options) {
+    async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);
         return {
             response,
-            base64Image: response.artifacts[0].base64,
+            base64Images: response.artifacts.map((artifact) => artifact.base64),
         };
     }
     withTextPrompt() {
@@ -92,12 +108,6 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.StabilityImageGenerationModel = StabilityImageGenerationModel;
-const stabilityImageGenerationModels = [
-    "stable-diffusion-v1-5",
-    "stable-diffusion-512-v2-1",
-    "stable-diffusion-xl-1024-v0-9",
-    "stable-diffusion-xl-1024-v1-0",
-];
 const stabilityImageGenerationResponseSchema = zod_1.z.object({
     artifacts: zod_1.z.array(zod_1.z.object({
         base64: zod_1.z.string(),
@@ -105,24 +115,3 @@ const stabilityImageGenerationResponseSchema = zod_1.z.object({
         finishReason: zod_1.z.enum(["SUCCESS", "ERROR", "CONTENT_FILTERED"]),
     })),
 });
-async function callStabilityImageGenerationAPI({ api = new StabilityApiConfiguration_js_1.StabilityApiConfiguration(), abortSignal, engineId, height, width, textPrompts, cfgScale, clipGuidancePreset, sampler, samples, seed, steps, stylePreset, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/generation/${engineId}/text-to-image`),
-        headers: api.headers,
-        body: {
-            height,
-            width,
-            text_prompts: textPrompts,
-            cfg_scale: cfgScale,
-            clip_guidance_preset: clipGuidancePreset,
-            sampler,
-            samples,
-            seed,
-            steps,
-            style_preset: stylePreset,
-        },
-        failedResponseHandler: StabilityError_js_1.failedStabilityCallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(stabilityImageGenerationResponseSchema),
-        abortSignal,
-    });
-}

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

@@ -6,6 +6,39 @@ import { PromptTemplate } from "../../model-function/PromptTemplate.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { StabilityImageGenerationPrompt } from "./StabilityImageGenerationPrompt.js";
+declare const stabilityImageGenerationModels: readonly ["stable-diffusion-v1-6", "stable-diffusion-xl-1024-v1-0"];
+export type StabilityImageGenerationModelType = (typeof stabilityImageGenerationModels)[number] | (string & {});
+export type StabilityImageGenerationStylePreset = "3d-model" | "analog-film" | "anime" | "cinematic" | "comic-book" | "digital-art" | "enhance" | "fantasy-art" | "isometric" | "line-art" | "low-poly" | "modeling-compound" | "neon-punk" | "origami" | "photographic" | "pixel-art" | "tile-texture";
+export type StabilityImageGenerationSampler = "DDIM" | "DDPM" | "K_DPMPP_2M" | "K_DPMPP_2S_ANCESTRAL" | "K_DPM_2" | "K_DPM_2_ANCESTRAL" | "K_EULER" | "K_EULER_ANCESTRAL" | "K_HEUN" | "K_LMS";
+export type StabilityClipGuidancePreset = "FAST_BLUE" | "FAST_GREEN" | "NONE" | "SIMPLE" | "SLOW" | "SLOWER" | "SLOWEST";
+export interface StabilityImageGenerationSettings extends ImageGenerationModelSettings {
+    api?: ApiConfiguration;
+    model: StabilityImageGenerationModelType;
+    height?: number;
+    width?: number;
+    /**
+     * How strictly the diffusion process adheres to the prompt text (higher values keep your image closer to your prompt)
+     */
+    cfgScale?: number;
+    clipGuidancePreset?: StabilityClipGuidancePreset;
+    /**
+     * Which sampler to use for the diffusion process.
+     * If this value is omitted we'll automatically select an appropriate sampler for you.
+     */
+    sampler?: StabilityImageGenerationSampler;
+    /**
+     * Random noise seed (omit this option or use 0 for a random seed).
+     */
+    seed?: number;
+    /**
+     * Number of diffusion steps to run.
+     */
+    steps?: number;
+    /**
+     * Pass in a style preset to guide the image model towards a particular style.
+     */
+    stylePreset?: StabilityImageGenerationStylePreset;
+}
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -13,13 +46,12 @@ import { StabilityImageGenerationPrompt } from "./StabilityImageGenerationPrompt
  *
  * @example
  * const image = await generateImage(
- *   new StabilityImageGenerationModel({
- *     model: "stable-diffusion-512-v2-1",
+ *   stability.ImageGenerator({
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -34,7 +66,7 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     get modelName(): StabilityImageGenerationModelType;
     callAPI(input: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<StabilityImageGenerationResponse>;
     get settingsForEvent(): Partial<StabilityImageGenerationSettings>;
-    doGenerateImage(prompt: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<{
+    doGenerateImages(prompt: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
             artifacts: {
                 base64: string;
@@ -42,27 +74,12 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
                 finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
             }[];
         };
-        base64Image: string;
+        base64Images: string[];
     }>;
     withTextPrompt(): PromptTemplateImageGenerationModel<string, StabilityImageGenerationPrompt, StabilityImageGenerationSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, StabilityImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, StabilityImageGenerationPrompt, StabilityImageGenerationSettings, this>;
     withSettings(additionalSettings: StabilityImageGenerationSettings): this;
 }
-declare const stabilityImageGenerationModels: readonly ["stable-diffusion-v1-5", "stable-diffusion-512-v2-1", "stable-diffusion-xl-1024-v0-9", "stable-diffusion-xl-1024-v1-0"];
-export type StabilityImageGenerationModelType = (typeof stabilityImageGenerationModels)[number] | (string & {});
-export interface StabilityImageGenerationSettings extends ImageGenerationModelSettings {
-    api?: ApiConfiguration;
-    model: StabilityImageGenerationModelType;
-    height?: number;
-    width?: number;
-    cfgScale?: number;
-    clipGuidancePreset?: string;
-    sampler?: StabilityImageGenerationSampler;
-    samples?: number;
-    seed?: number;
-    steps?: number;
-    stylePreset?: StabilityImageGenerationStylePreset;
-}
 declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
     artifacts: z.ZodArray<z.ZodObject<{
         base64: z.ZodString;
@@ -91,6 +108,4 @@ declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
     }[];
 }>;
 export type StabilityImageGenerationResponse = z.infer<typeof stabilityImageGenerationResponseSchema>;
-export type StabilityImageGenerationStylePreset = "enhance" | "anime" | "photographic" | "digital-art" | "comic-book" | "fantasy-art" | "line-art" | "analog-film" | "neon-punk" | "isometric" | "low-poly" | "origami" | "modeling-compound" | "cinematic" | "3d-model" | "pixel-art" | "tile-texture";
-export type StabilityImageGenerationSampler = "DDIM" | "DDPM" | "K_DPMPP_2M" | "K_DPMPP_2S_ANCESTRAL" | "K_DPM_2" | "K_DPM_2_ANCESTRAL" | "K_EULER" | "K_EULER_ANCESTRAL" | "K_HEUN" | "K_LMS";
 export {};

package/model-provider/stability/StabilityImageGenerationModel.js

@@ -6,6 +6,10 @@ import { PromptTemplateImageGenerationModel } from "../../model-function/generat
 import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { failedStabilityCallResponseHandler } from "./StabilityError.js";
 import { mapBasicPromptToStabilityFormat, } from "./StabilityImageGenerationPrompt.js";
+const stabilityImageGenerationModels = [
+    "stable-diffusion-v1-6",
+    "stable-diffusion-xl-1024-v1-0",
+];
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -13,13 +17,12 @@ import { mapBasicPromptToStabilityFormat, } from "./StabilityImageGenerationProm
  *
  * @example
  * const image = await generateImage(
- *   new StabilityImageGenerationModel({
- *     model: "stable-diffusion-512-v2-1",
+ *   stability.ImageGenerator({
+ *     model: "stable-diffusion-v1-6",
  *     cfgScale: 7,
  *     clipGuidancePreset: "FAST_BLUE",
  *     height: 512,
  *     width: 512,
- *     samples: 1,
  *     steps: 30,
  *   })
  *   [
@@ -42,37 +45,50 @@ export class StabilityImageGenerationModel extends AbstractModel {
         return this.settings.model;
     }
     async callAPI(input, options) {
+        const api = this.settings.api ?? new StabilityApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: this.settings.api?.retry,
             throttle: this.settings.api?.throttle,
-            call: async () => callStabilityImageGenerationAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                engineId: this.settings.model,
-                textPrompts: input,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/generation/${this.settings.model}/text-to-image`),
+                headers: api.headers,
+                body: {
+                    height: this.settings.height,
+                    width: this.settings.width,
+                    text_prompts: input,
+                    cfg_scale: this.settings.cfgScale,
+                    clip_guidance_preset: this.settings.clipGuidancePreset,
+                    sampler: this.settings.sampler,
+                    samples: this.settings.numberOfGenerations,
+                    seed: this.settings.seed,
+                    steps: this.settings.steps,
+                    style_preset: this.settings.stylePreset,
+                },
+                failedResponseHandler: failedStabilityCallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(stabilityImageGenerationResponseSchema),
+                abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        const eventSettingProperties = [
-            "baseUrl",
-            "height",
-            "width",
-            "cfgScale",
-            "clipGuidancePreset",
-            "sampler",
-            "samples",
-            "seed",
-            "steps",
-            "stylePreset",
-        ];
-        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+        return {
+            numberOfGenerations: this.settings.numberOfGenerations,
+            height: this.settings.height,
+            width: this.settings.width,
+            cfgScale: this.settings.cfgScale,
+            clipGuidancePreset: this.settings.clipGuidancePreset,
+            sampler: this.settings.sampler,
+            seed: this.settings.seed,
+            steps: this.settings.steps,
+            stylePreset: this.settings.stylePreset,
+        };
     }
-    async doGenerateImage(prompt, options) {
+    async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);
         return {
             response,
-            base64Image: response.artifacts[0].base64,
+            base64Images: response.artifacts.map((artifact) => artifact.base64),
         };
     }
     withTextPrompt() {
@@ -88,12 +104,6 @@ export class StabilityImageGenerationModel extends AbstractModel {
         return new StabilityImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const stabilityImageGenerationModels = [
-    "stable-diffusion-v1-5",
-    "stable-diffusion-512-v2-1",
-    "stable-diffusion-xl-1024-v0-9",
-    "stable-diffusion-xl-1024-v1-0",
-];
 const stabilityImageGenerationResponseSchema = z.object({
     artifacts: z.array(z.object({
         base64: z.string(),
@@ -101,24 +111,3 @@ const stabilityImageGenerationResponseSchema = z.object({
         finishReason: z.enum(["SUCCESS", "ERROR", "CONTENT_FILTERED"]),
     })),
 });
-async function callStabilityImageGenerationAPI({ api = new StabilityApiConfiguration(), abortSignal, engineId, height, width, textPrompts, cfgScale, clipGuidancePreset, sampler, samples, seed, steps, stylePreset, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/generation/${engineId}/text-to-image`),
-        headers: api.headers,
-        body: {
-            height,
-            width,
-            text_prompts: textPrompts,
-            cfg_scale: cfgScale,
-            clip_guidance_preset: clipGuidancePreset,
-            sampler,
-            samples,
-            seed,
-            steps,
-            style_preset: stylePreset,
-        },
-        failedResponseHandler: failedStabilityCallResponseHandler,
-        successfulResponseHandler: createJsonResponseHandler(stabilityImageGenerationResponseSchema),
-        abortSignal,
-    });
-}

package/model-provider/stability/index.cjs

@@ -26,10 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stability = exports.StabilityError = void 0;
+exports.stability = void 0;
 __exportStar(require("./StabilityApiConfiguration.cjs"), exports);
-var StabilityError_js_1 = require("./StabilityError.cjs");
-Object.defineProperty(exports, "StabilityError", { enumerable: true, get: function () { return StabilityError_js_1.StabilityError; } });
 exports.stability = __importStar(require("./StabilityFacade.cjs"));
 __exportStar(require("./StabilityImageGenerationModel.cjs"), exports);
 __exportStar(require("./StabilityImageGenerationPrompt.cjs"), exports);

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

@@ -1,5 +1,5 @@
 export * from "./StabilityApiConfiguration.js";
-export { StabilityError, StabilityErrorData } from "./StabilityError.js";
+export { StabilityErrorData } from "./StabilityError.js";
 export * as stability from "./StabilityFacade.js";
 export * from "./StabilityImageGenerationModel.js";
 export * from "./StabilityImageGenerationPrompt.js";

package/model-provider/stability/index.js

@@ -1,5 +1,4 @@
 export * from "./StabilityApiConfiguration.js";
-export { StabilityError } from "./StabilityError.js";
 export * as stability from "./StabilityFacade.js";
 export * from "./StabilityImageGenerationModel.js";
 export * from "./StabilityImageGenerationPrompt.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.100.0",
+  "version": "0.102.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -30,6 +30,10 @@
   "engines": {
     "node": ">=18"
   },
+  "publishConfig": {
+    "directory": "dist",
+    "linkDirectory": true
+  },
   "files": [
     "./*"
   ],
@@ -56,16 +60,17 @@
     }
   },
   "scripts": {
-    "setup": "husky install",
     "lint": "eslint --ext .ts src",
-    "clean": "rimraf build dist",
-    "build": "npm run build:esm && npm run build:cjs",
+    "clean": "rimraf build dist .turbo",
+    "build": "pnpm build:esm && pnpm build:cjs && pnpm build:copy-files",
     "build:esm": "tsc --outDir dist/",
     "build:cjs": "tsc --outDir build/cjs/ -p tsconfig.cjs.json && node bin/prepare-cjs.js",
+    "build:copy-files": "copyfiles --flat package.json ../../README.md ../../LICENSE ../../CHANGELOG.md dist",
     "test": "vitest --config vitest.config.js --run src",
     "test:watch": "vitest watch--config vitest.config.js",
-    "dist": "npm run clean && npm run lint && npm run test && npm run build && npm run dist:copy-files",
-    "dist:copy-files": "copyfiles package.json README.md LICENSE dist"
+    "test:coverage": "vitest run --coverage",
+    "test:coverage:ui": "vitest run --coverage --ui",
+    "dist": "pnpm clean && pnpm lint && pnpm test && pnpm build"
   },
   "dependencies": {
     "eventsource-parser": "1.1.1",
@@ -74,23 +79,18 @@
     "secure-json-parse": "2.7.0",
     "ws": "8.14.2",
     "zod": "3.22.4",
-    "zod-to-json-schema": "3.22.1"
+    "zod-to-json-schema": "3.22.3"
   },
   "devDependencies": {
     "@types/node": "18.11.9",
     "@types/ws": "^8.5.7",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
-    "copyfiles": "2.4.1",
+    "@vitest/coverage-v8": "^1.1.0",
+    "@vitest/ui": "1.1.0",
     "eslint": "^8.45.0",
     "eslint-config-prettier": "9.0.0",
     "fastify": "^4.0.0",
-    "husky": "^8.0.3",
-    "lint-staged": "15.1.0",
-    "msw": "2.0.10",
-    "prettier": "3.1.0",
-    "rimraf": "5.0.5",
-    "typescript": "5.2.2",
-    "vitest": "1.0.4"
+    "msw": "2.0.10"
   }
 }