Merge error fix

aiserver.py

@@ -255,12 +255,7 @@ model_menu = {
     }
 
 
-    def add_text(self, text):
-        self.queue.append({
-            "decoded": text,
-            "probabilities": self.probability_buffer
-        })
-        self.probability_buffer = None
+
 class Send_to_socketio(object):
     def write(self, bar):
         print(bar, end="")

static/koboldai.js

@@ -2013,6 +2013,16 @@ function process_log_message(data) {
 	if (level == 'ERROR') {
 		show_error_message(data['html']);
 	}
+	
+	//put log message in log popup
+	log_popup = document.getElementById('log_popup');
+	log_popup.classList.remove("hidden");
+	log_popup_data = log_popup.querySelector("#popup_list_area")
+	//clear out the error box
+	for (item of data['html']) {
+		$e("div", log_popup_data, {'innerHTML': item, 'classes': ['console_text']})
+		$e("br", log_popup_data)
+	}
 }
 
 //--------------------------------------------UI to Server Functions----------------------------------

templates/popups.html

@@ -130,6 +130,19 @@
 		<button type="button" class="btn btn-primary popup_load_cancel_button" onclick="document.getElementById('error_message').classList.add('hidden');">Ok</button>
 	</div>
 </div>
+
+<!---------------- log screen ---------------------->
+<div class="popup hidden" id="log_popup">
+	<div class="title">
+		<div class="popuptitletext">Log</div>
+	</div>
+	<div id="popup_list_area" class="popup_list_area" style="overflow-x: scroll;">
+		
+	</div>
+	<div class="popup_load_cancel">
+		<button type="button" class="btn btn-primary popup_load_cancel_button" onclick="document.getElementById('error_message').classList.add('hidden');">Ok</button>
+	</div>
+</div>
 <!---------------- Advanced Theme Editor ---------------------->
 <div class="popup hidden" id="advanced_theme_editor">
 	<div class="title">