modelfusion 0.46.0 → 0.47.1

package/{prompt → model-function/generate-text}/PromptFormatTextStreamingModel.d.ts

@@ -1,13 +1,13 @@
-import { FunctionOptions } from "../core/FunctionOptions.js";
-import { TextGenerationModelSettings, TextStreamingModel } from "../model-function/generate-text/TextGenerationModel.js";
-import { PromptFormat } from "./PromptFormat.js";
+import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { PromptFormatTextGenerationModel } from "./PromptFormatTextGenerationModel.js";
+import { TextGenerationModelSettings, TextStreamingModel } from "./TextGenerationModel.js";
+import { TextGenerationPromptFormat } from "./TextGenerationPromptFormat.js";
 export declare class PromptFormatTextStreamingModel<PROMPT, MODEL_PROMPT, SETTINGS extends TextGenerationModelSettings, MODEL extends TextStreamingModel<MODEL_PROMPT, SETTINGS>> extends PromptFormatTextGenerationModel<PROMPT, MODEL_PROMPT, SETTINGS, MODEL> implements TextStreamingModel<PROMPT, SETTINGS> {
     constructor(options: {
         model: MODEL;
-        promptFormat: PromptFormat<PROMPT, MODEL_PROMPT>;
+        promptFormat: TextGenerationPromptFormat<PROMPT, MODEL_PROMPT>;
     });
-    doStreamText(prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<import("../index.js").Delta<string>>>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, PROMPT>): PromptFormatTextStreamingModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
+    doStreamText(prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<import("../Delta.js").Delta<string>>>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, PROMPT>): PromptFormatTextStreamingModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

package/model-function/generate-text/TextGenerationModel.d.ts

@@ -1,8 +1,8 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
 import { Delta } from "../Delta.js";
 import { Model, ModelSettings } from "../Model.js";
 import { BasicTokenizer, FullTokenizer } from "../tokenize-text/Tokenizer.js";
+import { TextGenerationPromptFormat } from "./TextGenerationPromptFormat.js";
 export interface TextGenerationModelSettings extends ModelSettings {
     /**
      * Maximum number of tokens to generate.
@@ -43,9 +43,9 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
             totalTokens: number;
         };
     }>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, PROMPT>): TextGenerationModel<INPUT_PROMPT, SETTINGS>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, PROMPT>): TextGenerationModel<INPUT_PROMPT, SETTINGS>;
 }
 export interface TextStreamingModel<PROMPT, SETTINGS extends TextGenerationModelSettings = TextGenerationModelSettings> extends TextGenerationModel<PROMPT, SETTINGS> {
     doStreamText(prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<Delta<string>>>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, PROMPT>): TextStreamingModel<INPUT_PROMPT, SETTINGS>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, PROMPT>): TextStreamingModel<INPUT_PROMPT, SETTINGS>;
 }

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

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

package/model-function/generate-text/TextGenerationPromptFormat.d.ts

@@ -0,0 +1,11 @@
+import { PromptFormat } from "../PromptFormat.js";
+/**
+ * Prompt formats format a source prompt into the structure of a target prompt.
+ */
+export interface TextGenerationPromptFormat<SOURCE_PROMPT, TARGET_PROMPT> extends PromptFormat<SOURCE_PROMPT, TARGET_PROMPT> {
+    /**
+     * The texts that should be used as default stop sequences.
+     * This is e.g. important for chat formats.
+     */
+    stopSequences: string[];
+}

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

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

package/{prompt → model-function/generate-text}/TextPromptFormat.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapChatPromptToTextFormat = exports.mapInstructionPromptToTextFormat = void 0;
-const validateChatPrompt_js_1 = require("./chat/validateChatPrompt.cjs");
+const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
 /**
  * Formats an instruction prompt as a basic text prompt.
  */

package/{prompt → model-function/generate-text}/TextPromptFormat.d.ts

@@ -1,10 +1,10 @@
-import { PromptFormat } from "./PromptFormat.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 import { InstructionPrompt } from "./InstructionPrompt.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
+import { TextGenerationPromptFormat } from "./TextGenerationPromptFormat.js";
 /**
  * Formats an instruction prompt as a basic text prompt.
  */
-export declare const mapInstructionPromptToTextFormat: () => PromptFormat<InstructionPrompt, string>;
+export declare const mapInstructionPromptToTextFormat: () => TextGenerationPromptFormat<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a basic text prompt.
  *
@@ -14,4 +14,4 @@ export declare const mapInstructionPromptToTextFormat: () => PromptFormat<Instru
 export declare const mapChatPromptToTextFormat: (options?: {
     user?: string;
     ai?: string;
-}) => PromptFormat<ChatPrompt, string>;
+}) => TextGenerationPromptFormat<ChatPrompt, string>;

