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

Fix for undo bug.

Browse Source
This commit is contained in:
ebolam
2022-11-03 19:56:25 -04:00
parent 6c146b805d
commit ffbce750f5
2 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
koboldai_settings.py
View File

@@ -545,12 +545,12 @@ class settings(object):
else: else:
setattr(self, key, value) setattr(self, key, value)
logger.debug("Loading {} took {}s".format(key, time.time()- start_time)) logger.debug("Loading {} took {}s".format(key, time.time()- start_time))
#check from prompt_wi_highlighted_text since that wasn't always in the V2 save format #check from prompt_wi_highlighted_text since that wasn't always in the V2 save format
if 'prompt_wi_highlighted_text' in self.__dict__: if 'prompt' in json_data and 'prompt_wi_highlighted_text' not in json_data:
if self.prompt_wi_highlighted_text[0]['text'] != self.prompt and self.prompt_wi_highlighted_text[0]['text'] == "": self.prompt_wi_highlighted_text[0]['text'] = self.prompt
self.prompt_wi_highlighted_text[0]['text'] = self.prompt self.assign_world_info_to_actions(action_id=-1)
self.assign_world_info_to_actions(action_id=-1) process_variable_changes(self.socketio, "story", 'prompt_wi_highlighted_text', self.prompt_wi_highlighted_text, None)
process_variable_changes(self.socketio, "story", 'prompt_wi_highlighted_text', self.prompt_wi_highlighted_text, None)
if 'no_save' in self.__dict__: if 'no_save' in self.__dict__:
setattr(self, 'no_save', False) setattr(self, 'no_save', False)
@@ -1462,6 +1462,8 @@ class KoboldStoryRegister(object):
old_length = self.actions[action_id]["Selected Text Length"] old_length = self.actions[action_id]["Selected Text Length"]
self.actions[action_id]["Options"].append({"text": self.actions[action_id]["Selected Text"], "Pinned": False, "Previous Selection": True, "Edited": False}) self.actions[action_id]["Options"].append({"text": self.actions[action_id]["Selected Text"], "Pinned": False, "Previous Selection": True, "Edited": False})
self.actions[action_id]["Selected Text"] = "" self.actions[action_id]["Selected Text"] = ""
if "wi_highlighted_text" in self.actions[action_id]:
del self.actions[action_id]["wi_highlighted_text"]
self.actions[action_id]['Selected Text Length'] = 0 self.actions[action_id]['Selected Text Length'] = 0
self.action_count -= 1 self.action_count -= 1
process_variable_changes(self.socketio, "story", 'actions', {"id": action_id, 'action': self.actions[action_id]}, None) process_variable_changes(self.socketio, "story", 'actions', {"id": action_id, 'action': self.actions[action_id]}, None)
@@ -1472,10 +1474,8 @@ class KoboldStoryRegister(object):
def pop(self): def pop(self):
if self.action_count >= 0: if self.action_count >= 0:
text = self.actions[self.action_count]['Selected Text'] text = self.actions[self.action_count]['Selected Text']
length = self.actions[self.action_count]['Selected Text Length']
self.delete_action(self.action_count) self.delete_action(self.action_count)
logger.debug("Calcing AI Text from Action Pop") logger.debug("Calcing AI Text from Action Pop")
ignore = self.koboldai_vars.calc_ai_text()
return text return text
else: else:
return None return None

39
static/koboldai.js
View File

