From 72827ed1497b89e3308cbf5b5c73ab96b94d24e0 Mon Sep 17 00:00:00 2001 From: ebolam Date: Wed, 29 Jun 2022 17:44:22 -0400 Subject: [PATCH] Colab fix and send_to_ui fix --- aiserver.py | 2 +- koboldai_settings.py | 9 +++++---- static/koboldai.js | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/aiserver.py b/aiserver.py index 023dbb42..2aa90c2c 100644 --- a/aiserver.py +++ b/aiserver.py @@ -4213,7 +4213,7 @@ def tpumtjgenerate(txt, minimum, maximum, found_entries=None): koboldai_vars.actions.append_options([x["generated_text"] for x in genout]) genout = [{"generated_text": x['text']} for x in koboldai_vars.actions.get_current_options()] if(len(koboldai_vars.actions.get_current_options()) == 1): - genresult(koboldai_vars.actions.get_current_options()[0]) + genresult(koboldai_vars.actions.get_current_options()[0]['text']) else: if(koboldai_vars.lua_koboldbridge.restart_sequence is not None and koboldai_vars.lua_koboldbridge.restart_sequence > 0): genresult(genout[koboldai_vars.lua_koboldbridge.restart_sequence-1]["generated_text"]) diff --git a/koboldai_settings.py b/koboldai_settings.py index 1f5f9a2f..76553869 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -88,10 +88,11 @@ class koboldai_vars(object): self._model_settings.send_to_ui() self._user_settings.send_to_ui() self._system_settings.send_to_ui() - if 'story' in self._sessions: - self._story_settings[self._sessions['story']].send_to_ui() - else: - self._story_settings['default'].send_to_ui() + #if 'story' in self._sessions: + # self._story_settings[self._sessions['story']].send_to_ui() + #else: + # self._story_settings['default'].send_to_ui() + self._story_settings['default'].send_to_ui() def __setattr__(self, name, value): if name[0] == "_": diff --git a/static/koboldai.js b/static/koboldai.js index 4dad96e9..7eca766e 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -8,7 +8,7 @@ socket.on("disconnect", (reason, details) => { }); socket.on('reset_story', function(){reset_story();}); socket.on('var_changed', function(data){var_changed(data);}); -socket.onAny(function(event_name, data) {console.log({"event": event_name, "class": data.classname, "data": data});}); +//socket.onAny(function(event_name, data) {console.log({"event": event_name, "class": data.classname, "data": data});}); var backend_vars = {}; var presets = {} @@ -141,6 +141,7 @@ function create_options(data) { } function do_story_text_updates(data) { + console.log(data); story_area = document.getElementById('Selected Text'); if (document.getElementById('Selected Text Chunk '+data.value.id)) { document.getElementById('Selected Text Chunk '+data.value.id).textContent = data.value.text;