package/{prompt → model-function/generate-text}/TextPromptFormat.js

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

package/{prompt → model-function/generate-text}/VicunaPromptFormat.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapChatPromptToVicunaFormat = void 0;
-const validateChatPrompt_js_1 = require("./chat/validateChatPrompt.cjs");
+const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
 const DEFAULT_SYSTEM_PROMPT = "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.";
 /**
  * Formats a chat prompt as a Vicuna prompt.

package/{prompt → model-function/generate-text}/VicunaPromptFormat.d.ts

@@ -1,5 +1,5 @@
-import { PromptFormat } from "./PromptFormat.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { TextGenerationPromptFormat } from "./TextGenerationPromptFormat.js";
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *
@@ -13,4 +13,4 @@ import { ChatPrompt } from "./chat/ChatPrompt.js";
  * ASSISTANT:
  * ```
  */
-export declare function mapChatPromptToVicunaFormat(): PromptFormat<ChatPrompt, string>;
+export declare function mapChatPromptToVicunaFormat(): TextGenerationPromptFormat<ChatPrompt, string>;

package/{prompt → model-function/generate-text}/VicunaPromptFormat.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./chat/validateChatPrompt.js";
+import { validateChatPrompt } from "./validateChatPrompt.js";
 const DEFAULT_SYSTEM_PROMPT = "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.";
 /**
  * Formats a chat prompt as a Vicuna prompt.

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateText = void 0;
 const executeCall_js_1 = require("../executeCall.cjs");
+const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
 /**
  * Generates a text using a prompt.
  * The prompt format depends on the model.
@@ -16,7 +17,7 @@ const executeCall_js_1 = require("../executeCall.cjs");
  * );
  */
 function generateText(model, prompt, options) {
-    return (0, executeCall_js_1.executeCall)({
+    return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeCall_js_1.executeCall)({
         functionType: "text-generation",
         input: prompt,
         model,
@@ -26,10 +27,12 @@ function generateText(model, prompt, options) {
             const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
             return {
                 response: result.response,
-                extractedValue: shouldTrimWhitespace ? result.text.trim() : result.text,
+                extractedValue: shouldTrimWhitespace
+                    ? result.text.trim()
+                    : result.text,
                 usage: result.usage,
             };
         },
-    });
+    }));
 }
 exports.generateText = generateText;

package/model-function/generate-text/generateText.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { ModelFunctionPromise } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
 /**
  * Generates a text using a prompt.

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

@@ -1,4 +1,5 @@
 import { executeCall } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 /**
  * Generates a text using a prompt.
  * The prompt format depends on the model.
@@ -13,7 +14,7 @@ import { executeCall } from "../executeCall.js";
  * );
  */
 export function generateText(model, prompt, options) {
-    return executeCall({
+    return new ModelFunctionPromise(executeCall({
         functionType: "text-generation",
         input: prompt,
         model,
@@ -23,9 +24,11 @@ export function generateText(model, prompt, options) {
             const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
             return {
                 response: result.response,
-                extractedValue: shouldTrimWhitespace ? result.text.trim() : result.text,
+                extractedValue: shouldTrimWhitespace
+                    ? result.text.trim()
+                    : result.text,
                 usage: result.usage,
             };
         },
-    });
+    }));
 }

package/{prompt → model-function/generate-text}/index.cjs

@@ -15,13 +15,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AlpacaPromptFormat.cjs"), exports);
+__exportStar(require("./ChatPrompt.cjs"), exports);
 __exportStar(require("./InstructionPrompt.cjs"), exports);
 __exportStar(require("./Llama2PromptFormat.cjs"), exports);
-__exportStar(require("./PromptFormat.cjs"), exports);
 __exportStar(require("./PromptFormatTextGenerationModel.cjs"), exports);
 __exportStar(require("./PromptFormatTextStreamingModel.cjs"), exports);
+__exportStar(require("./TextGenerationEvent.cjs"), exports);
+__exportStar(require("./TextGenerationModel.cjs"), exports);
+__exportStar(require("./TextGenerationPromptFormat.cjs"), exports);
 __exportStar(require("./TextPromptFormat.cjs"), exports);
+__exportStar(require("./TextStreamingEvent.cjs"), exports);
 __exportStar(require("./VicunaPromptFormat.cjs"), exports);
