mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-21 13:12:12 -03:00
Refactor _prepare_checkpoint_paths() to return a tuple instead of having side effects on instance variables. This prevents extra unet paths from being incorrectly classified as checkpoints when processing extra paths. - Changed return type from List[str] to Tuple[List[str], List[str], List[str]] (all_paths, checkpoint_roots, unet_roots) - Updated _init_checkpoint_paths() and _apply_library_paths() callers - Fixed extra paths processing to properly isolate main and extra roots - Updated test_checkpoint_path_overlap.py tests for new API This ensures models in extra unet paths are correctly identified as diffusion_model type and don't appear in checkpoints list.
185 lines
6.6 KiB
Python
185 lines
6.6 KiB
Python
import logging
|
|
import os
|
|
from typing import List, Tuple
|
|
import comfy.sd
|
|
import folder_paths
|
|
from ..utils.utils import get_checkpoint_info_absolute, _format_model_name_for_comfyui
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class CheckpointLoaderLM:
|
|
"""Checkpoint Loader with support for extra folder paths
|
|
|
|
Loads checkpoints from both standard ComfyUI folders and LoRA Manager's
|
|
extra folder paths, providing a unified interface for checkpoint loading.
|
|
"""
|
|
|
|
NAME = "CheckpointLoaderLM"
|
|
CATEGORY = "Lora Manager/loaders"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(s):
|
|
# Get list of checkpoint names from scanner (includes extra folder paths)
|
|
checkpoint_names = s._get_checkpoint_names()
|
|
return {
|
|
"required": {
|
|
"ckpt_name": (
|
|
checkpoint_names,
|
|
{"tooltip": "The name of the checkpoint (model) to load."},
|
|
),
|
|
}
|
|
}
|
|
|
|
RETURN_TYPES = ("MODEL", "CLIP", "VAE")
|
|
RETURN_NAMES = ("MODEL", "CLIP", "VAE")
|
|
OUTPUT_TOOLTIPS = (
|
|
"The model used for denoising latents.",
|
|
"The CLIP model used for encoding text prompts.",
|
|
"The VAE model used for encoding and decoding images to and from latent space.",
|
|
)
|
|
FUNCTION = "load_checkpoint"
|
|
|
|
@classmethod
|
|
def _get_checkpoint_names(cls) -> List[str]:
|
|
"""Get list of checkpoint names from scanner cache in ComfyUI format (relative path with extension)"""
|
|
try:
|
|
from ..services.service_registry import ServiceRegistry
|
|
import asyncio
|
|
|
|
async def _get_names():
|
|
scanner = await ServiceRegistry.get_checkpoint_scanner()
|
|
cache = await scanner.get_cached_data()
|
|
|
|
# Get all model roots for calculating relative paths
|
|
model_roots = scanner.get_model_roots()
|
|
|
|
# Filter only checkpoint type (not diffusion_model) and format names
|
|
names = []
|
|
for item in cache.raw_data:
|
|
if item.get("sub_type") == "checkpoint":
|
|
file_path = item.get("file_path", "")
|
|
if file_path:
|
|
# Format as ComfyUI-style: "folder/model_name.ext"
|
|
formatted_name = _format_model_name_for_comfyui(
|
|
file_path, model_roots
|
|
)
|
|
if formatted_name:
|
|
names.append(formatted_name)
|
|
|
|
return sorted(names)
|
|
|
|
try:
|
|
loop = asyncio.get_running_loop()
|
|
import concurrent.futures
|
|
|
|
def run_in_thread():
|
|
new_loop = asyncio.new_event_loop()
|
|
asyncio.set_event_loop(new_loop)
|
|
try:
|
|
return new_loop.run_until_complete(_get_names())
|
|
finally:
|
|
new_loop.close()
|
|
|
|
with concurrent.futures.ThreadPoolExecutor() as executor:
|
|
future = executor.submit(run_in_thread)
|
|
return future.result()
|
|
except RuntimeError:
|
|
return asyncio.run(_get_names())
|
|
except Exception as e:
|
|
logger.error(f"Error getting checkpoint names: {e}")
|
|
return []
|
|
|
|
def load_checkpoint(self, ckpt_name: str) -> Tuple:
|
|
"""Load a checkpoint by name, supporting extra folder paths
|
|
|
|
Args:
|
|
ckpt_name: The name of the checkpoint to load (format: "folder/model_name.ext")
|
|
|
|
Returns:
|
|
Tuple of (MODEL, CLIP, VAE)
|
|
"""
|
|
# Get absolute path from cache using ComfyUI-style name
|
|
ckpt_path, metadata = get_checkpoint_info_absolute(ckpt_name)
|
|
|
|
if metadata is None:
|
|
raise FileNotFoundError(
|
|
f"Checkpoint '{ckpt_name}' not found in LoRA Manager cache. "
|
|
"Make sure the checkpoint is indexed and try again."
|
|
)
|
|
|
|
# Check if it's a GGUF model
|
|
if ckpt_path.endswith(".gguf"):
|
|
return self._load_gguf_checkpoint(ckpt_path, ckpt_name)
|
|
|
|
# Load regular checkpoint using ComfyUI's API
|
|
logger.info(f"Loading checkpoint from: {ckpt_path}")
|
|
out = comfy.sd.load_checkpoint_guess_config(
|
|
ckpt_path,
|
|
output_vae=True,
|
|
output_clip=True,
|
|
embedding_directory=folder_paths.get_folder_paths("embeddings"),
|
|
)
|
|
return out[:3]
|
|
|
|
def _load_gguf_checkpoint(self, ckpt_path: str, ckpt_name: str) -> Tuple:
|
|
"""Load a GGUF format checkpoint
|
|
|
|
Args:
|
|
ckpt_path: Absolute path to the GGUF file
|
|
ckpt_name: Name of the checkpoint for error messages
|
|
|
|
Returns:
|
|
Tuple of (MODEL, CLIP, VAE) - CLIP and VAE may be None for GGUF
|
|
"""
|
|
try:
|
|
# Try to import ComfyUI-GGUF modules
|
|
from custom_nodes.ComfyUI_GGUF.loader import gguf_sd_loader
|
|
from custom_nodes.ComfyUI_GGUF.ops import GGMLOps
|
|
from custom_nodes.ComfyUI_GGUF.nodes import GGUFModelPatcher
|
|
except ImportError:
|
|
raise RuntimeError(
|
|
f"Cannot load GGUF model '{ckpt_name}'. "
|
|
"ComfyUI-GGUF is not installed. "
|
|
"Please install ComfyUI-GGUF from https://github.com/city96/ComfyUI-GGUF "
|
|
"to load GGUF format models."
|
|
)
|
|
|
|
logger.info(f"Loading GGUF checkpoint from: {ckpt_path}")
|
|
|
|
try:
|
|
# Load GGUF state dict
|
|
sd, extra = gguf_sd_loader(ckpt_path)
|
|
|
|
# Prepare kwargs for metadata if supported
|
|
kwargs = {}
|
|
import inspect
|
|
|
|
valid_params = inspect.signature(
|
|
comfy.sd.load_diffusion_model_state_dict
|
|
).parameters
|
|
if "metadata" in valid_params:
|
|
kwargs["metadata"] = extra.get("metadata", {})
|
|
|
|
# Load the model
|
|
model = comfy.sd.load_diffusion_model_state_dict(
|
|
sd, model_options={"custom_operations": GGMLOps()}, **kwargs
|
|
)
|
|
|
|
if model is None:
|
|
raise RuntimeError(
|
|
f"Could not detect model type for GGUF checkpoint: {ckpt_path}"
|
|
)
|
|
|
|
# Wrap with GGUFModelPatcher
|
|
model = GGUFModelPatcher.clone(model)
|
|
|
|
# GGUF checkpoints typically don't include CLIP/VAE
|
|
return (model, None, None)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error loading GGUF checkpoint '{ckpt_name}': {e}")
|
|
raise RuntimeError(
|
|
f"Failed to load GGUF checkpoint '{ckpt_name}': {str(e)}"
|
|
)
|