modelfusion 0.117.0 → 0.119.0

package/model-function/generate-structure/StructureFromTextStreamingModel.js

@@ -1,34 +1,13 @@
 import { streamText } from "../../model-function/generate-text/streamText.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { generateText } from "../generate-text/generateText.js";
 import { StructureFromTextGenerationModel } from "./StructureFromTextGenerationModel.js";
-import { StructureParseError } from "./StructureParseError.js";
 import { parsePartialJson } from "./parsePartialJson.js";
 export class StructureFromTextStreamingModel extends StructureFromTextGenerationModel {
     constructor(options) {
         super(options);
     }
-    async doGenerateStructure(schema, prompt, options) {
-        const { response, text } = await generateText(this.model, this.template.createPrompt(prompt, schema), {
-            ...options,
-            fullResponse: true,
-        });
-        try {
-            return {
-                response,
-                value: this.template.extractStructure(text),
-                valueText: text,
-            };
-        }
-        catch (error) {
-            throw new StructureParseError({
-                valueText: text,
-                cause: error,
-            });
-        }
-    }
     async doStreamStructure(schema, prompt, options) {
-        const textStream = await streamText(this.model, this.template.createPrompt(prompt, schema), options);
+        const textStream = await streamText(this.getModelWithJsonOutput(schema), this.template.createPrompt(prompt, schema), options);
         const queue = new AsyncQueue();
         // run async on purpose:
         (async () => {

package/model-function/generate-structure/StructureGenerationEvent.d.ts

@@ -4,7 +4,7 @@ export interface StructureGenerationStartedEvent extends BaseModelCallStartedEve
 }
 export type StructureGenerationFinishedEventResult = {
     status: "success";
-    response: unknown;
+    rawResponse: unknown;
     value: unknown;
     usage?: {
         promptTokens: number;

package/model-function/generate-structure/generateStructure.cjs

@@ -29,7 +29,7 @@ async function generateStructure(model, schema, prompt, options) {
             }
             const value = parseResult.data;
             return {
-                response: result.response,
+                rawResponse: result.response,
                 extractedValue: value,
                 usage: result.usage,
             };
@@ -38,7 +38,7 @@ async function generateStructure(model, schema, prompt, options) {
     return options?.fullResponse
         ? {
             structure: fullResponse.value,
-            response: fullResponse.response,
+            rawResponse: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : fullResponse.value;

package/model-function/generate-structure/generateStructure.d.ts

@@ -44,6 +44,6 @@ export declare function generateStructure<STRUCTURE, PROMPT, SETTINGS extends St
     fullResponse: true;
 }): Promise<{
     structure: STRUCTURE;
-    response: unknown;
+    rawResponse: unknown;
     metadata: ModelCallMetadata;
 }>;

package/model-function/generate-structure/generateStructure.js

@@ -26,7 +26,7 @@ export async function generateStructure(model, schema, prompt, options) {
             }
             const value = parseResult.data;
             return {
-                response: result.response,
+                rawResponse: result.response,
                 extractedValue: value,
                 usage: result.usage,
             };
@@ -35,7 +35,7 @@ export async function generateStructure(model, schema, prompt, options) {
     return options?.fullResponse
         ? {
             structure: fullResponse.value,
-            response: fullResponse.response,
+            rawResponse: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : fullResponse.value;

package/model-function/generate-structure/jsonStructurePrompt.cjs

@@ -15,12 +15,8 @@ exports.jsonStructurePrompt = {
                 instruction: prompt,
             }),
             extractStructure,
-            adaptModel: (model) => {
-                if (model.withJsonOutput != null) {
-                    model = model.withJsonOutput();
-                }
-                return model.withInstructionPrompt();
-            },
+            adaptModel: (model) => model.withInstructionPrompt(),
+            withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema),
         };
     },
     instruction({ schemaPrefix, schemaSuffix, } = {}) {
@@ -35,12 +31,8 @@ exports.jsonStructurePrompt = {
                 instruction: prompt.instruction,
             }),
             extractStructure,
-            adaptModel: (model) => {
-                if (model.withJsonOutput != null) {
-                    model = model.withJsonOutput();
-                }
-                return model.withInstructionPrompt();
-            },
+            adaptModel: (model) => model.withInstructionPrompt(),
+            withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema),
         };
     },
 };

