diff --git a/public/script.js b/public/script.js
index b29d51929..75b532c8c 100644
--- a/public/script.js
+++ b/public/script.js
@@ -648,23 +648,7 @@ var token;
}
}
async function setBackground(bg) {
- /*
- const response = await fetch("/setbackground", {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({
- "bg": bg
- })
- });
- if (response.ok === true) {
- //const getData = await response.json();
- //background = getData;
-
- //var aa = JSON.parse(getData[0]);
- //const load_ch_coint = Object.getOwnPropertyNames(getData);
- }*/
- //console.log(bg);
jQuery.ajax({
type: 'POST', //
url: '/setbackground', //
@@ -679,9 +663,6 @@ var token;
contentType: "application/json",
//processData: false,
success: function (html) {
- //setBackground(html);
- //$('body').css('background-image', 'linear-gradient(rgba(19,21,44,0.75), rgba(19,21,44,0.75)), url('+e.target.result+')');
- //$("#form_bg_download").after("![](backgrounds/"+html+")
World imported successfully! Select it now?
');
+ }
+ }
+ }
+
+ function download(content, fileName, contentType) {
+ var a = document.createElement("a");
+ var file = new Blob([content], { type: contentType });
+ a.href = URL.createObjectURL(file);
+ a.download = fileName;
+ a.click();
+ }
+ // World Info Editor
+ async function showWorldEditor() {
+ if (!world_info) {
+ popup_type = 'default';
+ callPopup('Select a world info first!
');
+ return;
+ }
+
+ is_world_edit_open = true;
+ $('#world_popup_name').val(world_info);
+ $('#world_popup').css('display', 'flex');
+ await loadWorldInfoData();
+ displayWorldEntries(world_info_data);
+ }
+
+ async function loadWorldInfoData() {
+ if (!world_info) {
+ return;
+ }
+
+ const response = await fetch("/getworldinfo", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ "X-CSRF-Token": token,
+ },
+ body: JSON.stringify({ name: world_info })
+ });
+
+ if (response.ok) {
+ world_info_data = await response.json();
+ }
+ }
+
+ function hideWorldEditor() {
+ is_world_edit_open = false;
+ $('#world_popup').css('display', 'none');
+ }
+
+ function displayWorldEntries(data) {
+ $('#world_popup_entries_list').empty();
+
+ if (!data || !('entries' in data)) {
+ return;
+ }
+
+ for (const entryUid in data.entries) {
+ const entry = data.entries[entryUid];
+ appendWorldEntry(entry);
+ }
+ }
+
+ function appendWorldEntry(entry) {
+ const template = $('#entry_edit_template .world_entry').clone();
+ template.data('uid', entry.uid);
+
+ // key
+ const keyInput = template.find('textarea[name="key"]');
+ keyInput.data('uid', entry.uid);
+ keyInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).val();
+ $(this).css("height", ""); //reset the height
+ $(this).css("height", $(this).prop('scrollHeight') + "px");
+ world_info_data.entries[uid].key = value.split(',').map(x => x.trim()).filter(x => x);
+ saveWorldInfo();
+ });
+ keyInput.val(entry.key.join(',')).trigger('input');
+ keyInput.css("height", ""); //reset the height
+ keyInput.css("height", $(this).prop('scrollHeight') + "px");
+
+ // keysecondary
+ const keySecondaryInput = template.find('textarea[name="keysecondary"]');
+ keySecondaryInput.data('uid', entry.uid);
+ keySecondaryInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).val();
+ $(this).css("height", ""); //reset the height
+ $(this).css("height", $(this).prop('scrollHeight') + "px");
+ world_info_data.entries[uid].keysecondary = value.split(',').map(x => x.trim()).filter(x => x);
+ saveWorldInfo();
+ });
+ keySecondaryInput.val(entry.keysecondary.join(',')).trigger('input');
+ keySecondaryInput.css("height", ""); //reset the height
+ keySecondaryInput.css("height", $(this).prop('scrollHeight') + "px");
+
+ // comment
+ const commentInput = template.find('textarea[name="comment"]');
+ commentInput.data('uid', entry.uid);
+ commentInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).val();
+ $(this).css("height", ""); //reset the height
+ $(this).css("height", $(this).prop('scrollHeight') + "px");
+ world_info_data.entries[uid].comment = value;
+ saveWorldInfo();
+ });
+ commentInput.val(entry.comment).trigger('input');
+ commentInput.css("height", ""); //reset the height
+ commentInput.css("height", $(this).prop('scrollHeight') + "px");
+
+ // content
+ const contentInput = template.find('textarea[name="content"]');
+ contentInput.data('uid', entry.uid);
+ contentInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).val();
+ world_info_data.entries[uid].content = value;
+ $(this).css("height", ""); //reset the height
+ $(this).css("height", $(this).prop('scrollHeight') + "px");
+ saveWorldInfo();
+
+ // count tokens
+ const numberOfTokens = encode(value).length;
+ $(this).closest('.world_entry').find('.world_entry_form_token_counter').html(numberOfTokens);
+ });
+ contentInput.val(entry.content).trigger('input');
+ contentInput.css("height", ""); //reset the height
+ contentInput.css("height", $(this).prop('scrollHeight') + "px");
+
+ // selective
+ const selectiveInput = template.find('input[name="selective"]');
+ selectiveInput.data('uid', entry.uid);
+ selectiveInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).prop('checked');
+ world_info_data.entries[uid].selective = value;
+ saveWorldInfo();
+
+ const keysecondary = $(this).closest('.world_entry').find('.keysecondary');
+ value ? keysecondary.show() : keysecondary.hide();
+ });
+ selectiveInput.prop('checked', entry.selective).trigger('input');
+ selectiveInput.siblings('.checkbox_fancy').click(function () {
+ $(this).siblings('input').click();
+ });
+
+
+ // constant
+ const constantInput = template.find('input[name="constant"]');
+ constantInput.data('uid', entry.uid);
+ constantInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = $(this).prop('checked');
+ world_info_data.entries[uid].constant = value;
+ saveWorldInfo();
+ });
+ constantInput.prop('checked', entry.constant).trigger('input');
+ constantInput.siblings('.checkbox_fancy').click(function () {
+ $(this).siblings('input').click();
+ });
+
+ // order
+ const orderInput = template.find('input[name="order"]');
+ orderInput.data('uid', entry.uid);
+ orderInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = Number($(this).val());
+
+ world_info_data.entries[uid].order = !isNaN(value) ? value : 0;
+ saveWorldInfo();
+ });
+ orderInput.val(entry.order).trigger('input');
+
+ // position
+ if (entry.position === undefined) {
+ entry.position = 0;
+ }
+
+ const positionInput = template.find('input[name="position"]');
+ positionInput.data('uid', entry.uid);
+ positionInput.on('input', function () {
+ const uid = $(this).data('uid');
+ const value = Number($(this).val());
+ world_info_data.entries[uid].position = !isNaN(value) ? value : 0;
+ saveWorldInfo();
+ })
+ template.find(`input[name="position"][value=${entry.position}]`).prop('checked', true).trigger('input');
+
+ // display uid
+ template.find('.world_entry_form_uid_value').html(entry.uid);
+
+ // delete button
+ const deleteButton = template.find('input.delete_entry_button');
+ deleteButton.data('uid', entry.uid);
+ deleteButton.on('click', function () {
+ const uid = $(this).data('uid');
+ deleteWorldInfoEntry(uid);
+ $(this).closest('.world_entry').remove();
+ saveWorldInfo();
+ });
+
+ template.appendTo('#world_popup_entries_list');
+ return template;
+ }
+
+ async function deleteWorldInfoEntry(uid) {
+ if (!world_info_data || !('entries' in world_info_data)) {
+ return;
+ }
+
+ delete world_info_data.entries[uid];
+ }
+
+ function createWorldInfoEntry() {
+ const newEntryTemplate = {
+ key: [],
+ keysecondary: [],
+ comment: '',
+ content: '',
+ constant: false,
+ selective: false,
+ order: 100,
+ position: 0,
+ };
+ const newUid = getFreeWorldEntryUid();
+
+ if (!Number.isInteger(newUid)) {
+ console.error("Couldn't assign UID to a new entry");
+ return;
+ }
+
+ const newEntry = { uid: newUid, ...newEntryTemplate };
+ world_info_data.entries[newUid] = newEntry;
+
+ const entryTemplate = appendWorldEntry(newEntry);
+ entryTemplate.get(0).scrollIntoView({ behavior: 'smooth' });
+ }
+
+ async function saveWorldInfo(immediately) {
+ if (!world_info || !world_info_data) {
+ return;
+ }
+
+ async function _save() {
+ const response = await fetch("/editworldinfo", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ "X-CSRF-Token": token,
+ },
+ body: JSON.stringify({ name: world_info, data: world_info_data })
+ });
+ }
+
+ if (immediately) {
+ return await _save();
+ }
+
+ clearTimeout(timerWorldSave);
+ timerWorldSave = setTimeout(async () => await _save(), durationSaveEdit);
+ }
+
+ async function renameWorldInfo() {
+ const oldName = world_info;
+ const newName = $('#world_popup_name').val();
+
+ if (oldName === newName) {
+ return;
+ }
+
+ world_info = newName;
+ await saveWorldInfo(true);
+ await deleteWorldInfo(oldName, newName);
+ }
+
+ async function deleteWorldInfo(worldInfoName, selectWorldName) {
+ if (!world_names.includes(worldInfoName)) {
+ return;
+ }
+
+ const response = await fetch("/deleteworldinfo", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ "X-CSRF-Token": token,
+ },
+ body: JSON.stringify({ name: worldInfoName })
+ });
+
+ if (response.ok) {
+ await updateWorldInfoList();
+
+ const selectedIndex = world_names.indexOf(selectWorldName);
+ if (selectedIndex !== -1) {
+ $('#world_info').val(selectedIndex).change();
+ }
+ else {
+ $('#world_info').val('None').change();
+ }
+
+ hideWorldEditor();
+ }
+ }
+
+ function getFreeWorldEntryUid() {
+ if (!world_info_data || !('entries' in world_info_data)) {
+ return null;
+ }
+
+ const MAX_UID = 1_000_000; // <- should be safe enough :)
+ for (let uid = 0; uid < MAX_UID; uid++) {
+ if (uid in world_info_data.entries) {
+ continue;
+ }
+ return uid;
+ }
+
+ return null;
+ }
+
+ function getFreeWorldName() {
+ const MAX_FREE_NAME = 100_000;
+ for (let index = 1; index < MAX_FREE_NAME; index++) {
+ const newName = `New World (${index})`;
+ if (world_names.includes(newName)) {
+ continue;
+ }
+ return newName;
+ }
+
+ return undefined;
+ }
+
+ async function createNewWorldInfo() {
+ const worldInfoTemplate = { entries: {} };
+ const worldInfoName = getFreeWorldName();
+
+ if (!worldInfoName) {
+ return;
+ }
+
+ world_info = worldInfoName;
+ world_info_data = { ...worldInfoTemplate };
+ await saveWorldInfo(true);
+ await updateWorldInfoList();
+
+ const selectedIndex = world_names.indexOf(worldInfoName);
+ if (selectedIndex !== -1) {
+ $('#world_info').val(selectedIndex).change();
+ }
+ else {
+ $('#world_info').val('None').change();
+ }
+ }
/////////////////////////////////////////////////////////
///////// INTERACTIVE FUNCTIONS AND LISTENERS ///////////
@@ -3425,7 +3782,6 @@ console.log('sipwing left after tr5ansition calls addOneMessage');
is_group_automode_enabled = value;
});
-
$(document).on('click', '.character_select', function () {
if (this_chid !== $(this).attr("chid")) { //if clicked on a different character from what was currently selected
if (!is_send_press) {
@@ -3667,118 +4023,12 @@ console.log('sipwing left after tr5ansition calls addOneMessage');
$("#shadow_popup").css('opacity:', 0.0);
popup_type = '';
});
- function callPopup(text) {
- $("#dialogue_popup_cancel").css("display", "inline-block");
- switch (popup_type) {
- case 'text':
- case 'char_not_selected':
- $("#dialogue_popup_ok").text("Ok");
- $("#dialogue_popup_cancel").css("display", "none");
- break;
-
- case 'world_imported':
- case 'new_chat':
-
-
- $("#dialogue_popup_ok").text("Yes");
- break;
- case 'del_world':
- case 'del_group':
- default:
-
- $("#dialogue_popup_ok").text("Delete");
-
- }
- $("#dialogue_popup_text").html(text);
- $("#shadow_popup").css('display', 'block');
- $('#shadow_popup').transition({ opacity: 1.0, duration: animation_rm_duration, easing: animation_rm_easing });
- }
- function read_bg_load(input) {
- if (input.files && input.files[0]) {
- var reader = new FileReader();
-
- reader.onload = function (e) {
- $('#bg_load_preview')
- .attr('src', e.target.result)
- .width(103)
- .height(83);
-
- var formData = new FormData($("#form_bg_download").get(0));
-
- //console.log(formData);
- jQuery.ajax({
- type: 'POST',
- url: '/downloadbackground',
- data: formData,
- beforeSend: function () {
- //$('#create_button').attr('value','Creating...');
- },
- cache: false,
- contentType: false,
- processData: false,
- success: function (html) {
- setBackground(html);
- if (bg1_toggle == true) { // this is a repeat of the background setting function for when user uploads a new BG image
- bg1_toggle = false; // should make the Bg setting a modular function to be called in both cases
- var number_bg = 2;
- var target_opacity = 1.0;
- } else {
- bg1_toggle = true;
- var number_bg = 1;
- var target_opacity = 0.0;
- }
- $('#bg2').transition({
- opacity: target_opacity,
- duration: 1300,//animation_rm_duration,
- easing: "linear",
- complete: function () {
- $("#options").css('display', 'none');
- }
- });
- $('#bg' + number_bg).css('background-image', 'url(' + e.target.result + ')');
- $("#form_bg_download").after("");
- },
- error: function (jqXHR, exception) {
- console.log(exception);
- console.log(jqXHR);
- }
- });
-
- };
-
- reader.readAsDataURL(input.files[0]);
- }
- }
$("#add_bg_button").change(function () {
read_bg_load(this);
});
- function read_avatar_load(input) {
- if (input.files && input.files[0]) {
- var reader = new FileReader();
- if (selected_button == 'create') {
-
- create_save_avatar = input.files;
- }
- reader.onload = function (e) {
-
- if (selected_button == 'character_edit') {
-
- timerSaveEdit = setTimeout(() => { $("#create_button").click(); }, durationSaveEdit);
- }
- $('#avatar_load_preview')
- .attr('src', e.target.result);
- //.width(103)
- //.height(83);
- //console.log(e.target.result.name);
-
- };
-
- reader.readAsDataURL(input.files[0]);
- }
- }
$("#add_avatar_button").change(function () {
is_mes_reload_avatar = Date.now();
@@ -3888,7 +4138,7 @@ console.log('sipwing left after tr5ansition calls addOneMessage');
chat[0]['is_user'] = false;
chat[0]['is_name'] = true;
chat[0]['mes'] = this_ch_mes;
- add_mes_without_animation = true;
+ //add_mes_without_animation = true;
addOneMessage(chat[0]);
}
}
@@ -4254,7 +4504,6 @@ console.log('#settings_preset sensor -- starting');
}
});
-
for (var i of ["temp", "rep_pen", "rep_pen_size", "top_k", "top_p", "typical_p", "penalty_alpha"]) {
$('#' + i + '_textgenerationwebui').attr('x-setting-id', i);
$(document).on('input', '#' + i + '_textgenerationwebui', function () {
@@ -4506,12 +4755,7 @@ console.log('#settings_preset sensor -- starting');
is_api_button_press_novel = true;
}
});
- function resultCheckStatusNovel() {
- is_api_button_press_novel = false;
- checkOnlineStatus();
- $("#api_loading_novel").css("display", 'none');
- $("#api_button_novel").css("display", 'inline-block');
- }
+
$("#model_novel_select").change(function () {
model_novel = $('#model_novel_select').find(":selected").val();
saveSettings();
@@ -4682,389 +4926,6 @@ console.log('#settings_preset sensor -- starting');
$('#form_world_import').trigger("reset");
});
- async function updateWorldInfoList(importedWorldName) {
- var result = await fetch('/getsettings', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- "X-CSRF-Token": token,
- },
- body: JSON.stringify({})
- });
-
- if (result.ok) {
- var data = await result.json();
- world_names = data.world_names?.length ? data.world_names : [];
- $('#world_info').find('option[value!="None"]').remove();
-
- world_names.forEach((item, i) => {
- $('#world_info').append(``);
- });
-
- if (importedWorldName) {
- const indexOf = world_names.indexOf(world_info);
- $('#world_info').val(indexOf);
-
- popup_type = 'world_imported';
- callPopup('World imported successfully! Select it now?
');
- }
- }
- }
-
- function download(content, fileName, contentType) {
- var a = document.createElement("a");
- var file = new Blob([content], { type: contentType });
- a.href = URL.createObjectURL(file);
- a.download = fileName;
- a.click();
- }
-
- // World Info Editor
- async function showWorldEditor() {
- if (!world_info) {
- popup_type = 'default';
- callPopup('Select a world info first!
');
- return;
- }
-
- is_world_edit_open = true;
- $('#world_popup_name').val(world_info);
- $('#world_popup').css('display', 'flex');
- await loadWorldInfoData();
- displayWorldEntries(world_info_data);
- }
-
- async function loadWorldInfoData() {
- if (!world_info) {
- return;
- }
-
- const response = await fetch("/getworldinfo", {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- "X-CSRF-Token": token,
- },
- body: JSON.stringify({ name: world_info })
- });
-
- if (response.ok) {
- world_info_data = await response.json();
- }
- }
-
- function hideWorldEditor() {
- is_world_edit_open = false;
- $('#world_popup').css('display', 'none');
- }
-
- function displayWorldEntries(data) {
- $('#world_popup_entries_list').empty();
-
- if (!data || !('entries' in data)) {
- return;
- }
-
- for (const entryUid in data.entries) {
- const entry = data.entries[entryUid];
- appendWorldEntry(entry);
- }
- }
-
- function appendWorldEntry(entry) {
- const template = $('#entry_edit_template .world_entry').clone();
- template.data('uid', entry.uid);
-
- // key
- const keyInput = template.find('textarea[name="key"]');
- keyInput.data('uid', entry.uid);
- keyInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).val();
- $(this).css("height", ""); //reset the height
- $(this).css("height", $(this).prop('scrollHeight') + "px");
- world_info_data.entries[uid].key = value.split(',').map(x => x.trim()).filter(x => x);
- saveWorldInfo();
- });
- keyInput.val(entry.key.join(',')).trigger('input');
- keyInput.css("height", ""); //reset the height
- keyInput.css("height", $(this).prop('scrollHeight') + "px");
-
- // keysecondary
- const keySecondaryInput = template.find('textarea[name="keysecondary"]');
- keySecondaryInput.data('uid', entry.uid);
- keySecondaryInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).val();
- $(this).css("height", ""); //reset the height
- $(this).css("height", $(this).prop('scrollHeight') + "px");
- world_info_data.entries[uid].keysecondary = value.split(',').map(x => x.trim()).filter(x => x);
- saveWorldInfo();
- });
- keySecondaryInput.val(entry.keysecondary.join(',')).trigger('input');
- keySecondaryInput.css("height", ""); //reset the height
- keySecondaryInput.css("height", $(this).prop('scrollHeight') + "px");
-
- // comment
- const commentInput = template.find('textarea[name="comment"]');
- commentInput.data('uid', entry.uid);
- commentInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).val();
- $(this).css("height", ""); //reset the height
- $(this).css("height", $(this).prop('scrollHeight') + "px");
- world_info_data.entries[uid].comment = value;
- saveWorldInfo();
- });
- commentInput.val(entry.comment).trigger('input');
- commentInput.css("height", ""); //reset the height
- commentInput.css("height", $(this).prop('scrollHeight') + "px");
-
- // content
- const contentInput = template.find('textarea[name="content"]');
- contentInput.data('uid', entry.uid);
- contentInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).val();
- world_info_data.entries[uid].content = value;
- $(this).css("height", ""); //reset the height
- $(this).css("height", $(this).prop('scrollHeight') + "px");
- saveWorldInfo();
-
- // count tokens
- const numberOfTokens = encode(value).length;
- $(this).closest('.world_entry').find('.world_entry_form_token_counter').html(numberOfTokens);
- });
- contentInput.val(entry.content).trigger('input');
- contentInput.css("height", ""); //reset the height
- contentInput.css("height", $(this).prop('scrollHeight') + "px");
-
- // selective
- const selectiveInput = template.find('input[name="selective"]');
- selectiveInput.data('uid', entry.uid);
- selectiveInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).prop('checked');
- world_info_data.entries[uid].selective = value;
- saveWorldInfo();
-
- const keysecondary = $(this).closest('.world_entry').find('.keysecondary');
- value ? keysecondary.show() : keysecondary.hide();
- });
- selectiveInput.prop('checked', entry.selective).trigger('input');
- selectiveInput.siblings('.checkbox_fancy').click(function () {
- $(this).siblings('input').click();
- });
-
-
- // constant
- const constantInput = template.find('input[name="constant"]');
- constantInput.data('uid', entry.uid);
- constantInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = $(this).prop('checked');
- world_info_data.entries[uid].constant = value;
- saveWorldInfo();
- });
- constantInput.prop('checked', entry.constant).trigger('input');
- constantInput.siblings('.checkbox_fancy').click(function () {
- $(this).siblings('input').click();
- });
-
- // order
- const orderInput = template.find('input[name="order"]');
- orderInput.data('uid', entry.uid);
- orderInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = Number($(this).val());
-
- world_info_data.entries[uid].order = !isNaN(value) ? value : 0;
- saveWorldInfo();
- });
- orderInput.val(entry.order).trigger('input');
-
- // position
- if (entry.position === undefined) {
- entry.position = 0;
- }
-
- const positionInput = template.find('input[name="position"]');
- positionInput.data('uid', entry.uid);
- positionInput.on('input', function () {
- const uid = $(this).data('uid');
- const value = Number($(this).val());
- world_info_data.entries[uid].position = !isNaN(value) ? value : 0;
- saveWorldInfo();
- })
- template.find(`input[name="position"][value=${entry.position}]`).prop('checked', true).trigger('input');
-
- // display uid
- template.find('.world_entry_form_uid_value').html(entry.uid);
-
- // delete button
- const deleteButton = template.find('input.delete_entry_button');
- deleteButton.data('uid', entry.uid);
- deleteButton.on('click', function () {
- const uid = $(this).data('uid');
- deleteWorldInfoEntry(uid);
- $(this).closest('.world_entry').remove();
- saveWorldInfo();
- });
-
- template.appendTo('#world_popup_entries_list');
- return template;
- }
-
- async function deleteWorldInfoEntry(uid) {
- if (!world_info_data || !('entries' in world_info_data)) {
- return;
- }
-
- delete world_info_data.entries[uid];
- }
-
- function createWorldInfoEntry() {
- const newEntryTemplate = {
- key: [],
- keysecondary: [],
- comment: '',
- content: '',
- constant: false,
- selective: false,
- order: 100,
- position: 0,
- };
- const newUid = getFreeWorldEntryUid();
-
- if (!Number.isInteger(newUid)) {
- console.error("Couldn't assign UID to a new entry");
- return;
- }
-
- const newEntry = { uid: newUid, ...newEntryTemplate };
- world_info_data.entries[newUid] = newEntry;
-
- const entryTemplate = appendWorldEntry(newEntry);
- entryTemplate.get(0).scrollIntoView({ behavior: 'smooth' });
- }
-
- async function saveWorldInfo(immediately) {
- if (!world_info || !world_info_data) {
- return;
- }
-
- async function _save() {
- const response = await fetch("/editworldinfo", {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- "X-CSRF-Token": token,
- },
- body: JSON.stringify({ name: world_info, data: world_info_data })
- });
- }
-
- if (immediately) {
- return await _save();
- }
-
- clearTimeout(timerWorldSave);
- timerWorldSave = setTimeout(async () => await _save(), durationSaveEdit);
- }
-
- async function renameWorldInfo() {
- const oldName = world_info;
- const newName = $('#world_popup_name').val();
-
- if (oldName === newName) {
- return;
- }
-
- world_info = newName;
- await saveWorldInfo(true);
- await deleteWorldInfo(oldName, newName);
- }
-
- async function deleteWorldInfo(worldInfoName, selectWorldName) {
- if (!world_names.includes(worldInfoName)) {
- return;
- }
-
- const response = await fetch("/deleteworldinfo", {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- "X-CSRF-Token": token,
- },
- body: JSON.stringify({ name: worldInfoName })
- });
-
- if (response.ok) {
- await updateWorldInfoList();
-
- const selectedIndex = world_names.indexOf(selectWorldName);
- if (selectedIndex !== -1) {
- $('#world_info').val(selectedIndex).change();
- }
- else {
- $('#world_info').val('None').change();
- }
-
- hideWorldEditor();
- }
- }
-
- function getFreeWorldEntryUid() {
- if (!world_info_data || !('entries' in world_info_data)) {
- return null;
- }
-
- const MAX_UID = 1_000_000; // <- should be safe enough :)
- for (let uid = 0; uid < MAX_UID; uid++) {
- if (uid in world_info_data.entries) {
- continue;
- }
- return uid;
- }
-
- return null;
- }
-
- function getFreeWorldName() {
- const MAX_FREE_NAME = 100_000;
- for (let index = 1; index < MAX_FREE_NAME; index++) {
- const newName = `New World (${index})`;
- if (world_names.includes(newName)) {
- continue;
- }
- return newName;
- }
-
- return undefined;
- }
-
- async function createNewWorldInfo() {
- const worldInfoTemplate = { entries: {} };
- const worldInfoName = getFreeWorldName();
-
- if (!worldInfoName) {
- return;
- }
-
- world_info = worldInfoName;
- world_info_data = { ...worldInfoTemplate };
- await saveWorldInfo(true);
- await updateWorldInfoList();
-
- const selectedIndex = world_names.indexOf(worldInfoName);
- if (selectedIndex !== -1) {
- $('#world_info').val(selectedIndex).change();
- }
- else {
- $('#world_info').val('None').change();
- }
- }
-
$('#world_info_edit_button').click(() => {
is_world_edit_open ? hideWorldEditor() : showWorldEditor();
});
@@ -5097,96 +4958,4 @@ console.log('#settings_preset sensor -- starting');
$('#world_create_button').click(() => {
createNewWorldInfo();
});
-
- /// UTILS
-
-
-/* //RossAscends: auto-load last character function (fires when active_character is defined and auto_load_chat is true)
- function autoloadchat() {
- console.log('starting autoloadchat routine');
- jQuery.ajax({
- type: 'POST',
- url: '/getsettings',
- data: JSON.stringify({}),
- beforeSend: function () {
- },
- cache: false,
- dataType: "json",
- contentType: "application/json",
- success: function (data) {
- if (data.result != 'file not find') {
- settings = JSON.parse(data.settings);
- //get the character to auto-load
- if (settings.active_character !== undefined) {
- if (settings.active_character !== '') {
- active_character = settings.active_character;
- }
- }
- }
- console.log('active_character = ' + active_character);
- console.log('auto_load_chat = ' + auto_load_chat);
-
- if (active_character !== undefined && auto_load_chat == true) {
- $('#CharID' + active_character).click(); //will auto-select and load chat of last selected character is auto_load_chat is true
- }
- },
- error: function (jqXHR, exception) {
- console.log(exception);
- console.log(jqXHR);
-
- }
- });
-
- }*/
- /* //RossAscends: auto-connect to last API function (fires when API URL exists in settings and auto_connect is true)
- function autoconnect() {
- console.log('starting autoconnect routine');
- jQuery.ajax({
- type: 'POST',
- url: '/getsettings',
- data: JSON.stringify({}),
- beforeSend: function () {
- },
- cache: false,
- dataType: "json",
- contentType: "application/json",
- //processData: false,
- success: function (data) {
- if (data.result != 'file not find') {
- settings = JSON.parse(data.settings);
-
- //Load the API server URL from settings
- api_server = settings.api_server;
- api_server_textgenerationwebui = settings.api_server_textgenerationwebui;
- api_key_novel = settings.api_key_novel;
- $('#api_url_text').val(api_server);
- $('#textgenerationwebui_api_url_text').val(api_server_textgenerationwebui);
- $('#api_key_novel').val(api_key_novel);
- }
-
- console.log('api_server = ' + api_server);
- console.log('api_server_textgenerationwebui = ' + api_server_textgenerationwebui);
- console.log('api_key_novel = ' + api_key_novel);
- console.log('auto_connect = ' + auto_connect);
- changeMainAPI();
-
- if (main_api === 'kobold' && api_server && auto_connect) {
- $('#api_button').click();
- }
-
- if (main_api === 'textgenerationwebui' && api_server_textgenerationwebui && auto_connect) {
- $('#api_button_textgenerationwebui').click();
- }
-
- if (main_api === 'novel' && api_key_novel && auto_connect) {
- $('#api_button_novel').click();
- }
- },
- error: function (jqXHR, exception) {
- console.log(exception);
- console.log(jqXHR);
-
- }
- });
- } */
});
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index d0e42b1d6..1918d0b2b 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -39,7 +39,21 @@ var create_save_scenario;
var create_save_mes_example;
var count_tokens;
var perm_tokens;
-var ALC_Done;
+
+const observerConfig = { childList: true, subtree: true };
+
+const observer = new MutationObserver(function(mutations) {
+ mutations.forEach(function(mutation) {
+ if (mutation.target.id === "online_status_text2") {
+ RA_checkOnlineStatus();
+ } else if (mutation.target.parentNode === SelectedCharacterTab) {
+ setTimeout(RA_CountCharTokens, 200);
+ }
+ });
+});
+
+observer.observe(document.documentElement, observerConfig);
+
//RossAscends: Added function to format dates used in files and chat timestamps to a humanized format.
//Mostly I wanted this to be for file names, but couldn't figure out exactly where the filename save code was as everything seemed to be connected.
@@ -63,7 +77,6 @@ export function humanizedDateTime() {
return HumanizedDateTime;
}
-//RA_CountCharTokens -- faster counting characters. Works for unsaved characters, and counts permanent and ephemeral tokens separately.
// triggers:
$("#rm_button_create").on("click", function () { //when "+New Character" is clicked
@@ -78,15 +91,8 @@ $("#rm_button_create").on("click", function () { //when "+New Character" is
create_save_mes_example="";
$("#result_info").html('Type to start counting tokens!');
});
-$(SelectedCharacterTab).children("h2").on("DOMSubtreeModified", function () { // when the nav's 3rd panel tab header changes (when a char is selected from the char list)
- //console.log('3rd tab name changed - counting tokens');
- //SaveLocal('ActiveChar',active_character);
- setTimeout(RA_CountCharTokens,200); //delay to allow textareas to fill out, so we don't show a previous char's count
-});
-
$("#rm_ch_create_block").on("input", function () {RA_CountCharTokens();}); //when any input is made to the create/edit character form textareas
$("#character_popup").on("input", function () {RA_CountCharTokens();}); //when any input is made to the advanced editing popup textareas
-
//function:
function RA_CountCharTokens() {
$("#result_info").html("");
@@ -150,9 +156,6 @@ function RA_CountCharTokens() {
$("#result_info").html(count_tokens + " Tokens (" + perm_tokens + " Permanent Tokens)"); //display normal if both counts are under 1024
} else {$("#result_info").html("" +count_tokens +" Tokens (" +perm_tokens +" Permanent Tokens)(TOO MANY)");} //warn if either are over 1024
}
-
-
-
//Auto Load Last Charcter -- (fires when active_character is defined and auto_load_chat is true)
async function RA_autoloadchat() {
if (document.getElementById('CharID0') !== null){
@@ -169,7 +172,6 @@ async function RA_autoloadchat() {
setTimeout(RA_autoloadchat,100) // if the charcter list hadn't been loaded yet, try again.
}
}
-
//only triggers when AutoLoadChat is enabled, consider adding this as an independent feature later.
function RestoreNavTab(){
if($(rm_button_selected_ch).children("h2").text()!==''){ //check for a change in the character edit tab name
@@ -179,9 +181,7 @@ function RestoreNavTab(){
setTimeout(RestoreNavTab,100) //if not changed yet, check again after 100ms
}
}
-
//changes input bar and send button display depending on connection status
-$("#online_status_text2").on("DOMSubtreeModified", function () {RA_checkOnlineStatus();});
function RA_checkOnlineStatus() {
if (online_status == "no_connection") {
$("#send_textarea").attr("placeholder", "Not connected to API!"); //Input bar placeholder tells users they are not connected
@@ -195,66 +195,44 @@ function RA_checkOnlineStatus() {
}
}
}
-
//Auto-connect to API (when set to kobold, API URL exists, and auto_connect is true)
-function RA_autoconnect() {
- //console.log('RA_AC -- starting..')
- if(online_status !== undefined && api_server !== ''){
- if (online_status == "no_connection") {
- if (LoadLocalBool('AutoConnectEnabled') === true) {
- if (main_api === "kobold") {
- if (api_server !== "") {
- $("#api_url_text").val(api_server);
- console.log('clicking API-button');
- $("#api_button").click();
- //console.log("clicked KAI connect for you");
- } else {
- console.log(main_api+' '+api_server);
- console.log("RA_AC - KAI API not specificed");
- }
- } else {
- //console.log("RA_AC - not kobold. skipping to novel.");
- }
-
- if (main_api === "novel") {
- if (api_key_novel !== "") {
- $("#api_key_novel").val(api_key_novel);
- console.log('clicking novel API-button');
- $("#api_button").click();
- // console.log("clicked NAI connect for you");
- } else {
- console.log("RA_AC - no novel API key");
- }
- }
- } else {
- console.log("RA_AC - is disabled. stopping.");
+
+ function RA_autoconnect() {
+ if (typeof online_status !== 'undefined' && (api_server !== '' || api_key_novel !== '')) {
+ if (online_status === "no_connection" && LoadLocalBool('AutoConnectEnabled')) {
+ if (isUrlOrAPIKey(api_server) && main_api === "kobold") {
+ $("#api_url_text").val(api_server);
+ $("#api_button").click();
+ //} else if (isUrlOrAPIKey(api_key_novel) && main_api === "novel") {
+ // $("#api_key_novel").val(api_key_novel);
+ // $("#api_button").click();
}
+ }
} else {
- console.log("RA_AC -- Already online, nothing to do.");
+ setTimeout(RA_autoconnect, 100);
}
- }else{
- console.log('RA_AC -- settings not loaded yet...trying again..');
- setTimeout(RA_autoconnect,100);
- } // if onlinbe_staus hadn't been declared yet, try again..
-}
-
+ }
+
+ function isUrlOrAPIKey(string) {
+ //const pattern = /^\d{3}-\d{3}-\d{3}-\d{3}$/; //need a sample novelAI key to set this format
+ try {
+ new URL(string);
+ return true;
+ } catch (_) {
+// return pattern.test(string);
+ }
+ }
$("document").ready(function () {
// read the state of Nav Lock and whether the nav was open or not before page load.
$(PanelPin).prop('checked', LoadLocalBool("NavLockOn"));
- if (LoadLocalBool("NavLockOn") == true){
- $(NavToggle).prop("checked", LoadLocalBool("NavOpened"));
- }
+ if (LoadLocalBool("NavLockOn") == true){$(NavToggle).prop("checked", LoadLocalBool("NavOpened"));}
// read the state of AutoConnect and AutoLoadChat.
$(AutoConnectCheckbox).prop("checked",LoadLocalBool("AutoConnectEnabled"));
$(AutoLoadChatCheckbox).prop("checked",LoadLocalBool("AutoLoadChatEnabled"));
-
- if (LoadLocalBool('AutoLoadChatEnabled') == true) {
- console.log('calling RA_ALC');
- RA_autoloadchat();
- }
+ if (LoadLocalBool('AutoLoadChatEnabled') == true) {RA_autoloadchat();}
//Autoconnect on page load if enabled, or when api type is changed
if (LoadLocalBool("AutoConnectEnabled") == true) {RA_autoconnect()}
$("#main_api").change(function () {RA_autoconnect();});
@@ -262,60 +240,38 @@ $("document").ready(function () {
//close the RightNav panel when user clicks outside of it or related panels (adv editing popup, or dialog popups)
$("html").click(function (e) {
- //console.log('clicking'+$(this));
- if ($(NavToggle).prop("checked") === true && $(PanelPin).prop("checked") === false) {
- if ($(e.target).attr("id") !== "nav-toggle") {
- if (RightNavPanel.contains(e.target) === false) {
- if (AdvancedCharDefsPopup.contains(e.target) === false) {
- if (ConfirmationPopup.contains(e.target) === false) {
+ if ($(NavToggle).prop("checked") &&
+ !$(PanelPin).prop("checked") &&
+ $(e.target).attr("id") !== "nav-toggle" &&
+ !RightNavPanel.contains(e.target) &&
+ !AdvancedCharDefsPopup.contains(e.target) &&
+ !ConfirmationPopup.contains(e.target)) {
NavToggle.click();
- }
- }
}
- }
- }
});
//save NavLock prefs and record state of the Nav being open or closed
- $(NavToggle).on("change", function () {
- SaveLocal("NavOpened", $(NavToggle).prop("checked"));
- });
- $(PanelPin).on("change",function () {
- SaveLocal("NavLockOn", $(PanelPin).prop("checked"));
- });
+ $(NavToggle).on("change", function () {SaveLocal("NavOpened", $(NavToggle).prop("checked")); });
+ $(PanelPin).on("change",function () {SaveLocal("NavLockOn", $(PanelPin).prop("checked")); });
//save AutoConnect and AutoLoadChat prefs
- $(AutoConnectCheckbox).on("change",function () {
- SaveLocal("AutoConnectEnabled", $(AutoConnectCheckbox).prop("checked"));
- });
- $(AutoLoadChatCheckbox).on("change",function () {
- SaveLocal("AutoLoadChatEnabled", $(AutoLoadChatCheckbox).prop("checked"));
- });
+ $(AutoConnectCheckbox).on("change",function () {SaveLocal("AutoConnectEnabled", $(AutoConnectCheckbox).prop("checked")); });
+ $(AutoLoadChatCheckbox).on("change",function () {SaveLocal("AutoLoadChatEnabled", $(AutoLoadChatCheckbox).prop("checked")); });
//save the clicked Nav Tab as the tab to auto-open on page reload
- $("#rm_button_settings").click( function (){
- SaveLocal('SelectedNavTab','rm_button_settings');
- });
- $(SelectedCharacterTab).click(function () {
- console.log('3rd tab clicked - saving selnavtab');
- //SaveLocal('ActiveChar',this_chid);
- SaveLocal('SelectedNavTab','rm_button_selected_ch');
- });
+ $("#rm_button_settings").click( function (){SaveLocal('SelectedNavTab','rm_button_settings'); });
+ $(SelectedCharacterTab).click(function () {SaveLocal('SelectedNavTab','rm_button_selected_ch'); });
$("#rm_button_characters").click( function () { //if char list is clicked, in addition to saving it...
SaveLocal('SelectedNavTab','rm_button_characters');
characters.sort(Intl.Collator().compare); // we sort the list
});
// when a char is selected from the list, save them as the auto-load character for next page load
- $(document).on("click", ".character_select",function () {
- console.log('char clicked in charlist - saving local activechar');
- SaveLocal('ActiveChar',$(this).attr('chid'));
- });
+ $(document).on("click", ".character_select",function () {SaveLocal('ActiveChar',$(this).attr('chid')); });
//this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
$('#send_textarea').on('input', function () {
this.style.height = '40px';
- this.style.height =
- (this.scrollHeight) + 'px';
+ this.style.height = (this.scrollHeight) + 'px';
});
//Regenerate if user swipes on the last mesage in chat
@@ -324,18 +280,20 @@ $("document").ready(function () {
//2. find a way to make the chat slide down smoothly when the last mes div gets .remove()-d
document.addEventListener('swiped-left', function(e) {
+ var SwipeButR = $('.swipe_right:last');
var SwipeTargetMesClassParent = e.target.closest('.last_mes');
if (SwipeTargetMesClassParent !== null){
- if($('.swipe_right:last').attr('style')=='display: flex;' == true){
- $('.swipe_right:last').click();
+ if(SwipeButR.attr('style')=='display: flex;' == true){
+ SwipeButR.click();
}
}
});
document.addEventListener('swiped-right', function(e) {
+ var SwipeButL = $('.swipe_left:last');
var SwipeTargetMesClassParent = e.target.closest('.last_mes');
if (SwipeTargetMesClassParent !== null){
- if($('.swipe_left:last').attr('style')=='display: flex;' == true){
- $('.swipe_left:last').click();
+ if(SwipeButL.attr('style')=='display: flex;' == true){
+ SwipeButL.click();
}
}
});