modelfusion 0.92.1 → 0.93.1

package/model-provider/huggingface/HuggingFaceTextGenerationModel.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 { PromptFormatTextGenerationModel } from "../../model-function/generate-text/PromptFormatTextGenerationModel.js";
+import { PromptTemplateTextGenerationModel } from "../../model-function/generate-text/PromptTemplateTextGenerationModel.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 /**
@@ -92,10 +92,10 @@ export class HuggingFaceTextGenerationModel extends AbstractModel {
             text: response[0].generated_text,
         };
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

package/model-provider/llamacpp/{LlamaCppBakLLaVA1Format.cjs → LlamaCppBakLLaVA1PromptTemplate.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = void 0;
-const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-format/ChatPrompt.cjs");
+const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";

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

@@ -0,0 +1,11 @@
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { MultiModalChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { MultiModalInstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
+import { LlamaCppTextGenerationPrompt } from "./LlamaCppTextGenerationModel.js";
+/**
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
+ *
+ * @see https://github.com/SkunkworksAI/BakLLaVA
+ */
+export declare function instruction(): TextGenerationPromptTemplate<MultiModalInstructionPrompt, LlamaCppTextGenerationPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<MultiModalChatPrompt, LlamaCppTextGenerationPrompt>;

package/model-provider/llamacpp/{LlamaCppBakLLaVA1Format.js → LlamaCppBakLLaVA1PromptTemplate.js}

@@ -1,4 +1,4 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-format/ChatPrompt.js";
+import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -6,7 +6,7 @@ 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 PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
@@ -101,7 +101,7 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     withTextPrompt() {
-        return this.withPromptFormat({
+        return this.withPromptTemplate({
             format(prompt) {
                 return { text: prompt };
             },
@@ -109,31 +109,31 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     /**
-     * Maps the prompt for a text version of the Llama.cpp prompt format (without image support).
+     * Maps the prompt for a text version of the Llama.cpp prompt template (without image support).
      */
-    withTextPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({
+    withTextPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this.withTextPrompt().withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     /**
-     * Maps the prompt for the full Llama.cpp prompt format (incl. image support).
+     * Maps the prompt for the full Llama.cpp prompt template (incl. image support).
      */
-    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/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 { 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 { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;
@@ -110,15 +110,15 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
         };
     }>;
     doStreamText(prompt: LlamaCppTextGenerationPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
-    withTextPrompt(): PromptFormatTextStreamingModel<string, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    withTextPrompt(): PromptTemplateTextStreamingModel<string, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     /**
-     * Maps the prompt for a text version of the Llama.cpp prompt format (without image support).
+     * Maps the prompt for a text version of the Llama.cpp prompt template (without image support).
      */
-    withTextPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, PromptFormatTextStreamingModel<string, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>>;
+    withTextPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, PromptTemplateTextStreamingModel<string, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>>;
     /**
-     * Maps the prompt for the full Llama.cpp prompt format (incl. image support).
+     * Maps the prompt for the full Llama.cpp prompt template (incl. image support).
      */
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, LlamaCppTextGenerationPrompt>): PromptFormatTextStreamingModel<INPUT_PROMPT, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, LlamaCppTextGenerationPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, LlamaCppTextGenerationPrompt, LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withSettings(additionalSettings: Partial<LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>>): this;
 }
 declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -3,7 +3,7 @@ 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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
@@ -98,7 +98,7 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         });
     }
     withTextPrompt() {
-        return this.withPromptFormat({
+        return this.withPromptTemplate({
             format(prompt) {
                 return { text: prompt };
             },
@@ -106,31 +106,31 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         });
     }
     /**
-     * Maps the prompt for a text version of the Llama.cpp prompt format (without image support).
+     * Maps the prompt for a text version of the Llama.cpp prompt template (without image support).
      */
-    withTextPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel({
+    withTextPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel({
             model: this.withTextPrompt().withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     /**
-     * Maps the prompt for the full Llama.cpp prompt format (incl. image support).
+     * Maps the prompt for the full Llama.cpp prompt template (incl. image support).
      */
-    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/llamacpp/index.cjs

@@ -26,9 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.llamacpp = exports.LlamaCppError = exports.LlamaCppBakLLaVA1Format = void 0;
+exports.llamacpp = exports.LlamaCppError = exports.LlamaCppBakLLaVA1Prompt = void 0;
 __exportStar(require("./LlamaCppApiConfiguration.cjs"), exports);
-exports.LlamaCppBakLLaVA1Format = __importStar(require("./LlamaCppBakLLaVA1Format.cjs"));
+exports.LlamaCppBakLLaVA1Prompt = __importStar(require("./LlamaCppBakLLaVA1PromptTemplate.cjs"));
 var LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 Object.defineProperty(exports, "LlamaCppError", { enumerable: true, get: function () { return LlamaCppError_js_1.LlamaCppError; } });
 exports.llamacpp = __importStar(require("./LlamaCppFacade.cjs"));

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

@@ -1,5 +1,5 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Format from "./LlamaCppBakLLaVA1Format.js";
+export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
 export { LlamaCppError, LlamaCppErrorData } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";

package/model-provider/llamacpp/index.js

@@ -1,5 +1,5 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Format from "./LlamaCppBakLLaVA1Format.js";
+export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
 export { LlamaCppError } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -8,7 +8,7 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 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 TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
 const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -98,27 +98,27 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             responseFormat: exports.OllamaTextGenerationResponseFormat.deltaIterable,
         });
     }
-    asToolCallGenerationModel(promptFormat) {
+    asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
             model: this,
-            format: promptFormat,
+            format: promptTemplate,
         });
     }
-    asToolCallsOrTextGenerationModel(promptFormat) {
+    asToolCallsOrTextGenerationModel(promptTemplate) {
         return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
             model: this,
-            format: promptFormat,
+            template: promptTemplate,
         });
     }
-    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/ollama/OllamaTextGenerationModel.d.ts

@@ -4,11 +4,11 @@ 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 { TextGenerationToolCallModel, ToolCallPromptFormat } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptFormat } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 /**
  * @see https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion
  */
@@ -137,9 +137,9 @@ export declare class OllamaTextGenerationModel<CONTEXT_WINDOW_SIZE extends numbe
         text: string;
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
-    asToolCallGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallPromptFormat<INPUT_PROMPT, string>): TextGenerationToolCallModel<INPUT_PROMPT, string, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallsOrGenerateTextPromptFormat<INPUT_PROMPT, string>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, string, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, string>): TextGenerationToolCallModel<INPUT_PROMPT, string, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, string>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, string, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withSettings(additionalSettings: Partial<OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>>): this;
 }
 declare const ollamaTextGenerationResponseSchema: z.ZodObject<{

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -5,7 +5,7 @@ import { postJsonToApi } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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 { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -95,27 +95,27 @@ export class OllamaTextGenerationModel extends AbstractModel {
             responseFormat: OllamaTextGenerationResponseFormat.deltaIterable,
         });
     }
-    asToolCallGenerationModel(promptFormat) {
+    asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel({
             model: this,
-            format: promptFormat,
+            format: promptTemplate,
         });
     }
-    asToolCallsOrTextGenerationModel(promptFormat) {
+    asToolCallsOrTextGenerationModel(promptTemplate) {
         return new TextGenerationToolCallsOrGenerateTextModel({
             model: this,
-            format: promptFormat,
+            template: promptTemplate,
         });
     }
-    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/openai/OpenAICompletionModel.cjs

@@ -7,8 +7,8 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 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 parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
@@ -239,26 +239,26 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     /**
-     * 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/openai/OpenAICompletionModel.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 { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -174,17 +174,17 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, 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, OpenAICompletionModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, OpenAICompletionModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }
 declare const OpenAICompletionResponseSchema: z.ZodObject<{

package/model-provider/openai/OpenAICompletionModel.js

@@ -4,8 +4,8 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.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 { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
@@ -233,26 +233,26 @@ export class OpenAICompletionModel extends AbstractModel {
         });
     }
     /**
-     * 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/openai/OpenAIImageGenerationModel.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 OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 exports.OPENAI_IMAGE_MODELS = {
@@ -122,10 +122,10 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
-    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/openai/OpenAIImageGenerationModel.d.ts

@@ -3,9 +3,9 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.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";
 export declare const OPENAI_IMAGE_MODELS: {
     "dall-e-2": {
         getCost(settings: OpenAIImageGenerationSettings): 2000 | 1800 | 1600 | null;
@@ -61,7 +61,7 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
         };
         base64Image: string;
     }>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, string>): PromptTemplateImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIImageGenerationSettings>): this;
 }
 export type OpenAIImageGenerationResponseFormatType<T> = {

package/model-provider/openai/OpenAIImageGenerationModel.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 { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 export const OPENAI_IMAGE_MODELS = {
@@ -118,10 +118,10 @@ export class OpenAIImageGenerationModel extends AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatImageGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateImageGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {