modelfusion 0.102.0 → 0.104.0

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chat = exports.instruction = exports.text = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
+exports.validateLlama2Prompt = exports.chat = exports.instruction = exports.text = void 0;
+const Content_js_1 = require("./Content.cjs");
+const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
 const END_SEGMENT = " </s>";
@@ -47,9 +48,10 @@ function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format(prompt) {
+            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
             return `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${prompt.system != null
                 ? `${BEGIN_SYSTEM}${prompt.system}${END_SYSTEM}`
-                : ""}${prompt.instruction}${END_INSTRUCTION}${prompt.responsePrefix ?? ""}`;
+                : ""}${instruction}${END_INSTRUCTION}${prompt.responsePrefix ?? ""}`;
         },
     };
 }
@@ -69,7 +71,7 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
+            validateLlama2Prompt(prompt);
             let text = prompt.system != null
                 ? // Separate section for system message to simplify implementation
                     // (this is slightly different from the original instructions):
@@ -78,7 +80,8 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${content}${END_INSTRUCTION}`;
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        text += `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${textContent}${END_INSTRUCTION}`;
                         break;
                     }
                     case "assistant": {
@@ -97,3 +100,31 @@ function chat() {
     };
 }
 exports.chat = chat;
+/**
+ * Checks if a Llama2 chat prompt is valid. Throws a {@link ChatPromptValidationError} if it's not.
+ *
+ * - The first message of the chat must be a user message.
+ * - Then it must be alternating between an assistant message and a user message.
+ * - The last message must always be a user message (when submitting to a model).
+ *
+ * The type checking is done at runtime when you submit a chat prompt to a model with a prompt template.
+ *
+ * @throws {@link ChatPromptValidationError}
+ */
+function validateLlama2Prompt(chatPrompt) {
+    const messages = chatPrompt.messages;
+    if (messages.length < 1) {
+        throw new InvalidPromptError_js_1.InvalidPromptError("ChatPrompt should have at least one message.", chatPrompt);
+    }
+    for (let i = 0; i < messages.length; i++) {
+        const expectedRole = i % 2 === 0 ? "user" : "assistant";
+        const role = messages[i].role;
+        if (role !== expectedRole) {
+            throw new InvalidPromptError_js_1.InvalidPromptError(`Message at index ${i} should have role '${expectedRole}', but has role '${role}'.`, chatPrompt);
+        }
+    }
+    if (messages.length % 2 === 0) {
+        throw new InvalidPromptError_js_1.InvalidPromptError("The last message must be a user message.", chatPrompt);
+    }
+}
+exports.validateLlama2Prompt = validateLlama2Prompt;

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
-import { TextInstructionPrompt } from "./InstructionPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
 /**
  * Formats a text prompt as a Llama 2 prompt.
  *
@@ -27,7 +27,7 @@ export declare function text(): TextGenerationPromptTemplate<string, string>;
  *
  * @see https://www.philschmid.de/llama-2#how-to-prompt-llama-2-chat
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a Llama 2 prompt.
  *
@@ -40,4 +40,16 @@ export declare function instruction(): TextGenerationPromptTemplate<TextInstruct
  * ${ user msg 1 } [/INST] ${ model response 1 } </s><s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } </s><s>[INST] ${ user msg 3 } [/INST]
  * ```
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;
+/**
+ * Checks if a Llama2 chat prompt is valid. Throws a {@link ChatPromptValidationError} if it's not.
+ *
+ * - The first message of the chat must be a user message.
+ * - Then it must be alternating between an assistant message and a user message.
+ * - The last message must always be a user message (when submitting to a model).
+ *
+ * The type checking is done at runtime when you submit a chat prompt to a model with a prompt template.
+ *
+ * @throws {@link ChatPromptValidationError}
+ */
+export declare function validateLlama2Prompt(chatPrompt: ChatPrompt): void;

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

@@ -1,4 +1,5 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.js";
+import { InvalidPromptError } from "./InvalidPromptError.js";
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
 const END_SEGMENT = " </s>";
@@ -43,9 +44,10 @@ export function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format(prompt) {
+            const instruction = validateContentIsString(prompt.instruction, prompt);
             return `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${prompt.system != null
                 ? `${BEGIN_SYSTEM}${prompt.system}${END_SYSTEM}`
-                : ""}${prompt.instruction}${END_INSTRUCTION}${prompt.responsePrefix ?? ""}`;
+                : ""}${instruction}${END_INSTRUCTION}${prompt.responsePrefix ?? ""}`;
         },
     };
 }
@@ -64,7 +66,7 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
+            validateLlama2Prompt(prompt);
             let text = prompt.system != null
                 ? // Separate section for system message to simplify implementation
                     // (this is slightly different from the original instructions):
@@ -73,7 +75,8 @@ export function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${content}${END_INSTRUCTION}`;
+                        const textContent = validateContentIsString(content, prompt);
+                        text += `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${textContent}${END_INSTRUCTION}`;
                         break;
                     }
                     case "assistant": {
@@ -91,3 +94,30 @@ export function chat() {
         stopSequences: [END_SEGMENT],
     };
 }
