modelfusion 0.92.1 → 0.93.0

package/model-provider/anthropic/{AnthropicPromptFormat.js → AnthropicPromptTemplate.js}

@@ -1,4 +1,6 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-format/ChatPrompt.js";
+import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+const HUMAN_PREFIX = "\n\nHuman:";
+const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
@@ -6,9 +8,9 @@ export function text() {
     return {
         format(prompt) {
             let text = "";
-            text += "\n\nHuman:";
+            text += HUMAN_PREFIX;
             text += prompt;
-            text += "\n\nAssistant:";
+            text += ASSISTANT_PREFIX;
             return text;
         },
         stopSequences: [],
@@ -21,9 +23,12 @@ export function instruction() {
     return {
         format(prompt) {
             let text = prompt.system ?? "";
-            text += "\n\nHuman:";
+            text += HUMAN_PREFIX;
             text += prompt.instruction;
-            text += "\n\nAssistant:";
+            text += ASSISTANT_PREFIX;
+            if (prompt.responsePrefix != null) {
+                text += prompt.responsePrefix;
+            }
             return text;
         },
         stopSequences: [],
@@ -42,11 +47,13 @@ export function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `\n\nHuman:${content}`;
+                        text += HUMAN_PREFIX;
+                        text += content;
                         break;
                     }
                     case "assistant": {
-                        text += `\n\nAssistant:${content}`;
+                        text += ASSISTANT_PREFIX;
+                        text += content;
                         break;
                     }
                     default: {
@@ -56,7 +63,7 @@ export function chat() {
                 }
             }
             // AI message prefix:
-            text += `\n\nAssistant:`;
+            text += ASSISTANT_PREFIX;
             return text;
         },
         stopSequences: [],

package/model-provider/anthropic/AnthropicPromptTemplate.test.cjs

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AnthropicPromptTemplate_js_1 = require("./AnthropicPromptTemplate.cjs");
+describe("text prompt", () => {
+    it("should format prompt", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.text)().format("prompt");
+        expect(prompt).toMatchSnapshot();
+    });
+});
+describe("instruction prompt", () => {
+    it("should format prompt with instruction", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.instruction)().format({
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with system and instruction", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.instruction)().format({
+            system: "system",
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with instruction and response prefix", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.instruction)().format({
+            instruction: "instruction",
+            responsePrefix: "response prefix",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+});
+describe("chat prompt", () => {
+    it("should format prompt with user message", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.chat)().format({
+            messages: [{ role: "user", content: "user message" }],
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with user-assistant-user messages", () => {
+        const prompt = (0, AnthropicPromptTemplate_js_1.chat)().format({
+            messages: [
+                { role: "user", content: "1st user message" },
+                { role: "assistant", content: "assistant message" },
+                { role: "user", content: "2nd user message" },
+            ],
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+});

package/model-provider/anthropic/AnthropicPromptTemplate.test.d.ts

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

package/model-provider/anthropic/AnthropicPromptTemplate.test.js

@@ -0,0 +1,47 @@
+import { chat, instruction, text } from "./AnthropicPromptTemplate.js";
+describe("text prompt", () => {
+    it("should format prompt", () => {
+        const prompt = text().format("prompt");
+        expect(prompt).toMatchSnapshot();
+    });
+});
+describe("instruction prompt", () => {
+    it("should format prompt with instruction", () => {
+        const prompt = instruction().format({
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with system and instruction", () => {
+        const prompt = instruction().format({
+            system: "system",
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with instruction and response prefix", () => {
+        const prompt = instruction().format({
+            instruction: "instruction",
+            responsePrefix: "response prefix",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+});
+describe("chat prompt", () => {
+    it("should format prompt with user message", () => {
+        const prompt = chat().format({
+            messages: [{ role: "user", content: "user message" }],
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with user-assistant-user messages", () => {
+        const prompt = chat().format({
+            messages: [
+                { role: "user", content: "1st user message" },
+                { role: "assistant", content: "assistant message" },
+                { role: "user", content: "2nd user message" },
+            ],
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+});

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -6,13 +6,13 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
+const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AnthropicApiConfiguration_js_1 = require("./AnthropicApiConfiguration.cjs");
 const AnthropicError_js_1 = require("./AnthropicError.cjs");
-const AnthropicPromptFormat_js_1 = require("./AnthropicPromptFormat.cjs");
+const AnthropicPromptTemplate_js_1 = require("./AnthropicPromptTemplate.cjs");
 exports.ANTHROPIC_TEXT_GENERATION_MODELS = {
     "claude-instant-1": {
         contextWindowSize: 100000,
@@ -110,32 +110,32 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     /**
-     * Returns this model with a text prompt format.
+     * Returns this model with a text prompt template.
      */
     withTextPrompt() {
-        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.text)());
+        return this.withPromptTemplate((0, AnthropicPromptTemplate_js_1.text)());
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.instruction)());
+        return this.withPromptTemplate((0, AnthropicPromptTemplate_js_1.instruction)());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt() {
-        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.chat)());
+        return this.withPromptTemplate((0, AnthropicPromptTemplate_js_1.chat)());
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 export declare const ANTHROPIC_TEXT_GENERATION_MODELS: {
     "claude-instant-1": {
         contextWindowSize: number;
@@ -59,18 +59,18 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
-     * Returns this model with a text prompt format.
+     * Returns this model with a text prompt template.
      */
-    withTextPrompt(): PromptFormatTextStreamingModel<string, string, AnthropicTextGenerationModelSettings, this>;
+    withTextPrompt(): PromptTemplateTextStreamingModel<string, string, AnthropicTextGenerationModelSettings, this>;
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<AnthropicTextGenerationModelSettings>): this;
 }
 declare const anthropicTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -3,13 +3,13 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AnthropicApiConfiguration } from "./AnthropicApiConfiguration.js";
 import { failedAnthropicCallResponseHandler } from "./AnthropicError.js";
-import { instruction, chat, text } from "./AnthropicPromptFormat.js";
+import { instruction, chat, text } from "./AnthropicPromptTemplate.js";
 export const ANTHROPIC_TEXT_GENERATION_MODELS = {
     "claude-instant-1": {
         contextWindowSize: 100000,
@@ -107,32 +107,32 @@ export class AnthropicTextGenerationModel extends AbstractModel {
         });
     }
     /**
-     * Returns this model with a text prompt format.
+     * Returns this model with a text prompt template.
      */
     withTextPrompt() {
-        return this.withPromptFormat(text());
+        return this.withPromptTemplate(text());
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(instruction());
+        return this.withPromptTemplate(instruction());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt() {
-        return this.withPromptFormat(chat());
+        return this.withPromptTemplate(chat());
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

package/model-provider/anthropic/index.cjs

@@ -26,11 +26,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnthropicPromptFormat = exports.anthropic = exports.anthropicErrorDataSchema = exports.AnthropicError = void 0;
+exports.AnthropicPromptTemplate = exports.anthropic = exports.anthropicErrorDataSchema = exports.AnthropicError = void 0;
 __exportStar(require("./AnthropicApiConfiguration.cjs"), exports);
 var AnthropicError_js_1 = require("./AnthropicError.cjs");
 Object.defineProperty(exports, "AnthropicError", { enumerable: true, get: function () { return AnthropicError_js_1.AnthropicError; } });
 Object.defineProperty(exports, "anthropicErrorDataSchema", { enumerable: true, get: function () { return AnthropicError_js_1.anthropicErrorDataSchema; } });
 exports.anthropic = __importStar(require("./AnthropicFacade.cjs"));
-exports.AnthropicPromptFormat = __importStar(require("./AnthropicPromptFormat.cjs"));
+exports.AnthropicPromptTemplate = __importStar(require("./AnthropicPromptTemplate.cjs"));
 __exportStar(require("./AnthropicTextGenerationModel.cjs"), exports);

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

@@ -1,5 +1,5 @@
 export * from "./AnthropicApiConfiguration.js";
 export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
 export * as anthropic from "./AnthropicFacade.js";
-export * as AnthropicPromptFormat from "./AnthropicPromptFormat.js";
+export * as AnthropicPromptTemplate from "./AnthropicPromptTemplate.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/anthropic/index.js

@@ -1,5 +1,5 @@
 export * from "./AnthropicApiConfiguration.js";
 export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
 export * as anthropic from "./AnthropicFacade.js";
-export * as AnthropicPromptFormat from "./AnthropicPromptFormat.js";
+export * as AnthropicPromptTemplate from "./AnthropicPromptTemplate.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -5,7 +5,7 @@ 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 PromptTemplateImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptTemplateImageGenerationModel.cjs");
 const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
 const Automatic1111ImageGenerationPrompt_js_1 = require("./Automatic1111ImageGenerationPrompt.cjs");
@@ -54,12 +54,12 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
         };
     }
     withTextPrompt() {
-        return this.withPromptFormat((0, Automatic1111ImageGenerationPrompt_js_1.mapBasicPromptToAutomatic1111Format)());
+        return this.withPromptTemplate((0, Automatic1111ImageGenerationPrompt_js_1.mapBasicPromptToAutomatic1111Format)());
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatImageGenerationModel_js_1.PromptFormatImageGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateImageGenerationModel_js_1.PromptTemplateImageGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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

@@ -2,9 +2,9 @@ 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 { PromptTemplate } from "../../model-function/PromptTemplate.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
-import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
+import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { Automatic1111ImageGenerationPrompt } from "./Automatic1111ImageGenerationPrompt.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -25,8 +25,8 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
         };
         base64Image: string;
     }>;
-    withTextPrompt(): PromptFormatImageGenerationModel<string, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptFormatImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
+    withTextPrompt(): PromptTemplateImageGenerationModel<string, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
     withSettings(additionalSettings: Automatic1111ImageGenerationSettings): this;
 }
 export interface Automatic1111ImageGenerationSettings extends ImageGenerationModelSettings {

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -2,7 +2,7 @@ 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 { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { failedAutomatic1111CallResponseHandler } from "./Automatic1111Error.js";
 import { mapBasicPromptToAutomatic1111Format, } from "./Automatic1111ImageGenerationPrompt.js";
@@ -51,12 +51,12 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
         };
     }
     withTextPrompt() {
-        return this.withPromptFormat(mapBasicPromptToAutomatic1111Format());
+        return this.withPromptTemplate(mapBasicPromptToAutomatic1111Format());
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatImageGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateImageGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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

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

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -6,8 +6,8 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.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/prompt-format/TextPromptFormat.cjs");
+const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseJsonStream_js_1 = require("../../util/streaming/parseJsonStream.cjs");
@@ -134,26 +134,26 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         return fullDelta.delta;
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.instruction)());
+        return this.withPromptTemplate((0, TextPromptTemplate_js_1.instruction)());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.chat)(options));
+        return this.withPromptTemplate((0, TextPromptTemplate_js_1.chat)(options));
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
 export declare const COHERE_TEXT_GENERATION_MODELS: {
     command: {
@@ -85,17 +85,17 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     extractTextDelta(fullDelta: CohereTextGenerationDelta): string | undefined;
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, CohereTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, CohereTextGenerationModelSettings, this>;
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;
-    }): PromptFormatTextStreamingModel<import("../../index.js").TextChatPrompt, string, CohereTextGenerationModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, CohereTextGenerationModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;
 }
 declare const cohereTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -3,8 +3,8 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
-import { chat, instruction, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
+import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJsonStream } from "../../util/streaming/parseJsonStream.js";
@@ -131,26 +131,26 @@ export class CohereTextGenerationModel extends AbstractModel {
         return fullDelta.delta;
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(instruction());
+        return this.withPromptTemplate(instruction());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat(chat(options));
+        return this.withPromptTemplate(chat(options));
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -5,7 +5,7 @@ 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 PromptFormatTextGenerationModel_js_1 = require("../../model-function/generate-text/PromptFormatTextGenerationModel.cjs");
+const PromptTemplateTextGenerationModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextGenerationModel.cjs");
 const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 /**
@@ -95,10 +95,10 @@ class HuggingFaceTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             text: response[0].generated_text,
         };
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextGenerationModel_js_1.PromptFormatTextGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextGenerationModel_js_1.PromptTemplateTextGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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

@@ -2,9 +2,9 @@ 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 { PromptFormatTextGenerationModel } from "../../model-function/generate-text/PromptFormatTextGenerationModel.js";
+import { PromptTemplateTextGenerationModel } from "../../model-function/generate-text/PromptTemplateTextGenerationModel.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
-import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.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: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextGenerationModel<INPUT_PROMPT, string, HuggingFaceTextGenerationModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextGenerationModel<INPUT_PROMPT, string, HuggingFaceTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<HuggingFaceTextGenerationModelSettings>): this;
 }
 declare const huggingFaceTextGenerationResponseSchema: z.ZodArray<z.ZodObject<{