Another bug fix from united merge

This commit is contained in:
ebolam
2022-08-30 15:57:20 -04:00
parent 2a6236a2ec
commit a4d351ecfb
3 changed files with 14 additions and 13 deletions

View File

@@ -1438,7 +1438,7 @@ def get_oai_models(data):
if changed: if changed:
with open("settings/{}.settings".format(model), "w") as file: with open("settings/{}.settings".format(model), "w") as file:
js["apikey"] = key 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('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") 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 changed = False
if changed: if changed:
f = open("settings/" + data['model'].replace('/', '_') + ".breakmodel", "w") 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() f.close()
koboldai_vars.colaburl = data['url'] + "/request" koboldai_vars.colaburl = data['url'] + "/request"
koboldai_vars.model = data['model'] koboldai_vars.model = data['model']

View File

@@ -1174,13 +1174,14 @@ function update_gpu_layers() {
function load_model() { function load_model() {
var accept = document.getElementById('btn_loadmodelaccept'); var accept = document.getElementById('btn_loadmodelaccept');
gpu_layers = [] gpu_layers = []
for (let i=0; i < document.getElementById("gpu_count").value; i++) { disk_layers = 0;
gpu_layers.push(document.getElementById("gpu_layers_"+i).value); if (!(document.getElementById("modellayers").classList.contains("hidden"))) {
} for (let i=0; i < document.getElementById("gpu_count").value; i++) {
if (document.getElementById("disk_layers")) { gpu_layers.push(document.getElementById("gpu_layers_"+i).value);
disk_layers = document.getElementById("disk_layers").value; }
} else { if (document.getElementById("disk_layers")) {
disk_layers = "0"; disk_layers = document.getElementById("disk_layers").value;
}
} }
//Need to do different stuff with custom models //Need to do different stuff with custom models
if ((accept.getAttribute('menu') == 'GPT2Custom') || (accept.getAttribute('menu') == 'NeoCustom')) { if ((accept.getAttribute('menu') == 'GPT2Custom') || (accept.getAttribute('menu') == 'NeoCustom')) {

View File

@@ -27,10 +27,10 @@
<div id="loadmodellistcontent" class="popup_list_area"></div> <div id="loadmodellistcontent" class="popup_list_area"></div>
<div class="popup_load_cancel"> <div class="popup_load_cancel">
<div> <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 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" 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="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});"> <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" id="oaimodel"><option value="">Select OAI Model</option></select> <select class="hidden fullwidth settings_select" id="oaimodel"><option value="">Select OAI Model</option></select>
</div> </div>
<div class="hidden" id=modellayers> <div class="hidden" id=modellayers>
<div class="justifyleft"> <div class="justifyleft">