rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://github.com/cohee1207/SillyTavern into dev

Browse Source
This commit is contained in:
Cohee1207
2023-05-05 15:57:49 +03:00
parent efdaf30afd b9797f2d53
commit a8c47037ac
22 changed files with 1532 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/NovelAI Settings/Classic-Krake.settings
View File

@@ -6,8 +6,8 @@
"temperature": 1.7,
"max_length": 90,
"min_length": 1,
"tail_free_sampling": 0.6602,
"repetition_penalty": 1.0565,
"tail_free_sampling": 0.66,
"repetition_penalty": 1.06,
"repetition_penalty_range": 340,
"repetition_penalty_frequency": 0,
"repetition_penalty_presence": 0

665
public/index.html
View File

File diff suppressed because it is too large Load Diff

20
public/notes/content.md
View File

@@ -213,6 +213,26 @@ Constant entries will be inserted first. Then entries with higher order numbers.
Entries inserted by direct mentioning of their keys have higher priority than those that were mentioned in other entries contents.
### Recursive scanning
**Entries can activate other entries by mentioning their keywords in the content text.**
For example, if your World Info contains two entries:
```
Entry #1
Keyword: Bessie
Content: Bessie is a cow and is friend with Rufus.
```
```
Entry #2
Keyword: Rufus
Content: Rufus is a dog.
```
**Both** of them will be pulled into the context if the message text mentions **just Bessie**.
## KoboldAI
### Basic Settings

293
public/script.js
View File

