xinyun/ComfyUI-KJNodes
1
0
Fork 0
mirror of https://git.datalinker.icu/kijai/ComfyUI-KJNodes.git synced 2025-12-09 21:04:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Further fix for input selection nodes

Browse Source
This commit is contained in:
kijai 2025-04-20 17:49:51 +03:00
parent d399bc559d
commit 9903cf078e
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodes/image_nodes.py
View File

@ -1793,7 +1793,8 @@ Inserts a latent at the specified index into the original latent batch.
class ImageBatchFilter:
RETURN_TYPES = ("IMAGE",)
RETURN_TYPES = ("IMAGE", "STRING",)
RETURN_NAMES = ("images", "removed_indices",)
FUNCTION = "filter"
CATEGORY = "KJNodes/image"
DESCRIPTION = "Removes empty images from a batch"
@ -1823,6 +1824,7 @@ class ImageBatchFilter:
mean_diff = color_diff.mean(dim=(1, 2, 3))
empty_indices = mean_diff <= empty_threshold
empty_indices_string = ', '.join([str(i) for i in range(B) if empty_indices[i]])
if replacement_image is not None:
B_rep, H_rep, W_rep, C_rep = replacement_image.shape
@ -1831,10 +1833,10 @@ class ImageBatchFilter:
replacement = common_upscale(replacement.movedim(-1, 1), W, H, "lanczos", "center").movedim(1, -1)
input_images[empty_indices] = replacement[0]
return (input_images,)
return (input_images, empty_indices_string,)
else:
non_empty_images = input_images[~empty_indices]
return (non_empty_images,)
return (non_empty_images, empty_indices_string,)
class GetImagesFromBatchIndexed:

47
web/js/jsnodes.js
View File

@ -17,7 +17,7 @@ app.registerExtension({
this.inputs = [];
}
const target_number_of_inputs = this.widgets.find(w => w.name === "inputcount")["value"];
const num_inputs = this.inputs.filter(input => input.type !== "INT").length
const num_inputs = this.inputs.filter(input => input.type === this.cond_type).length
if(target_number_of_inputs===num_inputs)return; // already set, do nothing
if(target_number_of_inputs < num_inputs){
@ -38,46 +38,51 @@ app.registerExtension({
case "TransitionImagesMulti":
nodeType.prototype.onNodeCreated = function () {
this._type = "IMAGE"
this.inputs_offset = nodeData.name.includes("selective")?1:0
this.addWidget("button", "Update inputs", null, () => {
if (!this.inputs) {
this.inputs = [];
}
const target_number_of_inputs = this.widgets.find(w => w.name === "inputcount")["value"];
const num_inputs = this.inputs.filter(input => input.type !== "INT").length
console.log("target_number_of_inputs", target_number_of_inputs)
const num_inputs = this.inputs.filter(input => input.type === this._type).length
console.log("num_inputs", num_inputs)
if(target_number_of_inputs===num_inputs)return; // already set, do nothing
if(target_number_of_inputs < num_inputs){
for(let i = num_inputs; i>=this.inputs_offset+target_number_of_inputs; i--)
this.removeInput(i)
const inputs_to_remove = num_inputs - target_number_of_inputs;
for(let i = 0; i < inputs_to_remove; i++) {
this.removeInput(this.inputs.length - 1);
}
}
else{
for(let i = num_inputs+1-this.inputs_offset; i <= target_number_of_inputs; ++i)
for(let i = num_inputs+1; i <= target_number_of_inputs; ++i)
this.addInput(`image_${i}`, this._type)
}
});
}
break;
case "MaskBatchMulti":
nodeType.prototype.onNodeCreated = function () {
this._type = "MASK"
this.inputs_offset = nodeData.name.includes("selective")?1:0
this.addWidget("button", "Update inputs", null, () => {
if (!this.inputs) {
this.inputs = [];
}
const target_number_of_inputs = this.widgets.find(w => w.name === "inputcount")["value"];
const num_inputs = this.inputs.filter(input => input.type !== "INT").length
const num_inputs = this.inputs.filter(input => input.type === this._type).length
if(target_number_of_inputs===num_inputs)return; // already set, do nothing
if(target_number_of_inputs < num_inputs){
for(let i = num_inputs; i>=this.inputs_offset+target_number_of_inputs; i--)
this.removeInput(i)
const inputs_to_remove = num_inputs - target_number_of_inputs;
for(let i = 0; i < inputs_to_remove; i++) {
this.removeInput(this.inputs.length - 1);
}
}
else{
for(let i = num_inputs+1-this.inputs_offset; i <= target_number_of_inputs; ++i)
for(let i = num_inputs+1; i <= target_number_of_inputs; ++i)
this.addInput(`mask_${i}`, this._type)
}
}
});
}
break;
@ -225,21 +230,23 @@ app.registerExtension({
originalOnNodeCreated.apply(this, arguments);
this._type = "STRING";
this.inputs_offset = nodeData.name.includes("selective") ? 1 : 0;
this.addWidget("button", "Update inputs", null, () => {
if (!this.inputs) {
this.inputs = [];
}
const target_number_of_inputs = this.widgets.find(w => w.name === "inputcount")["value"];
const num_inputs = this.inputs.filter(input => input.type !== "INT").length
const num_inputs = this.inputs.filter(input => input.name && input.name.toLowerCase().includes("string_")).length
if (target_number_of_inputs === num_inputs) return; // already set, do nothing
if (target_number_of_inputs < num_inputs) {
for (let i = num_inputs; i >= this.inputs_offset + target_number_of_inputs; i--)
this.removeInput(i);
} else {
for (let i = num_inputs + 1 - this.inputs_offset; i <= target_number_of_inputs; ++i)
this.addInput(`string_${i}`, this._type);
if(target_number_of_inputs < num_inputs){
const inputs_to_remove = num_inputs - target_number_of_inputs;
for(let i = 0; i < inputs_to_remove; i++) {
this.removeInput(this.inputs.length - 1);
}
}
else{
for(let i = num_inputs+1; i <= target_number_of_inputs; ++i)
this.addInput(`string_${i}`, this._type)
}
});
}