Fix for APIs and Custom Models not working in AI menu

This commit is contained in:
ebolam
2022-08-11 10:33:47 -04:00
parent ad6bf95c42
commit 9016e29c66

View File

@ -1078,7 +1078,7 @@ function buildLoadModelList(ar, menu, breadcrumbs, showdelete) {
html = html + "<span class=\"loadlisticon loadmodellisticon-folder oi oi-folder allowed\" aria-hidden=\"true\"></span>" html = html + "<span class=\"loadlisticon loadmodellisticon-folder oi oi-folder allowed\" aria-hidden=\"true\"></span>"
} else { } else {
//this is a model //this is a model
html = html + "<div class=\"loadlistpadding\"></div>" html = html + "<div class=\"loadlisticon oi oi-caret-right allowed\"></div>"
} }
//now let's do the delete icon if applicable //now let's do the delete icon if applicable
@ -1096,6 +1096,7 @@ function buildLoadModelList(ar, menu, breadcrumbs, showdelete) {
</div>" </div>"
loadmodelcontent.append(html); loadmodelcontent.append(html);
//If this is a menu //If this is a menu
console.log(ar[i]);
if(ar[i][3]) { if(ar[i][3]) {
$("#loadmodel"+i).off("click").on("click", (function () { $("#loadmodel"+i).off("click").on("click", (function () {
return function () { return function () {
@ -1105,15 +1106,27 @@ function buildLoadModelList(ar, menu, breadcrumbs, showdelete) {
})(i)); })(i));
//Normal load //Normal load
} else { } else {
$("#loadmodel"+i).off("click").on("click", (function () { if (['NeoCustom', 'GPT2Custom'].includes(menu)) {
return function () { $("#loadmodel"+i).off("click").on("click", (function () {
$("#use_gpu_div").addClass("hidden"); return function () {
$("#modelkey").addClass("hidden"); $("#use_gpu_div").addClass("hidden");
$("#modellayers").addClass("hidden"); $("#modelkey").addClass("hidden");
socket.send({'cmd': 'selectmodel', 'data': $(this).attr("name")}); $("#modellayers").addClass("hidden");
highlightLoadLine($(this)); socket.send({'cmd': 'selectmodel', 'data': $(this).attr("name"), 'path': $(this).attr("pretty_name")});
} highlightLoadLine($(this));
})(i)); }
})(i));
} else {
$("#loadmodel"+i).off("click").on("click", (function () {
return function () {
$("#use_gpu_div").addClass("hidden");
$("#modelkey").addClass("hidden");
$("#modellayers").addClass("hidden");
socket.send({'cmd': 'selectmodel', 'data': $(this).attr("name")});
highlightLoadLine($(this));
}
})(i));
}
} }
} }
} }
@ -2841,6 +2854,8 @@ $(document).ready(function(){
if (msg.key) { if (msg.key) {
$("#modelkey").removeClass("hidden"); $("#modelkey").removeClass("hidden");
$("#modelkey")[0].value = msg.key_value; $("#modelkey")[0].value = msg.key_value;
//if we're in the API list, disable to load button until the model is selected (after the API Key is entered)
disableButtons([load_model_accept]);
} else { } else {
$("#modelkey").addClass("hidden"); $("#modelkey").addClass("hidden");
@ -2878,6 +2893,7 @@ $(document).ready(function(){
} }
} else if(msg.cmd == 'oai_engines') { } else if(msg.cmd == 'oai_engines') {
$("#oaimodel").removeClass("hidden") $("#oaimodel").removeClass("hidden")
enableButtons([load_model_accept]);
selected_item = 0; selected_item = 0;
length = $("#oaimodel")[0].options.length; length = $("#oaimodel")[0].options.length;
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
@ -2914,6 +2930,7 @@ $(document).ready(function(){
opt.innerHTML = engine[1]; opt.innerHTML = engine[1];
$("#oaimodel")[0].appendChild(opt); $("#oaimodel")[0].appendChild(opt);
} }
enableButtons([load_model_accept]);
} }
}); });