package/model-function/generate-structure/jsonStructurePrompt.js

@@ -12,12 +12,8 @@ export const jsonStructurePrompt = {
                 instruction: prompt,
             }),
             extractStructure,
-            adaptModel: (model) => {
-                if (model.withJsonOutput != null) {
-                    model = model.withJsonOutput();
-                }
-                return model.withInstructionPrompt();
-            },
+            adaptModel: (model) => model.withInstructionPrompt(),
+            withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema),
         };
     },
     instruction({ schemaPrefix, schemaSuffix, } = {}) {
@@ -32,12 +28,8 @@ export const jsonStructurePrompt = {
                 instruction: prompt.instruction,
             }),
             extractStructure,
-            adaptModel: (model) => {
-                if (model.withJsonOutput != null) {
-                    model = model.withJsonOutput();
-                }
-                return model.withInstructionPrompt();
-            },
+            adaptModel: (model) => model.withInstructionPrompt(),
+            withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema),
         };
     },
 };

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

@@ -11,7 +11,7 @@ export declare class PromptTemplateFullTextModel<PROMPT, MODEL_PROMPT, SETTINGS
         promptTemplate: TextGenerationPromptTemplate<PROMPT, MODEL_PROMPT>;
     });
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions | undefined): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         toolCall: {
             id: string;
             args: unknown;
@@ -23,7 +23,7 @@ export declare class PromptTemplateFullTextModel<PROMPT, MODEL_PROMPT, SETTINGS
         } | undefined;
     }>;
     doGenerateToolCalls(tools: ToolDefinition<string, unknown>[], prompt: PROMPT, options?: FunctionOptions | undefined): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         text: string | null;
         toolCalls: {
             id: string;

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

@@ -68,6 +68,12 @@ class PromptTemplateTextGenerationModel {
             template: promptTemplate,
         });
     }
