modelfusion 0.46.0 → 0.47.1

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

@@ -2,19 +2,22 @@ import { z } from "zod";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormat } from "../../model-function/PromptFormat.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
+import { Automatic1111ImageGenerationPrompt } from "./Automatic1111ImageGenerationPrompt.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
  * @see https://github.com/AUTOMATIC1111/stable-diffusion-webui
  */
-export declare class Automatic1111ImageGenerationModel extends AbstractModel<Automatic1111ImageGenerationModelSettings> implements ImageGenerationModel<A111ImageGenerationPrompt, Automatic1111ImageGenerationModelSettings> {
-    constructor(settings: Automatic1111ImageGenerationModelSettings);
+export declare class Automatic1111ImageGenerationModel extends AbstractModel<Automatic1111ImageGenerationSettings> implements ImageGenerationModel<Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings> {
+    constructor(settings: Automatic1111ImageGenerationSettings);
     readonly provider: "Automatic1111";
     get modelName(): string;
-    callAPI(input: A111ImageGenerationPrompt, options?: FunctionOptions): Promise<Automatic1111ImageGenerationResponse>;
-    get settingsForEvent(): Partial<Automatic1111ImageGenerationModelSettings>;
-    doGenerateImage(prompt: A111ImageGenerationPrompt, options?: FunctionOptions): Promise<{
+    callAPI(input: Automatic1111ImageGenerationPrompt, options?: FunctionOptions): Promise<Automatic1111ImageGenerationResponse>;
+    get settingsForEvent(): Partial<Automatic1111ImageGenerationSettings>;
+    doGenerateImage(prompt: Automatic1111ImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
             images: string[];
             parameters: {};
@@ -22,9 +25,11 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
         };
         base64Image: string;
     }>;
-    withSettings(additionalSettings: Automatic1111ImageGenerationModelSettings): this;
+    withBasicPrompt(): PromptFormatImageGenerationModel<string, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptFormatImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
+    withSettings(additionalSettings: Automatic1111ImageGenerationSettings): this;
 }
-export interface Automatic1111ImageGenerationModelSettings extends ImageGenerationModelSettings {
+export interface Automatic1111ImageGenerationSettings extends ImageGenerationModelSettings {
     api?: ApiConfiguration;
     model: string;
     height?: number;
@@ -46,9 +51,4 @@ declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     info: string;
 }>;
 export type Automatic1111ImageGenerationResponse = z.infer<typeof Automatic1111ImageGenerationResponseSchema>;
-export type A111ImageGenerationPrompt = {
-    prompt: string;
-    negativePrompt?: string;
-    seed?: number;
-};
 export {};

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -2,8 +2,10 @@ import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { failedAutomatic1111CallResponseHandler } from "./Automatic1111Error.js";
+import { mapBasicPromptToAutomatic1111Format, } from "./Automatic1111ImageGenerationPrompt.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -48,6 +50,15 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
             base64Image: response.images[0],
         };
     }
+    withBasicPrompt() {
+        return this.withPromptFormat(mapBasicPromptToAutomatic1111Format());
+    }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new Automatic1111ImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/automatic1111/Automatic1111ImageGenerationPrompt.cjs

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapBasicPromptToAutomatic1111Format = void 0;
+/**
+ * Formats a basic text prompt as an Automatic1111 prompt.
+ */
+function mapBasicPromptToAutomatic1111Format() {
+    return {
+        format: (description) => ({ prompt: description }),
+    };
+}
+exports.mapBasicPromptToAutomatic1111Format = mapBasicPromptToAutomatic1111Format;

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

@@ -0,0 +1,10 @@
+import { PromptFormat } from "../../model-function/PromptFormat.js";
+export type Automatic1111ImageGenerationPrompt = {
+    prompt: string;
+    negativePrompt?: string;
+    seed?: number;
+};
+/**
+ * Formats a basic text prompt as an Automatic1111 prompt.
+ */
+export declare function mapBasicPromptToAutomatic1111Format(): PromptFormat<string, Automatic1111ImageGenerationPrompt>;

package/model-provider/automatic1111/Automatic1111ImageGenerationPrompt.js

@@ -0,0 +1,8 @@
+/**
+ * Formats a basic text prompt as an Automatic1111 prompt.
+ */
+export function mapBasicPromptToAutomatic1111Format() {
+    return {
+        format: (description) => ({ prompt: description }),
+    };
+}

package/model-provider/automatic1111/index.cjs