-__exportStar(require("./chat/ChatPrompt.cjs"), exports);
-__exportStar(require("./chat/trimChatPrompt.cjs"), exports);
-__exportStar(require("./chat/validateChatPrompt.cjs"), exports);
+__exportStar(require("./generateText.cjs"), exports);
+__exportStar(require("./streamText.cjs"), exports);
+__exportStar(require("./trimChatPrompt.cjs"), exports);
+__exportStar(require("./validateChatPrompt.cjs"), exports);

package/model-function/generate-text/index.d.ts

@@ -0,0 +1,16 @@
+export * from "./AlpacaPromptFormat.js";
+export * from "./ChatPrompt.js";
+export * from "./InstructionPrompt.js";
+export * from "./Llama2PromptFormat.js";
+export * from "./PromptFormatTextGenerationModel.js";
+export * from "./PromptFormatTextStreamingModel.js";
+export * from "./TextGenerationEvent.js";
+export * from "./TextGenerationModel.js";
+export * from "./TextGenerationPromptFormat.js";
+export * from "./TextPromptFormat.js";
+export * from "./TextStreamingEvent.js";
+export * from "./VicunaPromptFormat.js";
+export * from "./generateText.js";
+export * from "./streamText.js";
+export * from "./trimChatPrompt.js";
+export * from "./validateChatPrompt.js";

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

@@ -0,0 +1,16 @@
+export * from "./AlpacaPromptFormat.js";
+export * from "./ChatPrompt.js";
+export * from "./InstructionPrompt.js";
+export * from "./Llama2PromptFormat.js";
+export * from "./PromptFormatTextGenerationModel.js";
+export * from "./PromptFormatTextStreamingModel.js";
+export * from "./TextGenerationEvent.js";
+export * from "./TextGenerationModel.js";
+export * from "./TextGenerationPromptFormat.js";
+export * from "./TextPromptFormat.js";
+export * from "./TextStreamingEvent.js";
+export * from "./VicunaPromptFormat.js";
+export * from "./generateText.js";
+export * from "./streamText.js";
+export * from "./trimChatPrompt.js";
+export * from "./validateChatPrompt.js";

package/{prompt/chat → model-function/generate-text}/trimChatPrompt.d.ts

