Message sent as a jailbreak to activate the roleplay
diff --git a/public/script.js b/public/script.js
index ec62a0c5f..c3f06494f 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1123,7 +1123,7 @@ class StreamingProcessor {
hideSwipeButtons();
return (count_view_mes - 1);
}
-
+
onProgressStreaming(messageId, text) {
let processedText = cleanUpMessage(text);
let result = extractNameFromMessage(processedText, this.force_name2);
@@ -1142,7 +1142,7 @@ class StreamingProcessor {
mesText.append(formattedText);
scrollChatToBottom();
}
-
+
onFinishStreaming(messageId, text) {
this.onProgressStreaming(messageId, text);
playMessageSound();
@@ -1152,7 +1152,7 @@ class StreamingProcessor {
setGenerationProgress(0);
$('.mes_edit:last').show();
}
-
+
onErrorStreaming() {
$("#send_textarea").removeAttr('disabled');
is_send_press = false;
@@ -1160,11 +1160,11 @@ class StreamingProcessor {
setGenerationProgress(0);
showSwipeButtons();
}
-
+
onStopStreaming() {
this.onErrorStreaming();
}
-
+
nullStreamingGeneration() {
throw new Error('Generation function for streaming is not hooked up');
}
@@ -1439,7 +1439,7 @@ async function Generate(type, automatic_trigger, force_name2) {
console.log('post replace chat.length = ' + chat.length);
//chat2 = chat2.reverse();
var this_max_context = 1487;
- if (main_api == 'kobold' || main_api == 'textgenerationwebui') {
+ if (main_api == 'kobold' || main_api == 'textgenerationwebui') {
this_max_context = (max_context - amount_gen);
}
if (main_api == 'novel') {
@@ -1764,7 +1764,7 @@ async function Generate(type, automatic_trigger, force_name2) {
'length_penalty': textgenerationwebui_settings.length_penalty,
'early_stopping': textgenerationwebui_settings.early_stopping,
'seed': textgenerationwebui_settings.seed,
- 'add_bos_token': textgenerationwebui_settings.add_bos_token,
+ 'add_bos_token': textgenerationwebui_settings.add_bos_token,
'custom_stopping_strings': getStoppingStrings().concat(textgenerationwebui_settings.custom_stopping_strings),
}
];
@@ -2342,7 +2342,7 @@ function changeMainAPI() {
if (selectedVal == "poe") {
$("#amount_gen_block").css("display", "none");
} else {
- $("#amount_gen_block").css("display", "block");
+ $("#amount_gen_block").css("display", "flex");
}
}
@@ -2514,10 +2514,10 @@ async function getSettings(type) {
);
$("#max_context").val(max_context);
- $("#max_context_counter").text(`${max_context} Tokens`);
+ $("#max_context_counter").text(`${max_context}`);
$("#amount_gen").val(amount_gen);
- $("#amount_gen_counter").text(`${amount_gen} Tokens`);
+ $("#amount_gen_counter").text(`${amount_gen}`);
swipes = !!settings.swipes; //// swipecode
$('#swipes-checkbox').prop('checked', swipes); /// swipecode
@@ -4261,11 +4261,11 @@ $(document).ready(function () {
amount_gen = preset.genamt;
$("#amount_gen").val(amount_gen);
- $("#amount_gen_counter").text(`${amount_gen} Tokens`);
+ $("#amount_gen_counter").text(`${amount_gen}`);
max_context = preset.max_length;
$("#max_context").val(max_context);
- $("#max_context_counter").text(`${max_context} Tokens`);
+ $("#max_context_counter").text(`${max_context}`);
$("#range_block").find('input').prop("disabled", false);
$("#kobold-advanced-config").find('input').prop("disabled", false);
@@ -4340,13 +4340,13 @@ $(document).ready(function () {
{
sliderId: "#amount_gen",
counterId: "#amount_gen_counter",
- format: (val) => `${val} Tokens`,
+ format: (val) => `${val}`,
setValue: (val) => { amount_gen = Number(val); },
},
{
sliderId: "#max_context",
counterId: "#max_context_counter",
- format: (val) => `${val} Tokens`,
+ format: (val) => `${val}`,
setValue: (val) => { max_context = Number(val); },
}
];
diff --git a/public/scripts/kai-settings.js b/public/scripts/kai-settings.js
index 8f9b3d649..c479a58c3 100644
--- a/public/scripts/kai-settings.js
+++ b/public/scripts/kai-settings.js
@@ -103,7 +103,7 @@ const sliders = [
name: "rep_pen_range",
sliderId: "#rep_pen_range",
counterId: "#rep_pen_range_counter",
- format: (val) => val + " Tokens",
+ format: (val) => val,
setValue: (val) => { kai_settings.rep_pen_range = Number(val); },
},
{
@@ -161,7 +161,7 @@ $(document).ready(function () {
});
});
- $('#single_line').on("input", function() {
+ $('#single_line').on("input", function () {
const value = $(this).prop('checked');
kai_settings.single_line = value;
saveSettingsDebounced();
diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js
index ef9f1c2ea..4d2fba33e 100644
--- a/public/scripts/nai-settings.js
+++ b/public/scripts/nai-settings.js
@@ -40,10 +40,10 @@ function loadNovelPreset(preset) {
$("#rep_pen_counter_novel").html(nai_settings.rep_pen_novel);
$("#rep_pen_size_novel").val(nai_settings.rep_pen_size_novel);
- $("#rep_pen_size_counter_novel").html(`${nai_settings.rep_pen_size_novel} Tokens`);
+ $("#rep_pen_size_counter_novel").html(`${nai_settings.rep_pen_size_novel}`);
}
-function loadNovelSettings(settings){
+function loadNovelSettings(settings) {
//load Novel API KEY is exists
if (settings.api_key_novel != undefined) {
nai_settings.api_key_novel = settings.api_key_novel;
@@ -65,7 +65,7 @@ function loadNovelSettings(settings){
$("#rep_pen_counter_novel").text(Number(nai_settings.rep_pen_novel).toFixed(2));
$("#rep_pen_size_novel").val(nai_settings.rep_pen_size_novel);
- $("#rep_pen_size_counter_novel").text(`${nai_settings.rep_pen_size_novel} Tokens`);
+ $("#rep_pen_size_counter_novel").text(`${nai_settings.rep_pen_size_novel}`);
}
const sliders = [
@@ -84,7 +84,7 @@ const sliders = [
{
sliderId: "#rep_pen_size_novel",
counterId: "#rep_pen_size_counter_novel",
- format: (val) => `${val} Tokens`,
+ format: (val) => `${val}`,
setValue: (val) => { nai_settings.rep_pen_size_novel = Number(val); },
},
];
@@ -100,7 +100,7 @@ $(document).ready(function () {
saveSettingsDebounced();
});
});
-
+
$("#model_novel_select").change(function () {
nai_settings.model_novel = $("#model_novel_select").find(":selected").val();
saveSettingsDebounced();
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 7a9ad757d..ec5cd5e5a 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -568,7 +568,7 @@ function loadOpenAISettings(data, settings) {
$(`#model_openai_select option[value="${oai_settings.openai_model}"`).attr('selected', true).trigger('change');
$('#openai_max_context').val(oai_settings.openai_max_context);
- $('#openai_max_context_counter').text(`${oai_settings.openai_max_context} Tokens`);
+ $('#openai_max_context_counter').text(`${oai_settings.openai_max_context}`);
$('#openai_max_tokens').val(oai_settings.openai_max_tokens);
@@ -731,7 +731,7 @@ $(document).ready(function () {
$(document).on('input', '#openai_max_context', function () {
oai_settings.openai_max_context = parseInt($(this).val());
- $('#openai_max_context_counter').text(`${$(this).val()} Tokens`);
+ $('#openai_max_context_counter').text(`${$(this).val()}`);
saveSettingsDebounced();
});
@@ -842,7 +842,7 @@ $(document).ready(function () {
oai_settings.jailbreak_prompt = $('#jailbreak_prompt_textarea').val();
saveSettingsDebounced();
});
-
+
$("#main_prompt_textarea").on('input', function () {
oai_settings.main_prompt = $('#main_prompt_textarea').val();
saveSettingsDebounced();
diff --git a/public/style.css b/public/style.css
index 4afd78fbf..51af99795 100644
--- a/public/style.css
+++ b/public/style.css
@@ -617,6 +617,10 @@ select {
margin: 5px 0;
}
+h3 {
+ margin: 10px 0;
+}
+
#top-bar h3 {
margin: 0;
padding: 10px 0;
@@ -638,13 +642,13 @@ input[type="file"] {
}
#right-nav-panel-tabs {
- margin-top: 10px;
+ margin-top: 5px;
margin-bottom: 10px;
width: 100%;
max-height: 30px;
display: flex;
align-items: center;
- padding: 0 10px;
+ padding: 0 5px;
}
#right-nav-panel-tabs .right_menu_button:last-of-type {
@@ -1692,31 +1696,32 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):not(#lm_button
.range-block {
height: min-content;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ margin-bottom: 10px;
+ justify-content: space-between;
}
.range-block-title {
margin: 0;
padding: 0;
+ width: 100%;
+ text-align: center;
}
.range-block-counter {
width: max-content;
- display: block;
- max-width: 100%;
- position: relative;
- margin-left: auto;
- margin-right: auto;
- /* margin-top: 10px; */
+ margin-left: 5px;
font-size: calc(var(--mainFontSize) - 0.3rem);
color: var(--white50a);
}
.range-block-range {
- margin: 0 auto;
- margin-bottom: 10px;
- width: 100%;
- margin-bottom: 10px;
+ margin: 0;
+ width: 80%;
+ /* margin-bottom: 10px; */
}
input[type="range"] {
@@ -1731,16 +1736,6 @@ input[type="range"] {
background-size: 70% 100%;
background-repeat: no-repeat;
box-shadow: inset 0 0 2px black;
- /* -webkit-appearance:none;
- width:160px;
- height:20px;
- margin:10px 50px;
- background: linear-gradient(to right, #9A2720 0%, #9A2720 100%);
- background-size:150px 10px;
- background-position:center;
- background-repeat:no-repeat;
- overflow:hidden;
- outline: none; */
}
input[type="range"]::-webkit-slider-thumb {
@@ -1955,19 +1950,28 @@ input[type="range"]::-webkit-slider-thumb {
display: inline;
}
+h4 {
+ margin: 10px 0;
+}
+
#character_popup h4 {
- margin-top: 0;
+ /* margin-top: 0;
margin-bottom: 0;
- margin-left: 0;
+ margin-left: 0; */
+}
+
+h5 {
+ margin: 5px 0;
}
#character_popup h5 {
- margin-top: 0;
+ /* margin-top: 0;
margin-bottom: 3px;
- margin-left: 0;
+ margin-left: 0; */
color: var(--grey50);
}
+
#character_popup_text {
display: grid;
grid-template-columns: 50px auto;
@@ -2979,7 +2983,7 @@ label[for="extensions_autoconnect"] {
margin: 0;
left: 0;
right: auto;
- padding: 10px 10px 0 10px;
+ padding: 5px;
border-radius: 0 0 20px 0;
box-shadow: none;
}
@@ -2988,9 +2992,9 @@ label[for="extensions_autoconnect"] {
width: 100%;
}
-.drawer-content .text_pole {
+/* .drawer-content .text_pole {
width: 100%;
-}
+} */
.drawer-content select {
width: 100%;
@@ -3021,6 +3025,10 @@ label[for="extensions_autoconnect"] {
width: unset;
}
+.wide100p {
+ width: 100%;
+}
+
#openai_api-presets {
display: flex;
flex-direction: row;