From ed62f852ecfe3fd4b9206ba6219e436703bf1b76 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Wed, 7 Sep 2022 19:47:33 -0400
Subject: [PATCH] Fix for abort

---
 aiserver.py              | 19 ++++++++++---------
 koboldai_settings.py     | 13 +++++++++----
 static/koboldai.css      |  5 +++++
 templates/index_new.html |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 25785c84..49aabc34 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -918,17 +918,17 @@ def loadsettings():
 #  Load a soft prompt from a file
 #==================================================================#
 
-def check_for_sp_change():
-    while(True):
-        time.sleep(0.05)
-
-        if(koboldai_vars.sp_changed):
-            with app.app_context():
-                emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
-            koboldai_vars.sp_changed = False
+#def check_for_sp_change():
+#    while(True):
+#        time.sleep(0.05)
+#
+#        if(koboldai_vars.sp_changed):
+#            with app.app_context():
+#                emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
+#            koboldai_vars.sp_changed = False
 
 
-socketio.start_background_task(check_for_sp_change)
+#socketio.start_background_task(check_for_sp_change)
 
 def spRequest(filename):
     if(not koboldai_vars.allowsp):
@@ -1798,6 +1798,7 @@ def patch_transformers():
             if(koboldai_vars.abort or koboldai_vars.generated_tkns >= koboldai_vars.genamt):
                 self.regeneration_required = False
                 self.halt = False
+                koboldai_vars.abort = False
                 return True
             if(koboldai_vars.standalone):
                 return False
diff --git a/koboldai_settings.py b/koboldai_settings.py
index 06db24ce..cbdb3c44 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -317,7 +317,7 @@ class koboldai_vars(object):
         #    return getattr(self._story_settings[self._sessions['story']], name)
         else:
             return getattr(self._story_settings['default'], name)
-        
+
 
 class settings(object):
     def to_json(self):
@@ -796,9 +796,14 @@ class system_settings(settings):
         if name not in self.local_only_variables and name[0] != "_" and not new_variable:
             process_variable_changes(self.socketio, self.__class__.__name__.replace("_settings", ""), name, value, old_value)
             
-            if name == "aibusy" and value == False:
-                koboldai_vars.abort = False
-                
+            #if name == "aibusy" and value == False and self.abort == True:
+            #    koboldai_vars.abort = False
+            
+            #for original UI
+            if name == 'sp_changed':
+                self.socketio.emit('from_server', {'cmd': 'spstatitems', 'data': {koboldai_vars.spfilename: koboldai_vars.spmeta} if koboldai_vars.allowsp and len(koboldai_vars.spfilename) else {}}, namespace=None, broadcast=True, room="UI_1")
+                self.sp_changed = False
+            
             if name == 'horde_share':
                 if self.on_colab == False:
                     if os.path.exists("./KoboldAI-Horde"):
diff --git a/static/koboldai.css b/static/koboldai.css
index 548e054a..5fda3e58 100644
--- a/static/koboldai.css
+++ b/static/koboldai.css
@@ -1403,6 +1403,11 @@ body {
 	height: 0px;
 }
 
+.statusbar_outer[system_aibusy="false"] {
+	display: none;
+	height: 0px;
+}
+
 .statusbar_inner {
 	background-color: var(--statusbar_color);
 	color: var(--statusbar_text_color);
diff --git a/templates/index_new.html b/templates/index_new.html
index ec6884c3..e8f27c4d 100644
--- a/templates/index_new.html
+++ b/templates/index_new.html
@@ -80,7 +80,7 @@
 																											document.getElementById("themetext").value = "";
 																										}'
 																										onkeyup="calc_token_usage()"></textarea>
-			<div class="statusbar_outer hidden" id="status_bar" onclick="socket.emit('abort','');">
+			<div class="statusbar_outer hidden var_sync_alt_system_aibusy" id="status_bar" onclick="socket.emit('abort','');">
 				<div class="statusbar_inner" style="width:0%" onclick="socket.emit('abort','');">0%</div>
 			</div><br>
 			<button type="button" class="btn action_button submit var_sync_alt_system_aibusy" system_aibusy=False id="btnsubmit"