@@ -1,5 +1,5 @@
-import { HasContextWindowSize, HasTokenizer, TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
 import { ChatPrompt } from "./ChatPrompt.js";
+import { HasContextWindowSize, HasTokenizer, TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *

package/model-function/index.cjs

@@ -19,6 +19,7 @@ __exportStar(require("./Model.cjs"), exports);
 __exportStar(require("./ModelCallEvent.cjs"), exports);
 __exportStar(require("./ModelCallMetadata.cjs"), exports);
 __exportStar(require("./ModelInformation.cjs"), exports);
+__exportStar(require("./PromptFormat.cjs"), exports);
 __exportStar(require("./SuccessfulModelCall.cjs"), exports);
 __exportStar(require("./describe-image/ImageDescriptionEvent.cjs"), exports);
 __exportStar(require("./describe-image/ImageDescriptionModel.cjs"), exports);
@@ -28,6 +29,7 @@ __exportStar(require("./embed/EmbeddingModel.cjs"), exports);
 __exportStar(require("./embed/embed.cjs"), exports);
 __exportStar(require("./generate-image/ImageGenerationEvent.cjs"), exports);
 __exportStar(require("./generate-image/ImageGenerationModel.cjs"), exports);
+__exportStar(require("./generate-image/PromptFormatImageGenerationModel.cjs"), exports);
 __exportStar(require("./generate-image/generateImage.cjs"), exports);
 __exportStar(require("./generate-structure/NoSuchStructureError.cjs"), exports);
 __exportStar(require("./generate-structure/StructureFromTextGenerationModel.cjs"), exports);
@@ -40,11 +42,7 @@ __exportStar(require("./generate-structure/StructureValidationError.cjs"), expor
 __exportStar(require("./generate-structure/generateStructure.cjs"), exports);
 __exportStar(require("./generate-structure/generateStructureOrText.cjs"), exports);
 __exportStar(require("./generate-structure/streamStructure.cjs"), exports);
-__exportStar(require("./generate-text/TextGenerationEvent.cjs"), exports);
-__exportStar(require("./generate-text/TextGenerationModel.cjs"), exports);
-__exportStar(require("./generate-text/TextStreamingEvent.cjs"), exports);
-__exportStar(require("./generate-text/generateText.cjs"), exports);
-__exportStar(require("./generate-text/streamText.cjs"), exports);
+__exportStar(require("./generate-text/index.cjs"), exports);
 __exportStar(require("./synthesize-speech/SpeechSynthesisEvent.cjs"), exports);
 __exportStar(require("./synthesize-speech/SpeechSynthesisModel.cjs"), exports);
 __exportStar(require("./synthesize-speech/synthesizeSpeech.cjs"), exports);

package/model-function/index.d.ts

@@ -3,6 +3,7 @@ export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelCallMetadata.js";
 export * from "./ModelInformation.js";
+export * from "./PromptFormat.js";
 export * from "./SuccessfulModelCall.js";
 export * from "./describe-image/ImageDescriptionEvent.js";
 export * from "./describe-image/ImageDescriptionModel.js";
@@ -12,6 +13,7 @@ export * from "./embed/EmbeddingModel.js";
 export * from "./embed/embed.js";
 export * from "./generate-image/ImageGenerationEvent.js";
 export * from "./generate-image/ImageGenerationModel.js";
+export * from "./generate-image/PromptFormatImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
 export * from "./generate-structure/NoSuchStructureError.js";
 export * from "./generate-structure/StructureFromTextGenerationModel.js";
@@ -24,11 +26,7 @@ export * from "./generate-structure/StructureValidationError.js";
 export * from "./generate-structure/generateStructure.js";
 export * from "./generate-structure/generateStructureOrText.js";
 export * from "./generate-structure/streamStructure.js";
-export * from "./generate-text/TextGenerationEvent.js";
-export * from "./generate-text/TextGenerationModel.js";
-export * from "./generate-text/TextStreamingEvent.js";
-export * from "./generate-text/generateText.js";
-export * from "./generate-text/streamText.js";
+export * from "./generate-text/index.js";
 export * from "./synthesize-speech/SpeechSynthesisEvent.js";
 export * from "./synthesize-speech/SpeechSynthesisModel.js";
 export * from "./synthesize-speech/synthesizeSpeech.js";

package/model-function/index.js

@@ -3,6 +3,7 @@ export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelCallMetadata.js";
 export * from "./ModelInformation.js";
+export * from "./PromptFormat.js";
 export * from "./SuccessfulModelCall.js";
 export * from "./describe-image/ImageDescriptionEvent.js";
 export * from "./describe-image/ImageDescriptionModel.js";
@@ -12,6 +13,7 @@ export * from "./embed/EmbeddingModel.js";
 export * from "./embed/embed.js";
 export * from "./generate-image/ImageGenerationEvent.js";
 export * from "./generate-image/ImageGenerationModel.js";
+export * from "./generate-image/PromptFormatImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
 export * from "./generate-structure/NoSuchStructureError.js";
 export * from "./generate-structure/StructureFromTextGenerationModel.js";
@@ -24,11 +26,7 @@ export * from "./generate-structure/StructureValidationError.js";
 export * from "./generate-structure/generateStructure.js";
 export * from "./generate-structure/generateStructureOrText.js";
 export * from "./generate-structure/streamStructure.js";
-export * from "./generate-text/TextGenerationEvent.js";
-export * from "./generate-text/TextGenerationModel.js";
-export * from "./generate-text/TextStreamingEvent.js";
-export * from "./generate-text/generateText.js";
-export * from "./generate-text/streamText.js";
+export * from "./generate-text/index.js";
 export * from "./synthesize-speech/SpeechSynthesisEvent.js";
 export * from "./synthesize-speech/SpeechSynthesisModel.js";
 export * from "./synthesize-speech/synthesizeSpeech.js";

package/model-function/synthesize-speech/synthesizeSpeech.cjs

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.synthesizeSpeech = void 0;
 const executeCall_js_1 = require("../executeCall.cjs");
+const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
 /**
  * Synthesizes speech from text.
  */
 function synthesizeSpeech(model, text, options) {
-    return (0, executeCall_js_1.executeCall)({
+    return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeCall_js_1.executeCall)({
         functionType: "speech-synthesis",
         input: text,
         model,
@@ -18,6 +19,6 @@ function synthesizeSpeech(model, text, options) {
                 extractedValue: response,
             };
         },
-    });
+    }));
 }
 exports.synthesizeSpeech = synthesizeSpeech;

package/model-function/synthesize-speech/synthesizeSpeech.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { ModelFunctionPromise } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 import { SpeechSynthesisModel, SpeechSynthesisModelSettings } from "./SpeechSynthesisModel.js";
 /**
  * Synthesizes speech from text.

package/model-function/synthesize-speech/synthesizeSpeech.js

@@ -1,9 +1,10 @@
 import { executeCall } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 /**
  * Synthesizes speech from text.
  */
 export function synthesizeSpeech(model, text, options) {
-    return executeCall({
+    return new ModelFunctionPromise(executeCall({
         functionType: "speech-synthesis",
         input: text,
         model,
@@ -15,5 +16,5 @@ export function synthesizeSpeech(model, text, options) {
                 extractedValue: response,
             };
         },
-    });
+    }));
 }

