rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sanitize completion names. Only send names in msg texts if names in completion is disabled

This commit is contained in:
Cohee 2023-08-03 22:47:04 +03:00 committed by maver
parent 5f43121e15
commit 29552ecfcf
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/PromptManager.js
View File

@ -938,6 +938,10 @@ PromptManagerModule.prototype.isValidName = function(name) {
return regex.test(name);
}
PromptManagerModule.prototype.sanitizeName = function(name) {
return name.replace(/[^a-zA-Z0-9_]/g, '_').substring(0, 64);
}
/**
* Loads a given prompt into the edit form fields.
* @param {Object} prompt - Prompt object with properties 'name', 'role', 'content', and 'system_prompt'

13
public/scripts/openai.js
View File

@ -251,10 +251,11 @@ function setOpenAIMessages(chat) {
}
// for groups or sendas command - prepend a character's name
if (selected_group || (chat[j].force_avatar && chat[j].name !== name1 && chat[j].extra?.type !== system_message_types.NARRATOR)) {
content = `${chat[j].name}: ${content}`;
if (!oai_settings.names_in_completion) {
if (selected_group || (chat[j].force_avatar && chat[j].name !== name1 && chat[j].extra?.type !== system_message_types.NARRATOR)) {
content = `${chat[j].name}: ${content}`;
}
}
content = replaceBiasMarkup(content);
// remove caret return (waste of tokens)
@ -448,9 +449,9 @@ function populateChatHistory(prompts, chatCompletion, type = null, cyclePrompt =
prompt.identifier = `chatHistory-${openai_msgs.length - index}`;
const chatMessage = Message.fromPrompt(promptManager.preparePrompt(prompt));
if (true === promptManager.serviceSettings.names_in_completion && prompt.name)
if (promptManager.isValidName(prompt.name)) chatMessage.name = prompt.name;
else throw new InvalidCharacterNameError();
if (true === promptManager.serviceSettings.names_in_completion && prompt.name) {
chatMessage.name = promptManager.isValidName(prompt.name) ? prompt.name : promptManager.sanitizeName(prompt.name);
}
if (chatCompletion.canAfford(chatMessage)) chatCompletion.insertAtStart(chatMessage, 'chatHistory');
else return false;