From 468aafb38477a00d86d97442211e76a33865e48c Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Sun, 18 Jun 2023 06:35:22 +0900 Subject: [PATCH] less console spam, placehold for dinkus MD escape --- public/index.html | 11 +++++++++++ public/script.js | 28 +++++++++++++++++----------- public/scripts/power-user.js | 12 ++++++++++-- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/public/index.html b/public/index.html index f95e88204..9ce46b9e0 100644 --- a/public/index.html +++ b/public/index.html @@ -1625,7 +1625,18 @@ + +
+

Instruct mode ? diff --git a/public/script.js b/public/script.js index a94b00a43..626de7621 100644 --- a/public/script.js +++ b/public/script.js @@ -218,7 +218,8 @@ export { talkativeness_default, default_ch_mes, extension_prompt_types, - updateVisibleDivs + updateVisibleDivs, + mesForShowdownParse, } // API OBJECT FOR EXTERNAL WIRING @@ -228,6 +229,7 @@ const gpt3 = new GPT3BrowserTokenizer({ type: 'gpt3' }); hljs.addPlugin({ "before:highlightElement": ({ el }) => { el.textContent = el.innerText } }); // Markdown converter +let mesForShowdownParse; //intended to be used as a context to compare showdown strings against let converter; reloadMarkdownProcessor(); @@ -1017,6 +1019,10 @@ export async function reloadCurrentChat() { } function messageFormatting(mes, ch_name, isSystem, isUser) { + if (mes) { + mesForShowdownParse = mes; + } + if (!mes) { mes = ''; } @@ -1233,7 +1239,7 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true // don't need prompt button for user if (params.isUser === true) { newMessage.find(".mes_prompt").hide(); - console.log(`hiding prompt for user mesID ${params.mesId}`); + //console.log(`hiding prompt for user mesID ${params.mesId}`); } //shows or hides the Prompt display button @@ -1241,16 +1247,16 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true //if we have itemized messages, and the array isn't null.. if (params.isUser === false && itemizedPrompts.length !== 0 && itemizedPrompts.length !== null) { - console.log('looking through itemized prompts...'); - console.log(`mesIdToFind = ${mesIdToFind} from ${params.avatarImg}`); - console.log(`itemizedPrompts.length = ${itemizedPrompts.length}`) - console.log(itemizedPrompts); + // console.log('looking through itemized prompts...'); + //console.log(`mesIdToFind = ${mesIdToFind} from ${params.avatarImg}`); + //console.log(`itemizedPrompts.length = ${itemizedPrompts.length}`) + //console.log(itemizedPrompts); for (var i = 0; i < itemizedPrompts.length; i++) { - console.log(`itemized array item ${i} is MesID ${Number(itemizedPrompts[i].mesId)}, does it match ${Number(mesIdToFind)}?`); + //console.log(`itemized array item ${i} is MesID ${Number(itemizedPrompts[i].mesId)}, does it match ${Number(mesIdToFind)}?`); if (Number(itemizedPrompts[i].mesId) === Number(mesIdToFind)) { newMessage.find(".mes_prompt").show(); - console.log(`showing button for mesID ${params.mesId} from ${params.characterName}`); + //console.log(`showing button for mesID ${params.mesId} from ${params.characterName}`); break; } /*else { @@ -1260,10 +1266,10 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true } */ } } else { - console.log('itemizedprompt array empty null, or user, hiding this prompt buttons'); + //console.log('itemizedprompt array empty null, or user, hiding this prompt buttons'); //$(".mes_prompt").hide(); newMessage.find(".mes_prompt").hide(); - console.log(itemizedPrompts); + //console.log(itemizedPrompts); } newMessage.find('.avatar img').on('error', function () { @@ -2353,7 +2359,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, thisPromptBits = additionalPromptStuff; - console.log(thisPromptBits); + //console.log(thisPromptBits); itemizedPrompts.push(thisPromptBits); console.log(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`); diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js index d2da0ad4b..e41493864 100644 --- a/public/scripts/power-user.js +++ b/public/scripts/power-user.js @@ -92,6 +92,7 @@ let power_user = { multigen_first_chunk: 50, multigen_next_chunks: 30, custom_chat_separator: '', + // markdown_escape_strings: '', fast_ui_mode: true, avatar_style: avatar_styles.ROUND, chat_display: chat_styles.DEFAULT, @@ -259,7 +260,7 @@ function toggleWaifu() { } function switchWaifuMode() { - console.log(`switching waifu to ${power_user.waifuMode}`); + //console.log(`switching waifu to ${power_user.waifuMode}`); $("body").toggleClass("waifuMode", power_user.waifuMode); $("#waifuMode").prop("checked", power_user.waifuMode); scrollChatToBottom(); @@ -522,6 +523,7 @@ function loadPowerUserSettings(settings, data) { $("#include_newline_checkbox").prop("checked", power_user.include_newline); $('#render_formulas').prop("checked", power_user.render_formulas); $("#custom_chat_separator").val(power_user.custom_chat_separator); + //$("#markdown_escape_strings").val(power_user.markdown_escape_strings); $("#fast_ui_mode").prop("checked", power_user.fast_ui_mode); $("#waifuMode").prop("checked", power_user.waifuMode); $("#movingUImode").prop("checked", power_user.movingUI); @@ -959,7 +961,13 @@ $(document).ready(() => { saveSettingsDebounced(); reloadMarkdownProcessor(power_user.render_formulas); }); - + /* + $("#markdown_escape_strings").on('input', function () { + power_user.markdown_escape_strings = $(this).val(); + saveSettingsDebounced(); + reloadMarkdownProcessor(power_user.render_formulas); + }); + */ $("#multigen").change(function () { power_user.multigen = $(this).prop("checked"); saveSettingsDebounced();