PromptNames: Rename startsWithGroupName function
| @@ -8,7 +8,7 @@ const PROMPT_PLACEHOLDER = getConfigValue('promptPlaceholder', 'Let\'s get start | ||
| 8 | 8 | * @property {string} charName Character name |
| 9 | 9 | * @property {string} userName User name |
| 10 | 10 | * @property {string[]} groupNames Group member names |
| 11 | 11 | * @property {function(string): boolean} startsFromGroupNamestartsWithGroupName Check if a message starts with a group name |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | 14 | /** |
| @@ -21,7 +21,7 @@ export function getPromptNames(request) { | ||
| 21 | 21 | charName: String(request.body.char_name || ''), |
| 22 | 22 | userName: String(request.body.user_name || ''), |
| 23 | 23 | groupNames: Array.isArray(request.body.group_names) ? request.body.group_names.map(String) : [], |
| 24 | 24 | startsFromGroupNamestartsWithGroupName: function (message) { |
| 25 | 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 | 136 | if (names.charName && messages[i].name === 'example_assistant') { |
| 137 | 137 | if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(messages[i].content)) { |
| 138 | 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 | 183 | if (names.charName && message.name === 'example_assistant') { |
| 184 | 184 | if (!message.content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(message.content)) { |
| 185 | 185 | message.content = `${names.charName}: ${message.content}`; |
| 186 | 186 | } |
| 187 | 187 | } |
| @@ -326,7 +326,7 @@ export function convertCohereMessages(messages, names) { | ||
| 326 | 326 | // No names support (who would've thought) |
| 327 | 327 | if (msg.name) { |
| 328 | 328 | if (msg.role == 'system' && msg.name == 'example_assistant') { |
| 329 | 329 | if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(msg.content)) { |
| 330 | 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 | 394 | if (names.charName && messages[0].name === 'example_assistant') { |
| 395 | 395 | if (!messages[0].content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(messages[0].content)) { |
| 396 | 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 | 424 | return; |
| 425 | 425 | } |
| 426 | 426 | if (message.name === 'example_user') { |
| 427 | 427 | if (names.userName && !part.text.startsWith(`${names.userName}: `)) { |
| 428 | 428 | part.text = `${names.userName}: ${part.text}`; |
| 429 | 429 | } |
| 430 | 430 | } else if (message.name === 'example_assistant') { |
| 431 | 431 | if (names.charName && !part.text.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(part.text)) { |
| 432 | 432 | part.text = `${names.charName}: ${part.text}`; |
| 433 | 433 | } |
| 434 | 434 | } else { |
| @@ -504,7 +504,7 @@ export function convertAI21Messages(messages, names) { | ||
| 504 | 504 | } |
| 505 | 505 | } |
| 506 | 506 | if (names.charName && messages[i].name === 'example_assistant') { |
| 507 | 507 | if (!messages[i].content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(messages[i].content)) { |
| 508 | 508 | messages[i].content = `${names.charName}: ${messages[i].content}`; |
| 509 | 509 | } |
| 510 | 510 | } |
| @@ -582,7 +582,7 @@ export function convertMistralMessages(messages, names) { | ||
| 582 | 582 | msg.tool_call_id = sanitizeToolId(msg.tool_call_id); |
| 583 | 583 | } |
| 584 | 584 | if (msg.role === 'system' && msg.name === 'example_assistant') { |
| 585 | 585 | if (names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(msg.content)) { |
| 586 | 586 | msg.content = `${names.charName}: ${msg.content}`; |
| 587 | 587 | } |
| 588 | 588 | delete msg.name; |
| @@ -668,7 +668,7 @@ export function mergeMessages(messages, names, strict) { | ||
| 668 | 668 | message.content = text; |
| 669 | 669 | } |
| 670 | 670 | if (message.role === 'system' && message.name === 'example_assistant') { |
| 671 | 671 | if (names.charName && !message.content.startsWith(`${names.charName}: `) && !names.startsFromGroupNamestartsWithGroupName(message.content)) { |
| 672 | 672 | message.content = `${names.charName}: ${message.content}`; |
| 673 | 673 | } |
| 674 | 674 | } |