modelfusion 0.27.3 → 0.29.0

package/README.md

@@ -314,6 +314,21 @@ const speech = await synthesizeSpeech(
 
 Providers: [Eleven Labs](https://modelfusion.dev/integration/model-provider/elevenlabs), [LMNT](https://modelfusion.dev/integration/model-provider/lmnt)
 
+### [Describe Image](https://modelfusion.dev/guide/function/describe-image)
+
+Describe an image as text, e.g. for image captioning or OCR.
+
+```ts
+const text = await describeImage(
+  new HuggingFaceImageDescriptionModel({
+    model: "nlpconnect/vit-gpt2-image-captioning",
+  }),
+  data: buffer
+);
+```
+
+Providers: [HuggingFace](/integration/model-provider/huggingface)
+
 ### [Generate Image](https://modelfusion.dev/guide/function/generate-image)
 
 Generate a base64-encoded image from a prompt.
@@ -412,16 +427,18 @@ Integrations: [Helicone](https://modelfusion.dev/integration/observability/helic
   - [Tokenize Text](https://modelfusion.dev/guide/function/tokenize-text)
   - [Transcribe Speech](https://modelfusion.dev/guide/function/transcribe-speech)
   - [Synthesize Speech](https://modelfusion.dev/guide/function/synthesize-speech)
-  - [Generate images](https://modelfusion.dev/guide/function/generate-image)
+  - [Describe Image](https://modelfusion.dev/guide/function/describe-image)
+  - [Generate Image](https://modelfusion.dev/guide/function/generate-image)
 - [Tools](https://modelfusion.dev/guide/tools)
 - [Text Chunks](https://modelfusion.dev/guide/text-chunk/)
   - [Split Text](https://modelfusion.dev/guide/text-chunk/split)
 - [Utilities](https://modelfusion.dev/guide/util/)
-  - [Function Logging](https://modelfusion.dev/guide/util/logging)
-  - [Function observers](https://modelfusion.dev/guide/util/observer)
-  - [Retry strategies](https://modelfusion.dev/guide/util/retry)
-  - [Throttling strategies](https://modelfusion.dev/guide/util/throttle)
-  - [Run abstraction](https://modelfusion.dev/guide/util/run)
+  - [API Configuration](https://modelfusion.dev/guide/util/api-configuration)
+    - [Retry strategies](https://modelfusion.dev/guide/util/api-configuration/retry)
+    - [Throttling strategies](https://modelfusion.dev/guide/util/api-configuration/throttle)
+  - [Logging](https://modelfusion.dev/guide/util/logging)
+  - [Observers](https://modelfusion.dev/guide/util/observer)
+  - [Runs](https://modelfusion.dev/guide/util/run)
   - [Abort signals](https://modelfusion.dev/guide/util/abort)
   - [Cost calculation](https://modelfusion.dev/guide/util/cost-calculation)
 

package/{model-function/BasicApiConfiguration.js → core/api/AbstractApiConfiguration.cjs}

@@ -1,11 +1,8 @@
-export class BasicApiConfiguration {
-    constructor({ baseUrl, retry, throttle, }) {
-        Object.defineProperty(this, "baseUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractApiConfiguration = void 0;
+class AbstractApiConfiguration {
+    constructor({ retry, throttle, }) {
         Object.defineProperty(this, "retry", {
             enumerable: true,
             configurable: true,
@@ -18,14 +15,8 @@ export class BasicApiConfiguration {
             writable: true,
             value: void 0
         });
-        this.baseUrl = baseUrl;
         this.retry = retry;
         this.throttle = throttle;
     }
-    get headers() {
-        return {};
-    }
-    assembleUrl(path) {
-        return `${this.baseUrl}${path}`;
-    }
 }
+exports.AbstractApiConfiguration = AbstractApiConfiguration;

package/core/api/AbstractApiConfiguration.d.ts

@@ -0,0 +1,13 @@
+import { RetryFunction } from "./RetryFunction.js";
+import { ThrottleFunction } from "./ThrottleFunction.js";
+import { ApiConfiguration } from "./ApiConfiguration.js";
+export declare abstract class AbstractApiConfiguration implements ApiConfiguration {
+    readonly retry?: RetryFunction;
+    readonly throttle?: ThrottleFunction;
+    constructor({ retry, throttle, }: {
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+    abstract assembleUrl(path: string): string;
+    abstract readonly headers: Record<string, string>;
+}

package/core/api/AbstractApiConfiguration.js

@@ -0,0 +1,18 @@
+export class AbstractApiConfiguration {
+    constructor({ retry, throttle, }) {
+        Object.defineProperty(this, "retry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "throttle", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.retry = retry;
+        this.throttle = throttle;
+    }
+}

package/core/api/ApiConfiguration.d.ts

@@ -0,0 +1,32 @@
+import { RetryFunction } from "./RetryFunction.js";
+import { ThrottleFunction } from "./ThrottleFunction.js";
+/**
+ * Settings for how to call an API, e.g. OpenAI.
+ *
+ * This interfaces enables creating pre-defined API configuration for certain API (e.g., OpenAI),
+ * pre-defined proxy configurations (e.g. Helicone OpenAI),
+ * and fully custom setups (e.g. your own internal OpenAI proxy with custom headers).
+ */
+export interface ApiConfiguration {
+    /**
+     * Creates a full URL given a inner path.
+     *
+     * The inner path always starts with a slash, e.g. `/generate`.
+     */
+    assembleUrl(path: string): string;
+    /**
+     * Returns the headers that should be included in every request to the API.
+     * This is intended for authentication headers and proxy settings.
+     *
+     * The model may add additional headers, in particular "Content-Type"."
+     */
+    readonly headers: Record<string, string>;
+    /**
+     * Defines how failed API calls should be retried.
+     */
+    readonly retry?: RetryFunction;
+    /**
+     * Defines how API calls should be rate limited.
+     */
+    readonly throttle?: ThrottleFunction;
+}

package/core/api/BaseUrlApiConfiguration.cjs

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseUrlApiConfiguration = void 0;
+const AbstractApiConfiguration_js_1 = require("./AbstractApiConfiguration.cjs");
+/**
+ * An API configuration that uses a base URL 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 BaseUrlApiConfiguration extends AbstractApiConfiguration_js_1.AbstractApiConfiguration {
+    constructor({ baseUrl, headers, retry, throttle, }) {
+        super({ retry, throttle });
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "headers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.baseUrl = baseUrl;
+        this.headers = headers;
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}`;
+    }
+}
+exports.BaseUrlApiConfiguration = BaseUrlApiConfiguration;

package/core/api/BaseUrlApiConfiguration.d.ts

@@ -0,0 +1,19 @@
+import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
+import { RetryFunction } from "./RetryFunction.js";
+import { ThrottleFunction } from "./ThrottleFunction.js";
+/**
+ * An API configuration that uses a base URL 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 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;
+    });
+    assembleUrl(path: string): string;
+}

package/core/api/BaseUrlApiConfiguration.js

@@ -0,0 +1,28 @@
+import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
+/**
+ * An API configuration that uses a base URL 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 BaseUrlApiConfiguration extends AbstractApiConfiguration {
+    constructor({ baseUrl, headers, retry, throttle, }) {
+        super({ retry, throttle });
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "headers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.baseUrl = baseUrl;
+        this.headers = headers;
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}`;
+    }
+}

package/core/api/index.cjs

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./AbortError.cjs"), exports);
+__exportStar(require("./ApiCallError.cjs"), exports);
+__exportStar(require("./ApiConfiguration.cjs"), exports);
+__exportStar(require("./BaseUrlApiConfiguration.cjs"), exports);
+__exportStar(require("./RetryError.cjs"), exports);
+__exportStar(require("./RetryFunction.cjs"), exports);
+__exportStar(require("./ThrottleFunction.cjs"), exports);
+__exportStar(require("./retryNever.cjs"), exports);
+__exportStar(require("./retryWithExponentialBackoff.cjs"), exports);
+__exportStar(require("./throttleMaxConcurrency.cjs"), exports);
+__exportStar(require("./throttleUnlimitedConcurrency.cjs"), exports);

package/core/api/index.d.ts

@@ -0,0 +1,11 @@
+export * from "./AbortError.js";
+export * from "./ApiCallError.js";
+export * from "./ApiConfiguration.js";
+export * from "./BaseUrlApiConfiguration.js";
+export * from "./RetryError.js";
+export * from "./RetryFunction.js";
+export * from "./ThrottleFunction.js";
+export * from "./retryNever.js";
+export * from "./retryWithExponentialBackoff.js";
+export * from "./throttleMaxConcurrency.js";
+export * from "./throttleUnlimitedConcurrency.js";

package/core/api/index.js

@@ -0,0 +1,11 @@
+export * from "./AbortError.js";
+export * from "./ApiCallError.js";
+export * from "./ApiConfiguration.js";
+export * from "./BaseUrlApiConfiguration.js";
+export * from "./RetryError.js";
+export * from "./RetryFunction.js";
+export * from "./ThrottleFunction.js";
+export * from "./retryNever.js";
+export * from "./retryWithExponentialBackoff.js";
+export * from "./throttleMaxConcurrency.js";
+export * from "./throttleUnlimitedConcurrency.js";

package/{util → core}/api/postToApi.d.ts

@@ -21,7 +21,7 @@ export declare const postToApi: <T>({ url, headers, body, successfulResponseHand
     url: string;
     headers?: Record<string, string> | undefined;
     body: {
-        content: string | FormData;
+        content: string | FormData | Buffer;
         values: unknown;
     };
     failedResponseHandler: ResponseHandler<Error>;

package/core/index.cjs

@@ -23,3 +23,4 @@ __exportStar(require("./GlobalFunctionLogging.cjs"), exports);
 __exportStar(require("./GlobalFunctionObservers.cjs"), exports);
 __exportStar(require("./Run.cjs"), exports);
 __exportStar(require("./Vector.cjs"), exports);
+__exportStar(require("./api/index.cjs"), exports);

package/core/index.d.ts

@@ -7,3 +7,4 @@ export * from "./GlobalFunctionLogging.js";
 export * from "./GlobalFunctionObservers.js";
 export * from "./Run.js";
 export * from "./Vector.js";
+export * from "./api/index.js";

package/core/index.js

@@ -7,3 +7,4 @@ export * from "./GlobalFunctionLogging.js";
 export * from "./GlobalFunctionObservers.js";
 export * from "./Run.js";
 export * from "./Vector.js";
+export * from "./api/index.js";

package/model-function/ModelCallEvent.d.ts

@@ -1,5 +1,6 @@
 import { BaseFunctionFinishedEvent, BaseFunctionStartedEvent } from "../core/FunctionEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
+import { ImageDescriptionFinishedEvent, ImageDescriptionStartedEvent } from "./describe-image/ImageDescriptionEvent.js";
 import { TextEmbeddingFinishedEvent, TextEmbeddingStartedEvent } from "./embed-text/TextEmbeddingEvent.js";
 import { ImageGenerationFinishedEvent, ImageGenerationStartedEvent } from "./generate-image/ImageGenerationEvent.js";
 import { JsonGenerationFinishedEvent, JsonGenerationStartedEvent } from "./generate-json/JsonGenerationEvent.js";
@@ -47,5 +48,5 @@ export interface BaseModelCallFinishedEvent extends BaseFunctionFinishedEvent {
      */
     result: BaseModelCallFinishedEventResult;
 }
-export type ModelCallStartedEvent = ImageGenerationStartedEvent | JsonGenerationStartedEvent | SpeechSynthesisStartedEvent | TextEmbeddingStartedEvent | TextGenerationStartedEvent | TextStreamingStartedEvent | TranscriptionStartedEvent;
-export type ModelCallFinishedEvent = ImageGenerationFinishedEvent | JsonGenerationFinishedEvent | SpeechSynthesisFinishedEvent | TextEmbeddingFinishedEvent | TextGenerationFinishedEvent | TextStreamingFinishedEvent | TranscriptionFinishedEvent;
+export type ModelCallStartedEvent = ImageDescriptionStartedEvent | ImageGenerationStartedEvent | JsonGenerationStartedEvent | SpeechSynthesisStartedEvent | TextEmbeddingStartedEvent | TextGenerationStartedEvent | TextStreamingStartedEvent | TranscriptionStartedEvent;
+export type ModelCallFinishedEvent = ImageDescriptionFinishedEvent | ImageGenerationFinishedEvent | JsonGenerationFinishedEvent | SpeechSynthesisFinishedEvent | TextEmbeddingFinishedEvent | TextGenerationFinishedEvent | TextStreamingFinishedEvent | TranscriptionFinishedEvent;

package/model-function/SuccessfulModelCall.d.ts

@@ -1,7 +1,7 @@
 import { FunctionEvent } from "../core/FunctionEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
 export type SuccessfulModelCall = {
-    type: "image-generation" | "json-generation" | "json-or-text-generation" | "speech-synthesis" | "text-embedding" | "text-generation" | "text-streaming" | "transcription";
+    type: "image-description" | "image-generation" | "json-generation" | "json-or-text-generation" | "speech-synthesis" | "text-embedding" | "text-generation" | "text-streaming" | "transcription";
     model: ModelInformation;
     settings: unknown;
     response: unknown;

package/model-function/describe-image/ImageDescriptionEvent.cjs

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/model-function/describe-image/ImageDescriptionEvent.d.ts

@@ -0,0 +1,18 @@
+import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
+export interface ImageDescriptionStartedEvent extends BaseModelCallStartedEvent {
+    functionType: "image-description";
+}
+export type ImageDescriptionFinishedEventResult = {
+    status: "success";
+    response: unknown;
+    output: string;
+} | {
+    status: "error";
+    error: unknown;
+} | {
+    status: "abort";
+};
+export interface ImageDescriptionFinishedEvent extends BaseModelCallFinishedEvent {
+    functionType: "image-description";
+    result: ImageDescriptionFinishedEventResult;
+}

package/model-function/describe-image/ImageDescriptionEvent.js

@@ -0,0 +1 @@
+export {};

package/model-function/describe-image/ImageDescriptionModel.cjs

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/model-function/describe-image/ImageDescriptionModel.d.ts

@@ -0,0 +1,8 @@
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
+import { Model, ModelSettings } from "../Model.js";
+export interface ImageDescriptionModelSettings extends ModelSettings {
+}
+export interface ImageDescriptionModel<DATA, RESPONSE, SETTINGS extends ImageDescriptionModelSettings> extends Model<SETTINGS> {
+    generateImageDescriptionResponse: (data: DATA, options?: ModelFunctionOptions<SETTINGS>) => PromiseLike<RESPONSE>;
+    extractImageDescription: (response: RESPONSE) => string;
+}

package/model-function/describe-image/ImageDescriptionModel.js

@@ -0,0 +1 @@
+export {};

package/model-function/describe-image/describeImage.cjs

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeImage = void 0;
+const executeCall_js_1 = require("../executeCall.cjs");
+/**
+ * Describe an image as text.
+ *
+ * Depending on the model, this can be used for image captioning, for describing the contents of an image, or for OCR.
+ */
+function describeImage(model, data, options) {
+    return (0, executeCall_js_1.executeCall)({
+        functionType: "image-description",
+        input: data,
+        model,
+        options,
+        generateResponse: (options) => model.generateImageDescriptionResponse(data, options),
+        extractOutputValue: model.extractImageDescription,
+    });
+}
+exports.describeImage = describeImage;

package/model-function/describe-image/describeImage.d.ts

@@ -0,0 +1,9 @@
+import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
+import { ModelFunctionPromise } from "../executeCall.js";
+import { ImageDescriptionModel, ImageDescriptionModelSettings } from "./ImageDescriptionModel.js";
+/**
+ * Describe an image as text.
+ *
+ * Depending on the model, this can be used for image captioning, for describing the contents of an image, or for OCR.
+ */
+export declare function describeImage<DATA, RESPONSE, SETTINGS extends ImageDescriptionModelSettings>(model: ImageDescriptionModel<DATA, RESPONSE, SETTINGS>, data: DATA, options?: ModelFunctionOptions<SETTINGS>): ModelFunctionPromise<string, RESPONSE>;

package/model-function/describe-image/describeImage.js

@@ -0,0 +1,16 @@
+import { executeCall } from "../executeCall.js";
+/**
+ * Describe an image as text.
+ *
+ * Depending on the model, this can be used for image captioning, for describing the contents of an image, or for OCR.
+ */
+export function describeImage(model, data, options) {
+    return executeCall({
+        functionType: "image-description",
+        input: data,
+        model,
+        options,
+        generateResponse: (options) => model.generateImageDescriptionResponse(data, options),
+        extractOutputValue: model.extractImageDescription,
+    });
+}

package/model-function/executeCall.cjs

@@ -7,7 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
-const AbortError_js_1 = require("../util/api/AbortError.cjs");
+const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
 class ModelFunctionPromise extends Promise {
     constructor(fullPromise) {

package/model-function/executeCall.js

@@ -4,7 +4,7 @@ import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
-import { AbortError } from "../util/api/AbortError.js";
+import { AbortError } from "../core/api/AbortError.js";
 import { runSafe } from "../util/runSafe.js";
 export class ModelFunctionPromise extends Promise {
     constructor(fullPromise) {

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

@@ -7,7 +7,7 @@ const GlobalFunctionLogging_js_1 = require("../../core/GlobalFunctionLogging.cjs
 const GlobalFunctionObservers_js_1 = require("../../core/GlobalFunctionObservers.cjs");
 const getFunctionCallLogger_js_1 = require("../../core/getFunctionCallLogger.cjs");
 const DurationMeasurement_js_1 = require("../../util/DurationMeasurement.cjs");
-const AbortError_js_1 = require("../../util/api/AbortError.cjs");
+const AbortError_js_1 = require("../../core/api/AbortError.cjs");
 const runSafe_js_1 = require("../../util/runSafe.cjs");
 const extractTextDeltas_js_1 = require("./extractTextDeltas.cjs");
 class StreamTextPromise extends Promise {

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

@@ -4,7 +4,7 @@ import { getGlobalFunctionLogging } from "../../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../../core/GlobalFunctionObservers.js";
 import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
-import { AbortError } from "../../util/api/AbortError.js";
+import { AbortError } from "../../core/api/AbortError.js";
 import { runSafe } from "../../util/runSafe.js";
 import { extractTextDeltas } from "./extractTextDeltas.js";
 export class StreamTextPromise extends Promise {

package/model-function/index.cjs

@@ -14,13 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ApiConfiguration.cjs"), exports);
-__exportStar(require("./BasicApiConfiguration.cjs"), exports);
 __exportStar(require("./Model.cjs"), exports);
 __exportStar(require("./ModelCallEvent.cjs"), exports);
 __exportStar(require("./ModelFunctionOptions.cjs"), exports);
 __exportStar(require("./ModelInformation.cjs"), exports);
 __exportStar(require("./SuccessfulModelCall.cjs"), exports);
+__exportStar(require("./describe-image/ImageDescriptionEvent.cjs"), exports);
+__exportStar(require("./describe-image/ImageDescriptionModel.cjs"), exports);
+__exportStar(require("./describe-image/describeImage.cjs"), exports);
 __exportStar(require("./embed-text/TextEmbeddingEvent.cjs"), exports);
 __exportStar(require("./embed-text/TextEmbeddingModel.cjs"), exports);
 __exportStar(require("./embed-text/embedText.cjs"), exports);

package/model-function/index.d.ts

@@ -1,10 +1,11 @@
-export * from "./ApiConfiguration.js";
-export * from "./BasicApiConfiguration.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelFunctionOptions.js";
 export * from "./ModelInformation.js";
 export * from "./SuccessfulModelCall.js";
+export * from "./describe-image/ImageDescriptionEvent.js";
+export * from "./describe-image/ImageDescriptionModel.js";
+export * from "./describe-image/describeImage.js";
 export * from "./embed-text/TextEmbeddingEvent.js";
 export * from "./embed-text/TextEmbeddingModel.js";
 export * from "./embed-text/embedText.js";

package/model-function/index.js

@@ -1,10 +1,11 @@
-export * from "./ApiConfiguration.js";
-export * from "./BasicApiConfiguration.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelFunctionOptions.js";
 export * from "./ModelInformation.js";
 export * from "./SuccessfulModelCall.js";
+export * from "./describe-image/ImageDescriptionEvent.js";
+export * from "./describe-image/ImageDescriptionModel.js";
+export * from "./describe-image/describeImage.js";
 export * from "./embed-text/TextEmbeddingEvent.js";
 export * from "./embed-text/TextEmbeddingModel.js";
 export * from "./embed-text/embedText.js";

package/model-provider/automatic1111/Automatic1111ApiConfiguration.cjs

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Automatic1111ApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-class Automatic1111ApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+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,
         });

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

@@ -1,7 +1,7 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export declare class Automatic1111ApiConfiguration extends BasicApiConfiguration {
+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;

package/model-provider/automatic1111/Automatic1111ApiConfiguration.js

@@ -1,8 +1,9 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-export class Automatic1111ApiConfiguration extends BasicApiConfiguration {
+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,
         });

package/model-provider/automatic1111/Automatic1111Error.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedAutomatic1111CallResponseHandler = exports.Automatic1111Error = exports.automatic1111ErrorDataSchema = void 0;
 const zod_1 = require("zod");
 const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const ApiCallError_js_1 = require("../../util/api/ApiCallError.cjs");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 exports.automatic1111ErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
     detail: zod_1.z.string(),

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

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { ResponseHandler } from "../../util/api/postToApi.js";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export declare const automatic1111ErrorDataSchema: z.ZodObject<{
     error: z.ZodString;
     detail: z.ZodString;

package/model-provider/automatic1111/Automatic1111Error.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import SecureJSON from "secure-json-parse";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export const automatic1111ErrorDataSchema = z.object({
     error: z.string(),
     detail: z.string(),

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Automatic1111ImageGenerationModel = void 0;
 const zod_1 = require("zod");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
 /**

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

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 /**