Performance optimizations for character edit / chat opening
This commit is contained in:
Cohee1207
parent
3acd0a590e
commit
991ff98eaa
|
|
@ -3267,16 +3267,6 @@
|
|||
</div>
|
||||
<div id="rm_print_characters_block" class="flexFlowColumn"></div>
|
||||
</div>
|
||||
|
||||
<!-- only displays after creating/deleting a character/group -->
|
||||
<div id="rm_info_block" class="right_menu">
|
||||
<div id="rm_info_panel">
|
||||
<div id="rm_info_avatar"></div>
|
||||
<div id="rm_info_text"></div>
|
||||
<div id="rm_info_button" class="menu_button" data-i18n="Back">Back</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1089,6 +1089,30 @@ export function getEntitiesList({ doFilter } = {}) {
|
|||
return entities;
|
||||
}
|
||||
|
||||
async function getOneCharacter(avatarUrl) {
|
||||
const response = await fetch("/getonecharacter", {
|
||||
method: "POST",
|
||||
headers: getRequestHeaders(),
|
||||
body: JSON.stringify({
|
||||
avatar_url: avatarUrl,
|
||||
}),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const getData = await response.json();
|
||||
getData['name'] = DOMPurify.sanitize(getData['name']);
|
||||
getData['chat'] = String(getData['chat']);
|
||||
|
||||
const indexOf = characters.findIndex(x => x.avatar === avatarUrl);
|
||||
|
||||
if (indexOf !== -1) {
|
||||
characters[indexOf] = getData;
|
||||
} else {
|
||||
toastr.error(`Character ${avatarUrl} not found in the list`, "Error", { timeOut: 5000, preventDuplicates: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function getCharacters() {
|
||||
var response = await fetch("/getcharacters", {
|
||||
method: "POST",
|
||||
|
|
@ -4541,10 +4565,9 @@ async function getChat() {
|
|||
chat_create_date = humanizedDateTime();
|
||||
}
|
||||
await getChatResult();
|
||||
await saveChat();
|
||||
saveChatDebounced();
|
||||
eventSource.emit('chatLoaded', { detail: { id: this_chid, character: characters[this_chid] } });
|
||||
|
||||
|
||||
setTimeout(function () {
|
||||
$('#send_textarea').click();
|
||||
$('#send_textarea').focus();
|
||||
|
|
@ -4596,7 +4619,7 @@ async function openCharacterChat(file_name) {
|
|||
chat_metadata = {};
|
||||
await getChat();
|
||||
$("#selected_chat_pole").val(file_name);
|
||||
$("#create_button").click();
|
||||
await createOrEditCharacter();
|
||||
}
|
||||
|
||||
////////// OPTIMZED MAIN API CHANGE FUNCTION ////////////
|
||||
|
|
@ -5797,11 +5820,11 @@ async function getStatusNovel() {
|
|||
|
||||
function selectRightMenuWithAnimation(selectedMenuId) {
|
||||
const displayModes = {
|
||||
'rm_info_block': 'flex',
|
||||
'rm_group_chats_block': 'flex',
|
||||
'rm_api_block': 'grid',
|
||||
'rm_characters_block': 'flex',
|
||||
};
|
||||
$('#hideCharPanelAvatarButton').toggle(selectedMenuId === 'rm_ch_create_block');
|
||||
document.querySelectorAll('#right-nav-panel .right_menu').forEach((menu) => {
|
||||
$(menu).css('display', 'none');
|
||||
|
||||
|
|
@ -5855,7 +5878,6 @@ function select_rm_info(type, charId, previousCharId = null) {
|
|||
toastr.success(`Character Imported: ${displayName}`);
|
||||
}
|
||||
|
||||
getCharacters();
|
||||
selectRightMenuWithAnimation('rm_characters_block');
|
||||
|
||||
setTimeout(function () {
|
||||
|
|
@ -6263,10 +6285,10 @@ function hideSwipeButtons() {
|
|||
|
||||
async function saveMetadata() {
|
||||
if (selected_group) {
|
||||
await editGroup(selected_group, true, false);
|
||||
await editGroup(selected_group, false, false);
|
||||
}
|
||||
else {
|
||||
await saveChat();
|
||||
saveChatDebounced();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6670,12 +6692,8 @@ async function createOrEditCharacter(e) {
|
|||
createTagMapFromList("#tagList", html);
|
||||
await getCharacters();
|
||||
|
||||
$("#rm_info_block").transition({ opacity: 0, duration: 0 });
|
||||
var $prev_img = $("#avatar_div_div").clone();
|
||||
$("#rm_info_avatar").append($prev_img);
|
||||
select_rm_info(`char_create`, html, oldSelectedChar);
|
||||
|
||||
$("#rm_info_block").transition({ opacity: 1.0, duration: 2000 });
|
||||
crop_data = undefined;
|
||||
},
|
||||
error: function (jqXHR, exception) {
|
||||
|
|
@ -6764,7 +6782,8 @@ async function createOrEditCharacter(e) {
|
|||
}
|
||||
}
|
||||
$("#create_button").removeAttr("disabled");
|
||||
await getCharacters();
|
||||
|
||||
await getOneCharacter(formData.get('avatar_url'));
|
||||
|
||||
$("#add_avatar_button").replaceWith(
|
||||
$("#add_avatar_button").val("").clone(true)
|
||||
|
|
@ -7221,12 +7240,6 @@ function importCharacter(file) {
|
|||
|
||||
if (data.file_name !== undefined) {
|
||||
$('#character_search_bar').val('').trigger('input');
|
||||
$("#rm_info_block").transition({ opacity: 0, duration: 0 });
|
||||
var $prev_img = $("#avatar_div_div").clone();
|
||||
$prev_img
|
||||
.children("img")
|
||||
.attr("src", "characters/" + data.file_name + ".png");
|
||||
$("#rm_info_avatar").append($prev_img);
|
||||
|
||||
let oldSelectedChar = null;
|
||||
if (this_chid != undefined && this_chid != "invalid-safety-id") {
|
||||
|
|
@ -7241,7 +7254,6 @@ function importCharacter(file) {
|
|||
let importedCharacter = currentContext.characters.find(character => character.avatar === avatarFileName);
|
||||
await importTags(importedCharacter);
|
||||
}
|
||||
$("#rm_info_block").transition({ opacity: 1, duration: 1000 });
|
||||
}
|
||||
},
|
||||
error: function (jqXHR, exception) {
|
||||
|
|
@ -7709,7 +7721,7 @@ $(document).ready(function () {
|
|||
setTimeout(function () {
|
||||
$("#option_select_chat").click();
|
||||
$("#options").hide();
|
||||
}, 200);
|
||||
}, 2000);
|
||||
}
|
||||
if (popup_type == "del_ch") {
|
||||
const deleteChats = !!$("#del_char_checkbox").prop("checked");
|
||||
|
|
@ -7808,11 +7820,6 @@ $(document).ready(function () {
|
|||
);
|
||||
});
|
||||
|
||||
$("#rm_info_button").on('click', function () {
|
||||
$("#rm_info_avatar").html("");
|
||||
select_rm_characters();
|
||||
});
|
||||
|
||||
//////// OPTIMIZED ALL CHAR CREATION/EDITING TEXTAREA LISTENERS ///////////////
|
||||
|
||||
$("#character_name_pole").on("input", function () {
|
||||
|
|
@ -9216,8 +9223,7 @@ $(document).ready(function () {
|
|||
doCharListDisplaySwitch();
|
||||
});
|
||||
|
||||
$("#hideCharPanelAvatarButton").on('click', () => {
|
||||
$("#hideCharPanelAvatarButton").hide().on('click', () => {
|
||||
$('#avatar-and-name-block').slideToggle()
|
||||
})
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -175,6 +175,7 @@ export async function getGroupChat(groupId) {
|
|||
addOneMessage(mes);
|
||||
}
|
||||
}
|
||||
await saveGroupChat(groupId, false);
|
||||
}
|
||||
|
||||
if (group) {
|
||||
|
|
@ -182,7 +183,6 @@ export async function getGroupChat(groupId) {
|
|||
updateChatMetadata(metadata, true);
|
||||
}
|
||||
|
||||
await saveGroupChat(groupId, true);
|
||||
eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
|
||||
}
|
||||
|
||||
|
|
@ -802,10 +802,7 @@ async function deleteGroup(id) {
|
|||
printMessages();
|
||||
await getCharacters();
|
||||
|
||||
$("#rm_info_avatar").html("");
|
||||
$("#rm_info_block").transition({ opacity: 0, duration: 0 });
|
||||
select_rm_info("group_delete", id);
|
||||
$("#rm_info_block").transition({ opacity: 1.0, duration: 2000 });
|
||||
|
||||
$("#rm_button_selected_ch").children("h2").text('');
|
||||
setRightTabSelectedClass();
|
||||
|
|
|
|||
|
|
@ -351,7 +351,8 @@ function setupChatCompletionPromptManager(openAiSettings) {
|
|||
};
|
||||
|
||||
promptManager.saveServiceSettings = () => {
|
||||
return saveSettings();
|
||||
saveSettingsDebounced();
|
||||
return new Promise((resolve) => eventSource.once(event_types.SETTINGS_UPDATED, resolve));
|
||||
}
|
||||
|
||||
promptManager.tryGenerate = () => {
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ function loadPowerUserSettings(settings, data) {
|
|||
}
|
||||
|
||||
async function loadCharListState() {
|
||||
if (document.getElementById('CharID0') !== null) {
|
||||
if (document.querySelector('.character_select') !== null) {
|
||||
console.debug('setting charlist state to...')
|
||||
if (power_user.charListGrid === true) {
|
||||
console.debug('..to grid')
|
||||
|
|
|
|||
|
|
@ -149,9 +149,6 @@ function setWorldInfoSettings(settings, data) {
|
|||
});
|
||||
|
||||
$("#world_editor_select").trigger("change");
|
||||
|
||||
// Update settings
|
||||
saveSettingsDebounced();
|
||||
}
|
||||
|
||||
// World Info Editor
|
||||
|
|
|
|||
|
|
@ -1275,6 +1275,7 @@ input[type="file"] {
|
|||
flex-direction: row;
|
||||
gap: 5px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
#rm_print_characters_block {
|
||||
|
|
@ -1985,35 +1986,6 @@ grammarly-extension {
|
|||
align-items: center;
|
||||
}
|
||||
|
||||
#rm_info_block {
|
||||
display: none;
|
||||
width: 100%;
|
||||
height: 80%;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
|
||||
}
|
||||
|
||||
#rm_info_panel {
|
||||
font-size: calc(var(--mainFontSize) + .5rem);
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#rm_info_button {
|
||||
width: min-content;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
#rm_info_avatar {
|
||||
display: flex;
|
||||
column-gap: 10px;
|
||||
width: fit-content;
|
||||
text-align: center;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
#delete_button,
|
||||
.redWarningBG {
|
||||
background-color: var(--crimson70a) !important;
|
||||
|
|
|
|||
13
server.js
13
server.js
|
|
@ -1373,7 +1373,20 @@ app.post("/getcharacters", jsonParser, function (request, response) {
|
|||
});
|
||||
});
|
||||
|
||||
app.post("/getonecharacter", jsonParser, async function (request, response) {
|
||||
if (!request.body) return response.sendStatus(400);
|
||||
const item = request.body.avatar_url;
|
||||
const filePath = path.join(charactersPath, item);
|
||||
|
||||
if (!fs.existsSync(filePath)) {
|
||||
return response.sendStatus(404);
|
||||
}
|
||||
|
||||
characters = {};
|
||||
await processCharacter(item, 0);
|
||||
|
||||
return response.send(characters[0]);
|
||||
});
|
||||
|
||||
/**
|
||||
* Handle a POST request to get the stats object
|
||||
|
|
|
|||
Loading…
Reference in New Issue