Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/utils/parseTextTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ export function parseTextTemplate<const Parts extends readonly TextTemplatePart[
if (typeof textPart === "string")
continue;

const matchingPartIndex = parts.findIndex((part) => part.text === textPart.separator);
if (matchingPartIndex < partIndex) {
const matchingPart = parts[matchingPartIndex]!;
if (result[matchingPart.key as Parts[number]["key"]] != null)
throw new Error(`Template must contain exactly one "${matchingPart.text}"`);

throw new Error(`Template must contain "${matchingPart.text}" before "${parts[partIndex - 1]!.text}"`);
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is the right fix since this function can support receiving the same separator more than once (with different keys).
What we should validate and throw on is whether after iterating all the parts we're still left with unused text separators (from splitText) which would indicate that the template contains additional instances of the separators we support (and already parsed), but after the expected sequence

for (; partIndex < parts.length; partIndex++) {
const part = parts[partIndex]!;

Expand Down
36 changes: 36 additions & 0 deletions test/standalone/chatWrappers/generic/TemplateChatWrapper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,42 @@ import {defaultChatSystemPrompt} from "../../../../src/config.js";


describe("TemplateChatWrapper", () => {
test.each([
{template: "{{history}}model: {{completion}} done {{completion}}", part: "{{completion}}"},
{template: "{{history}}model: {{completion}} done {{history}}", part: "{{history}}"}
] as const)("rejects a trailing $part", ({template, part}) => {
expect(() => new TemplateChatWrapper({
template,
historyTemplate: {
system: "system: {{message}}\n",
user: "user: {{message}}\n",
model: "model: {{message}}\n"
}
})).toThrow(`Template must contain exactly one "${part}"`);
});

test("rejects duplicate history message placeholders", () => {
expect(() => new TemplateChatWrapper({
template: "{{history}}model: {{completion}}\nuser: ",
historyTemplate: {
system: "system: {{message}}\n",
user: "user: {{message}} / {{message}}\n",
model: "model: {{message}}\n"
}
})).toThrow('Template must contain exactly one "{{message}}"');
});

test("rejects a system prompt after completion", () => {
expect(() => new TemplateChatWrapper({
template: "{{history}}model: {{completion}}\nuser: {{systemPrompt}}",
historyTemplate: {
system: "system: {{message}}\n",
user: "user: {{message}}\n",
model: "model: {{message}}\n"
}
})).toThrow('Template must contain "{{systemPrompt}}" before "{{completion}}"');
});

const conversationHistory: ChatHistoryItem[] = [{
type: "system",
text: defaultChatSystemPrompt
Expand Down
28 changes: 28 additions & 0 deletions test/standalone/utils/parseTextTemplate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,34 @@ import {parseTextTemplate} from "../../../src/utils/parseTextTemplate.js";

describe("utils", () => {
describe("parseTextTemplate", () => {
test.each(["{{name}}", "{{thing}}"])("rejects trailing duplicate %s", (part) => {
expect(() => parseTextTemplate(
`Hello, {{name}}! What is the {{thing}}? ${part} ignored text`,
[{key: "name", text: "{{name}}"}, {key: "thing", text: "{{thing}}"}]
)).toThrow(`Template must contain exactly one "${part}"`);
});

test("rejects a duplicate in a single-part template", () => {
expect(() => parseTextTemplate(
"{{message}} / {{message}} trailing text",
[{key: "message", text: "{{message}}"}]
)).toThrow('Template must contain exactly one "{{message}}"');
});

test("rejects a duplicate before a trailing optional part", () => {
expect(() => parseTextTemplate(
"{{name}} / {{name}} trailing text",
[{key: "name", text: "{{name}}"}, {key: "thing", text: "{{thing}}", optional: true}]
)).toThrow('Template must contain exactly one "{{name}}"');
});

test("rejects a skipped optional part after later parts", () => {
expect(() => parseTextTemplate(
"{{thing}} / {{name}} trailing text",
[{key: "name", text: "{{name}}", optional: true}, {key: "thing", text: "{{thing}}"}]
)).toThrow('Template must contain "{{name}}" before "{{thing}}"');
});

test("normal", async () => {
const res = parseTextTemplate(
"Hello, {{name}}! What is the {{thing}}?",
Expand Down
Loading