From 8e538ba300e3475004658c8cc60430aa76ca592b Mon Sep 17 00:00:00 2001 From: Llama <34464159+pi6am@users.noreply.github.com> Date: Fri, 25 Nov 2022 21:35:01 -0800 Subject: [PATCH 1/5] Combine append and append_submit, add docstring to append. Combine the append and append_submit methods, and add an optional parameter to append to indicate whether it is a submission. Add a docstring to append. --- aiserver.py | 2 +- koboldai_settings.py | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/aiserver.py b/aiserver.py index 2db72cae..03042895 100644 --- a/aiserver.py +++ b/aiserver.py @@ -4716,7 +4716,7 @@ def actionsubmit(data, actionmode=0, force_submit=False, force_prompt_gen=False, if(len(koboldai_vars.prompt.strip()) == 0): koboldai_vars.prompt = data else: - koboldai_vars.actions.append_submission(data) + koboldai_vars.actions.append(data, submission=True) update_story_chunk('last') send_debug() diff --git a/koboldai_settings.py b/koboldai_settings.py index 1cc69beb..ecda62ed 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1400,16 +1400,15 @@ class KoboldStoryRegister(object): ignore = self.koboldai_vars.calc_ai_text() self.set_game_saved() self.gen_all_audio() - - def append_submission(self, text, action_id_offset=0, recalc=True): - self._append(text, action_id_offset=action_id_offset, recalc=recalc) - self.submission_id = self.action_count + action_id_offset - def append(self, text, action_id_offset=0, recalc=True): - self._append(text, action_id_offset=action_id_offset, recalc=recalc) - self.submission_id = 0 + def append(self, text, action_id_offset=0, recalc=True, submission=False): + """Create a new action and append it to the table of actions. - def _append(self, text, action_id_offset=0, recalc=True): + text: The text of the action. + action_id_offset: An optional offset added to action_count when assiging an action_id. + recalc: If True, recalculate the context and generate audio. + submission: If True, mark this action as a user submission. + """ if self.koboldai_vars.remove_double_space: while " " in text: text = text.replace(" ", " ") @@ -1441,7 +1440,12 @@ class KoboldStoryRegister(object): "Probabilities": [], "Time": int(time.time()), } - + + if submission: + self.submission_id = action_id + else: + self.submission_id = 0 + if self.story_settings is not None: self.story_settings.assign_world_info_to_actions(action_id=action_id, no_transmit=True) process_variable_changes(self.socketio, "story", 'actions', {"id": action_id, 'action': self.actions[action_id]}, None) From 39a040437b4a83bea73fbfaeaad7b87475d04d61 Mon Sep 17 00:00:00 2001 From: ebolam Date: Sat, 26 Nov 2022 11:09:29 -0500 Subject: [PATCH 2/5] Fix for missing rep pen in UI1 --- gensettings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gensettings.py b/gensettings.py index 6af24f21..892fea9c 100644 --- a/gensettings.py +++ b/gensettings.py @@ -113,7 +113,6 @@ gensettingstf = [ "ui_level": 1 }, { - "UI_V2_Only": True, "uitype": "slider", "unit": "float", "label": "Repetition Penalty", From 498d999a06ee2bf9b4422df00c40d8ad71ade0ab Mon Sep 17 00:00:00 2001 From: ebolam Date: Sat, 26 Nov 2022 17:24:04 -0500 Subject: [PATCH 3/5] Added fix for UI2 to now show the back value when there is only one option (use redo to go restore it) --- static/koboldai.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/static/koboldai.js b/static/koboldai.js index e1d98fd1..5c872ed2 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -266,6 +266,30 @@ function create_options(action) { while (option_chunk.firstChild) { option_chunk.removeChild(option_chunk.firstChild); } + + //Let's check if we only have a single redo option. In that case we din't show as the user can use the redo button + seen_prev_selection = false; + show_options = false; + console.log(action.action.Options); + for (item of action.action.Options) { + if (!(item['Previous Selection'])) { + console.log(item); + show_options = true; + break; + } else if (item['Previous Selection']) { + if (seen_prev_selection) { + show_options = true; + break; + } else { + seen_prev_selection = true; + } + } + } + console.log("seen_prev_selection: "+seen_prev_selection+" show_options: "+show_options); + if (!(show_options)) { + return; + } + var table = document.createElement("div"); table.classList.add("sequences"); //Add Redo options From d3abf1761898e38838be29088c04f7943d5ed437 Mon Sep 17 00:00:00 2001 From: ebolam Date: Sat, 26 Nov 2022 17:26:34 -0500 Subject: [PATCH 4/5] Fix for missing text size --- templates/settings flyout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/settings flyout.html b/templates/settings flyout.html index 8dcfcf52..db031fe0 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -285,7 +285,7 @@ -
+
Game Text Size: help_icon From 7141888163f298a1572bab2b7199d69a61df9bbe Mon Sep 17 00:00:00 2001 From: ebolam Date: Sat, 26 Nov 2022 17:46:39 -0500 Subject: [PATCH 5/5] Fix for pin/delete/redo icons on options in light colored themes --- static/koboldai.css | 3 ++- static/koboldai.js | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 63ecfa57..74dea16c 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -1331,9 +1331,10 @@ body { margin: auto auto auto auto; display: flex; flex-direction: column; + color: var(--flyout_text); } -.delete_option_icon { +.option_icon { font-size: 1.2em !important; } diff --git a/static/koboldai.js b/static/koboldai.js index c6ba761e..67bbbcdb 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -317,10 +317,12 @@ function create_options(action) { iconcell.classList.add("sequnce_icon"); var icon = document.createElement("span"); icon.id = "Pin_"+i; - icon.classList.add("oi"); - icon.setAttribute('data-glyph', "loop-circular"); + icon.classList.add("material-icons-outlined"); + icon.classList.add("option_icon"); + icon.classList.add("cursor"); + icon.textContent = "cached"; iconcell.append(icon); - delete_icon = $e("span", iconcell, {"classes": ["material-icons-outlined", "cursor", 'delete_option_icon'], + delete_icon = $e("span", iconcell, {"classes": ["material-icons-outlined", "cursor", 'option_icon'], "tooltip": "Delete Option", 'option_id': i, 'option_chunk': action.id, 'textContent': 'delete'}); delete_icon.onclick = function () { @@ -353,8 +355,10 @@ function create_options(action) { iconcell.classList.add("sequnce_icon"); var icon = document.createElement("span"); icon.id = "Pin_"+i; - icon.classList.add("oi"); - icon.setAttribute('data-glyph', "pin"); + icon.classList.add("material-icons-outlined"); + icon.classList.add("option_icon"); + icon.classList.add("cursor"); + icon.textContent = "push_pin"; if (!(item.Pinned)) { icon.setAttribute('style', "filter: brightness(50%);"); }