modelfusion 0.99.0 → 0.101.0

package/README.md

@@ -85,7 +85,7 @@ Providers: [OpenAI](https://modelfusion.dev/integration/model-provider/openai),
 Multi-modal vision models such as GPT 4 Vision can process images as part of the prompt.
 
 ```ts
-import { streamText, openai, OpenAIChatMessage } from "modelfusion";
+import { streamText, openai } from "modelfusion";
 import { readFileSync } from "fs";
 
 const image = readFileSync("./image.png").toString("base64");
@@ -93,7 +93,7 @@ const image = readFileSync("./image.png").toString("base64");
 const textStream = await streamText(
   openai.ChatTextGenerator({ model: "gpt-4-vision-preview" }),
   [
-    OpenAIChatMessage.user([
+    openai.ChatMessage.user([
       { type: "text", text: "Describe the image in detail:" },
       { type: "image", base64Image: image, mimeType: "image/png" },
     ]),
@@ -355,14 +355,14 @@ const result = await guard(
   fixStructure({
     modifyInputForRetry: async ({ input, error }) => [
       ...input,
-      OpenAIChatMessage.assistant(null, {
+      openai.ChatMessage.assistant(null, {
         functionCall: {
           name: "sentiment",
           arguments: JSON.stringify(error.valueText),
         },
       }),
-      OpenAIChatMessage.user(error.message),
-      OpenAIChatMessage.user("Please fix the error and try again."),
+      openai.ChatMessage.user(error.message),
+      openai.ChatMessage.user("Please fix the error and try again."),
     ],
   })
 );
@@ -418,7 +418,7 @@ With `generateToolCall`, you can generate a tool call for a specific tool with a
 const { id, name, args } = await generateToolCall(
   openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
   calculator,
-  [OpenAIChatMessage.user("What's fourteen times twelve?")]
+  [openai.ChatMessage.user("What's fourteen times twelve?")]
 );
 ```
 
@@ -430,7 +430,7 @@ With `generateToolCallsOrText`, you can ask a language model to generate several
 const { text, toolCalls } = await generateToolCallsOrText(
   openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
   [toolA, toolB, toolC],
-  [OpenAIChatMessage.user(query)]
+  [openai.ChatMessage.user(query)]
 );
 ```
 
@@ -454,7 +454,7 @@ With `useTool`, you can use a tool with a language model that supports tools cal
 const { tool, toolCall, args, ok, result } = await useTool(
   openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
   calculator,
-  [OpenAIChatMessage.user("What's fourteen times twelve?")]
+  [openai.ChatMessage.user("What's fourteen times twelve?")]
 );
 
 console.log(`Tool call:`, toolCall);
@@ -472,7 +472,7 @@ With `useToolsOrGenerateText`, you can ask a language model to generate several
 const { text, toolResults } = await useToolsOrGenerateText(
   openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
   [calculator /* ... */],
-  [OpenAIChatMessage.user("What's fourteen times twelve?")]
+  [openai.ChatMessage.user("What's fourteen times twelve?")]
 );
 ```
 
@@ -767,12 +767,6 @@ Examples for almost all of the individual functions and objects. Highly recommen
 
 StoryTeller is an exploratory web application that creates short audio stories for pre-school kids.
 
-### [Chatbot (Terminal)](https://github.com/lgrammel/modelfusion/tree/main/examples/chatbot-terminal)
-
-> _Terminal app_, _chat_, _llama.cpp_
-
-A chat with an AI assistant, implemented as a terminal app.
-
 ### [Chatbot (Next.JS)](https://github.com/lgrammel/modelfusion/tree/main/examples/chatbot-next-js)
 
 > _Next.js app_, _OpenAI GPT-3.5-turbo_, _streaming_, _abort handling_

package/core/api/BaseUrlApiConfiguration.d.ts

@@ -1,6 +1,12 @@
 import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
 import { RetryFunction } from "./RetryFunction.js";
 import { ThrottleFunction } from "./ThrottleFunction.js";
+export type BaseUrlApiConfigurationOptions = {
+    baseUrl: string;
+    headers: Record<string, string>;
+    retry?: RetryFunction;
+    throttle?: ThrottleFunction;
+};
 /**
  * An API configuration that uses a base URL and a set of headers.
  *
@@ -9,11 +15,6 @@ import { ThrottleFunction } from "./ThrottleFunction.js";
 export declare class BaseUrlApiConfiguration extends AbstractApiConfiguration {
     readonly baseUrl: string;
     readonly headers: Record<string, string>;
-    constructor({ baseUrl, headers, retry, throttle, }: {
-        baseUrl: string;
-        headers: Record<string, string>;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    });
+    constructor({ baseUrl, headers, retry, throttle, }: BaseUrlApiConfigurationOptions);
     assembleUrl(path: string): string;
 }

package/core/api/BaseUrlPartsApiConfiguration.cjs

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

package/core/api/BaseUrlPartsApiConfiguration.d.ts

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

package/core/api/BaseUrlPartsApiConfiguration.js

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

package/core/api/index.cjs

@@ -18,6 +18,7 @@ __exportStar(require("./AbortError.cjs"), exports);
 __exportStar(require("./ApiCallError.cjs"), exports);
 __exportStar(require("./ApiConfiguration.cjs"), exports);
 __exportStar(require("./BaseUrlApiConfiguration.cjs"), exports);
+__exportStar(require("./BaseUrlPartsApiConfiguration.cjs"), exports);
 __exportStar(require("./RetryError.cjs"), exports);
 __exportStar(require("./RetryFunction.cjs"), exports);
 __exportStar(require("./ThrottleFunction.cjs"), exports);

package/core/api/index.d.ts

@@ -2,6 +2,7 @@ export * from "./AbortError.js";
 export * from "./ApiCallError.js";
 export * from "./ApiConfiguration.js";
 export * from "./BaseUrlApiConfiguration.js";
+export * from "./BaseUrlPartsApiConfiguration.js";
 export * from "./RetryError.js";
 export * from "./RetryFunction.js";
 export * from "./ThrottleFunction.js";

package/core/api/index.js

@@ -2,6 +2,7 @@ export * from "./AbortError.js";
 export * from "./ApiCallError.js";
 export * from "./ApiConfiguration.js";
 export * from "./BaseUrlApiConfiguration.js";
+export * from "./BaseUrlPartsApiConfiguration.js";
 export * from "./RetryError.js";
 export * from "./RetryFunction.js";
 export * from "./ThrottleFunction.js";

package/guard/fixStructure.cjs

@@ -45,14 +45,14 @@ const StructureValidationError_js_1 = require("../model-function/generate-struct
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.assistant(null, {
+ *      openai.ChatMessage.assistant(null, {
  *        functionCall: {
  *          name: "sentiment",
  *          arguments: JSON.stringify(error.valueText),
  *        },
  *      }),
- *      OpenAIChatMessage.user(error.message),
- *      OpenAIChatMessage.user("Please fix the error and try again."),
+ *      openai.ChatMessage.user(error.message),
+ *      openai.ChatMessage.user("Please fix the error and try again."),
  *    ],
  *  })
  * );

package/guard/fixStructure.d.ts

@@ -43,14 +43,14 @@ import { Guard } from "./guard.js";
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.assistant(null, {
+ *      openai.ChatMessage.assistant(null, {
  *        functionCall: {
  *          name: "sentiment",
  *          arguments: JSON.stringify(error.valueText),
  *        },
  *      }),
- *      OpenAIChatMessage.user(error.message),
- *      OpenAIChatMessage.user("Please fix the error and try again."),
+ *      openai.ChatMessage.user(error.message),
+ *      openai.ChatMessage.user("Please fix the error and try again."),
  *    ],
  *  })
  * );

package/guard/fixStructure.js

@@ -42,14 +42,14 @@ import { StructureValidationError } from "../model-function/generate-structure/S
  *  fixStructure({
  *    modifyInputForRetry: async ({ input, error }) => [
  *      ...input,
- *      OpenAIChatMessage.assistant(null, {
+ *      openai.ChatMessage.assistant(null, {
  *        functionCall: {
  *          name: "sentiment",
  *          arguments: JSON.stringify(error.valueText),
  *        },
  *      }),
- *      OpenAIChatMessage.user(error.message),
- *      OpenAIChatMessage.user("Please fix the error and try again."),
+ *      openai.ChatMessage.user(error.message),
+ *      openai.ChatMessage.user("Please fix the error and try again."),
  *    ],
  *  })
  * );

package/model-function/generate-structure/generateStructure.d.ts

@@ -17,11 +17,11 @@ import { StructureGenerationModel, StructureGenerationModelSettings } from "./St
  *       .describe("Sentiment."),
  *   })),
  *   [
- *     OpenAIChatMessage.system(
+ *     openai.ChatMessage.system(
  *       "You are a sentiment evaluator. " +
  *         "Analyze the sentiment of the following product review:"
  *     ),
- *     OpenAIChatMessage.user(
+ *     openai.ChatMessage.user(
  *       "After I opened the package, I was met by a very unpleasant smell " +
  *         "that did not disappear even after washing. Never again!"
  *     ),

package/model-function/generate-structure/streamStructure.d.ts

@@ -38,7 +38,7 @@ export type StructureStreamPart<STRUCTURE> = {
  *       })
  *     ),
  *   [
- *     OpenAIChatMessage.user(
+ *     openai.ChatMessage.user(
  *       "Generate 3 character descriptions for a fantasy role playing game."
  *     ),
  *   ]

package/model-provider/automatic1111/Automatic1111ApiConfiguration.cjs

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Automatic1111ApiConfiguration = void 0;
-const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
-class Automatic1111ApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:7860/sdapi/v1", retry, throttle, } = {}) {
-        super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
-        });
+const BaseUrlPartsApiConfiguration_js_1 = require("../../core/api/BaseUrlPartsApiConfiguration.cjs");
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration_js_1.BaseUrlPartsApiConfiguration {
+    constructor({ protocol = "http", host = "127.0.0.1", port = "7860", path = "/sdapi/v1", headers = {}, retry, throttle, } = {}) {
+        super({ protocol, host, port, path, headers, retry, throttle });
     }
 }
 exports.Automatic1111ApiConfiguration = Automatic1111ApiConfiguration;

package/model-provider/automatic1111/Automatic1111ApiConfiguration.d.ts

@@ -1,10 +1,8 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export declare class Automatic1111ApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, retry, throttle, }?: {
-        baseUrl?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    });
+import { BaseUrlPartsApiConfiguration, BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export declare class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration {
+    constructor({ protocol, host, port, path, headers, retry, throttle, }?: Partial<BaseUrlPartsApiConfigurationOptions>);
 }

package/model-provider/automatic1111/Automatic1111ApiConfiguration.js

@@ -1,11 +1,10 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-export class Automatic1111ApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:7860/sdapi/v1", retry, throttle, } = {}) {
-        super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
-        });
+import { BaseUrlPartsApiConfiguration, } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration {
+    constructor({ protocol = "http", host = "127.0.0.1", port = "7860", path = "/sdapi/v1", headers = {}, retry, throttle, } = {}) {
+        super({ protocol, host, port, path, headers, retry, throttle });
     }
 }

package/model-provider/automatic1111/Automatic1111Error.cjs

@@ -1,40 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedAutomatic1111CallResponseHandler = exports.Automatic1111Error = exports.automatic1111ErrorDataSchema = void 0;
+exports.failedAutomatic1111CallResponseHandler = 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.automatic1111ErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const automatic1111ErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.string(),
     detail: zod_1.z.string(),
     body: zod_1.z.string(),
     errors: zod_1.z.string(),
 }));
-class Automatic1111Error extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.detail, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.Automatic1111Error = Automatic1111Error;
-const failedAutomatic1111CallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    const parsedError = (0, parseJSON_js_1.parseJSON)({
-        text: responseBody,
-        schema: exports.automatic1111ErrorDataSchema,
-    });
-    return new Automatic1111Error({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
-exports.failedAutomatic1111CallResponseHandler = failedAutomatic1111CallResponseHandler;
+exports.failedAutomatic1111CallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
+    errorSchema: automatic1111ErrorDataSchema,
+    errorToMessage: (error) => error.detail,
+});

package/model-provider/automatic1111/Automatic1111Error.d.ts

@@ -1,21 +1,12 @@
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const automatic1111ErrorDataSchema: ZodSchema<{
+declare const automatic1111ErrorDataSchema: ZodSchema<{
     error: string;
     errors: string;
     body: string;
     detail: string;
 }>;
 export type Automatic1111ErrorData = (typeof automatic1111ErrorDataSchema)["_type"];
-export declare class Automatic1111Error extends ApiCallError {
-    readonly data: Automatic1111ErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: Automatic1111ErrorData;
-    });
-}
 export declare const failedAutomatic1111CallResponseHandler: ResponseHandler<ApiCallError>;
+export {};

package/model-provider/automatic1111/Automatic1111Error.js

@@ -1,35 +1,13 @@
 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 automatic1111ErrorDataSchema = new ZodSchema(z.object({
+const automatic1111ErrorDataSchema = new ZodSchema(z.object({
     error: z.string(),
     detail: z.string(),
     body: z.string(),
     errors: z.string(),
 }));
-export class Automatic1111Error extends ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.detail, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-export const failedAutomatic1111CallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    const parsedError = parseJSON({
-        text: responseBody,
-        schema: automatic1111ErrorDataSchema,
-    });
-    return new Automatic1111Error({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
+export const failedAutomatic1111CallResponseHandler = createJsonErrorResponseHandler({
+    errorSchema: automatic1111ErrorDataSchema,
+    errorToMessage: (error) => error.detail,
+});

package/model-provider/automatic1111/Automatic1111Facade.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageGenerator = void 0;
+exports.Api = exports.ImageGenerator = void 0;
+const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111ImageGenerationModel_js_1 = require("./Automatic1111ImageGenerationModel.cjs");
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -13,3 +14,11 @@ function ImageGenerator(settings) {
     return new Automatic1111ImageGenerationModel_js_1.Automatic1111ImageGenerationModel(settings);
 }
 exports.ImageGenerator = ImageGenerator;
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+function Api(settings) {
+    return new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration(settings);
+}
+exports.Api = Api;

package/model-provider/automatic1111/Automatic1111Facade.d.ts

@@ -1,3 +1,5 @@
+import { BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { Automatic1111ImageGenerationModel, Automatic1111ImageGenerationSettings } from "./Automatic1111ImageGenerationModel.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -7,3 +9,8 @@ import { Automatic1111ImageGenerationModel, Automatic1111ImageGenerationSettings
  * @return A new instance of ${@link Automatic1111ImageGenerationModel}.
  */
 export declare function ImageGenerator(settings: Automatic1111ImageGenerationSettings): Automatic1111ImageGenerationModel;
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export declare function Api(settings: Partial<BaseUrlPartsApiConfigurationOptions>): Automatic1111ApiConfiguration;

package/model-provider/automatic1111/Automatic1111Facade.js

@@ -1,3 +1,4 @@
+import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { Automatic1111ImageGenerationModel, } from "./Automatic1111ImageGenerationModel.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -9,3 +10,10 @@ import { Automatic1111ImageGenerationModel, } from "./Automatic1111ImageGenerati
 export function ImageGenerator(settings) {
     return new Automatic1111ImageGenerationModel(settings);
 }
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export function Api(settings) {
+    return new Automatic1111ApiConfiguration(settings);
+}

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -28,13 +28,29 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
         return this.settings.model;
     }
     async callAPI(input, options) {
+        const api = this.settings.api ?? new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callAutomatic1111ImageGenerationAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                prompt: input.prompt,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/txt2img`),
+                headers: api.headers,
+                body: {
+                    height: this.settings.height,
+                    width: this.settings.width,
+                    prompt: input.prompt,
+                    negative_prompt: input.negativePrompt,
+                    sampler_index: this.settings.sampler,
+                    steps: this.settings.steps,
+                    seed: input.seed,
+                    override_settings: {
+                        sd_model_checkpoint: this.settings.model,
+                    },
+                },
+                failedResponseHandler: Automatic1111Error_js_1.failedAutomatic1111CallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(Automatic1111ImageGenerationResponseSchema),
+                abortSignal,
             }),
         });
     }
@@ -72,24 +88,3 @@ const Automatic1111ImageGenerationResponseSchema = zod_1.z.object({
     parameters: zod_1.z.object({}),
     info: zod_1.z.string(),
 });
-async function callAutomatic1111ImageGenerationAPI({ api = new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration(), abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/txt2img`),
-        headers: api.headers,
-        body: {
-            height,
-            width,
-            prompt,
-            negative_prompt: negativePrompt,
-            sampler_index: sampler,
-            steps,
-            seed,
-            override_settings: {
-                sd_model_checkpoint: model,
-            },
-        },
-        failedResponseHandler: Automatic1111Error_js_1.failedAutomatic1111CallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(Automatic1111ImageGenerationResponseSchema),
-        abortSignal,
-    });
-}