diff --git a/public/script.js b/public/script.js index 87538e14d..78211024e 100644 --- a/public/script.js +++ b/public/script.js @@ -872,11 +872,12 @@ async function getCharacters() { if (this_chid != undefined && this_chid != "invalid-safety-id") { $("#avatar_url_pole").val(characters[this_chid].avatar); } - console.log(characters); + await getGroups(); await printCharacters(); await AA_CountCharTime(this_chid); + } } @@ -3424,7 +3425,7 @@ function saveReply(type, getMessage, this_mes_is_name, title) { chat[chat.length - 1]['is_user'])) { type = 'normal'; } - + console.log(chat); const generationFinished = new Date(); const img = extractImageFromMessage(getMessage); getMessage = img.getMessage; @@ -3844,17 +3845,14 @@ async function getChat() { chat.push(...response); chat_create_date = chat[0]['create_date']; chat_metadata = chat[0]['chat_metadata'] ?? {}; - console.log(chat_metadata); + chat.shift(); } else { chat_create_date = humanizedDateTime(); } await getChatResult(); await saveChat(); - console.log('Chat loaded'); - //loop through chats and get both chat[messageId]['gen_started'] and chat[messageId]['gen_finished'] - //add up the difference of all of them and print it in seconds - let totalTime = 0; + setTimeout(function () { $('#send_textarea').click(); @@ -4699,7 +4697,7 @@ async function saveSettings(type) { extension_settings: extension_settings, context_settings: context_settings, tags: tags, - tag_map: tag_map, + tag_map: tag_map, ...nai_settings, ...kai_settings, ...oai_settings, diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 65236d62a..ee1007585 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -146,9 +146,17 @@ export function AA_CountCharTime(chid){ if (chid !== undefined && chid !== "invalid-safety-id") { // if we are counting a valid pre-saved char let selected_character = characters[chid]; let timeStirng = humanizeGenTime(selected_character); + //get total word counts + let user_words = selected_character.user_word_count; + let char_words = selected_character.word_count; + + + console.log("Time spent generating: " + timeStirng) //append to #result_info html - $("#result_info").append(`
${timeStirng}
`); + $("#result_info").append(`
Chat time: ${timeStirng}
`); + $("#result_info").append(`
Total words: ${user_words} / ${char_words}
`); + } } @@ -317,7 +325,7 @@ export function RA_CountCharTokens() { // if neither, probably safety char or some error in loading } else { console.debug("RA_TC -- no valid char found, closing."); } } - $("#result_info").html(`${count_tokens} Tokens dumb (${perm_tokens} Permanent)`); + $("#result_info").html(`${count_tokens} Tokens (${perm_tokens} Permanent)`); // display the counted tokens const tokenLimit = Math.max(((main_api !== 'openai' ? max_context : oai_settings.openai_max_context) / 2), 1024); if (count_tokens < tokenLimit && perm_tokens < tokenLimit) { diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js index fe5d9828e..ab6254a91 100644 --- a/public/scripts/power-user.js +++ b/public/scripts/power-user.js @@ -654,7 +654,6 @@ function loadPowerUserSettings(settings, data) { switchWaifuMode(); loadMovingUIState(); - console.log(power_user); } function loadMovingUIState() { @@ -831,8 +830,6 @@ const compareFunc = (first, second) => { }; function sortCharactersList() { - console.log(characters); - console.log(getContext()); const arr1 = groups.map(x => ({ item: x, id: x.id,