The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
refactor: Replace manual patches merging with merge_nested_dicts (#10360)
Faychafa8a24fe1f8
diff --git a/comfy/samplers.py b/comfy/samplers.pyindex c59e296a1..e7efaf470 100755--- a/comfy/samplers.py+++ b/comfy/samplers.py@@ -306,17 +306,10 @@ def _calc_cond_batch(model: BaseModel, conds: list[list[dict]], x_in: torch.Tenscopy_dict1=False)if patches is not None:- # TODO: replace with merge_nested_dicts function- if "patches" in transformer_options:- cur_patches = transformer_options["patches"].copy()- for p in patches:- if p in cur_patches:- cur_patches[p] = cur_patches[p] + patches[p]- else:- cur_patches[p] = patches[p]- transformer_options["patches"] = cur_patches- else:- transformer_options["patches"] = patches+ transformer_options["patches"] = comfy.patcher_extension.merge_nested_dicts(+ transformer_options.get("patches", {}),+ patches+ )transformer_options["cond_or_uncond"] = cond_or_uncond[:]transformer_options["uuids"] = uuids[:]