@@ -230,30 +230,8 @@ function fix_text(val) {
function create_options(action) { function create_options(action) {
//Set all options before the next chunk to hidden //Set all options before the next chunk to hidden
document.getElementById('main-grid').setAttribute('option_length', action.action.Options.length); document.getElementById('main-grid').setAttribute('option_length', action.action.Options.length);
var option_container = document.getElementById("Select Options"); var option_chunk = document.getElementById("Select Options");
var current_chunk = parseInt(document.getElementById("action_count").textContent)+1;
if (current_chunk != action.id.toString()) {
return;
}
if (document.getElementById("Select Options Chunk " + current_chunk)) {
//document.getElementById("Select Options Chunk " + current_chunk).classList.remove("hidden");
document.getElementById("Select Options Chunk " + current_chunk).remove();
}
if (document.getElementById("Select Options Chunk " + (current_chunk-1))) {
//document.getElementById("Select Options Chunk " + (current_chunk-1)).classList.add("hidden");
document.getElementById("Select Options Chunk " + (current_chunk-1)).remove();
}
if (document.getElementById("Select Options Chunk "+action.id)) {
var option_chunk = document.getElementById("Select Options Chunk "+action.id);
} else {
var option_chunk = document.createElement("div");
option_chunk.id = "Select Options Chunk "+action.id;
if (current_chunk != action.id) {
option_chunk.classList.add("hidden");
}
option_container.append(option_chunk);
}
//first, let's clear out our existing data //first, let's clear out our existing data
while (option_chunk.firstChild) { while (option_chunk.firstChild) {
option_chunk.removeChild(option_chunk.firstChild); option_chunk.removeChild(option_chunk.firstChild);
@@ -339,11 +317,6 @@ function create_options(action) {
function process_actions_data(data) { function process_actions_data(data) {
start_time = Date.now(); start_time = Date.now();
if (document.getElementById("Selected Text").firstElementChild.id == "story_prompt") {
first_story_element = document.getElementById("Selected Text").firstElementChild.nextElementSibling;
} else {
first_story_element = document.getElementById("Selected Text").firstElementChild;
}
if (Array.isArray(data.value)) { if (Array.isArray(data.value)) {
actions = data.value; actions = data.value;
} else { } else {
@@ -439,6 +412,7 @@ function do_story_text_updates(action) {
} }
function do_prompt(data) { function do_prompt(data) {
console.log(data);
var elements_to_change = document.getElementsByClassName("var_sync_story_prompt"); var elements_to_change = document.getElementsByClassName("var_sync_story_prompt");
for (item of elements_to_change) { for (item of elements_to_change) {
//clear out the item first //clear out the item first
@@ -631,7 +605,6 @@ function var_changed(data) {
//if (data.name == "sp") { //if (data.name == "sp") {
// console.log({"name": data.name, "data": data}); // console.log({"name": data.name, "data": data});
//} //}
console.log(data);
if (data.name in vars_sync_time) { if (data.name in vars_sync_time) {
if (vars_sync_time[data.name] > Date.parse(data.transmit_time)) { if (vars_sync_time[data.name] > Date.parse(data.transmit_time)) {
@@ -2299,7 +2272,6 @@ function show_error_message(data) {
while (error_box_data.firstChild) { while (error_box_data.firstChild) {
error_box_data.removeChild(error_box_data.firstChild); error_box_data.removeChild(error_box_data.firstChild);
} }
console.log(data);
if (Array.isArray(data)) { if (Array.isArray(data)) {
for (item of data) { for (item of data) {
$e("div", error_box_data, {'innerHTML': item, 'classes': ['console_text']}) $e("div", error_box_data, {'innerHTML': item, 'classes': ['console_text']})
@@ -2391,7 +2363,6 @@ async function download_story_to_json() {
let r = await fetch("json"); let r = await fetch("json");
let j = await r.json(); let j = await r.json();
downloadString(JSON.stringify(j), j['story_name']+".json") downloadString(JSON.stringify(j), j['story_name']+".json")
console.log("Got JSON");
} }
catch(err) { catch(err) {
//first we're going to find all the var_sync_story_ classes used in the document. //first we're going to find all the var_sync_story_ classes used in the document.
@@ -2456,7 +2427,6 @@ async function download_story_to_json() {
j['gamestarted'] = true; j['gamestarted'] = true;
downloadString(JSON.stringify(j), j['story_name']+".json") downloadString(JSON.stringify(j), j['story_name']+".json")
console.log("used alt json");
} }
} }
@@ -2794,7 +2764,6 @@ function save_preset() {
//--------------------------------------------General UI Functions------------------------------------ //--------------------------------------------General UI Functions------------------------------------
function privacy_mode(enabled) { function privacy_mode(enabled) {
console.log("Setting Privacy Mode: "+enabled);
if (enabled) { if (enabled) {
document.getElementById('SideMenu').classList.add("superblur"); document.getElementById('SideMenu').classList.add("superblur");
document.getElementById('main-grid').classList.add("superblur"); document.getElementById('main-grid').classList.add("superblur");
@@ -5654,7 +5623,6 @@ function infinite_scroll() {
} }
function run_infinite_scroll_update(action_type, actions, first_action) { function run_infinite_scroll_update(action_type, actions, first_action) {
console.log("action_type: "+action_type);
//console.log("first_action: "+first_action); //console.log("first_action: "+first_action);
if (action_type == "append") { if (action_type == "append") {
if (document.getElementById('Selected Text Chunk '+actions[actions.length-1].id)) { if (document.getElementById('Selected Text Chunk '+actions[actions.length-1].id)) {
@@ -5704,10 +5672,7 @@ function run_infinite_scroll_update(action_type, actions, first_action) {
} }
if (scroll_trigger_element != undefined) { if (scroll_trigger_element != undefined) {
console.log("Starting auto_loader");
auto_loader_timeout = setTimeout(function() {socket.emit("get_next_100_actions", parseInt(scroll_trigger_element.getAttribute("chunk")));}, 1000); auto_loader_timeout = setTimeout(function() {socket.emit("get_next_100_actions", parseInt(scroll_trigger_element.getAttribute("chunk")));}, 1000);
} else {
console.log("Skipping auto_loader");
} }
} }