@@ -19,3 +19,4 @@ __exportStar(require("./Automatic1111ApiConfiguration.cjs"), exports);
 var Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
 Object.defineProperty(exports, "Automatic1111Error", { enumerable: true, get: function () { return Automatic1111Error_js_1.Automatic1111Error; } });
 __exportStar(require("./Automatic1111ImageGenerationModel.cjs"), exports);
+__exportStar(require("./Automatic1111ImageGenerationPrompt.cjs"), exports);

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

@@ -1,3 +1,4 @@
 export * from "./Automatic1111ApiConfiguration.js";
 export { Automatic1111Error, Automatic1111ErrorData, } from "./Automatic1111Error.js";
 export * from "./Automatic1111ImageGenerationModel.js";
+export * from "./Automatic1111ImageGenerationPrompt.js";

package/model-provider/automatic1111/index.js

@@ -1,3 +1,4 @@
 export * from "./Automatic1111ApiConfiguration.js";
 export { Automatic1111Error, } from "./Automatic1111Error.js";
 export * from "./Automatic1111ImageGenerationModel.js";
+export * from "./Automatic1111ImageGenerationPrompt.js";

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -10,9 +10,9 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const AsyncQueue_js_1 = require("../../event-source/AsyncQueue.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
+const TextPromptFormat_js_1 = require("../../model-function/generate-text/TextPromptFormat.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../prompt/PromptFormatTextStreamingModel.cjs");
-const TextPromptFormat_js_1 = require("../../prompt/TextPromptFormat.cjs");
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -4,9 +4,9 @@ import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
+import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
 export declare const COHERE_TEXT_GENERATION_MODELS: {
     command: {
@@ -95,7 +95,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
         user?: string;
         ai?: string;
     }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, CohereTextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;
 }
 declare const cohereTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -4,9 +4,9 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { AsyncQueue } from "../../event-source/AsyncQueue.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
-import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../prompt/TextPromptFormat.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HuggingFaceTextGenerationModel = void 0;
 const zod_1 = __importDefault(require("zod"));
-const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const PromptFormatTextGenerationModel_js_1 = require("../../prompt/PromptFormatTextGenerationModel.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const PromptFormatTextGenerationModel_js_1 = require("../../model-function/generate-text/PromptFormatTextGenerationModel.cjs");
 const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 /**

package/model-provider/huggingface/HuggingFaceTextGenerationModel.d.ts

@@ -1,10 +1,10 @@
 import z from "zod";
-import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatTextGenerationModel } from "../../model-function/generate-text/PromptFormatTextGenerationModel.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
-import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
+import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 export interface HuggingFaceTextGenerationModelSettings extends TextGenerationModelSettings {
     api?: ApiConfiguration;
     model: string;
@@ -53,7 +53,7 @@ export declare class HuggingFaceTextGenerationModel extends AbstractModel<Huggin
         }[];
         text: string;
     }>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatTextGenerationModel<INPUT_PROMPT, string, HuggingFaceTextGenerationModelSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextGenerationModel<INPUT_PROMPT, string, HuggingFaceTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<HuggingFaceTextGenerationModelSettings>): this;
 }
 declare const huggingFaceTextGenerationResponseSchema: z.ZodArray<z.ZodObject<{

package/model-provider/huggingface/HuggingFaceTextGenerationModel.js

@@ -1,8 +1,8 @@
 import z from "zod";
-import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatTextGenerationModel } from "../../model-function/generate-text/PromptFormatTextGenerationModel.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 /**

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -11,7 +11,7 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const AsyncQueue_js_1 = require("../../event-source/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../event-source/parseEventSourceStream.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../prompt/PromptFormatTextStreamingModel.cjs");
+const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -4,9 +4,9 @@ import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
+import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;
@@ -100,7 +100,7 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
         };
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withSettings(additionalSettings: Partial<LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>>): this;
 }
 declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -5,7 +5,7 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 import { AsyncQueue } from "../../event-source/AsyncQueue.js";
 import { parseEventSourceStream } from "../../event-source/parseEventSourceStream.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIImageGenerationResponseFormat = exports.OpenAIImageGenerationModel = exports.calculateOpenAIImageGenerationCostInMillicents = void 0;
 const zod_1 = require("zod");
-const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const PromptFormatImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptFormatImageGenerationModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 /**
@@ -77,6 +78,12 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel_js_1.PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new OpenAIImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }

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

@@ -1,9 +1,11 @@
 import { z } from "zod";
-import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
-import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormat } from "../../model-function/PromptFormat.js";
+import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
 export interface OpenAIImageGenerationCallSettings {
     n?: number;
     size?: "256x256" | "512x512" | "1024x1024";
@@ -43,6 +45,7 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
         };
         base64Image: string;
     }>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIImageGenerationSettings>): this;
 }
 export type OpenAIImageGenerationResponseFormatType<T> = {

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -1,7 +1,8 @@
 import { z } from "zod";
-import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 /**
@@ -73,6 +74,12 @@ export class OpenAIImageGenerationModel extends AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new OpenAIImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/openai/OpenAITextGenerationModel.cjs

@@ -11,9 +11,9 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const AsyncQueue_js_1 = require("../../event-source/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../event-source/parseEventSourceStream.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
+const TextPromptFormat_js_1 = require("../../model-function/generate-text/TextPromptFormat.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../prompt/PromptFormatTextStreamingModel.cjs");
-const TextPromptFormat_js_1 = require("../../prompt/TextPromptFormat.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");

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

@@ -4,9 +4,9 @@ import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
+import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -182,7 +182,7 @@ export declare class OpenAITextGenerationModel extends AbstractModel<OpenAITextG
         user?: string;
         ai?: string;
     }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, OpenAITextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAITextGenerationModelSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAITextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAITextGenerationModelSettings>): this;
 }
 declare const openAITextGenerationResponseSchema: z.ZodObject<{

package/model-provider/openai/OpenAITextGenerationModel.js

@@ -5,9 +5,9 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 import { AsyncQueue } from "../../event-source/AsyncQueue.js";
 import { parseEventSourceStream } from "../../event-source/parseEventSourceStream.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
-import { PromptFormatTextStreamingModel } from "../../prompt/PromptFormatTextStreamingModel.js";
-import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../prompt/TextPromptFormat.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";

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

@@ -11,7 +11,7 @@ const postToApi_js_1 = require("../../../core/api/postToApi.cjs");
 const AbstractModel_js_1 = require("../../../model-function/AbstractModel.cjs");
 const StructureParseError_js_1 = require("../../../model-function/generate-structure/StructureParseError.cjs");
 const parsePartialJson_js_1 = require("../../../model-function/generate-structure/parsePartialJson.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../../prompt/PromptFormatTextStreamingModel.cjs");
+const PromptFormatTextStreamingModel_js_1 = require("../../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("../OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("../OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");

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

@@ -7,9 +7,9 @@ import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { Delta } from "../../../model-function/Delta.js";
 import { StructureGenerationModel } from "../../../model-function/generate-structure/StructureGenerationModel.js";
 import { StructureOrTextGenerationModel } from "../../../model-function/generate-structure/StructureOrTextGenerationModel.js";
+import { PromptFormatTextStreamingModel } from "../../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "../../../prompt/PromptFormat.js";
-import { PromptFormatTextStreamingModel } from "../../../prompt/PromptFormatTextStreamingModel.js";
+import { TextGenerationPromptFormat } from "../../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 export declare const OPENAI_CHAT_MODELS: {
@@ -315,7 +315,7 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(): PromptFormatTextStreamingModel<import("../../../index.js").ChatPrompt, OpenAIChatMessage[], OpenAIChatSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, OpenAIChatMessage[]>): PromptFormatTextStreamingModel<INPUT_PROMPT, OpenAIChatMessage[], OpenAIChatSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, OpenAIChatMessage[]>): PromptFormatTextStreamingModel<INPUT_PROMPT, OpenAIChatMessage[], OpenAIChatSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
 }
 declare const openAIChatResponseSchema: z.ZodObject<{

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

@@ -5,7 +5,7 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../../core/api/pos
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { StructureParseError } from "../../../model-function/generate-structure/StructureParseError.js";
 import { parsePartialJson } from "../../../model-function/generate-structure/parsePartialJson.js";
-import { PromptFormatTextStreamingModel } from "../../../prompt/PromptFormatTextStreamingModel.js";
+import { PromptFormatTextStreamingModel } from "../../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { OpenAIApiConfiguration } from "../OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "../OpenAIError.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapChatPromptToOpenAIChatFormat = exports.mapInstructionPromptToOpenAIChatFormat = void 0;
-const validateChatPrompt_js_1 = require("../../../prompt/chat/validateChatPrompt.cjs");
+const validateChatPrompt_js_1 = require("../../../model-function/generate-text/validateChatPrompt.cjs");
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */

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

@@ -1,12 +1,12 @@
+import { ChatPrompt } from "../../../model-function/generate-text/ChatPrompt.js";
+import { InstructionPrompt } from "../../../model-function/generate-text/InstructionPrompt.js";
+import { TextGenerationPromptFormat } from "../../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
-import { ChatPrompt } from "../../../prompt/chat/ChatPrompt.js";
-import { InstructionPrompt } from "../../../prompt/InstructionPrompt.js";
-import { PromptFormat } from "../../../prompt/PromptFormat.js";
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-export declare function mapInstructionPromptToOpenAIChatFormat(): PromptFormat<InstructionPrompt, Array<OpenAIChatMessage>>;
+export declare function mapInstructionPromptToOpenAIChatFormat(): TextGenerationPromptFormat<InstructionPrompt, Array<OpenAIChatMessage>>;
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */
-export declare function mapChatPromptToOpenAIChatFormat(): PromptFormat<ChatPrompt, Array<OpenAIChatMessage>>;
+export declare function mapChatPromptToOpenAIChatFormat(): TextGenerationPromptFormat<ChatPrompt, Array<OpenAIChatMessage>>;

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

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "../../../prompt/chat/validateChatPrompt.js";
+import { validateChatPrompt } from "../../../model-function/generate-text/validateChatPrompt.js";
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -5,8 +5,10 @@ const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const PromptFormatImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptFormatImageGenerationModel.cjs");
 const StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
 const StabilityError_js_1 = require("./StabilityError.cjs");
+const StabilityImageGenerationPrompt_js_1 = require("./StabilityImageGenerationPrompt.cjs");
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -76,6 +78,15 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             base64Image: response.artifacts[0].base64,
         };
     }
