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

First stab at tab preservation in world info

Browse Source
This commit is contained in:
ebolam
2022-09-26 11:37:58 -04:00
parent ce1829b8ce
commit 0adf6e3298
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aiserver.py
View File

@@ -2262,7 +2262,7 @@ def reset_model_settings():
koboldai_vars.newlinemode = "n" koboldai_vars.newlinemode = "n"
koboldai_vars.revision = None koboldai_vars.revision = None
def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=False, online_model="", use_breakmodel_args=False, breakmodel_args_default_to_cpu=False): def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=False, online_model="", use_breakmodel_args=False, breakmodel_args_default_to_cpu=False, url=None):
global model global model
global generator global generator
global torch global torch
@@ -2921,10 +2921,12 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
from transformers import GPT2TokenizerFast from transformers import GPT2TokenizerFast
tokenizer = GPT2TokenizerFast.from_pretrained("EleutherAI/gpt-neo-2.7B", revision=koboldai_vars.revision, cache_dir="cache") tokenizer = GPT2TokenizerFast.from_pretrained("EleutherAI/gpt-neo-2.7B", revision=koboldai_vars.revision, cache_dir="cache")
loadsettings() loadsettings()
koboldai_vars.colaburl = url if url is not None else koboldai_vars.colaburl
elif(koboldai_vars.model == "OAI"): elif(koboldai_vars.model == "OAI"):
from transformers import GPT2TokenizerFast from transformers import GPT2TokenizerFast
tokenizer = GPT2TokenizerFast.from_pretrained("gpt2", revision=koboldai_vars.revision, cache_dir="cache") tokenizer = GPT2TokenizerFast.from_pretrained("gpt2", revision=koboldai_vars.revision, cache_dir="cache")
loadsettings() loadsettings()
koboldai_vars.colaburl = url if url is not None else koboldai_vars.colaburl
# Load the TPU backend if requested # Load the TPU backend if requested
elif(koboldai_vars.use_colab_tpu or koboldai_vars.model in ("TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX")): elif(koboldai_vars.use_colab_tpu or koboldai_vars.model in ("TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX")):
global tpu_mtj_backend global tpu_mtj_backend
@@ -8107,7 +8109,7 @@ def UI_2_load_model(data):
koboldai_vars.model = data['model'] koboldai_vars.model = data['model']
koboldai_vars.custmodpth = data['path'] koboldai_vars.custmodpth = data['path']
print("loading Model") print("loading Model")
load_model(use_gpu=data['use_gpu'], gpu_layers=data['gpu_layers'], disk_layers=data['disk_layers'], online_model=data['online_model']) load_model(use_gpu=data['use_gpu'], gpu_layers=data['gpu_layers'], disk_layers=data['disk_layers'], online_model=data['online_model'], url=koboldai_vars.colaburl)
#==================================================================# #==================================================================#
# Event triggered when load story is clicked # Event triggered when load story is clicked

22
static/koboldai.js
View File