+/**
+ * Checks if a Llama2 chat prompt is valid. Throws a {@link ChatPromptValidationError} if it's not.
+ *
+ * - The first message of the chat must be a user message.
+ * - Then it must be alternating between an assistant message and a user message.
+ * - The last message must always be a user message (when submitting to a model).
+ *
+ * The type checking is done at runtime when you submit a chat prompt to a model with a prompt template.
+ *
+ * @throws {@link ChatPromptValidationError}
+ */
+export function validateLlama2Prompt(chatPrompt) {
+    const messages = chatPrompt.messages;
+    if (messages.length < 1) {
+        throw new InvalidPromptError("ChatPrompt should have at least one message.", chatPrompt);
+    }
+    for (let i = 0; i < messages.length; i++) {
+        const expectedRole = i % 2 === 0 ? "user" : "assistant";
+        const role = messages[i].role;
+        if (role !== expectedRole) {
+            throw new InvalidPromptError(`Message at index ${i} should have role '${expectedRole}', but has role '${role}'.`, chatPrompt);
+        }
+    }
+    if (messages.length % 2 === 0) {
+        throw new InvalidPromptError("The last message must be a user message.", chatPrompt);
+    }
+}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
+const Content_js_1 = require("./Content.cjs");
 const roleNames = {
     system: "System",
     user: "User",
@@ -36,8 +36,9 @@ exports.text = text;
 const instruction = () => ({
     stopSequences: [],
     format(prompt) {
+        const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
         return (segment("system", prompt.system) +
-            segment("user", prompt.instruction) +
+            segment("user", instruction) +
             segmentStart("assistant") +
             (prompt.responsePrefix ?? ""));
     },
@@ -53,12 +54,12 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system != null ? segment("system", prompt.system) : "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += segment("user", content);
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        text += segment("user", textContent);
                         break;
                     }
                     case "assistant": {

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
-import { TextInstructionPrompt } from "./InstructionPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
 /**
  * Formats a text prompt as a neural chat prompt.
  *
@@ -12,7 +12,7 @@ export declare function text(): TextGenerationPromptTemplate<string, string>;
  *
  * @see https://huggingface.co/Intel/neural-chat-7b-v3-1#prompt-template
  */
-export declare const instruction: () => TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare const instruction: () => TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a basic text prompt.
  *
@@ -20,4 +20,4 @@ export declare const instruction: () => TextGenerationPromptTemplate<TextInstruc
  * @param assistant The label of the assistant in the chat. Default to "assistant".
  * @param system The label of the system in the chat. Optional, defaults to no prefix.
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

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

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.js";
 const roleNames = {
     system: "System",
     user: "User",
@@ -32,8 +32,9 @@ export function text() {
 export const instruction = () => ({
     stopSequences: [],
     format(prompt) {
+        const instruction = validateContentIsString(prompt.instruction, prompt);
         return (segment("system", prompt.system) +
-            segment("user", prompt.instruction) +
+            segment("user", instruction) +
             segmentStart("assistant") +
             (prompt.responsePrefix ?? ""));
     },
@@ -48,12 +49,12 @@ export const instruction = () => ({
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system != null ? segment("system", prompt.system) : "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += segment("user", content);
+                        const textContent = validateContentIsString(content, prompt);
+                        text += segment("user", textContent);
                         break;
                     }
                     case "assistant": {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
+const Content_js_1 = require("./Content.cjs");
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -20,7 +20,7 @@ const instruction = () => ({
         if (prompt.system != null) {
             text += `${prompt.system}\n\n`;
         }
-        text += `${prompt.instruction}\n\n`;
+        text += `${(0, Content_js_1.validateContentIsString)(prompt.instruction, prompt)}\n\n`;
         if (prompt.responsePrefix != null) {
             text += prompt.responsePrefix;
         }
@@ -37,14 +37,13 @@ exports.instruction = instruction;
  */
 const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
     format(prompt) {
-        (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
         let text = prompt.system != null
             ? `${system != null ? `${system}:` : ""}${prompt.system}\n\n`
             : "";
         for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
-                    text += `${user}:\n${content}\n\n`;
+                    text += `${user}:\n${(0, Content_js_1.validateContentIsString)(content, prompt)}\n\n`;
                     break;
                 }
                 case "assistant": {

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
-import { TextInstructionPrompt } from "./InstructionPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -8,7 +8,7 @@ export declare const text: () => TextGenerationPromptTemplate<string, string>;
 /**
  * Formats an instruction prompt as a basic text prompt.
  */
-export declare const instruction: () => TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare const instruction: () => TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a basic text prompt.
  *
@@ -20,4 +20,4 @@ export declare const chat: (options?: {
     user?: string;
     assistant?: string;
     system?: string;
-}) => TextGenerationPromptTemplate<TextChatPrompt, string>;
+}) => TextGenerationPromptTemplate<ChatPrompt, string>;

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

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -16,7 +16,7 @@ export const instruction = () => ({
         if (prompt.system != null) {
             text += `${prompt.system}\n\n`;
         }
-        text += `${prompt.instruction}\n\n`;
+        text += `${validateContentIsString(prompt.instruction, prompt)}\n\n`;
         if (prompt.responsePrefix != null) {
             text += prompt.responsePrefix;
         }
@@ -32,14 +32,13 @@ export const instruction = () => ({
  */
 export const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
     format(prompt) {
-        validateChatPrompt(prompt);
         let text = prompt.system != null
             ? `${system != null ? `${system}:` : ""}${prompt.system}\n\n`
             : "";
         for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
-                    text += `${user}:\n${content}\n\n`;
+                    text += `${user}:\n${validateContentIsString(content, prompt)}\n\n`;
                     break;
                 }
                 case "assistant": {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
+const Content_js_1 = require("./Content.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.";
@@ -21,14 +21,14 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system != null
                 ? `${prompt.system}\n\n`
                 : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `USER: ${content}\n`;
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        text += `USER: ${textContent}\n`;
                         break;
                     }
                     case "assistant": {

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

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

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

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.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.";
@@ -18,14 +18,14 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system != null
                 ? `${prompt.system}\n\n`
                 : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `USER: ${content}\n`;
+                        const textContent = validateContentIsString(content, prompt);
+                        text += `USER: ${textContent}\n`;
                         break;
                     }
                     case "assistant": {

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trimChatPrompt = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -14,7 +13,6 @@ const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
  */
 async function trimChatPrompt({ prompt, model, tokenLimit = model.contextWindowSize -
     (model.settings.maxGenerationTokens ?? model.contextWindowSize / 4), }) {
-    (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
     let minimalPrompt = {
         system: prompt.system,
         messages: [prompt.messages[prompt.messages.length - 1]], // last user message

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

@@ -1,5 +1,5 @@
 import { HasContextWindowSize, HasTokenizer, TextGenerationModel, TextGenerationModelSettings } from "../TextGenerationModel.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -11,7 +11,7 @@ import { TextChatPrompt } from "./ChatPrompt.js";
  * @see https://modelfusion.dev/guide/function/generate-text#limiting-the-chat-length
  */
 export declare function trimChatPrompt({ prompt, model, tokenLimit, }: {
-    prompt: TextChatPrompt;
-    model: TextGenerationModel<TextChatPrompt, TextGenerationModelSettings> & HasTokenizer<TextChatPrompt> & HasContextWindowSize;
+    prompt: ChatPrompt;
+    model: TextGenerationModel<ChatPrompt, TextGenerationModelSettings> & HasTokenizer<ChatPrompt> & HasContextWindowSize;
     tokenLimit?: number;
-}): Promise<TextChatPrompt>;
+}): Promise<ChatPrompt>;

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

@@ -1,4 +1,3 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -11,7 +10,6 @@ import { validateChatPrompt } from "./ChatPrompt.js";
  */
 export async function trimChatPrompt({ prompt, model, tokenLimit = model.contextWindowSize -
     (model.settings.maxGenerationTokens ?? model.contextWindowSize / 4), }) {
-    validateChatPrompt(prompt);
     let minimalPrompt = {
         system: prompt.system,
         messages: [prompt.messages[prompt.messages.length - 1]], // last user message

package/model-provider/anthropic/AnthropicPromptTemplate.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
+const Content_js_1 = require("../../model-function/generate-text/prompt-template/Content.cjs");
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -26,9 +26,10 @@ exports.text = text;
 function instruction() {
     return {
         format(prompt) {
+            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -47,13 +48,13 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { TextInstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
+import { ChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
@@ -8,10 +8,10 @@ export declare function text(): TextGenerationPromptTemplate<string, string>;
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
  *
  * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-provider/anthropic/AnthropicPromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { validateContentIsString } from "../../model-function/generate-text/prompt-template/Content.js";
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -22,9 +22,10 @@ export function text() {
 export function instruction() {
     return {
         format(prompt) {
+            const instruction = validateContentIsString(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -42,13 +43,13 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = validateContentIsString(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -4,12 +4,13 @@ exports.AnthropicTextGenerationResponseFormat = exports.AnthropicTextGenerationM
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
-const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.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 PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.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 parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const AnthropicApiConfiguration_js_1 = require("./AnthropicApiConfiguration.cjs");
 const AnthropicError_js_1 = require("./AnthropicError.cjs");
 const AnthropicPromptTemplate_js_1 = require("./AnthropicPromptTemplate.cjs");
@@ -74,8 +75,8 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         const abortSignal = options.run?.abortSignal;
         const userId = this.settings.userId;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
+            retry: api.retry,
+            throttle: api.throttle,
             call: async () => {
                 return (0, postToApi_js_1.postJsonToApi)({
                     url: api.assembleUrl(`/complete`),
@@ -100,8 +101,7 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "temperature",
             "topK",
             "topP",
@@ -116,9 +116,24 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.completion],
+            textGenerationResults: [
+                {
+                    text: response.completion,
+                    finishReason: this.translateFinishReason(response.stop_reason),
+                },
+            ],
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop_sequence":
+                return "stop";
+            case "max_tokens":
+                return "length";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,