From a4d351ecfb69b64d0b50b07a2c75d8d7c56721e7 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Tue, 30 Aug 2022 15:57:20 -0400
Subject: [PATCH] Another bug fix from united merge

---
 aiserver.py           |  4 ++--
 static/koboldai.js    | 15 ++++++++-------
 templates/popups.html |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 354f0048..2dc0ef48 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -1438,7 +1438,7 @@ def get_oai_models(data):
         if changed:
             with open("settings/{}.settings".format(model), "w") as file:
                 js["apikey"] = key
-                file.write(json.dumps(js, indent=3), room="UI_1")
+                file.write(json.dumps(js, indent=3))
             
         emit('from_server', {'cmd': 'oai_engines', 'data': engines, 'online_model': online_model}, broadcast=True, room="UI_1")
         emit('oai_engines', {'data': engines, 'online_model': online_model}, broadcast=False, room="UI_2")
@@ -7221,7 +7221,7 @@ def UI_2_load_model(data):
                 changed = False
     if changed:
         f = open("settings/" + data['model'].replace('/', '_') + ".breakmodel", "w")
-        f.write(data['gpu_layers'] + '\n' + data['disk_layers'])
+        f.write("{}\n{}".format(data['gpu_layers'], data['disk_layers']))
         f.close()
     koboldai_vars.colaburl = data['url'] + "/request"
     koboldai_vars.model = data['model']
diff --git a/static/koboldai.js b/static/koboldai.js
index b7e113ff..8a0ffb99 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -1174,13 +1174,14 @@ function update_gpu_layers() {
 function load_model() {
 	var accept = document.getElementById('btn_loadmodelaccept');
 	gpu_layers = []
-	for (let i=0; i < document.getElementById("gpu_count").value; i++) {
-		gpu_layers.push(document.getElementById("gpu_layers_"+i).value);
-	}
-	if (document.getElementById("disk_layers")) {
-		disk_layers = document.getElementById("disk_layers").value;
-	} else {
-		disk_layers = "0";
+	disk_layers = 0;
+	if (!(document.getElementById("modellayers").classList.contains("hidden"))) {
+		for (let i=0; i < document.getElementById("gpu_count").value; i++) {
+			gpu_layers.push(document.getElementById("gpu_layers_"+i).value);
+		}
+		if (document.getElementById("disk_layers")) {
+			disk_layers = document.getElementById("disk_layers").value;
+		}
 	}
 	//Need to do different stuff with custom models
 	if ((accept.getAttribute('menu') == 'GPT2Custom') || (accept.getAttribute('menu') == 'NeoCustom')) {
diff --git a/templates/popups.html b/templates/popups.html
index 13de10ec..6a9b4e80 100644
--- a/templates/popups.html
+++ b/templates/popups.html
@@ -27,10 +27,10 @@
 	<div id="loadmodellistcontent" class="popup_list_area"></div>
 	<div class="popup_load_cancel">
 		<div>
-			<input class="hidden" type="text" placeholder="key" id="modelkey" onblur="socket.emit('OAI_Key_Update', {'model': document.getElementById('btn_loadmodelaccept').getAttribute('selected_model'), 'key': this.value});">
-			<input class="hidden" type="text" placeholder="Enter the URL of the server (For example a trycloudflare link)" id="modelurl" onchange="check_enable_model_load()">
-			<input class="hidden" type="text" placeholder="Model Path or Hugging Face Name" id="custommodelname" menu="" onblur="socket.send({'cmd': 'selectmodel', 'data': $(this).attr('menu'), 'path_modelname': $('#custommodelname')[0].value});">
-			<select class="hidden" id="oaimodel"><option value="">Select OAI Model</option></select>
+			<input class="hidden fullwidth" type="text" placeholder="key" id="modelkey" onblur="socket.emit('OAI_Key_Update', {'model': document.getElementById('btn_loadmodelaccept').getAttribute('selected_model'), 'key': this.value});">
+			<input class="hidden fullwidth" type="text" placeholder="Enter the URL of the server (For example a trycloudflare link)" id="modelurl" onchange="check_enable_model_load()">
+			<input class="hidden fullwidth" type="text" placeholder="Model Path or Hugging Face Name" id="custommodelname" menu="" onblur="socket.send({'cmd': 'selectmodel', 'data': $(this).attr('menu'), 'path_modelname': $('#custommodelname')[0].value});">
+			<select class="hidden fullwidth settings_select" id="oaimodel"><option value="">Select OAI Model</option></select>
 		</div>
 		<div class="hidden" id=modellayers>
 			<div class="justifyleft">