@@ -1509,7 +1509,12 @@ function world_info_entry(data) {
world_info_data[data.uid] = data; world_info_data[data.uid] = data;
//delete the existing world info and recreate //delete the existing world info and recreate
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
original_focus = document.activeElement.id;
//console.log("Active ID: "+original_focus);
//console.log(document.activeElement);
document.getElementById("world_info_"+data.uid).remove(); document.getElementById("world_info_"+data.uid).remove();
} }
world_info_card_template = document.getElementById("world_info_"); world_info_card_template = document.getElementById("world_info_");
@@ -1616,8 +1621,10 @@ function world_info_entry(data) {
wpp_name.value = data.wpp.name; wpp_name.value = data.wpp.name;
} }
if ('attributes' in data.wpp) { if ('attributes' in data.wpp) {
i = -1;
for (const [attribute, values] of Object.entries(data.wpp.attributes)) { for (const [attribute, values] of Object.entries(data.wpp.attributes)) {
if (attribute != '') { if (attribute != '') {
i += 1;
attribute_area = document.createElement("div"); attribute_area = document.createElement("div");
label = document.createElement("span"); label = document.createElement("span");
label.textContent = "\xa0\xa0\xa0\xa0Attribute: "; label.textContent = "\xa0\xa0\xa0\xa0Attribute: ";
@@ -1627,10 +1634,13 @@ function world_info_entry(data) {
input.type = "text"; input.type = "text";
input.setAttribute("uid", data.uid); input.setAttribute("uid", data.uid);
input.setAttribute("data_type", "attribute"); input.setAttribute("data_type", "attribute");
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); world_info_wpp_area.append(attribute_area);
j=-1;
for (value of values) { for (value of values) {
j+=1;
value_area = document.createElement("div"); value_area = document.createElement("div");
label = document.createElement("span"); label = document.createElement("span");
label.textContent = "\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0Value: "; label.textContent = "\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0Value: ";
@@ -1641,6 +1651,7 @@ function world_info_entry(data) {
input.value = value; input.value = value;
input.setAttribute("uid", data.uid); input.setAttribute("uid", data.uid);
input.setAttribute("data_type", "value"); input.setAttribute("data_type", "value");
input.id = "wpp_"+data.uid+"_value_"+i+"_"+j;
value_area.append(input); value_area.append(input);
world_info_wpp_area.append(value_area); world_info_wpp_area.append(value_area);
} }
@@ -1652,6 +1663,7 @@ function world_info_entry(data) {
input.type = "text"; input.type = "text";
input.setAttribute("uid", data.uid); input.setAttribute("uid", data.uid);
input.setAttribute("data_type", "value"); input.setAttribute("data_type", "value");
input.id = "wpp_"+data.uid+"_value_"+i+"_blank";
input.onchange = function() {do_wpp(this.parentElement.parentElement)}; input.onchange = function() {do_wpp(this.parentElement.parentElement)};
value_area.append(input); value_area.append(input);
world_info_wpp_area.append(value_area); world_info_wpp_area.append(value_area);
@@ -1667,6 +1679,7 @@ function world_info_entry(data) {
input.type = "text"; input.type = "text";
input.setAttribute("uid", data.uid); input.setAttribute("uid", data.uid);
input.setAttribute("data_type", "attribute"); input.setAttribute("data_type", "attribute");
input.id = "wpp_"+data.uid+"_attr_blank";
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); world_info_wpp_area.append(attribute_area);
@@ -1757,6 +1770,11 @@ function world_info_entry(data) {
document.getElementById("world_info_basic_text_"+wpp_toggle.getAttribute('uid')).classList.remove("hidden"); document.getElementById("world_info_basic_text_"+wpp_toggle.getAttribute('uid')).classList.remove("hidden");
} }
if (document.getElementById(original_focus)) {
//for some reason we have to wrap this in a timmer
setTimeout(function() {document.getElementById(original_focus).focus()}, 0);
}
assign_world_info_to_action(null, data.uid); assign_world_info_to_action(null, data.uid);
update_token_lengths(); update_token_lengths();
@@ -2823,6 +2841,7 @@ function add_tags(tags, data) {
text.setAttribute("contenteditable", true); text.setAttribute("contenteditable", true);
text.setAttribute("uid", data.uid); text.setAttribute("uid", data.uid);
text.setAttribute("tag", tag); text.setAttribute("tag", tag);
text.id = "world_info_tags_text_"+data.uid+"_"+tag;
text.onblur = function () { text.onblur = function () {
for (var i = 0; i < world_info_data[this.getAttribute('uid')]['key'].length; i++) { for (var i = 0; i < world_info_data[this.getAttribute('uid')]['key'].length; i++) {
if (world_info_data[this.getAttribute('uid')]['key'][i] == this.getAttribute("tag")) { if (world_info_data[this.getAttribute('uid')]['key'][i] == this.getAttribute("tag")) {
@@ -2848,6 +2867,7 @@ function add_tags(tags, data) {
text.textContent = " "; text.textContent = " ";
text.setAttribute("uid", data.uid); text.setAttribute("uid", data.uid);
text.setAttribute("contenteditable", true); text.setAttribute("contenteditable", true);
text.id = "world_info_tags_text_"+data.uid+"_blank";
text.onblur = function () { text.onblur = function () {
world_info_data[this.getAttribute('uid')]['key'].push(this.textContent); world_info_data[this.getAttribute('uid')]['key'].push(this.textContent);
send_world_info(this.getAttribute('uid')); send_world_info(this.getAttribute('uid'));
@@ -2880,6 +2900,7 @@ function add_secondary_tags(tags, data) {
text.setAttribute("contenteditable", true); text.setAttribute("contenteditable", true);
text.setAttribute("uid", data.uid); text.setAttribute("uid", data.uid);
text.setAttribute("tag", tag); text.setAttribute("tag", tag);
text.id = "world_info_secondtags_text_"+data.uid+"_"+tag;
text.onblur = function () { text.onblur = function () {
for (var i = 0; i < world_info_data[this.getAttribute('uid')]['keysecondary'].length; i++) { for (var i = 0; i < world_info_data[this.getAttribute('uid')]['keysecondary'].length; i++) {
if (world_info_data[this.getAttribute('uid')]['keysecondary'][i] == this.getAttribute("tag")) { if (world_info_data[this.getAttribute('uid')]['keysecondary'][i] == this.getAttribute("tag")) {
@@ -2905,6 +2926,7 @@ function add_secondary_tags(tags, data) {
text.textContent = " "; text.textContent = " ";
text.setAttribute("uid", data.uid); text.setAttribute("uid", data.uid);
text.setAttribute("contenteditable", true); text.setAttribute("contenteditable", true);
text.id = "world_info_secondtags_text_"+data.uid+"_blank";
text.onblur = function () { text.onblur = function () {
world_info_data[this.getAttribute('uid')]['keysecondary'].push(this.textContent); world_info_data[this.getAttribute('uid')]['keysecondary'].push(this.textContent);
send_world_info(this.getAttribute('uid')); send_world_info(this.getAttribute('uid'));