Merge pull request #13 from silveroxides/refactor/incremental-writer

Refactor/incremental writer

Author: silveroxides

nodes/lora_merger.py

@@ -123,7 +123,9 @@ def extract_core_layer_lora(block_name: str) -> str:
                     core_base = extract_core_layer_base(base_key)
                     core_underscored = core_base.replace(".", "_")
                     if core_underscored in lora_lookup:
-                        layer_map[core_base] = lora_lookup[core_underscored] # List of (idx, block_name)
+                        # Always use standard format with diffusion_model. prefix when reference model is provided
+                        output_key = core_base if core_base.startswith("diffusion_model.") else "diffusion_model." + core_base
+                        layer_map[output_key] = lora_lookup[core_underscored] # List of (idx, block_name)
         else:
             for i, info in enumerate(lora_infos):
                 for block_name in info["pairs"].keys():
@@ -270,7 +272,7 @@ def extract_core_layer_lora(block_name: str) -> str:
         if verbose:
             matched_stats = {i: 0 for i in range(len(lora_paths))}
             for indices in layer_map.values():
-                for idx in indices:
+                for idx, block_name in indices:
                     matched_stats[idx] += 1
 
             print(f"[LoRA Multi-Merge] --- Merge Summary ---")
@@ -554,7 +556,9 @@ def extract_core_layer_lora(block_name: str) -> str:
                     core_base = extract_core_layer_base(base_key)
                     core_underscored = core_base.replace(".", "_")
                     if core_underscored in lora_lookup:
-                        layer_map[core_base] = lora_lookup[core_underscored] # List of (idx, block_name)
+                        # Always use standard format with diffusion_model. prefix when reference model is provided
+                        output_key = core_base if core_base.startswith("diffusion_model.") else "diffusion_model." + core_base
+                        layer_map[output_key] = lora_lookup[core_underscored] # List of (idx, block_name)
         else:
             for i, info in enumerate(lora_infos):
                 for block_name in info["pairs"].keys():
@@ -672,7 +676,7 @@ def process_ties_dare(tensors, weights, dim_to_pad):
         if verbose:
             matched_stats = {i: 0 for i in range(len(lora_paths))}
             for indices in layer_map.values():
-                for idx in indices:
+                for idx, block_name in indices:
                     matched_stats[idx] += 1
 
             print(f"[LoRA Multi-Merge DARE] --- Merge Summary ---")
@@ -870,7 +874,9 @@ def extract_core_layer_lora(block_name: str) -> str:
                     core_base = extract_core_layer_base(base_key)
                     core_underscored = core_base.replace(".", "_")
                     if core_underscored in lora_lookup:
-                        layer_map[core_base] = lora_lookup[core_underscored] # List of (idx, block_name)
+                        # Always use standard format with diffusion_model. prefix when reference model is provided
+                        output_key = core_base if core_base.startswith("diffusion_model.") else "diffusion_model." + core_base
+                        layer_map[output_key] = lora_lookup[core_underscored] # List of (idx, block_name)
         else:
             for i, info in enumerate(lora_infos):
                 for block_name in info["pairs"].keys():
@@ -990,7 +996,7 @@ def process_ties_dare_enhanced(tensors, weights, dim_to_pad):
         if verbose:
             matched_stats = {i: 0 for i in range(len(lora_paths))}
             for indices in layer_map.values():
-                for idx in indices:
+                for idx, block_name in indices:
                     matched_stats[idx] += 1
 
             print(f"[LoRA Multi-Merge Enhanced DARE] --- Merge Summary ---")

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "ComfyUI-ModelUtils"
 description = "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
-version = "0.4.0"
+version = "0.4.1"
 license = { file = "LICENSE" }
 
 classifiers = [

requirements.txt

@@ -1,5 +1,5 @@
 requests
 Pillow
 mutagen
-unifiedefficientloader==0.5.0
+unifiedefficientloader>=0.5.1
 av