package/model-function/transcribe-speech/transcribe.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transcribe = void 0;
 const executeCall_js_1 = require("../executeCall.cjs");
+const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
 /**
  * Transcribe audio data into text.
  *
@@ -17,7 +18,7 @@ const executeCall_js_1 = require("../executeCall.cjs");
  * );
  */
 function transcribe(model, data, options) {
-    return (0, executeCall_js_1.executeCall)({
+    return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeCall_js_1.executeCall)({
         functionType: "transcription",
         input: data,
         model,
@@ -29,6 +30,6 @@ function transcribe(model, data, options) {
                 extractedValue: result.transcription,
             };
         },
-    });
+    }));
 }
 exports.transcribe = transcribe;

package/model-function/transcribe-speech/transcribe.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { ModelFunctionPromise } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 import { TranscriptionModel, TranscriptionModelSettings } from "./TranscriptionModel.js";
 /**
  * Transcribe audio data into text.

package/model-function/transcribe-speech/transcribe.js

@@ -1,4 +1,5 @@
 import { executeCall } from "../executeCall.js";
+import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
 /**
  * Transcribe audio data into text.
  *
@@ -14,7 +15,7 @@ import { executeCall } from "../executeCall.js";
  * );
  */
 export function transcribe(model, data, options) {
-    return executeCall({
+    return new ModelFunctionPromise(executeCall({
         functionType: "transcription",
         input: data,
         model,
@@ -26,5 +27,5 @@ export function transcribe(model, data, options) {
                 extractedValue: result.transcription,
             };
         },
-    });
+    }));
 }

package/model-provider/anthropic/AnthropicPromptFormat.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapChatPromptToAnthropicFormat = exports.mapInstructionPromptToAnthropicFormat = 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 Anthropic prompt.
  */

package/model-provider/anthropic/AnthropicPromptFormat.d.ts

@@ -1,11 +1,11 @@
-import { ChatPrompt } from "../../prompt/chat/ChatPrompt.js";
-import { InstructionPrompt } from "../../prompt/InstructionPrompt.js";
-import { PromptFormat } from "../../prompt/PromptFormat.js";
+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";
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function mapInstructionPromptToAnthropicFormat(): PromptFormat<InstructionPrompt, string>;
+export declare function mapInstructionPromptToAnthropicFormat(): TextGenerationPromptFormat<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
  */
-export declare function mapChatPromptToAnthropicFormat(): PromptFormat<ChatPrompt, string>;
+export declare function mapChatPromptToAnthropicFormat(): TextGenerationPromptFormat<ChatPrompt, string>;

package/model-provider/anthropic/AnthropicPromptFormat.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 Anthropic prompt.
  */

package/model-provider/anthropic/AnthropicTextGenerationModel.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 AnthropicApiConfiguration_js_1 = require("./AnthropicApiConfiguration.cjs");
 const AnthropicError_js_1 = require("./AnthropicError.cjs");
 const AnthropicPromptFormat_js_1 = require("./AnthropicPromptFormat.cjs");

package/model-provider/anthropic/AnthropicTextGenerationModel.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";
 export declare const ANTHROPIC_TEXT_GENERATION_MODELS: {
     "claude-instant-1": {
         contextWindowSize: number;
@@ -63,7 +63,7 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
+    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<AnthropicTextGenerationModelSettings>): this;
 }
 declare const anthropicTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/anthropic/AnthropicTextGenerationModel.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 { AnthropicApiConfiguration } from "./AnthropicApiConfiguration.js";
 import { failedAnthropicCallResponseHandler } from "./AnthropicError.js";
 import { mapChatPromptToAnthropicFormat, mapInstructionPromptToAnthropicFormat, } from "./AnthropicPromptFormat.js";

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.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 Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
+const Automatic1111ImageGenerationPrompt_js_1 = require("./Automatic1111ImageGenerationPrompt.cjs");
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -51,6 +53,15 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
             base64Image: response.images[0],
         };
     }
+    withBasicPrompt() {
+        return this.withPromptFormat((0, Automatic1111ImageGenerationPrompt_js_1.mapBasicPromptToAutomatic1111Format)());
+    }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel_js_1.PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new Automatic1111ImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }