DominikDoom/a1111-sd-webui-tagcomplete
1
0
Fork 0
mirror of https://github.com/DominikDoom/a1111-sd-webui-tagcomplete.git synced 2026-03-12 00:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix model name based blacklist

Browse Source 
Now also based on the hash mutation observer
This commit is contained in:
Dominik Reh
2023-03-25 13:40:04 +01:00
parent 39abf1fe3a
commit c08746a2c0
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
javascript/tagAutocomplete.js
View File

@@ -256,13 +256,14 @@ function isEnabled() {
.filter(x => x.length > 0);
let shortHash = currentModelHash.substring(0, 10);
let modelNameWithoutHash = currentModelName.replace(/\[.*\]$/g, "").trim();
if (CFG.activeIn.modelListMode.toLowerCase() === "blacklist") {
// If the current model is in the blacklist, disable
return modelList.filter(x => x === currentModelName || x === currentModelHash || x === shortHash).length === 0;
return modelList.filter(x => x === currentModelName || x === modelNameWithoutHash || x === currentModelHash || x === shortHash).length === 0;
} else {
// If the current model is in the whitelist, enable.
// An empty whitelist is ignored.
return modelList.length === 0 || modelList.filter(x => x === currentModelName || x === currentModelHash || x === shortHash).length > 0;
return modelList.length === 0 || modelList.filter(x => x === currentModelName || x === modelNameWithoutHash || x === currentModelHash || x === shortHash).length > 0;
}
} else {
return false;
@@ -806,14 +807,6 @@ async function setup() {
});
});
// Add change listener to model dropdown to react to model changes
let modelDropdown = gradioApp().querySelector("#setting_sd_model_checkpoint span.single-select");
currentModelName = modelDropdown.textContent;
modelDropdown?.addEventListener("change", () => {
setTimeout(() => {
currentModelName = modelDropdown.textContent;
}, 100);
});
// Add mutation observer for the model hash text to also allow hash-based blacklist again
let modelHashText = gradioApp().querySelector("#sd_checkpoint_hash");
if (modelHashText) {
@@ -822,6 +815,8 @@ async function setup() {
for (const mutation of mutationList) {
if (mutation.type === "attributes" && mutation.attributeName === "title") {
currentModelHash = mutation.target.title;
let modelDropdown = gradioApp().querySelector("#setting_sd_model_checkpoint span.single-select");
currentModelName = modelDropdown?.textContent;
}
}
});