@@ -24,6 +24,7 @@ import {
selectImportedWorldInfo,
setWorldInfoSettings,
deleteWorldInfo,
world_info_recursive,
} from "./scripts/world-info.js";
import {
@@ -47,6 +48,7 @@ import {
openGroupChat,
editGroup,
deleteGroupChat,
renameGroupChat,
} from "./scripts/group-chats.js";
import {
@@ -100,9 +102,9 @@ import {
setPoeOnlineStatus,
} from "./scripts/poe.js";
import { debounce, delay } from "./scripts/utils.js";
import { debounce, delay, restoreCaretPosition, saveCaretPosition } from "./scripts/utils.js";
import { extension_settings, loadExtensionSettings } from "./scripts/extensions.js";
import { executeSlashCommands, getSlashCommandsHelp } from "./scripts/slash-commands.js";
import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js";
import {
tag_map,
tags,
@@ -192,7 +194,7 @@ let converter;
reloadMarkdownProcessor();
/* let bg_menu_toggle = false; */
const systemUserName = "SillyTavern System";
export const systemUserName = "SillyTavern System";
let default_user_name = "You";
let name1 = default_user_name;
let name2 = "SillyTavern System";
@@ -965,9 +967,9 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
});
}
if (ch_name && (forceAvatar || ch_name !== name1)) {
mes = mes.replaceAll(ch_name + ":", "");
}
/* if (ch_name && (forceAvatar || ch_name !== name1)) {
mes = mes.replaceAll(ch_name + ":", "");
} */
return mes;
}
@@ -1019,11 +1021,17 @@ function addCopyToCodeBlocks(messageElement) {
function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true } = {}) {
var messageText = mes["mes"];
var characterName = name1;
if (mes.name === name1) {
var characterName = name1; //set to user's name by default
} else { var characterName = mes.name }
var avatarImg = "User Avatars/" + user_avatar;
const isSystem = mes.is_system;
const title = mes.title;
generatedPromtCache = "";
//for non-user mesages
if (!mes["is_user"]) {
if (mes.force_avatar) {
avatarImg = mes.force_avatar;
@@ -1039,8 +1047,11 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
avatarImg = default_avatar;
}
}
//old processing:
//if messge is from sytem, use the name provided in the message JSONL to proceed,
//if not system message, use name2 (char's name) to proceed
//characterName = mes.is_system || mes.force_avatar ? mes.name : name2;
characterName = mes.is_system || mes.force_avatar ? mes.name : name2;
}
if (count_view_mes == 0) {
@@ -1055,14 +1066,14 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
const bias = messageFormating(mes.extra?.bias ?? "");
let params = {
mesId: count_view_mes,
characterName: characterName,
isUser: mes.is_user,
avatarImg: avatarImg,
bias: bias,
isSystem: isSystem,
title: title,
...formatGenerationTimer(mes.gen_started, mes.gen_finished),
mesId: count_view_mes,
characterName: characterName,
isUser: mes.is_user,
avatarImg: avatarImg,
bias: bias,
isSystem: isSystem,
title: title,
...formatGenerationTimer(mes.gen_started, mes.gen_finished),
};
const HTMLForEachMes = getMessageFromTemplate(params);
@@ -1089,7 +1100,6 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
}
newMessage.find('.avatar img').on('error', function () {
/* $(this).attr("src", "/img/user-slash-solid.svg"); */
$(this).hide();
$(this).parent().html(`<div class="missing-avatar fa-solid fa-user-slash"></div>`);
});
@@ -1163,13 +1173,30 @@ function substituteParams(content, _name1, _name2) {
function getStoppingStrings(isImpersonate, addSpace) {
const charString = `\n${name2}:`;
const userString = is_pygmalion ? `\nYou:` : `\n${name1}:`;
const result = isImpersonate ? charString : userString;
return [addSpace ? `${result} ` : result];
const youString = `\nYou:`;
const userString = `\n${name1}:`;
const result = isImpersonate ? [charString] : [youString];
result.push(userString);
// Add other group members as the stopping strings
if (selected_group) {
const group = groups.find(x => x.id === selected_group);
if (group && Array.isArray(group.members)) {
const names = group.members
.map(x => characters.find(y => y.avatar == x))
.filter(x => x && x.name !== name2)
.map(x => `\n${x.name}:`);
result.push(...names);
}
}
return addSpace ? result.map(x => `${x} `) : result;
}
function processCommands(message, type) {
if (type == "regenerate" || type == "swipe") {
if (type == "regenerate" || type == "swipe" || type == 'quiet') {
return null;
}
@@ -1477,7 +1504,7 @@ class StreamingProcessor {
}
}
async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_prompt } = {}) {
async function Generate(type, { automatic_trigger, force_name2, resolve, reject, quiet_prompt } = {}) {
//console.log('Generate entered');
setGenerationProgress(0);
tokens_already_generated = 0;
@@ -1513,25 +1540,22 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
}
if (selected_group && !is_group_generating) {
generateGroupWrapper(false, type = type);
generateGroupWrapper(false, type, null, { resolve, reject, quiet_prompt });
return;
}
if (online_status != 'no_connection' && this_chid != undefined && this_chid !== 'invalid-safety-id') {
let textareaText;
if (type !== 'regenerate' && type !== "swipe" && !isImpersonate) {
if (type !== 'regenerate' && type !== "swipe" && type !== 'quiet' && !isImpersonate) {
is_send_press = true;
textareaText = $("#send_textarea").val();
//console.log('Not a Regenerate call, so posting normall with input of: ' +textareaText);
$("#send_textarea").val('').trigger('input');
} else {
//console.log('Regenerate call detected')
textareaText = "";
if (chat.length && chat[chat.length - 1]['is_user']) {//If last message from You
if (chat.length && chat[chat.length - 1]['is_user']) {
//do nothing? why does this check exist?
}
else if (type !== "swipe" && !isImpersonate) {
else if (type !== 'quiet' && type !== "swipe" && !isImpersonate) {
chat.length = chat.length - 1;
count_view_mes -= 1;
$('#chat').children().last().hide(500, function () {
@@ -1584,7 +1608,9 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
//*********************************
//PRE FORMATING STRING
//*********************************
if (textareaText != "" && !automatic_trigger) {
//for normal messages sent from user..
if (textareaText != "" && !automatic_trigger && type !== 'quiet') {
chat[chat.length] = {};
chat[chat.length - 1]['name'] = name1;
chat[chat.length - 1]['is_user'] = true;
@@ -1633,7 +1659,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
console.log(`Core/all messages: ${coreChat.length}/${chat.length}`);
if (main_api === 'openai') {
setOpenAIMessages(coreChat);
setOpenAIMessages(coreChat, quiet_prompt);
setOpenAIMessageExamples(mesExamplesArray);
}
@@ -1669,7 +1695,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
let charName = selected_group ? coreChat[j].name : name2;
let this_mes_ch_name = '';
if (coreChat[j]['is_user']) {
this_mes_ch_name = name1;
//this_mes_ch_name = name1;
this_mes_ch_name = coreChat[j]['name'];
} else {
this_mes_ch_name = charName;
}
@@ -1726,7 +1753,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
// Extension added strings
const allAnchors = getAllExtensionPrompts();
const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.AFTER_SCENARIO);
const zeroDepthAnchor = getExtensionPrompt(extension_prompt_types.IN_CHAT, 0, ' ');
let zeroDepthAnchor = getExtensionPrompt(extension_prompt_types.IN_CHAT, 0, ' ');
let { worldInfoString, worldInfoBefore, worldInfoAfter } = getWorldInfoPrompt(chat2);
@@ -1747,7 +1774,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
anchorBottom,
charPersonality,
promptBias,
allAnchors
allAnchors,
quiet_prompt,
].join('').replace(/\r/gm, '');
return getTokenCount(encodeString, padding_tokens) < this_max_context;
}
@@ -1899,7 +1927,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
charPersonality,
generatedPromtCache,
promptBias,
allAnchors
allAnchors,
quiet_prompt,
].join('').replace(/\r/gm, '');
let thisPromtContextSize = getTokenCount(prompt, padding_tokens);
@@ -1968,6 +1997,11 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
}
}
// Add quiet generation prompt at depth 0
if (quiet_prompt && quiet_prompt.length) {
finalPromt += `\n${quiet_prompt}`;
}
finalPromt = finalPromt.replace(/\r/gm, '');
if (power_user.collapse_newlines) {
@@ -1977,7 +2011,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
let this_amount_gen = parseInt(amount_gen); // how many tokens the AI will be requested to generate
let this_settings = koboldai_settings[koboldai_setting_names[preset_settings]];
if (isMultigenEnabled()) {
if (isMultigenEnabled() && type !== 'quiet') {
// if nothing has been generated yet..
if (tokens_already_generated === 0) {
// if the max gen setting is > 50...(
@@ -2041,25 +2075,25 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
let prompt = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type);
setInContextMessages(openai_messages_count, type);
if (isStreamingEnabled()) {
streamingProcessor.generator = await sendOpenAIRequest(prompt, streamingProcessor.abortController.signal);
if (isStreamingEnabled() && type !== 'quiet') {
streamingProcessor.generator = await sendOpenAIRequest(type, prompt, streamingProcessor.abortController.signal);
}
else {
sendOpenAIRequest(prompt).then(onSuccess).catch(onError);
sendOpenAIRequest(type, prompt).then(onSuccess).catch(onError);
}
}
else if (main_api == 'kobold' && horde_settings.use_horde) {
generateHorde(finalPromt, generate_data).then(onSuccess).catch(onError);
}
else if (main_api == 'poe') {
if (isStreamingEnabled()) {
if (isStreamingEnabled() && type !== 'quiet') {
streamingProcessor.generator = await generatePoe(type, finalPromt, streamingProcessor.abortController.signal);
}
else {
generatePoe(type, finalPromt).then(onSuccess).catch(onError);
}
}
else if (main_api == 'textgenerationwebui' && textgenerationwebui_settings.streaming) {
else if (main_api == 'textgenerationwebui' && textgenerationwebui_settings.streaming && type !== 'quiet') {
streamingProcessor.generator = await generateTextGenWithStreaming(generate_data, streamingProcessor.abortController.signal);
}
else {
@@ -2078,7 +2112,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
}); //end of "if not data error"
}
if (isStreamingEnabled()) {
if (isStreamingEnabled() && type !== 'quiet') {
hideSwipeButtons();
let getMessage = await streamingProcessor.generate();
@@ -2103,7 +2137,6 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
}
function onSuccess(data) {
is_send_press = false;
if (!data.error) {
//const getData = await response.json();
@@ -2113,7 +2146,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
//Pygmalion run again
// to make it continue generating so long as it's under max_amount and hasn't signaled
// an end to the character's response via typing "You:" or adding "<endoftext>"
if (isMultigenEnabled()) {
if (isMultigenEnabled() && type !== 'quiet') {
message_already_generated += getMessage;
promptBias = '';
if (shouldContinueMultigen(getMessage)) {
@@ -2147,6 +2180,9 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
if (isImpersonate) {
$('#send_textarea').val(getMessage).trigger('input');
}
else if (type == 'quiet') {
resolve(getMessage);
}
else {
if (!isMultigenEnabled()) {
({ type, getMessage } = saveReply(type, getMessage, this_mes_is_name, title));
@@ -2156,7 +2192,11 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
}
}
activateSendButtons();
playMessageSound();
if (type !== 'quiet') {
playMessageSound();
}
generate_loop_counter = 0;
} else {
++generate_loop_counter;
@@ -2189,6 +2229,10 @@ async function Generate(type, { automatic_trigger, force_name2, quiet, quiet_pro
};
function onError(jqXHR, exception) {
if (type == 'quiet') {
reject(exception);
}
$("#send_textarea").removeAttr('disabled');
is_send_press = false;
activateSendButtons();
@@ -2371,7 +2415,7 @@ function cleanUpMessage(getMessage, isImpersonate) {
// trailing invisible whitespace before every newlines, on a multiline string
// "trailing whitespace on newlines \nevery line of the string \n?sample text" ->
// "trailing whitespace on newlines\nevery line of the string\nsample text"
getMessage = getMessage.replace(/\s+$/gm, "");
getMessage = getMessage.replace(/[^\S\r\n]+$/gm, "");
if (is_pygmalion) {
getMessage = getMessage.replace(/<USER>/g, name1);
getMessage = getMessage.replace(/<BOT>/g, name2);
@@ -2394,6 +2438,8 @@ function cleanUpMessage(getMessage, isImpersonate) {
}
const stoppingStrings = getStoppingStrings(isImpersonate, false);
//console.log('stopping on these strings: ');
//console.log(stoppingStrings);
for (const stoppingString of stoppingStrings) {
if (stoppingString.length) {
@@ -2630,25 +2676,27 @@ async function saveChat(chat_name, withMetadata) {
alert('Trying to save group chat with regular saveChat function. Aborting to prevent corruption.');
throw new Error('Group chat saved from saveChat');
}
/*
if (item.is_user) {
var str = item.mes.replace(`${name1}:`, `${default_user_name}:`);
chat[i].mes = str;
chat[i].name = default_user_name;
//var str = item.mes.replace(`${name1}:`, `${name1}:`);
//chat[i].mes = str;
//chat[i].name = name1;
} else if (i !== chat.length - 1 && chat[i].swipe_id !== undefined) {
// delete chat[i].swipes;
// delete chat[i].swipe_id;
}
*/
});
var save_chat = [
{
user_name: default_user_name,
user_name: name1,
character_name: name2,
create_date: chat_create_date,
chat_metadata: metadata,
},
...chat,
];
jQuery.ajax({
return jQuery.ajax({
type: "POST",
url: "/savechat",
data: JSON.stringify({
@@ -2745,8 +2793,8 @@ function getChatResult() {
for (let i = 0; i < chat.length; i++) {
const item = chat[i];
if (item["is_user"]) {
item['mes'] = item['mes'].replace(default_user_name + ':', name1 + ':');
item['name'] = name1;
//item['mes'] = item['mes'].replace(default_user_name + ':', name1 + ':');
//item['name'] = name1;
}
}
} else {
@@ -3145,6 +3193,7 @@ async function saveSettings(type) {
world_info: world_info,
world_info_depth: world_info_depth,
world_info_budget: world_info_budget,
world_info_recursive: world_info_recursive,
textgenerationwebui_settings: textgenerationwebui_settings,
swipes: swipes,
horde_settings: horde_settings,
@@ -3159,8 +3208,11 @@ async function saveSettings(type) {
}, null, 4),
beforeSend: function () {
if (type == "change_name") {
//let nameBeforeChange = name1;
name1 = $("#your_name").val();
// console.log('beforeSend name1 = '+name1);
//$(`.mes[ch_name="${nameBeforeChange}"]`).attr('ch_name' === name1);
//console.log('beforeSend name1 = ' + nameBeforeChange);
//console.log('new name: ' + name1);
}
},
cache: false,
@@ -3170,8 +3222,6 @@ async function saveSettings(type) {
success: function (data) {
//online_status = data.result;
if (type == "change_name") {
clearChat();
printMessages();
}
@@ -3764,6 +3814,7 @@ window["SillyTavern"].getContext = function () {
activateSendButtons,
deactivateSendButtons,
saveReply,
registerSlashCommand: registerSlashCommand,
};
};
@@ -4313,7 +4364,11 @@ $(document).ready(function () {
duration: 200,
easing: animation_easing,
});
setTimeout(function () { $("#shadow_popup").css("display", "none"); }, 200);
setTimeout(function () {
$("#shadow_popup").css("display", "none");
$("#dialogue_popup").removeClass('large_dialogue_popup');
}, 200);
// $("#shadow_popup").css("opacity:", 0.0);
if (popup_type == "del_bg") {
delBackground(bg_file_for_del.attr("bgfile"));
@@ -4421,13 +4476,16 @@ $(document).ready(function () {
if (popup_type == 'input') {
dialogueResolve($("#dialogue_popup_input").val());
$("#dialogue_popup_input").val('');
}
else {
dialogueResolve(true);
}
dialogueResolve = null;
}
});
$("#dialogue_popup_cancel").click(function (e) {
$("#shadow_popup").transition({
@@ -4435,7 +4493,11 @@ $(document).ready(function () {
duration: 200,
easing: animation_easing,
});
setTimeout(function () { $("#shadow_popup").css("display", "none"); }, 200);
setTimeout(function () {
$("#shadow_popup").css("display", "none");
$("#dialogue_popup").removeClass('large_dialogue_popup');
}, 200);
//$("#shadow_popup").css("opacity:", 0.0);
popup_type = "";
@@ -4443,6 +4505,7 @@ $(document).ready(function () {
dialogueResolve(false);
dialogueResolve = null;
}
});
$("#add_bg_button").change(function () {
@@ -4647,34 +4710,64 @@ $(document).ready(function () {
$("#renameCharButton").on('click', renameCharacter);
$(document).on("click", ".renameChatButton", async function () {
var old_filenamefull = $(this).closest('.select_chat_block_wrapper').find('.select_chat_block_filename').text();
var old_filename = old_filenamefull.substring(0, old_filenamefull.length - 6);
const old_filenamefull = $(this).closest('.select_chat_block_wrapper').find('.select_chat_block_filename').text();
const old_filename = old_filenamefull.replace('.jsonl', '');
const popupText = `<h3>Enter the new name for the chat:<h3>
<small>!!Using an existing filename will overwrite that file!!<br>
<small>!!Using an existing filename will produce an error!!<br>
This will break the link between bookmark chats.<br>
No need to add '.jsonl' at the end.<br>
</small>`;
let newName = await callPopup(popupText, 'input', old_filename);
const newName = await callPopup(popupText, 'input', old_filename);
if (!newName) {
if (!newName || newName == old_filename) {
console.log('no new name found, aborting');
return;
}
const newMetadata = { main_chat: characters[this_chid].chat };
await saveChat(newName, newMetadata);
await saveChat(); //is this second save needed?
chat_file_for_del = old_filenamefull;
popup_type = 'del_chat';
const body = {
is_group: !!selected_group,
avatar_url: characters[this_chid]?.avatar,
original_file: `${old_filename}.jsonl`,
renamed_file: `${newName}.jsonl`,
}
setTimeout(function () {
callPopup('Confirm Delete of Old File After Rename');
}, 200);
try {
const response = await fetch('/renamechat', {
method: 'POST',
body: JSON.stringify(body),
headers: getRequestHeaders(),
});
if (!response.ok) {
throw new Error('Unsuccessful request.');
}
const data = response.json();
if (data.error) {
throw new Error('Server returned an error.');
}
if (selected_group) {
await renameGroupChat(selected_group, old_filename, newName);
}
else {
if (characters[this_chid].chat == old_filename) {
characters[this_chid].chat = newName;
saveCharacterDebounced();
}
}
reloadCurrentChat();
await delay(250);
$("#option_select_chat").trigger('click');
$("#options").hide();
} catch {
await delay(500);
await callPopup('An error has occurred. Chat was not renamed.', 'text');
}
});
$("#talkativeness_slider").on("input", function () {
@@ -5517,12 +5610,14 @@ $(document).ready(function () {
let thumbURL = $(this).children('img').attr('src');
let charsPath = '/characters/'
let targetAvatarImg = thumbURL.substring(thumbURL.lastIndexOf("=") + 1);
let avatarSrc = charsPath + targetAvatarImg;
if ($(this).parent().attr('is_user') == 'true') { //handle user avatars
console.log(avatarSrc);
if ($(this).parent().parent().attr('is_user') == 'true') { //handle user avatars
$("#zoomed_avatar").attr('src', thumbURL);
} else if ($(this).parent().attr('is_system') == 'true') { //handle system avatars
} else if ($(this).parent().parent().attr('is_system') == 'true') { //handle system avatars
$("#zoomed_avatar").attr('src', thumbURL);
} else if ($(this).parent().attr('is_user') == 'false') { //handle char avatars
} else if ($(this).parent().parent().attr('is_user') == 'false') { //handle char avatars
$("#zoomed_avatar").attr('src', avatarSrc);
}
$('#avatar_zoom_popup').toggle();
@@ -5531,7 +5626,10 @@ $(document).ready(function () {
});
$(document).on('click', '#OpenAllWIEntries', function () {
$("#world_popup_entries_list").children().find('.inline-drawer-header').click()
$("#world_popup_entries_list").children().find('.down').click()
});
$(document).on('click', '#CloseAllWIEntries', function () {
$("#world_popup_entries_list").children().find('.up').click()
});
$(document).keyup(function (e) {
@@ -5570,4 +5668,45 @@ $(document).ready(function () {
streamingProcessor.abortController.abort();
}
});
$(document).on('input', '.range-block-counter div[contenteditable="true"]', function () {
const caretPosition = saveCaretPosition($(this).get(0));
const myText = $(this).text().trim();
$(this).text(myText); // trim line breaks and spaces
const masterSelector = $(this).data('for');
const masterElement = document.getElementById(masterSelector);
if (masterElement == null) {
console.error('Master input element not found for the editable label', masterSelector);
return;
}
const myValue = Number(myText);
if (Number.isNaN(myValue)) {
console.warn('Label input is not a valid number. Resetting the value', myText);
$(masterElement).trigger('input');
restoreCaretPosition($(this).get(0), caretPosition);
return;
}
const masterMin = Number($(masterElement).attr('min'));
const masterMax = Number($(masterElement).attr('max'));
if (myValue < masterMin) {
console.warn('Label input is less than minimum.', myText, '<', masterMin);
restoreCaretPosition($(this).get(0), caretPosition);
return;
}
if (myValue > masterMax) {
console.warn('Label input is more than maximum.', myText, '>', masterMax);
restoreCaretPosition($(this).get(0), caretPosition);
return;
}
console.log('Label value OK, setting to the master input control', myText);
$(masterElement).val(myValue).trigger('input');
restoreCaretPosition($(this).get(0), caretPosition);
});
})

2
public/scripts/RossAscends-mods.js
View File

@@ -698,7 +698,7 @@ $("document").ready(function () {
function isInputElementInFocus() {
//return $(document.activeElement).is(":input");
var focused = $(':focus');
if (focused.is('input') || focused.is('textarea')) {
if (focused.is('input') || focused.is('textarea') || focused.attr('contenteditable') == 'true') {
if (focused.attr('id') === 'send_textarea') {
return false;
}

1
public/scripts/extensions.js
View File

@@ -25,6 +25,7 @@ const extension_settings = {
expressions: {},
dice: {},
tts: {},
sd: {},
};
let modules = [];

1
public/scripts/extensions/expressions/index.js
View File

@@ -381,4 +381,5 @@ function onClickExpressionImage() {
addExpressionImage();
addSettings();
setInterval(moduleWorkerWrapper, UPDATE_INTERVAL);
moduleWorkerWrapper();
})();

340
public/scripts/extensions/stable-diffusion/index.js Normal file
View File

@@ -0,0 +1,340 @@
import {
substituteParams,
saveSettingsDebounced,
systemUserName,
hideSwipeButtons,
showSwipeButtons
} from "../../../script.js";
import { getApiUrl, getContext, extension_settings, defaultRequestArgs } from "../../extensions.js";
import { stringFormat } from "../../utils.js";
// Wraps a string into monospace font-face span
const m = x => `<span class="monospace">${x}</span>`;
// Joins an array of strings with ' / '
const j = a => a.join(' / ');
// Wraps a string into paragraph block
const p = a => `<p>${a}</p>`
const postHeaders = {
'Content-Type': 'application/json',
'Bypass-Tunnel-Reminder': 'bypass',
};
const generationMode = {
CHARACTER: 0,
USER: 1,
SCENARIO: 2,
FREE: 3,
}
const triggerWords = {
[generationMode.CHARACTER]: ['yourself', 'you', 'bot', 'AI', 'character'],
[generationMode.USER]: ['me', 'user', 'myself'],
[generationMode.SCENARIO]: ['scenario', 'world', 'surroundings', 'scenery'],
}
const quietPrompts = {
[generationMode.CHARACTER]: "[Please provide a detailed description of {{char}}'s appearance and attributes in the form of a comma-delimited list of keywords and phrases. Ignore the rest of the story when crafting this description. Do not count this as part of your char responses, and do not attempt to continue the story.]",
[generationMode.USER]: "[Please provide a detailed description of {{user}}'s appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. Ignore the rest of the story when crafting this description. Do not count this as part of your char responses, and do not attempt to continue the story.]",
[generationMode.SCENARIO]: "[Provide a detailed description for all of the following: {{char}}'s appearance, {{char}}'s surroundings, a brief recap of recent events in the story.]",
[generationMode.FREE]: "[Please provide a detailed and vivid description of {0}]",
}
const helpString = [
`${m('what')} – requests an SD generation. Supported "what" arguments:`,
'<ul>',
`<li>${m(j(triggerWords[generationMode.CHARACTER]))} – AI character image</li>`,
`<li>${m(j(triggerWords[generationMode.USER]))} – user character image</li>`,
`<li>${m(j(triggerWords[generationMode.SCENARIO]))} – world scenario image</li>`,
'</ul>',
`Anything else would trigger a "free mode" with AI describing whatever you prompted.`,
].join('<br>');
const defaultSettings = {
// CFG Scale
scale_min: 1,
scale_max: 30,
scale_step: 0.5,
scale: 7,
// Sampler steps
steps_min: 1,
steps_max: 150,
steps_step: 1,
steps: 20,
// Image dimensions (Width & Height)
dimension_min: 64,
dimension_max: 2048,
dimension_step: 64,
width: 512,
height: 512,
prompt_prefix: 'best quality, absurdres, masterpiece, detailed, intricate, colorful,',
negative_prompt: 'lowres, bad anatomy, bad hands, text, error, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry',
sampler: 'DDIM',
model: '',
}
async function loadSettings() {
if (Object.keys(extension_settings.sd).length === 0) {
Object.assign(extension_settings.sd, defaultSettings);
}
$('#sd_scale').val(extension_settings.sd.scale).trigger('input');
$('#sd_steps').val(extension_settings.sd.steps).trigger('input');
$('#sd_prompt_prefix').val(extension_settings.sd.prompt_prefix).trigger('input');
$('#sd_negative_prompt').val(extension_settings.sd.negative_prompt).trigger('input');
$('#sd_width').val(extension_settings.sd.width).trigger('input');
$('#sd_height').val(extension_settings.sd.height).trigger('input');
await Promise.all([loadSamplers(), loadModels()]);
}
function onScaleInput() {
extension_settings.sd.scale = Number($('#sd_scale').val());
$('#sd_scale_value').text(extension_settings.sd.scale.toFixed(1));
saveSettingsDebounced();
}
function onStepsInput() {
extension_settings.sd.steps = Number($('#sd_steps').val());
$('#sd_steps_value').text(extension_settings.sd.steps);
saveSettingsDebounced();
}
function onPromptPrefixInput() {
extension_settings.sd.prompt_prefix = $('#sd_prompt_prefix').val();
saveSettingsDebounced();
}
function onNegativePromptInput() {
extension_settings.sd.negative_prompt = $('#sd_negative_prompt').val();
saveSettingsDebounced();
}
function onSamplerChange() {
extension_settings.sd.sampler = $('#sd_sampler').find(':selected').val();
saveSettingsDebounced();
}
function onWidthInput() {
extension_settings.sd.width = Number($('#sd_width').val());
$('#sd_width_value').text(extension_settings.sd.width);
saveSettingsDebounced();
}
function onHeightInput() {
extension_settings.sd.height = Number($('#sd_height').val());
$('#sd_height_value').text(extension_settings.sd.height);
saveSettingsDebounced();
}
async function onModelChange() {
extension_settings.sd.model = $('#sd_model').find(':selected').val();
saveSettingsDebounced();
const url = new URL(getApiUrl());
url.pathname = '/api/image/model';
const getCurrentModelResult = await fetch(url, {
method: 'POST',
headers: postHeaders,
body: JSON.stringify({ model: extension_settings.sd.model }),
});
if (getCurrentModelResult.ok) {
console.log('Model successfully updated on SD remote.');
}
}
async function loadSamplers() {
const url = new URL(getApiUrl());
url.pathname = '/api/image/samplers';
const result = await fetch(url, defaultRequestArgs);
if (result.ok) {
const data = await result.json();
const samplers = data.samplers;
for (const sampler of samplers) {
const option = document.createElement('option');
option.innerText = sampler;
option.value = sampler;
option.selected = sampler === extension_settings.sd.sampler;
$('#sd_sampler').append(option);
}
}
}
async function loadModels() {
const url = new URL(getApiUrl());
url.pathname = '/api/image/model';
const getCurrentModelResult = await fetch(url, defaultRequestArgs);
if (getCurrentModelResult.ok) {
const data = await getCurrentModelResult.json();
extension_settings.sd.model = data.model;
}
url.pathname = '/api/image/models';
const getModelsResult = await fetch(url, defaultRequestArgs);
if (getModelsResult.ok) {
const data = await getModelsResult.json();
const models = data.models;
for (const model of models) {
const option = document.createElement('option');
option.innerText = model;
option.value = model;
option.selected = model === extension_settings.sd.model;
$('#sd_model').append(option);
}
}
}
function getGenerationType(prompt) {
for (const [key, values] of Object.entries(triggerWords)) {
for (const value of values) {
if (value.toLowerCase() === prompt.toLowerCase().trim()) {
return key;
}
}
}
return generationMode.FREE;
}
function getQuietPrompt(mode, trigger) {
return substituteParams(stringFormat(quietPrompts[mode], trigger));
}
function processReply(str) {
str = str.replaceAll('"', '')
str = str.replaceAll('“', '')
str = str.replaceAll('\n', ' ')
str = str.trim();
return str;
}
async function generatePicture(_, trigger) {
if (!trigger || trigger.trim().length === 0) {
console.log('Trigger word empty, aborting');
return;
}
trigger = trigger.trim();
const generationMode = getGenerationType(trigger);
console.log('Generation mode', generationMode, 'triggered with', trigger);
const quiet_prompt = getQuietPrompt(generationMode, trigger);
const context = getContext();
try {
const prompt = processReply(await new Promise(
async function promptPromise(resolve, reject) {
try {
await context.generate('quiet', { resolve, reject, quiet_prompt });
}
catch {
reject();
}
}));
context.deactivateSendButtons();
hideSwipeButtons();
const url = new URL(getApiUrl());
url.pathname = '/api/image';
const result = await fetch(url, {
method: 'POST',
headers: postHeaders,
body: JSON.stringify({
prompt: prompt,
sampler: extension_settings.sd.sampler,
steps: extension_settings.sd.steps,
scale: extension_settings.sd.scale,
width: extension_settings.sd.width,
height: extension_settings.sd.height,
prompt_prefix: extension_settings.sd.prompt_prefix,
negative_prompt: extension_settings.sd.negative_prompt,
}),
});
if (result.ok) {
const data = await result.json();
const base64Image = `data:image/jpeg;base64,${data.image}`;
sendMessage(prompt, base64Image);
}
} catch (err) {
console.error(err);
throw new Error('SD prompt text generation failed.')
}
finally {
context.activateSendButtons();
showSwipeButtons();
}
}
async function sendMessage(prompt, image) {
const context = getContext();
const messageText = `[${context.name2} sends a picture that contains: ${prompt}]`;
const message = {
name: context.groupId ? systemUserName : context.name2,
is_system: context.groupId ? true : false,
is_user: false,
is_name: true,
send_date: Date.now(),
mes: context.groupId ? p(messageText) : messageText,
extra: {
image: image,
title: prompt,
},
};
context.chat.push(message);
context.addOneMessage(message);
context.saveChat();
}
jQuery(async () => {
getContext().registerSlashCommand('sd', generatePicture, ['picture', 'image'], helpString, true, true);
const settingsHtml = `
<div class="sd_settings">
<div class="inline-drawer">
<div class="inline-drawer-toggle inline-drawer-header">
<b>Stable Diffusion</b>
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
</div>
<div class="inline-drawer-content">
<small><i>Use slash commands to generate images. Type <span class="monospace">/help</span> in chat for more details</i></small>
<label for="sd_scale">CFG Scale (<span id="sd_scale_value"></span>)</label>
<input id="sd_scale" type="range" min="${defaultSettings.scale_min}" max="${defaultSettings.scale_max}" step="${defaultSettings.scale_step}" value="${defaultSettings.scale}" />
<label for="sd_steps">Sampling steps (<span id="sd_steps_value"></span>)</label>
<input id="sd_steps" type="range" min="${defaultSettings.steps_min}" max="${defaultSettings.steps_max}" step="${defaultSettings.steps_step}" value="${defaultSettings.steps}" />
<label for="sd_width">Width (<span id="sd_width_value"></span>)</label>
<input id="sd_width" type="range" max="${defaultSettings.dimension_max}" min="${defaultSettings.dimension_min}" step="${defaultSettings.dimension_step}" value="${defaultSettings.width}" />
<label for="sd_height">Height (<span id="sd_height_value"></span>)</label>
<input id="sd_height" type="range" max="${defaultSettings.dimension_max}" min="${defaultSettings.dimension_min}" step="${defaultSettings.dimension_step}" value="${defaultSettings.height}" />
<label for="sd_model">Stable Diffusion model</label>
<select id="sd_model"></select>
<label for="sd_sampler">Sampling method</label>
<select id="sd_sampler"></select>
<label for="sd_prompt_prefix">Generated prompt prefix</label>
<textarea id="sd_prompt_prefix" class="text_pole textarea_compact" rows="1"></textarea>
<label for="sd_negative_prompt">Negative prompt</label>
<textarea id="sd_negative_prompt" class="text_pole textarea_compact" rows="2"></textarea>
</div>
</div>`;
$('#extensions_settings').append(settingsHtml);
$('#sd_scale').on('input', onScaleInput);
$('#sd_steps').on('input', onStepsInput);
$('#sd_model').on('change', onModelChange);
$('#sd_sampler').on('change', onSamplerChange);
$('#sd_prompt_prefix').on('input', onPromptPrefixInput);
$('#sd_negative_prompt').on('input', onNegativePromptInput);
$('#sd_width').on('input', onWidthInput);
$('#sd_height').on('input', onHeightInput);
await loadSettings();
});

13
public/scripts/extensions/stable-diffusion/manifest.json Normal file
View File

@@ -0,0 +1,13 @@
{
"display_name": "Stable Diffusion",
"loading_order": 10,
"requires": [
"sd"
],
"optional": [],
"js": "index.js",
"css": "style.css",
"author": "Cohee#1207",
"version": "1.0.0",
"homePage": "https://github.com/Cohee1207/SillyTavern"
}

3
public/scripts/extensions/stable-diffusion/style.css Normal file
View File

@@ -0,0 +1,3 @@
.sd_settings label {
display: block;
}

16
public/scripts/extensions/tts/index.js
View File

@@ -3,6 +3,7 @@ import { extension_settings, getContext } from '../../extensions.js'
import { getStringHash } from '../../utils.js'
import { ElevenLabsTtsProvider } from './elevenlabs.js'
import { SileroTtsProvider } from './silerotts.js'
import { SystemTtsProvider } from './system.js'
const UPDATE_INTERVAL = 1000
@@ -17,7 +18,8 @@ let lastMessageHash = null
let ttsProviders = {
ElevenLabs: ElevenLabsTtsProvider,
Silero: SileroTtsProvider
Silero: SileroTtsProvider,
System: SystemTtsProvider,
}
let ttsProvider
let ttsProviderName
@@ -112,7 +114,13 @@ async function playAudioData(audioBlob) {
window['tts_preview'] = function (id) {
const audio = document.getElementById(id)
audio.play()
if (!audio.hidden) {
audio.play()
}
else {
ttsProvider.previewTtsVoice(id)
}
}
async function onTtsVoicesClick() {
@@ -122,8 +130,8 @@ async function onTtsVoicesClick() {
const voiceIds = await ttsProvider.fetchTtsVoiceIds()
for (const voice of voiceIds) {
popupText += `<div class="voice_preview"><b>${voice.name}</b> <i onclick="tts_preview('${voice.voice_id}')" class="fa-solid fa-play"></i></div>`
popupText += `<audio id="${voice.voice_id}" src="${voice.preview_url}"></audio>`
popupText += `<div class="voice_preview"><span class="voice_lang">${voice.lang || ''}</span> <b class="voice_name">${voice.name}</b> <i onclick="tts_preview('${voice.voice_id}')" class="fa-solid fa-play"></i></div>`
popupText += `<audio id="${voice.voice_id}" src="${voice.preview_url}" hidden="${!!voice.preview_url}"></audio>`
}
} catch {
popupText = 'Could not load voices list. Check your API key.'

15
public/scripts/extensions/tts/style.css
View File

@@ -25,4 +25,19 @@
display: flex;
justify-content: space-between;
align-items: center;
gap: 0.5rem;
}
.voice_preview .voice_name {
text-align: left;
flex: 1;
}
.voice_preview .voice_lang {
width: 4rem;
text-align: left;
}
.voice_preview .fa-play {
cursor: pointer;
}

143
public/scripts/extensions/tts/system.js Normal file
View File

@@ -0,0 +1,143 @@
export { SystemTtsProvider }
class SystemTtsProvider {
//########//
// Config //
//########//
previewStrings = {
'en-US': 'The quick brown fox jumps over the lazy dog',
'en-GB': 'Sphinx of black quartz, judge my vow',
'fr-FR': 'Portez ce vieux whisky au juge blond qui fume',
'de-DE': 'Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich',
'it-IT': "Pranzo d'acqua fa volti sghembi",
'es-ES': 'Quiere la boca exhausta vid, kiwi, piña y fugaz jamón',
'es-MX': 'Fabio me exige, sin tapujos, que añada cerveza al whisky',
'ru-RU': 'В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!',
'pt-BR': 'Vejo xá gritando que fez show sem playback.',
'pt-PR': 'Todo pajé vulgar faz boquinha sexy com kiwi.',
'uk-UA': "Фабрикуймо гідність, лящім їжею, ґав хапаймо, з'єднавці чаш!",
}
fallbackPreview = 'Neque porro quisquam est qui dolorem ipsum quia dolor sit amet'
settings
voices = []
defaultSettings = {
voiceMap: {},
rate: 1,
pitch: 1,
}
get settingsHtml() {
if (!window.speechSynthesis) {
return "Your browser or operating system doesn't support speech synthesis";
}
return `<p>Uses the voices provided by your operating system</p>
<label for="system_tts_rate">Rate: <span id="system_tts_rate_output"></span></label>
<input id="system_tts_rate" type="range" value="${this.defaultSettings.rate}" min="0.5" max="2" step="0.1" />
<label for="system_tts_pitch">Pitch: <span id="system_tts_pitch_output"></span></label>
<input id="system_tts_pitch" type="range" value="${this.defaultSettings.pitch}" min="0" max="2" step="0.1" />`;
}
onSettingsChange() {
this.settings.rate = Number($('#system_tts_rate').val());
this.settings.pitch = Number($('#system_tts_pitch').val());
$('#system_tts_pitch_output').text(this.settings.pitch);
$('#system_tts_rate_output').text(this.settings.rate);
console.log('Save changes');
}
loadSettings(settings) {
// Populate Provider UI given input settings
if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings");
}
// Only accept keys defined in defaultSettings
this.settings = this.defaultSettings;
for (const key in settings) {
if (key in this.settings) {
this.settings[key] = settings[key];
} else {
throw `Invalid setting passed to TTS Provider: ${key}`;
}
}
$('#system_tts_rate').val(this.settings.rate || this.defaultSettings.rate);
$('#system_tts_pitch').val(this.settings.pitch || this.defaultSettings.pitch);
$('#system_tts_pitch_output').text(this.settings.pitch);
$('#system_tts_rate_output').text(this.settings.rate);
console.info("Settings loaded");
}
async onApplyClick() {
return
}
//#################//
// TTS Interfaces //
//#################//
fetchTtsVoiceIds() {
if (!window.speechSynthesis) {
return [];
}
return speechSynthesis
.getVoices()
.sort((a, b) => a.lang.localeCompare(b.lang) || a.name.localeCompare(b.name))
.map(x => ({ name: x.name, voice_id: x.voiceURI, preview_url: '', lang: x.lang }));
}
previewTtsVoice(voiceId) {
const voice = speechSynthesis.getVoices().find(x => x.voiceURI === voiceId);
if (!voice) {
throw `TTS Voice name ${voiceName} not found`
}
speechSynthesis.cancel();
const text = this.previewStrings[voice.lang] ?? this.fallbackPreview;
const utterance = new SpeechSynthesisUtterance(text);
utterance.voice = voice;
utterance.rate = 1;
utterance.pitch = 1;
speechSynthesis.speak(utterance);
}
async getVoice(voiceName) {
if (!window.speechSynthesis) {
return { voice_id: null }
}
const voices = window.speechSynthesis.getVoices();
const match = voices.find(x => x.name == voiceName);
if (!match) {
throw `TTS Voice name ${voiceName} not found`
}
return { voice_id: match.voiceURI, name: match.name };
}
async generateTts(text, voiceId) {
if (!window.speechSynthesis) {
throw 'Speech synthesis API is not supported';
}
const silence = await fetch('/sounds/silence.mp3');
return new Promise((resolve, reject) => {
const voices = speechSynthesis.getVoices();
const voice = voices.find(x => x.voiceURI === voiceId);
const utterance = new SpeechSynthesisUtterance(text);
utterance.voice = voice;
utterance.rate = this.settings.rate || 1;
utterance.pitch = this.settings.pitch || 1;
utterance.onend = () => resolve(silence);
utterance.onerror = () => reject();
speechSynthesis.speak(utterance);
});
}
}

76
public/scripts/group-chats.js
View File

@@ -375,7 +375,7 @@ function getGroupAvatar(group) {
}
async function generateGroupWrapper(by_auto_mode, type = null) {
async function generateGroupWrapper(by_auto_mode, type = null, force_chid = null, params = {}) {
if (online_status === "no_connection") {
is_group_generating = false;
setSendButtonState(false);
@@ -423,6 +423,7 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
let lastMessageText = lastMessage.mes;
let activationText = "";
let isUserInput = false;
let isQuietGenDone = false;
if (userInput && userInput.length && !by_auto_mode) {
isUserInput = true;
@@ -437,7 +438,27 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
const activationStrategy = Number(group.activation_strategy ?? group_activation_strategy.NATURAL);
let activatedMembers = [];
if (type === "swipe") {
if (typeof force_chid == 'number') {
activatedMembers = [force_chid];
} else if (type === "quiet") {
activatedMembers = activateSwipe(group.members);
if (activatedMembers.length === 0) {
activatedMembers = activateListOrder(group.members.slice(0, 1));
}
const resolveOriginal = params.resolve;
const rejectOriginal = params.reject;
params.resolve = function() {
isQuietGenDone = true;
resolveOriginal.apply(this, arguments);
};
params.reject = function() {
isQuietGenDone = true;
rejectOriginal.apply(this, arguments);
}
}
else if (type === "swipe") {
activatedMembers = activateSwipe(group.members);
if (activatedMembers.length === 0) {
@@ -458,11 +479,11 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
// now the real generation begins: cycle through every character
for (const chId of activatedMembers) {
const generateType = type == "swipe" || type == "impersonate" ? type : "group_chat";
const generateType = type == "swipe" || type == "impersonate" || type == "quiet" ? type : "group_chat";
setCharacterId(chId);
setCharacterName(characters[chId].name)
await Generate(generateType, { automatic_trigger: by_auto_mode });
await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
if (type !== "swipe" && type !== "impersonate") {
// update indicator and scroll down
@@ -517,6 +538,13 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
}
}
}
else if (type === 'quiet') {
if (isQuietGenDone) {
break;
} else {
await delay(100);
}
}
else {
messagesBefore++;
break;
@@ -854,6 +882,10 @@ function select_group_chats(groupId, skipAnimation) {
template.attr("chid", characters.indexOf(character));
template.addClass(character.fav == 'true' ? 'is_fav' : '');
if (!group) {
template.find('[data-action="speak"]').hide();
}
if (
group &&
Array.isArray(group.members) &&
@@ -931,22 +963,29 @@ function select_group_chats(groupId, skipAnimation) {
const action = $(this).data('action');
const member = $(this).closest('.group_member');
if (action == 'remove') {
if (action === 'remove') {
await modifyGroupMember(groupId, member, true);
}
if (action == 'add') {
if (action === 'add') {
await modifyGroupMember(groupId, member, false);
}
if (action == 'up' || action == 'down') {
if (action === 'up' || action === 'down') {
await reorderGroupMember(groupId, member, action);
}
if (action == 'view') {
if (action === 'view') {
openCharacterDefinition(member);
}
if (action === 'speak') {
const chid = Number(member.attr('chid'));
if (Number.isInteger(chid)) {
generateGroupWrapper(false, null, chid);
}
}
sortCharactersList("#rm_group_add_members .group_member");
});
}
@@ -1159,6 +1198,25 @@ export async function openGroupChat(groupId, chatId) {
await getGroupChat(groupId);
}
export async function renameGroupChat(groupId, oldChatId, newChatId) {
const group = groups.find(x => x.id === groupId);
if (!group || !group.chats.includes(oldChatId)) {
return;
}
if (group.chat_id === oldChatId) {
group.chat_id = newChatId;
}
group.chats.splice(group.chats.indexOf(oldChatId), 1);
group.chats.push(newChatId);
group.past_metadata[newChatId] = (group.past_metadata[oldChatId] || {});
delete group.past_metadata[oldChatId];
await editGroup(groupId, true, true);
}
export async function deleteGroupChat(groupId, chatId) {
const group = groups.find(x => x.id === groupId);
@@ -1206,7 +1264,7 @@ export async function saveGroupBookmarkChat(groupId, name, metadata) {
});
}
$(document).ready(() => {
jQuery(() => {
$(document).on("click", ".group_select", selectGroup);
$("#rm_group_filter").on("input", filterGroupMembers);
$("#group_fav_filter").on("click", toggleFilterByFavorites);

13
public/scripts/openai.js
View File

@@ -144,7 +144,7 @@ function setOpenAIOnlineStatus(value) {
is_get_status_openai = value;
}
function setOpenAIMessages(chat) {
function setOpenAIMessages(chat, quietPrompt) {
let j = 0;
// clean openai msgs
openai_msgs = [];
@@ -176,6 +176,10 @@ function setOpenAIMessages(chat) {
openai_msgs.splice(i, 0, { "role": 'system', 'content': anchor.trim() })
}
}
if (quietPrompt) {
openai_msgs.splice(0, 0, { role: 'system', content: quietPrompt });
}
}
function setOpenAIMessageExamples(mesExamplesArray) {
@@ -481,7 +485,7 @@ function checkQuotaError(data) {
}
}
async function sendOpenAIRequest(openai_msgs_tosend, signal) {
async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
// Provide default abort signal
if (!signal) {
signal = new AbortController().signal;
@@ -492,6 +496,7 @@ async function sendOpenAIRequest(openai_msgs_tosend, signal) {
}
let logit_bias = {};
const stream = type !== 'quiet' && oai_settings.stream_openai;
if (oai_settings.bias_preset_selected
&& Array.isArray(oai_settings.bias_presets[oai_settings.bias_preset_selected])
@@ -507,7 +512,7 @@ async function sendOpenAIRequest(openai_msgs_tosend, signal) {
"frequency_penalty": parseFloat(oai_settings.freq_pen_openai),
"presence_penalty": parseFloat(oai_settings.pres_pen_openai),
"max_tokens": oai_settings.openai_max_tokens,
"stream": oai_settings.stream_openai,
"stream": stream,
"reverse_proxy": oai_settings.reverse_proxy,
"logit_bias": logit_bias,
};
@@ -520,7 +525,7 @@ async function sendOpenAIRequest(openai_msgs_tosend, signal) {
signal: signal,
});
if (oai_settings.stream_openai) {
if (stream) {
return async function* streamData() {
const decoder = new TextDecoder();
const reader = response.body.getReader();

7
public/scripts/poe.js
View File

@@ -32,7 +32,7 @@ Your replies will never be repetitive, nor convoluted.
You will always remember that your character is not an AI, but a fictional living person.
You will ask in OOC any doubt about the context that you may have when generating your reply in the ERP.
Please reply in confirmation of your understanding and acceptance of these terms saying "${DEFAULT_JAILBREAK_RESPONSE}", and wait for me to specify the the context of the scene, and the characteristics, background and personality of your character in a second message`;
const DEFAULT_CHARACTER_NUDGE_MESSAGE = "[Write the next reply as {{char}}. Don't talk as {{user}}]";
const DEFAULT_CHARACTER_NUDGE_MESSAGE = "[Your next response shall only be written from the point of view of {{char}}.]";
const DEFAULT_IMPERSONATION_PROMPT = "[Write 1 reply only in internet RP style from the point of view of {{user}}, using the chat history so far as a guideline for the writing style of {{user}}. Don't write as {{char}} or system.]";
const poe_settings = {
@@ -115,7 +115,8 @@ async function generatePoe(type, finalPrompt, signal) {
console.log('Could not jailbreak the bot');
}
const isImpersonate = type == 'impersonate';
const isImpersonate = type === 'impersonate';
const isQuiet = type === 'quiet';
if (poe_settings.character_nudge && !isImpersonate) {
let characterNudge = '\n' + substituteParams(poe_settings.character_nudge_message);
@@ -136,7 +137,7 @@ async function generatePoe(type, finalPrompt, signal) {
finalPrompt = sentences.join('');
}
const reply = await sendMessage(finalPrompt, true, signal);
const reply = await sendMessage(finalPrompt, !isQuiet, signal);
got_reply = true;
return reply;
}

39
public/scripts/tags.js
View File

@@ -153,6 +153,7 @@ function createNewTag(tagName) {
const tag = {
id: random_id(),
name: tagName,
color: '',
};
tags.push(tag);
return tag;
@@ -165,6 +166,10 @@ function appendTagToList(listElement, tag, { removable, editable, selectable })
let tagElement = $('#tag_template .tag').clone();
tagElement.attr('id', tag.id);
tagElement.css('color', 'var(--SmartThemeBodyColor)');
tagElement.css('background-color', tag.color);
tagElement.find('.tag_name').text(tag.name);
const removeButton = tagElement.find(".tag_remove");
removable ? removeButton.show() : removeButton.hide();
@@ -287,21 +292,37 @@ function createTagInput(inputSelector, listSelector) {
}
function onViewTagsListClick() {
$('#dialogue_popup').addClass('large_dialogue_popup');
const list = document.createElement('div');
const everything = Object.values(tag_map).flat();
$(list).append('<h3>Tags</h3><i>Click on the tag name to edit it.</i>')
$(list).append('<h3>Tags</h3><i>Click on the tag name to edit it.</i><br>');
$(list).append('<i>Click on color box to assign new color.</i><br><br>');
for (const tag of tags) {
const count = everything.filter(x => x == tag.id).length;
const template = $('#tag_view_template .tag_view_item').clone();
template.attr('id', tag.id);
template.find('.tag_view_counter_value').text(count);
template.find('.tag_view_name').text(tag.name);
template.find('.tag_view_name').addClass('tag');
template.find('.tag_view_name').css('background-color', tag.color);
const colorPickerId = tag.name + "-tag-color";
template.find('.tagColorPickerHolder').html(
`<toolcool-color-picker id="${colorPickerId}" color="${tag.color}" class="tag-color"></toolcool-color-picker>`
);
template.find('.tag-color').attr('id', colorPickerId);
list.appendChild(template.get(0));
}
setTimeout(function () {
document.querySelector(`#${colorPickerId}`).addEventListener('change', (evt) => {
onTagColorize(evt);
});
}, 100);
$(colorPickerId).color = tag.color;
}
callPopup(list.outerHTML, 'text');
}
@@ -330,6 +351,18 @@ function onTagRenameInput() {
saveSettingsDebounced();
}
function onTagColorize(evt) {
console.log(evt);
const id = $(evt.target).closest('.tag_view_item').attr('id');
const newColor = evt.detail.rgba;
$(evt.target).parent().parent().find('.tag_view_name').css('background-color', newColor);
$(`.tag[id="${id}"]`).css('background-color', newColor);
const tag = tags.find(x => x.id === id);
tag.color = newColor;
console.log(tag);
saveSettingsDebounced();
}
$(document).ready(() => {
createTagInput('#tagInput', '#tagList');
createTagInput('#groupTagInput', '#groupTagList');

51
public/scripts/utils.js
View File

@@ -111,3 +111,54 @@ export function stringFormat(format) {
;
});
};
// Save the caret position in a contenteditable element
export function saveCaretPosition(element) {
// Get the current selection
const selection = window.getSelection();
// If the selection is empty, return null
if (selection.rangeCount === 0) {
return null;
}
// Get the range of the current selection
const range = selection.getRangeAt(0);
// If the range is not within the specified element, return null
if (!element.contains(range.commonAncestorContainer)) {
return null;
}
// Return an object with the start and end offsets of the range
const position = {
start: range.startOffset,
end: range.endOffset
};
console.log('Caret saved', position);
return position;
}
// Restore the caret position in a contenteditable element
export function restoreCaretPosition(element, position) {
// If the position is null, do nothing
if (!position) {
return;
}
console.log('Caret restored', position);
// Create a new range object
const range = new Range();
// Set the start and end positions of the range within the element
range.setStart(element.childNodes[0], position.start);
range.setEnd(element.childNodes[0], position.end);
// Create a new selection object and set the range
const selection = window.getSelection();
selection.removeAllRanges();
selection.addRange(range);
}

36
public/scripts/world-info.js
View File

@@ -6,6 +6,7 @@ export {
world_info_data,
world_info_budget,
world_info_depth,
world_info_recursive,
world_names,
imported_world_name,
checkWorldInfo,
@@ -21,6 +22,7 @@ let world_info_data = null;
let world_info_depth = 2;
let world_info_budget = 128;
let is_world_edit_open = false;
let world_info_recursive = false;
let imported_world_name = "";
const saveWorldDebounced = debounce(async () => await _save(), 500);
const saveSettingsDebounced = debounce(() => saveSettings(), 500);
@@ -47,13 +49,17 @@ function setWorldInfoSettings(settings, data) {
world_info_depth = Number(settings.world_info_depth);
if (settings.world_info_budget !== undefined)
world_info_budget = Number(settings.world_info_budget);
if (settings.world_info_recursive !== undefined)
world_info_recursive = Boolean(settings.world_info_recursive);
$("#world_info_depth_counter").html(`${world_info_depth} Messages`);
$("#world_info_depth_counter").text(world_info_depth);
$("#world_info_depth").val(world_info_depth);
$("#world_info_budget_counter").html(`${world_info_budget} Tokens`);
$("#world_info_budget_counter").text(world_info_budget);
$("#world_info_budget").val(world_info_budget);
$("#world_info_recursive").prop('checked', world_info_recursive);
world_names = data.world_names?.length ? data.world_names : [];
if (settings.world_info != undefined) {
@@ -155,6 +161,7 @@ function appendWorldEntry(entry) {
// Prevent closing the drawer on clicking the input
event.stopPropagation();
});
keyInput.on("input", function () {
const uid = $(this).data("uid");
const value = $(this).val();
@@ -166,6 +173,7 @@ function appendWorldEntry(entry) {
saveWorldInfo();
});
keyInput.val(entry.key.join(",")).trigger("input");
initScrollHeight(keyInput);
// keysecondary
const keySecondaryInput = template.find('textarea[name="keysecondary"]');
@@ -181,6 +189,7 @@ function appendWorldEntry(entry) {
saveWorldInfo();
});
keySecondaryInput.val(entry.keysecondary.join(",")).trigger("input");
initScrollHeight(keySecondaryInput);
// comment
const commentInput = template.find('textarea[name="comment"]');
@@ -192,6 +201,7 @@ function appendWorldEntry(entry) {
saveWorldInfo();
});
commentInput.val(entry.comment).trigger("input");
//initScrollHeight(commentInput);
// content
const contentInput = template.find('textarea[name="content"]');
@@ -210,6 +220,7 @@ function appendWorldEntry(entry) {
.html(numberOfTokens);
});
contentInput.val(entry.content).trigger("input");
//initScrollHeight(contentInput);
// selective
const selectiveInput = template.find('input[name="selective"]');
@@ -304,12 +315,20 @@ function appendWorldEntry(entry) {
});
template.appendTo("#world_popup_entries_list");
return template;
}
async function resetScrollHeight(element) {
element.style.height = '';
element.style.height = (element.scrollHeight) + 3 + 'px';
}
async function initScrollHeight(element) {
await delay(1);
const height = Number($(element).prop("scrollHeight")) + 1;
const height = Number($(element).prop("scrollHeight") + 3);
console.log(height);
//console.log(element.style.height);
$(element).css("height", "");
$(element).css("height", `${height}px`);
}
@@ -511,7 +530,7 @@ function checkWorldInfo(chat) {
}
}
needsToScan = activatedNow.size > 0;
needsToScan = world_info_recursive && activatedNow.size > 0;
const newEntries = [...activatedNow]
.map((x) => world_info_data.entries[x])
.sort((a, b) => sortedEntries.indexOf(a) - sortedEntries.indexOf(b));
@@ -652,13 +671,18 @@ $(document).ready(() => {
$(document).on("input", "#world_info_depth", function () {
world_info_depth = Number($(this).val());
$("#world_info_depth_counter").html(`${$(this).val()} Messages`);
$("#world_info_depth_counter").text($(this).val());
saveSettingsDebounced();
});
$(document).on("input", "#world_info_budget", function () {
world_info_budget = Number($(this).val());
$("#world_info_budget_counter").html(`${$(this).val()} Tokens`);
$("#world_info_budget_counter").text($(this).val());
saveSettingsDebounced();
});
$(document).on("input", "#world_info_recursive", function () {
world_info_recursive = !!$(this).prop('checked');
saveSettingsDebounced();
})
});

BIN
public/sounds/silence.mp3 Normal file
View File

Binary file not shown.

127
public/style.css
View File

@@ -174,8 +174,8 @@ code {
word-wrap: break-word;
border: 1px solid var(--white30a);
border-radius: 5px;
background-color: var(--black70a);
padding: 0 3px;
max-width: calc(100svw - 95px);
line-height: var(--mainFontSize);
}
@@ -546,6 +546,12 @@ code {
flex-direction: column;
}
.range-block-range-and-counter {
flex: 1;
flex-wrap: nowrap;
display: flex;
}
.change_name {
display: flex;
flex-direction: row;
@@ -623,7 +629,8 @@ body.big-avatars .avatar img {
padding-top: 5px;
padding-bottom: 5px;
max-width: 100%;
word-wrap: break-word;
/* word-wrap: break-word; */
overflow-wrap: anywhere;
/* animation: typing 3.5s steps(40, end), blink-caret .75s step-end infinite; */
}
@@ -685,9 +692,15 @@ select {
flex: 1;
}
#send_textarea::placeholder,
.text_pole::placeholder {
color: var(--SmartThemeBodyColor);
color: rgb(92, 90, 90);
}
#send_textarea::placeholder {
color: var(--SmartThemeEmColor);
text-align: center;
white-space: nowrap;
}
#rm_ch_create_block textarea {
@@ -1355,6 +1368,7 @@ input[type=search]:focus::-webkit-search-cancel-button {
#dialogue_popup {
width: 500px;
max-width: 90svw;
position: absolute;
z-index: 9999;
margin-left: auto;
@@ -1376,6 +1390,16 @@ input[type=search]:focus::-webkit-search-cancel-button {
overflow-y: hidden;
}
.large_dialogue_popup {
height: 90svh;
max-width: 90svw;
}
.height100pSpaceEvenly {
align-content: space-evenly;
height: 100%;
}
#dialogue_popup_holder {
display: flex;
flex-direction: column;
@@ -1929,16 +1953,39 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):not(#lm_button
}
.range-block-counter {
/* width: max-content; */
margin-left: 5px;
margin-right: 15px;
font-size: calc(var(--mainFontSize) * 0.95);
color: var(--SmartThemeBodyColor);
flex: 1;
display: flex;
}
.toggle-description {
width: max-content;
margin-left: 5px;
margin-right: 15px;
font-size: calc(var(--mainFontSize) - 0.2rem);
color: var(--SmartThemeBodyColor);
font-size: calc(var(--mainFontSize) * 0.8);
color: var(--SmartThemeEmColor);
text-align: center;
}
.range-block-counter div[contenteditable="true"] {
display: block;
cursor: text;
background-color: var(--black30a);
border: 1px solid var(--white30a);
border-radius: 5px;
padding: 2px;
flex: 1;
text-align: center;
}
.range-block-range {
margin: 0;
width: 80%;
/* width: 80%; */
flex: 5;
/* margin-bottom: 10px; */
}
@@ -2438,7 +2485,7 @@ h5 {
.tag_view_name {
text-align: left;
flex: 2;
/* flex: 2; */
}
.tag_view_counter {
@@ -2448,6 +2495,7 @@ h5 {
.tag_delete {
padding-right: 0;
color: var(--SmartThemeBodyColor) !important;
}
.tag {
@@ -2455,9 +2503,9 @@ h5 {
border-style: solid;
border-width: 1px;
box-sizing: border-box;
color: var(--SmartThemeQuoteColor);
color: var(--SmartThemeBodyColor);
background-color: var(--black30a);
border-color: var(--white30a);
border-color: var(--white50a);
padding: 0.2rem 0.3rem;
font-size: calc(var(--mainFontSize) - 5%);
display: flex;
@@ -2467,11 +2515,10 @@ h5 {
width: fit-content;
min-width: 0;
text-shadow: none !important;
}
.tag.selected {
border-color: var(--white70a);
}
.tag_remove {
cursor: pointer;
@@ -2490,6 +2537,10 @@ h5 {
margin: 5px 0;
}
#tagList .tag {
opacity: 0.6;
}
.tags.tags_inline {
opacity: 0.6;
column-gap: 0.2rem;
@@ -2517,6 +2568,13 @@ h5 {
#rm_tag_filter .tag {
cursor: pointer;
opacity: 0.6;
filter: brightness(0.8);
}
.tag.selected {
opacity: 1 !important;
filter: none !important;
}
body .ui-autocomplete {
@@ -2723,6 +2781,18 @@ body .ui-widget-content li:hover {
gap: 5px;
}
.group_member_icon .flex-container {
gap: 0px;
}
#rm_group_members .right_menu_button,
#rm_group_add_members .right_menu_button {
padding: 0px;
height: 20px;
display: flex;
align-items: center;
}
/* Rules for icon display */
#rm_group_members .group_member[order="start"] .fa-chevron-down,
#rm_group_members .group_member[order="end"] .fa-chevron-up,
@@ -2731,11 +2801,6 @@ body .ui-widget-content li:hover {
display: none;
}
#rm_group_members .right_menu_button,
#rm_group_add_members .right_menu_button {
padding: 0px;
}
.group_select {
display: flex;
flex-direction: row;
@@ -3131,8 +3196,9 @@ a {
/* Message images */
.mes img.img_extra {
max-width: 600px;
max-height: 300px;
max-width: 100%;
max-height: 60svh;
/*to fit inside single window height of mobile landscape*/
border-radius: 10px;
display: block;
}
@@ -3413,6 +3479,10 @@ toolcool-color-picker {
flex-wrap: nowrap;
}
.flex1 {
flex: 1;
}
.alignitemscenter {
align-items: center;
}
@@ -3502,6 +3572,18 @@ toolcool-color-picker {
flex: 1;
}
.editable-slider-notification {
position: absolute;
right: 0px;
left: 0px;
margin: 0 auto;
width: 70%;
top: 5px;
padding: 0;
display: block;
text-align: center;
}
.openai_logit_bias_form {
display: flex;
flex-direction: row;
@@ -3784,9 +3866,10 @@ body.waifuMode #avatar_zoom_popup {
aspect-ratio: 2 / 3;
}
/*
.mes img.img_extra {
max-width: 100%;
}
} */
.world_entry_thin_controls {
flex-direction: column;

52
server.js
View File

@@ -133,6 +133,20 @@ async function countTokensLlama(text) {
return ids.length;
}
const tokenizersCache = {};
function getTiktokenTokenizer(model) {
if (tokenizersCache[model]) {
console.log('Using the cached tokenizer instance for', model);
return tokenizersCache[model];
}
const tokenizer = tiktoken.encoding_for_model(model);
console.log('Instantiated the tokenizer for', model);
tokenizersCache[model] = tokenizer;
return tokenizer;
}
function humanizedISO8601DateTime() {
let baseDate = new Date(Date.now());
let humanYear = baseDate.getFullYear();
@@ -381,6 +395,7 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
if (!!request.header('X-Response-Streaming')) {
let isStreamingStopped = false;
request.socket.removeAllListeners('close');
request.socket.on('close', function () {
isStreamingStopped = true;
});
@@ -674,6 +689,29 @@ app.post("/createcharacter", urlencodedParser, function (request, response) {
}
});
app.post('/renamechat', jsonParser, async function (request, response) {
if (!request.body || !request.body.original_file || !request.body.renamed_file) {
return response.sendStatus(400);
}
const pathToFolder = request.body.is_group
? directories.groupChats
: path.join(directories.chats, String(request.body.avatar_url).replace('.png', ''));
const pathToOriginalFile = path.join(pathToFolder, request.body.original_file);
const pathToRenamedFile = path.join(pathToFolder, request.body.renamed_file);
console.log('Old chat name', pathToOriginalFile);
console.log('New chat name', pathToRenamedFile);
if (!fs.existsSync(pathToOriginalFile) || fs.existsSync(pathToRenamedFile)) {
console.log('Either Source or Destination files are not available');
return response.status(400).send({ error: true });
}
console.log('Successfully renamed.');
fs.renameSync(pathToOriginalFile, pathToRenamedFile);
return response.send({ ok: true });
});
app.post("/renamecharacter", jsonParser, async function (request, response) {
if (!request.body.avatar_url || !request.body.new_name) {
return response.sendStatus(400);
@@ -843,7 +881,7 @@ async function charaRead(img_url, input_format) {
description = exif_data['UserComment'].value[0];
}
try {
JSON.parse(description);
json5.parse(description);
char_data = description;
} catch {
const byteArr = description.split(",").map(Number);
@@ -1962,6 +2000,7 @@ app.post('/generate_poe', jsonParser, async (request, response) => {
if (streaming) {
let isStreamingStopped = false;
request.socket.removeAllListeners('close');
request.socket.on('close', function () {
isStreamingStopped = true;
client.abortController.abort();
@@ -2220,7 +2259,7 @@ app.post("/openai_bias", jsonParser, async function (request, response) {
let result = {};
const tokenizer = tiktoken.encoding_for_model(request.query.model === 'gpt-4-0314' ? 'gpt-4' : request.query.model);
const tokenizer = getTiktokenTokenizer(request.query.model === 'gpt-4-0314' ? 'gpt-4' : request.query.model);
for (const entry of request.body) {
if (!entry || !entry.text) {
@@ -2234,7 +2273,8 @@ app.post("/openai_bias", jsonParser, async function (request, response) {
}
}
tokenizer.free();
// not needed for cached tokenizers
//tokenizer.free();
return response.send(result);
});
@@ -2289,6 +2329,7 @@ app.post("/generate_openai", jsonParser, function (request, response_generate_op
const api_url = new URL(request.body.reverse_proxy || api_openai).toString();
const controller = new AbortController();
request.socket.removeAllListeners('close');
request.socket.on('close', function () {
controller.abort();
});
@@ -2383,7 +2424,7 @@ app.post("/tokenize_openai", jsonParser, function (request, response_tokenize_op
const tokensPerMessage = request.query.model.includes('gpt-4') ? 3 : 4;
const tokensPadding = 3;
const tokenizer = tiktoken.encoding_for_model(request.query.model === 'gpt-4-0314' ? 'gpt-4' : request.query.model);
const tokenizer = getTiktokenTokenizer(request.query.model === 'gpt-4-0314' ? 'gpt-4' : request.query.model);
let num_tokens = 0;
for (const msg of request.body) {
@@ -2397,7 +2438,8 @@ app.post("/tokenize_openai", jsonParser, function (request, response_tokenize_op
}
num_tokens += tokensPadding;
tokenizer.free();
// not needed for cached tokenizers
//tokenizer.free();
response_tokenize_openai.send({ "token_count": num_tokens });
});