rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Random Prompt Fix

Browse Source
This commit is contained in:
ebolam
2022-10-22 15:24:58 -04:00
parent 4aaf6d85b7
commit 8312b24bfc
2 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
static/koboldai.js
View File

@@ -442,7 +442,7 @@ function do_prompt(data) {
assign_world_info_to_action(-1, null); assign_world_info_to_action(-1, null);
} }
//if we have a prompt we need to disable the theme area, or enable it if we don't //if we have a prompt we need to disable the theme area, or enable it if we don't
if (data.value != "") { if (data.value[0].text != "") {
document.getElementById('input_text').placeholder = "Enter text here (shift+enter for new line)"; document.getElementById('input_text').placeholder = "Enter text here (shift+enter for new line)";
document.getElementById('themerow').classList.add("hidden"); document.getElementById('themerow').classList.add("hidden");
document.getElementById('themetext').value = ""; document.getElementById('themetext').value = "";
@@ -1671,7 +1671,6 @@ function world_info_entry_used_in_game(data) {
} }
function process_world_info_entry(data) { function process_world_info_entry(data) {
console.log(data);
let temp = [] let temp = []
if (Array.isArray(data)) { if (Array.isArray(data)) {
temp = data; temp = data;
@@ -1690,21 +1689,23 @@ function world_info_entry(data) {
var original_focus = null; var original_focus = null;
if (document.getElementById("world_info_"+data.uid)) { if (document.getElementById("world_info_"+data.uid)) {
//First let's get the id of the element we're on so we can restore it after removing the object //First let's get the id of the element we're on so we can restore it after removing the object
original_focus = document.activeElement.id; //original_focus = document.activeElement.id;
//console.log("Active ID: "+original_focus); //console.log("Active ID: "+original_focus);
//console.log(document.activeElement); //console.log(document.activeElement);
document.getElementById("world_info_"+data.uid).remove(); //document.getElementById("world_info_"+data.uid).remove();
} world_info_card = document.getElementById("world_info_"+data.uid);
} else {
world_info_card_template = document.getElementById("world_info_"); world_info_card_template = document.getElementById("world_info_");
world_info_card = world_info_card_template.cloneNode(true); world_info_card = world_info_card_template.cloneNode(true);
world_info_card.id = "world_info_"+data.uid; world_info_card.id = "world_info_"+data.uid;
world_info_card.setAttribute("uid", data.uid); world_info_card.setAttribute("uid", data.uid);
}
if (data.used_in_game) { if (data.used_in_game) {
world_info_card.classList.add("used_in_game"); world_info_card.classList.add("used_in_game");
} else { } else {
world_info_card.classList.remove("used_in_game"); world_info_card.classList.remove("used_in_game");
} }
title = world_info_card.querySelector('#world_info_title_') title = world_info_card.querySelector('.world_info_title')
title.id = "world_info_title_"+data.uid; title.id = "world_info_title_"+data.uid;
title.textContent = data.title; title.textContent = data.title;
title.setAttribute("uid", data.uid); title.setAttribute("uid", data.uid);
@@ -1726,7 +1727,7 @@ function world_info_entry(data) {
title.addEventListener('dragover', dragOver); title.addEventListener('dragover', dragOver);
title.addEventListener('dragleave', dragLeave); title.addEventListener('dragleave', dragLeave);
title.addEventListener('drop', drop); title.addEventListener('drop', drop);
delete_icon = world_info_card.querySelector('#world_info_delete_'); delete_icon = world_info_card.querySelector('.world_info_delete');
delete_icon.id = "world_info_delete_"+data.uid; delete_icon.id = "world_info_delete_"+data.uid;
delete_icon.setAttribute("uid", data.uid); delete_icon.setAttribute("uid", data.uid);
delete_icon.setAttribute("wi-title", data.title); delete_icon.setAttribute("wi-title", data.title);
@@ -1739,23 +1740,25 @@ function world_info_entry(data) {
} }
} }
} }
tags = world_info_card.querySelector('#world_info_tags_'); tags = world_info_card.querySelector('.world_info_tag_primary_area');
tags.id = "world_info_tags_"+data.uid; tags.id = "world_info_tags_"+data.uid;
//add tag content here //add tag content here
add_tags(tags, data); add_tags(tags, data);
secondarytags = world_info_card.querySelector('#world_info_secondtags_'); secondarytags = world_info_card.querySelector('.world_info_tag_secondary_area');
secondarytags.id = "world_info_secondtags_"+data.uid; secondarytags.id = "world_info_secondtags_"+data.uid;
//add second tag content here //add second tag content here
add_secondary_tags(secondarytags, data); add_secondary_tags(secondarytags, data);
//w++ toggle //w++ toggle
wpp_toggle_area = world_info_card.querySelector('#world_info_wpp_toggle_area_'); wpp_toggle_area = world_info_card.querySelector('.world_info_wpp_toggle_area');
wpp_toggle_area.id = "world_info_wpp_toggle_area_"+data.uid; wpp_toggle_area.id = "world_info_wpp_toggle_area_"+data.uid;
if (document.getElementById("world_info_wpp_toggle_"+data.uid)) {
wpp_toggle = document.getElementById("world_info_wpp_toggle_"+data.uid);
} else {
wpp_toggle = document.createElement("input"); wpp_toggle = document.createElement("input");
wpp_toggle.id = "world_info_wpp_toggle_"+data.uid; wpp_toggle.id = "world_info_wpp_toggle_"+data.uid;
wpp_toggle.setAttribute("type", "checkbox"); wpp_toggle.setAttribute("type", "checkbox");
wpp_toggle.setAttribute("uid", data.uid); wpp_toggle.setAttribute("uid", data.uid);
wpp_toggle.checked = data.use_wpp;
wpp_toggle.setAttribute("data-size", "mini"); wpp_toggle.setAttribute("data-size", "mini");
wpp_toggle.setAttribute("data-onstyle", "success"); wpp_toggle.setAttribute("data-onstyle", "success");
wpp_toggle.setAttribute("data-toggle", "toggle"); wpp_toggle.setAttribute("data-toggle", "toggle");
@@ -1773,12 +1776,19 @@ function world_info_entry(data) {
this.classList.add("pulse"); this.classList.add("pulse");
} }
wpp_toggle_area.append(wpp_toggle); wpp_toggle_area.append(wpp_toggle);
}
wpp_toggle.checked = data.use_wpp;
//w++ data //w++ data
let last_new_value = null let last_new_value = null
world_info_wpp_area = world_info_card.querySelector('#world_info_wpp_area_'); world_info_wpp_area = world_info_card.querySelector('.world_info_wpp_area');
world_info_wpp_area.id = "world_info_wpp_area_"+data.uid; world_info_wpp_area.id = "world_info_wpp_area_"+data.uid;
world_info_wpp_area.setAttribute("uid", data.uid); world_info_wpp_area.setAttribute("uid", data.uid);
wpp_format = world_info_card.querySelector('#wpp_format_'); wpp_attributes_area = world_info_card.querySelector('.wpp_attributes_area');
while (wpp_attributes_area.firstChild) {
wpp_attributes_area.removeChild(wpp_attributes_area.firstChild);
}
wpp_format = world_info_card.querySelector('.wpp_format');
wpp_format.id = "wpp_format_"+data.uid; wpp_format.id = "wpp_format_"+data.uid;
wpp_format.setAttribute("uid", data.uid); wpp_format.setAttribute("uid", data.uid);
wpp_format.setAttribute("data_type", "format"); wpp_format.setAttribute("data_type", "format");
@@ -1790,12 +1800,12 @@ function world_info_entry(data) {
} else { } else {
wpp_format.selectedIndex = 1; wpp_format.selectedIndex = 1;
} }
wpp_type = world_info_card.querySelector('#wpp_type_'); wpp_type = world_info_card.querySelector('.wpp_type');
wpp_type.id = "wpp_type_"+data.uid; wpp_type.id = "wpp_type_"+data.uid;
wpp_type.setAttribute("uid", data.uid); wpp_type.setAttribute("uid", data.uid);
wpp_type.setAttribute("data_type", "type"); wpp_type.setAttribute("data_type", "type");
wpp_type.value = data.wpp.type; wpp_type.value = data.wpp.type;
wpp_name = world_info_card.querySelector('#wpp_name_'); wpp_name = world_info_card.querySelector('.wpp_name');
wpp_name.id = "wpp_name_"+data.uid; wpp_name.id = "wpp_name_"+data.uid;
wpp_name.setAttribute("uid", data.uid); wpp_name.setAttribute("uid", data.uid);
wpp_name.setAttribute("data_type", "name"); wpp_name.setAttribute("data_type", "name");
@@ -1824,7 +1834,7 @@ function world_info_entry(data) {
input.id = "wpp_"+data.uid+"_attr_"+i input.id = "wpp_"+data.uid+"_attr_"+i
input.onchange = function() {do_wpp(this.parentElement.parentElement)}; input.onchange = function() {do_wpp(this.parentElement.parentElement)};
attribute_area.append(input); attribute_area.append(input);
world_info_wpp_area.append(attribute_area); wpp_attributes_area.append(attribute_area);
j=-1; j=-1;
for (value of values) { for (value of values) {
j+=1; j+=1;
@@ -1845,7 +1855,7 @@ function world_info_entry(data) {
input.setAttribute("data_type", "value"); input.setAttribute("data_type", "value");
input.id = "wpp_"+data.uid+"_value_"+i+"_"+j; input.id = "wpp_"+data.uid+"_value_"+i+"_"+j;
value_area.append(input); value_area.append(input);
world_info_wpp_area.append(value_area); wpp_attributes_area.append(value_area);
} }
value_area = document.createElement("div"); value_area = document.createElement("div");
label = document.createElement("span"); label = document.createElement("span");
@@ -1864,7 +1874,7 @@ function world_info_entry(data) {
last_new_value = input; last_new_value = input;
input.onchange = function() {if (this.value != "") {on_new_wi_item = this.id;do_wpp(this.parentElement.parentElement)}}; input.onchange = function() {if (this.value != "") {on_new_wi_item = this.id;do_wpp(this.parentElement.parentElement)}};
value_area.append(input); value_area.append(input);
world_info_wpp_area.append(value_area); wpp_attributes_area.append(value_area);
} }
} }
} }
@@ -1885,14 +1895,14 @@ function world_info_entry(data) {
input.id = "wpp_"+data.uid+"_attr_blank"; input.id = "wpp_"+data.uid+"_attr_blank";
input.onchange = function() {if (this.value != "") {on_new_wi_item=this.id;do_wpp(this.parentElement.parentElement)}}; input.onchange = function() {if (this.value != "") {on_new_wi_item=this.id;do_wpp(this.parentElement.parentElement)}};
attribute_area.append(input); attribute_area.append(input);
world_info_wpp_area.append(attribute_area); wpp_attributes_area.append(attribute_area);
//regular data //regular data
content_area = world_info_card.querySelector('#world_info_basic_text_'); manual_text_area = world_info_card.querySelector('.world_info_basic_text_area');
content_area.id = "world_info_basic_text_"+data.uid; manual_text_area.id = "world_info_basic_text_"+data.uid;
manual_text = world_info_card.querySelector('#world_info_entry_text_'); manual_text = world_info_card.querySelector('.world_info_entry_text');
manual_text.id = "world_info_entry_text_"+data.uid; manual_text.id = "world_info_entry_text_"+data.uid;
manual_text.setAttribute("uid", data.uid); manual_text.setAttribute("uid", data.uid);
manual_text.value = data.manual_text; manual_text.value = data.manual_text;
@@ -1901,7 +1911,7 @@ function world_info_entry(data) {
send_world_info(this.getAttribute('uid')); send_world_info(this.getAttribute('uid'));
this.classList.add("pulse"); this.classList.add("pulse");
} }
comment = world_info_card.querySelector('#world_info_comment_'); comment = world_info_card.querySelector('.world_info_comment');
comment.id = "world_info_comment_"+data.uid; comment.id = "world_info_comment_"+data.uid;
comment.setAttribute("uid", data.uid); comment.setAttribute("uid", data.uid);
comment.value = data.comment; comment.value = data.comment;
@@ -1910,13 +1920,15 @@ function world_info_entry(data) {
send_world_info(this.getAttribute('uid')); send_world_info(this.getAttribute('uid'));
this.classList.add("pulse"); this.classList.add("pulse");
} }
constant_area = world_info_card.querySelector('#world_info_toggle_area_'); constant_area = world_info_card.querySelector('.world_info_always_include');
constant_area.id = "world_info_toggle_area_"+data.uid; constant_area.id = "world_info_toggle_area_"+data.uid;
if (document.getElementById("world_info_constant_"+data.uid)) {
constant = document.getElementById("world_info_constant_"+data.uid);
} else {
constant = document.createElement("input"); constant = document.createElement("input");
constant.id = "world_info_constant_"+data.uid; constant.id = "world_info_constant_"+data.uid;
constant.setAttribute("type", "checkbox"); constant.setAttribute("type", "checkbox");
constant.setAttribute("uid", data.uid); constant.setAttribute("uid", data.uid);
constant.checked = data.constant;
constant.setAttribute("data-size", "mini"); constant.setAttribute("data-size", "mini");
constant.setAttribute("data-onstyle", "success"); constant.setAttribute("data-onstyle", "success");
constant.setAttribute("data-toggle", "toggle"); constant.setAttribute("data-toggle", "toggle");
@@ -1926,6 +1938,8 @@ function world_info_entry(data) {
this.classList.add("pulse"); this.classList.add("pulse");
} }
constant_area.append(constant); constant_area.append(constant);
}
constant.checked = data.constant;
if (!(document.getElementById("world_info_folder_"+data.folder))) { if (!(document.getElementById("world_info_folder_"+data.folder))) {
folder = document.createElement("div"); folder = document.createElement("div");
@@ -1959,6 +1973,9 @@ function world_info_entry(data) {
if (data.constant) { if (data.constant) {
document.getElementById("world_info_tags_"+data.uid).classList.add("hidden"); document.getElementById("world_info_tags_"+data.uid).classList.add("hidden");
document.getElementById("world_info_secondtags_"+data.uid).classList.add("hidden"); document.getElementById("world_info_secondtags_"+data.uid).classList.add("hidden");
} else {
document.getElementById("world_info_tags_"+data.uid).classList.remove("hidden");
document.getElementById("world_info_secondtags_"+data.uid).classList.remove("hidden");
} }
//$('#world_info_constant_'+data.uid).bootstrapToggle(); //$('#world_info_constant_'+data.uid).bootstrapToggle();
@@ -3179,6 +3196,9 @@ function removeA(arr) {
} }
function add_tags(tags, data) { function add_tags(tags, data) {
while (tags.firstChild) {
tags.removeChild(tags.firstChild);
}
for (tag of data.key) { for (tag of data.key) {
tag_item = document.createElement("span"); tag_item = document.createElement("span");
tag_item.classList.add("tag"); tag_item.classList.add("tag");
@@ -3254,6 +3274,9 @@ function add_tags(tags, data) {
} }
function add_secondary_tags(tags, data) { function add_secondary_tags(tags, data) {
while (tags.firstChild) {
tags.removeChild(tags.firstChild);
}
for (tag of data.keysecondary) { for (tag of data.keysecondary) {
tag_item = document.createElement("span"); tag_item = document.createElement("span");
tag_item.classList.add("tag"); tag_item.classList.add("tag");

26
templates/templates.html
View File

@@ -1,31 +1,32 @@
<!---------------- World Info Card ---------------------->
<div draggable="true" class="world_info_card" id="world_info_"> <div draggable="true" class="world_info_card" id="world_info_">
<div class="world_info_title_area"> <div class="world_info_title_area">
<h4 draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" id="world_info_title_" <h4 draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" id="world_info_title_"
class="world_info_title" onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');"></h4> class="world_info_title" onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');"></h4>
<span id="world_info_delete_" class="world_info_delete">X</span> <span id="world_info_delete_" class="world_info_delete">X</span>
</div> </div>
<div class="world_info_tag_area" id="world_info_toggle_area_"> <div class="world_info_tag_area world_info_always_include" id="world_info_toggle_area_">
Always Include Always Include
</div> </div>
<div id="world_info_tags_" class="world_info_tag_area"> <div id="world_info_tags_" class="world_info_tag_area world_info_tag_primary_area">
<div>Requires one of:</div> <div>Requires one of:</div>
</div> </div>
<div id="world_info_secondtags_" class="world_info_tag_area"> <div id="world_info_secondtags_" class="world_info_tag_area world_info_tag_secondary_area">
<div>And (if present):</div> <div>And (if present):</div>
</div> </div>
<div class="world_info_tag_area" id="world_info_wpp_toggle_area_"> <div class="world_info_tag_area world_info_wpp_toggle_area" id="world_info_wpp_toggle_area_">
Use W++ Use W++
</div> </div>
<div class="world_info_tag_area hidden" id="world_info_wpp_area_"> <div class="world_info_tag_area hidden world_info_wpp_area" id="world_info_wpp_area_">
<!--this part is very sensitive to location. Javascript uses parents to find the above tag for each of the inputs, so don't add stuff without messing with JS--> <!--this part is very sensitive to location. Javascript uses parents to find the above tag for each of the inputs, so don't add stuff without messing with JS-->
<select id="wpp_format_" class="settings_select"> <select id="wpp_format_" class="settings_select wpp_format">
<option>W++</option> <option>W++</option>
<option>Square Bracket Format (SBF)</option> <option>Square Bracket Format (SBF)</option>
</select> </select>
<table> <table>
<tr> <tr>
<td>Type:</td> <td>Type:</td>
<td><input draggable="true" type=text id="wpp_type_" <td><input draggable="true" type=text class="wpp_type" id="wpp_type_"
onchange="do_wpp(this.parentElement.parentElement.parentElement.parentElement.parentElement)" onchange="do_wpp(this.parentElement.parentElement.parentElement.parentElement.parentElement)"
onfocus="console.log('focus');this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');" onfocus="console.log('focus');this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');"
onblur="console.log('blur');this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');" onblur="console.log('blur');this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');"
@@ -33,17 +34,17 @@
</tr> </tr>
<tr> <tr>
<td>Name:</td> <td>Name:</td>
<td><input draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" type=text id="wpp_name_" <td><input draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" type=text class="wpp_name" id="wpp_name_"
onchange="do_wpp(this.parentElement.parentElement.parentElement.parentElement.parentElement)" onchange="do_wpp(this.parentElement.parentElement.parentElement.parentElement.parentElement)"
onfocus="this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');" onfocus="this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');"
onblur="this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');"></td> onblur="this.parentElement.parentElement.parentElement.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');"></td>
</tr> </tr>
</table> </table>
<div class="wpp_attributes_area"></div>
</div> </div>
<div id="world_info_basic_text_"> <div id="world_info_basic_text_" class="world_info_basic_text_area">
Text: Text:
<textarea draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" id="world_info_entry_text_" class="world_info_text fullwidth" oninput="autoResize(this, 60)" <textarea draggable="true" ondragstart="event.preventDefault();event.stopPropagation();" id="world_info_entry_text_" class="world_info_text world_info_entry_text fullwidth" oninput="autoResize(this, 60)"
onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');autoResize(this, 60)" onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');autoResize(this, 60)"
onblur="this.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');this.style.height='60px';"></textarea> onblur="this.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');this.style.height='60px';"></textarea>
</div> </div>
@@ -64,11 +65,12 @@
<div> <div>
Comment: Comment:
<textarea draggable="true" ondragstartondragstart="event.preventDefault();event.stopPropagation();" rows=1 id="world_info_comment_" <textarea draggable="true" ondragstartondragstart="event.preventDefault();event.stopPropagation();" rows=1 id="world_info_comment_"
class="world_info_text fullwidth" oninput="autoResize(this, 60)" onfocus="autoResize(this, 60)" onblur="this.style.height='60px';" class="world_info_text world_info_comment fullwidth" oninput="autoResize(this, 60)" onfocus="autoResize(this, 60)" onblur="this.style.height='60px';"
onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');;" onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');;"
onblur="this.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');"></textarea> onblur="this.parentElement.parentElement.setAttribute('draggable', 'true');this.setAttribute('draggable', 'true');"></textarea>
</div> </div>
</div> </div>
<!---------------- Phrase Bias ---------------------->
<div id="empty_bias"> <div id="empty_bias">
<div class="bias_phrase"> <div class="bias_phrase">
<input type=text placeholder="Word or Phrase to Bias" onchange="save_bias(this);"/> <input type=text placeholder="Word or Phrase to Bias" onchange="save_bias(this);"/>