+    withBasicPrompt() {
+        return this.withPromptFormat((0, StabilityImageGenerationPrompt_js_1.mapBasicPromptToStabilityFormat)());
+    }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel_js_1.PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new StabilityImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }

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

@@ -2,7 +2,10 @@ import { z } from "zod";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormat } from "../../model-function/PromptFormat.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
+import { StabilityImageGenerationPrompt } from "./StabilityImageGenerationPrompt.js";
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -25,27 +28,29 @@ import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-
  *   ]
  * );
  */
-export declare class StabilityImageGenerationModel extends AbstractModel<StabilityImageGenerationModelSettings> implements ImageGenerationModel<StabilityImageGenerationPrompt, StabilityImageGenerationModelSettings> {
-    constructor(settings: StabilityImageGenerationModelSettings);
+export declare class StabilityImageGenerationModel extends AbstractModel<StabilityImageGenerationSettings> implements ImageGenerationModel<StabilityImageGenerationPrompt, StabilityImageGenerationSettings> {
+    constructor(settings: StabilityImageGenerationSettings);
     readonly provider: "stability";
     get modelName(): StabilityImageGenerationModelType;
     callAPI(input: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<StabilityImageGenerationResponse>;
-    get settingsForEvent(): Partial<StabilityImageGenerationModelSettings>;
+    get settingsForEvent(): Partial<StabilityImageGenerationSettings>;
     doGenerateImage(prompt: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
             artifacts: {
-                seed: number;
                 base64: string;
+                seed: number;
                 finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
             }[];
         };
         base64Image: string;
     }>;
-    withSettings(additionalSettings: StabilityImageGenerationModelSettings): this;
+    withBasicPrompt(): PromptFormatImageGenerationModel<string, StabilityImageGenerationPrompt, StabilityImageGenerationSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, StabilityImageGenerationPrompt>): PromptFormatImageGenerationModel<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 StabilityImageGenerationModelSettings extends ImageGenerationModelSettings {
+export interface StabilityImageGenerationSettings extends ImageGenerationModelSettings {
     api?: ApiConfiguration;
     model: StabilityImageGenerationModelType;
     height?: number;
@@ -64,32 +69,28 @@ declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
         seed: z.ZodNumber;
         finishReason: z.ZodEnum<["SUCCESS", "ERROR", "CONTENT_FILTERED"]>;
     }, "strip", z.ZodTypeAny, {
-        seed: number;
         base64: string;
+        seed: number;
         finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }, {
-        seed: number;
         base64: string;
+        seed: number;
         finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     artifacts: {
-        seed: number;
         base64: string;
+        seed: number;
         finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }[];
 }, {
     artifacts: {
-        seed: number;
         base64: string;
+        seed: number;
         finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }[];
 }>;
 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 type StabilityImageGenerationPrompt = Array<{
-    text: string;
-    weight?: number;
-}>;
 export {};