The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Add FluxKontextMultiReferenceLatentMethod node. (#9356)
comfyanonymousc308a8840aeb
diff --git a/comfy/ldm/flux/model.py b/comfy/ldm/flux/model.pyindex 8f4d99f54..c4de82795 100644--- a/comfy/ldm/flux/model.py+++ b/comfy/ldm/flux/model.py@@ -224,19 +224,27 @@ class Flux(nn.Module):if ref_latents is not None:h = 0w = 0+ index = 0+ index_ref_method = kwargs.get("ref_latents_method", "offset") == "index"for ref in ref_latents:- h_offset = 0- w_offset = 0- if ref.shape[-2] + h > ref.shape[-1] + w:- w_offset = w+ if index_ref_method:+ index += 1+ h_offset = 0+ w_offset = 0else:- h_offset = h-- kontext, kontext_ids = self.process_img(ref, index=1, h_offset=h_offset, w_offset=w_offset)+ index = 1+ h_offset = 0+ w_offset = 0+ if ref.shape[-2] + h > ref.shape[-1] + w:+ w_offset = w+ else:+ h_offset = h+ h = max(h, ref.shape[-2] + h_offset)+ w = max(w, ref.shape[-1] + w_offset)++ kontext, kontext_ids = self.process_img(ref, index=index, h_offset=h_offset, w_offset=w_offset)img = torch.cat([img, kontext], dim=1)img_ids = torch.cat([img_ids, kontext_ids], dim=1)- h = max(h, ref.shape[-2] + h_offset)- w = max(w, ref.shape[-1] + w_offset)txt_ids = torch.zeros((bs, context.shape[1], 3), device=x.device, dtype=x.dtype)out = self.forward_orig(img, img_ids, context, txt_ids, timestep, y, guidance, control, transformer_options, attn_mask=kwargs.get("attention_mask", None))diff --git a/comfy/model_base.py b/comfy/model_base.pyindex cde61df7c..bf874b875 100644--- a/comfy/model_base.py+++ b/comfy/model_base.py@@ -890,6 +890,10 @@ class Flux(BaseModel):for lat in ref_latents:latents.append(self.process_latent_in(lat))out['ref_latents'] = comfy.conds.CONDList(latents)++ ref_latents_method = kwargs.get("reference_latents_method", None)+ if ref_latents_method is not None:+ out['ref_latents_method'] = comfy.conds.CONDConstant(ref_latents_method)return outdef extra_conds_shapes(self, **kwargs):diff --git a/comfy_extras/nodes_flux.py b/comfy_extras/nodes_flux.pyindex 8a8a17698..c8db75bb3 100644--- a/comfy_extras/nodes_flux.py+++ b/comfy_extras/nodes_flux.py@@ -100,9 +100,28 @@ class FluxKontextImageScale:return (image, )+class FluxKontextMultiReferenceLatentMethod:+ @classmethod+ def INPUT_TYPES(s):+ return {"required": {+ "conditioning": ("CONDITIONING", ),+ "reference_latents_method": (("offset", "index"), ),+ }}++ RETURN_TYPES = ("CONDITIONING",)+ FUNCTION = "append"+ EXPERIMENTAL = True++ CATEGORY = "advanced/conditioning/flux"++ def append(self, conditioning, reference_latents_method):+ c = node_helpers.conditioning_set_values(conditioning, {"reference_latents_method": reference_latents_method})+ return (c, )+NODE_CLASS_MAPPINGS = {"CLIPTextEncodeFlux": CLIPTextEncodeFlux,"FluxGuidance": FluxGuidance,"FluxDisableGuidance": FluxDisableGuidance,"FluxKontextImageScale": FluxKontextImageScale,+ "FluxKontextMultiReferenceLatentMethod": FluxKontextMultiReferenceLatentMethod,}