+    withJsonOutput(schema) {
+        return new PromptTemplateTextGenerationModel({
+            model: this.model.withJsonOutput(schema),
+            promptTemplate: this.promptTemplate,
+        });
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextGenerationModel({
             model: this.withSettings({

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

@@ -1,4 +1,6 @@
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
@@ -19,7 +21,7 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
     get contextWindowSize(): MODEL["contextWindowSize"];
     get countPromptTokens(): MODEL["countPromptTokens"] extends undefined ? undefined : (prompt: PROMPT) => PromiseLike<number>;
     doGenerateTexts(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         textGenerationResults: import("./TextGenerationResult.js").TextGenerationResult[];
         usage?: {
             promptTokens: number;
@@ -28,7 +30,7 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
         } | undefined;
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: unknown;
+        rawResponse: unknown;
         textGenerationResults: import("./TextGenerationResult.js").TextGenerationResult[];
         usage?: {
             promptTokens: number;
@@ -40,6 +42,7 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallModel<INPUT_PROMPT, PROMPT, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallsModel<INPUT_PROMPT, PROMPT, this>;
     asStructureGenerationModel<INPUT_PROMPT>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, PROMPT>): StructureFromTextGenerationModel<INPUT_PROMPT, PROMPT, this>;
+    withJsonOutput(schema: Schema<unknown> & JsonSchemaProducer): this;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): PromptTemplateTextGenerationModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

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

@@ -65,6 +65,12 @@ export class PromptTemplateTextGenerationModel {
             template: promptTemplate,
         });
     }
+    withJsonOutput(schema) {
+        return new PromptTemplateTextGenerationModel({
+            model: this.model.withJsonOutput(schema),
+            promptTemplate: this.promptTemplate,
+        });
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextGenerationModel({
             model: this.withSettings({

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

@@ -20,6 +20,12 @@ class PromptTemplateTextStreamingModel extends PromptTemplateTextGenerationModel
             template: promptTemplate,
         });
     }
+    withJsonOutput(schema) {
+        return new PromptTemplateTextStreamingModel({
+            model: this.model.withJsonOutput(schema),
+            promptTemplate: this.promptTemplate,
+        });
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
             model: this.withSettings({

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

@@ -1,4 +1,6 @@
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { StructureFromTextPromptTemplate } from "../generate-structure/StructureFromTextPromptTemplate.js";
 import { StructureFromTextStreamingModel } from "../generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextGenerationModel } from "./PromptTemplateTextGenerationModel.js";
@@ -12,6 +14,7 @@ export declare class PromptTemplateTextStreamingModel<PROMPT, MODEL_PROMPT, SETT
     doStreamText(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<AsyncIterable<import("../Delta.js").Delta<unknown>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asStructureGenerationModel<INPUT_PROMPT>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, PROMPT>): StructureFromTextStreamingModel<INPUT_PROMPT, PROMPT, this>;
+    withJsonOutput(schema: Schema<unknown> & JsonSchemaProducer): this;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): PromptTemplateTextStreamingModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

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

@@ -17,6 +17,12 @@ export class PromptTemplateTextStreamingModel extends PromptTemplateTextGenerati
             template: promptTemplate,
         });
     }
+    withJsonOutput(schema) {
+        return new PromptTemplateTextStreamingModel({
+            model: this.model.withJsonOutput(schema),
+            promptTemplate: this.promptTemplate,
+        });
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
             model: this.withSettings({

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

@@ -4,7 +4,7 @@ export interface TextGenerationStartedEvent extends BaseModelCallStartedEvent {
 }
 export type TextGenerationFinishedEventResult = {
     status: "success";
-    response: unknown;
+    rawResponse: unknown;
     value: string;
     usage?: {
         promptTokens: number;

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

@@ -1,4 +1,6 @@
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { Delta } from "../Delta.js";
 import { Model, ModelSettings } from "../Model.js";
 import { BasicTokenizer, FullTokenizer } from "../tokenize-text/Tokenizer.js";
@@ -63,7 +65,7 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
      */
     readonly countPromptTokens: ((prompt: PROMPT) => PromiseLike<number>) | undefined;
     doGenerateTexts(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         textGenerationResults: TextGenerationResult[];
         usage?: {
             promptTokens: number;
@@ -72,7 +74,7 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
         };
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: unknown;
+        rawResponse: unknown;
         textGenerationResults: TextGenerationResult[];
         usage?: {
             promptTokens: number;
@@ -82,9 +84,10 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
     };
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationModel<INPUT_PROMPT, SETTINGS>;
     /**
-     * Optional. When available, forces the model to return JSON as the text output.
+     * When possible, limit the output generation to the specified JSON schema,
+     * or super sets of it (e.g. JSON in general).
      */
-    withJsonOutput?(): this;
+    withJsonOutput(schema: Schema<unknown> & JsonSchemaProducer): this;
 }
 export interface TextStreamingModel<PROMPT, SETTINGS extends TextGenerationModelSettings = TextGenerationModelSettings> extends TextGenerationModel<PROMPT, SETTINGS> {
     doStreamText(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<AsyncIterable<Delta<unknown>>>;

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

@@ -40,7 +40,7 @@ async function generateText(model, prompt, options) {
                 }
                 const result = await model.doGenerateTexts(prompt, options);
                 try {
-                    await options.cache.storeValue(cacheKey, result.response);
+                    await options.cache.storeValue(cacheKey, result.rawResponse);
                 }
                 catch (err) {
                     cacheErrors = [...(cacheErrors ?? []), err];
@@ -60,7 +60,7 @@ async function generateText(model, prompt, options) {
                 : result.textGenerationResults;
             // TODO add cache information
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: textGenerationResults,
                 usage: result.usage,
             };
@@ -74,7 +74,7 @@ async function generateText(model, prompt, options) {
             finishReason: firstResult.finishReason,
             texts: textGenerationResults.map((textGeneration) => textGeneration.text),
             textGenerationResults,
-            response: fullResponse.response,
+            rawResponse: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : firstResult.text;

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

@@ -33,6 +33,6 @@ export declare function generateText<PROMPT>(model: TextGenerationModel<PROMPT,
     finishReason: TextGenerationFinishReason;
     texts: string[];
     textGenerationResults: TextGenerationResult[];
-    response: unknown;
+    rawResponse: unknown;
     metadata: ModelCallMetadata;
 }>;

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

@@ -37,7 +37,7 @@ export async function generateText(model, prompt, options) {
                 }
                 const result = await model.doGenerateTexts(prompt, options);
                 try {
-                    await options.cache.storeValue(cacheKey, result.response);
+                    await options.cache.storeValue(cacheKey, result.rawResponse);
                 }
                 catch (err) {
                     cacheErrors = [...(cacheErrors ?? []), err];
@@ -57,7 +57,7 @@ export async function generateText(model, prompt, options) {
                 : result.textGenerationResults;
             // TODO add cache information
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: textGenerationResults,
                 usage: result.usage,
             };
@@ -71,7 +71,7 @@ export async function generateText(model, prompt, options) {
             finishReason: firstResult.finishReason,
             texts: textGenerationResults.map((textGeneration) => textGeneration.text),
             textGenerationResults,
-            response: fullResponse.response,
+            rawResponse: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : firstResult.text;

package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.instruction = exports.text = void 0;
+exports.chat = exports.instruction = exports.text = void 0;
 const ContentPart_js_1 = require("./ContentPart.cjs");
 const DEFAULT_SYSTEM_PROMPT_INPUT = "Below is an instruction that describes a task, paired with an input that provides further context. Write a response that appropriately completes the request.";
 const DEFAULT_SYSTEM_PROMPT_NO_INPUT = "Below is an instruction that describes a task. Write a response that appropriately completes the request.";
@@ -81,3 +81,10 @@ function instruction() {
     };
 }
 exports.instruction = instruction;
+/**
+ * Not supported by Alpaca.
+ */
+function chat() {
+    throw new Error("Chat prompts are not supported by the Alpaca format.");
+}
+exports.chat = chat;

package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.d.ts

@@ -1,4 +1,5 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 import { InstructionPrompt } from "./InstructionPrompt.js";
 /**
  * Formats a text prompt as an Alpaca prompt.
@@ -44,3 +45,7 @@ export declare function instruction(): TextGenerationPromptTemplate<InstructionP
     input?: string;
 }, // optional input supported by Alpaca
 string>;
+/**
+ * Not supported by Alpaca.
+ */
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.js

@@ -76,3 +76,9 @@ export function instruction() {
         },
     };
 }
+/**
+ * Not supported by Alpaca.
+ */
+export function chat() {
+    throw new Error("Chat prompts are not supported by the Alpaca format.");
+}

package/model-function/generate-text/prompt-template/PromptTemplateProvider.cjs

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

package/model-function/generate-text/prompt-template/PromptTemplateProvider.d.ts

@@ -0,0 +1,8 @@
+import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
+export interface TextGenerationPromptTemplateProvider<TARGET_PROMPT> {
+    text(): TextGenerationPromptTemplate<string, TARGET_PROMPT>;
+    instruction(): TextGenerationPromptTemplate<InstructionPrompt, TARGET_PROMPT>;
+    chat(): TextGenerationPromptTemplate<ChatPrompt, TARGET_PROMPT>;
+}

package/model-function/generate-text/prompt-template/PromptTemplateProvider.js

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

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs

@@ -1,11 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chat = void 0;
+exports.chat = exports.instruction = exports.text = void 0;
 const ContentPart_js_1 = require("./ContentPart.cjs");
 const InvalidPromptError_js_1 = require("./InvalidPromptError.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.";
+/**
+ * Formats a text prompt as a Vicuna prompt.
+ */
+function text() {
+    return {
+        stopSequences: [],
+        format(prompt) {
+            let text = DEFAULT_SYSTEM_MESSAGE;
+            text += "\n\nUSER: ";
+            text += prompt;
+            text += "\n\nASSISTANT: ";
+            return text;
+        },
+    };
+}
+exports.text = text;
+/**
+ * Formats an instruction prompt as a Vicuna prompt.
+ */
+function instruction() {
+    return {
+        format(prompt) {
+            let text = prompt.system != null
+                ? `${prompt.system}\n\n`
+                : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
+            text += `USER: ${(0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt)}\n`;
+            text += `ASSISTANT: `;
+            return text;
+        },
+        stopSequences: [`\nUSER:`],
+    };
+}
+exports.instruction = instruction;
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.d.ts

@@ -1,5 +1,14 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
 import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
+/**
+ * Formats a text prompt as a Vicuna prompt.
+ */
+export declare function text(): TextGenerationPromptTemplate<string, string>;
+/**
+ * Formats an instruction prompt as a Vicuna prompt.
+ */
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.js

@@ -3,6 +3,37 @@ import { InvalidPromptError } from "./InvalidPromptError.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.";
+/**
+ * Formats a text prompt as a Vicuna prompt.
+ */
+export function text() {
+    return {
+        stopSequences: [],
+        format(prompt) {
+            let text = DEFAULT_SYSTEM_MESSAGE;
+            text += "\n\nUSER: ";
+            text += prompt;
+            text += "\n\nASSISTANT: ";
+            return text;
+        },
+    };
+}
+/**
+ * Formats an instruction prompt as a Vicuna prompt.
+ */
+export function instruction() {
+    return {
+        format(prompt) {
+            let text = prompt.system != null
+                ? `${prompt.system}\n\n`
+                : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
+            text += `USER: ${validateContentIsString(prompt.instruction, prompt)}\n`;
+            text += `ASSISTANT: `;
+            return text;
+        },
+        stopSequences: [`\nUSER:`],
+    };
+}
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.test.cjs

@@ -1,6 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const VicunaPromptTemplate_js_1 = require("./VicunaPromptTemplate.cjs");
+describe("text prompt", () => {
+    it("should format prompt", () => {
+        const prompt = (0, VicunaPromptTemplate_js_1.text)().format("prompt");
+        expect(prompt).toMatchSnapshot();
+    });
+});
+describe("instruction prompt", () => {
+    it("should format prompt with instruction", () => {
+        const prompt = (0, VicunaPromptTemplate_js_1.instruction)().format({
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with system and instruction", () => {
+        const prompt = (0, VicunaPromptTemplate_js_1.instruction)().format({
+            system: "system",
+            instruction: "instruction",
+        });
+        expect(prompt).toMatchSnapshot();
+    });
+    it("should format prompt with instruction and response prefix", () => {
+        const prompt = (0, VicunaPromptTemplate_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, VicunaPromptTemplate_js_1.chat)().format({

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.test.js

@@ -1,4 +1,32 @@
-import { chat } from "./VicunaPromptTemplate.js";
+import { chat, instruction, text } from "./VicunaPromptTemplate.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({

package/model-function/generate-text/prompt-template/index.cjs

@@ -36,6 +36,7 @@ __exportStar(require("./InvalidPromptError.cjs"), exports);
 exports.Llama2Prompt = __importStar(require("./Llama2PromptTemplate.cjs"));
 exports.MistralInstructPrompt = __importStar(require("./MistralInstructPromptTemplate.cjs"));
 exports.NeuralChatPrompt = __importStar(require("./NeuralChatPromptTemplate.cjs"));
+__exportStar(require("./PromptTemplateProvider.cjs"), exports);
 exports.TextPrompt = __importStar(require("./TextPromptTemplate.cjs"));
 exports.VicunaPrompt = __importStar(require("./VicunaPromptTemplate.cjs"));
 __exportStar(require("./trimChatPrompt.cjs"), exports);

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

@@ -7,6 +7,7 @@ export * from "./InvalidPromptError.js";
 export * as Llama2Prompt from "./Llama2PromptTemplate.js";
 export * as MistralInstructPrompt from "./MistralInstructPromptTemplate.js";
 export * as NeuralChatPrompt from "./NeuralChatPromptTemplate.js";
+export * from "./PromptTemplateProvider.js";
 export * as TextPrompt from "./TextPromptTemplate.js";
 export * as VicunaPrompt from "./VicunaPromptTemplate.js";
 export * from "./trimChatPrompt.js";