PromptNames: Rename startsWithGroupName function

107e2e0ed079b20fae9c21134e1b6e2bd26537df

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 2796d5dcde6eea470f5b40663e0a9cf914fe8e27
1 files changed, +11 -11Ignore whitespace
src/prompt-converters.js+11 -11
@@ -8,7 +8,7 @@ const PROMPT_PLACEHOLDER = getConfigValue('promptPlaceholder', 'Let\'s get start
8 * @property {string} charName Character name8 * @property {string} charName Character name
9 * @property {string} userName User name9 * @property {string} userName User name
10 * @property {string[]} groupNames Group member names10 * @property {string[]} groupNames Group member names
11 * @property {function(string): boolean} startsFromGroupName Check if a message starts with a group name11 * @property {function(string): boolean} startsWithGroupName Check if a message starts with a group name
12 */12 */
1313
14/**14/**
@@ -21,7 +21,7 @@ export function getPromptNames(request) {
21 charName: String(request.body.char_name || ''),21 charName: String(request.body.char_name || ''),
22 userName: String(request.body.user_name || ''),22 userName: String(request.body.user_name || ''),
23 groupNames: Array.isArray(request.body.group_names) ? request.body.group_names.map(String) : [],23 groupNames: Array.isArray(request.body.group_names) ? request.body.group_names.map(String) : [],
24 startsFromGroupName: function (message) {24 startsWithGroupName: function (message) {
25 return this.groupNames.some(name => message.startsWith(`${name}: `));25 return this.groupNames.some(name => message.startsWith(`${name}: `));
26 },26 },
27 };27 };
@@ -134,7 +134,7 @@ export function convertClaudeMessages(messages, prefillString, useSysPrompt, use
134 }134 }
135 }135 }
136 if (names.charName && messages[i].name === 'example_assistant') {136 if (names.charName && messages[i].name === 'example_assistant') {
137 if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(messages[i].content)) {137 if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(messages[i].content)) {
138 messages[i].content = `${names.charName}: ${messages[i].content}`;138 messages[i].content = `${names.charName}: ${messages[i].content}`;
139 }139 }
140 }140 }
@@ -181,7 +181,7 @@ export function convertClaudeMessages(messages, prefillString, useSysPrompt, use
181 }181 }
182 }182 }
183 if (names.charName && message.name === 'example_assistant') {183 if (names.charName && message.name === 'example_assistant') {
184 if (!message.content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(message.content)) {184 if (!message.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(message.content)) {
185 message.content = `${names.charName}: ${message.content}`;185 message.content = `${names.charName}: ${message.content}`;
186 }186 }
187 }187 }
@@ -326,7 +326,7 @@ export function convertCohereMessages(messages, names) {
326 // No names support (who would've thought)326 // No names support (who would've thought)
327 if (msg.name) {327 if (msg.name) {
328 if (msg.role == 'system' && msg.name == 'example_assistant') {328 if (msg.role == 'system' && msg.name == 'example_assistant') {
329 if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(msg.content)) {329 if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(msg.content)) {
330 msg.content = `${names.charName}: ${msg.content}`;330 msg.content = `${names.charName}: ${msg.content}`;
331 }331 }
332 }332 }
@@ -392,7 +392,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt, names) {
392 }392 }
393 }393 }
394 if (names.charName && messages[0].name === 'example_assistant') {394 if (names.charName && messages[0].name === 'example_assistant') {
395 if (!messages[0].content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(messages[0].content)) {395 if (!messages[0].content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(messages[0].content)) {
396 messages[0].content = `${names.charName}: ${messages[0].content}`;396 messages[0].content = `${names.charName}: ${messages[0].content}`;
397 }397 }
398 }398 }
@@ -424,11 +424,11 @@ export function convertGooglePrompt(messages, model, useSysPrompt, names) {
424 return;424 return;
425 }425 }
426 if (message.name === 'example_user') {426 if (message.name === 'example_user') {
427 if (!part.text.startsWith(`${names.userName}: `)) {427 if (names.userName && !part.text.startsWith(`${names.userName}: `)) {
428 part.text = `${names.userName}: ${part.text}`;428 part.text = `${names.userName}: ${part.text}`;
429 }429 }
430 } else if (message.name === 'example_assistant') {430 } else if (message.name === 'example_assistant') {
431 if (!part.text.startsWith(`${names.charName}: `) && !names.startsFromGroupName(part.text)) {431 if (names.charName && !part.text.startsWith(`${names.charName}: `) && !names.startsWithGroupName(part.text)) {
432 part.text = `${names.charName}: ${part.text}`;432 part.text = `${names.charName}: ${part.text}`;
433 }433 }
434 } else {434 } else {
@@ -504,7 +504,7 @@ export function convertAI21Messages(messages, names) {
504 }504 }
505 }505 }
506 if (names.charName && messages[i].name === 'example_assistant') {506 if (names.charName && messages[i].name === 'example_assistant') {
507 if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(messages[i].content)) {507 if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(messages[i].content)) {
508 messages[i].content = `${names.charName}: ${messages[i].content}`;508 messages[i].content = `${names.charName}: ${messages[i].content}`;
509 }509 }
510 }510 }
@@ -582,7 +582,7 @@ export function convertMistralMessages(messages, names) {
582 msg.tool_call_id = sanitizeToolId(msg.tool_call_id);582 msg.tool_call_id = sanitizeToolId(msg.tool_call_id);
583 }583 }
584 if (msg.role === 'system' && msg.name === 'example_assistant') {584 if (msg.role === 'system' && msg.name === 'example_assistant') {
585 if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(msg.content)) {585 if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(msg.content)) {
586 msg.content = `${names.charName}: ${msg.content}`;586 msg.content = `${names.charName}: ${msg.content}`;
587 }587 }
588 delete msg.name;588 delete msg.name;
@@ -668,7 +668,7 @@ export function mergeMessages(messages, names, strict) {
668 message.content = text;668 message.content = text;
669 }669 }
670 if (message.role === 'system' && message.name === 'example_assistant') {670 if (message.role === 'system' && message.name === 'example_assistant') {
671 if (names.charName && !message.content.startsWith(`${names.charName}: `) && !names.startsFromGroupName(message.content)) {671 if (names.charName && !message.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(message.content)) {
672 message.content = `${names.charName}: ${message.content}`;672 message.content = `${names.charName}: ${message.content}`;
673 }673 }
674 }674 }