mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-21 21:22:11 -03:00
1ae1b0d607
Move the 'empty/no LoRA' cycling functionality from the LoRA Pool node to the Lora Cycler widget for cleaner architecture: Frontend changes: - Add include_no_lora field to CyclerConfig interface - Add includeNoLora state and logic to useLoraCyclerState composable - Add toggle UI in LoraCyclerSettingsView with special styling - Show 'No LoRA' entry in LoraListModal when enabled - Update LoraCyclerWidget to integrate new logic Backend changes: - lora_cycler.py reads include_no_lora from config - Calculate effective_total_count (actual count + 1 when enabled) - Return empty lora_stack when on No LoRA position - Return actual LoRA count in total_count (not effective count) Reverted files to pre-PR state: - lora_loader.py, lora_pool.py, lora_randomizer.py, lora_stacker.py - lora_routes.py, lora_service.py - LoraPoolWidget.vue and related files Related to PR #861 Co-authored-by: dogatech <dogatech@dogatech.home>
88 lines
2.6 KiB
Python
88 lines
2.6 KiB
Python
"""
|
|
LoRA Pool Node - Defines filter configuration for LoRA selection.
|
|
|
|
This node provides a visual filter editor that generates a LORA_POOL_CONFIG
|
|
object for use by downstream nodes (like LoRA Randomizer).
|
|
"""
|
|
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class LoraPoolLM:
|
|
"""
|
|
A node that defines LoRA filter criteria through a Vue-based widget.
|
|
|
|
Outputs a LORA_POOL_CONFIG that can be consumed by:
|
|
- Frontend: LoRA Randomizer widget reads connected pool's widget value
|
|
- Backend: LoRA Randomizer receives config during workflow execution
|
|
"""
|
|
|
|
NAME = "Lora Pool (LoraManager)"
|
|
CATEGORY = "Lora Manager/randomizer"
|
|
|
|
@classmethod
|
|
def INPUT_TYPES(cls):
|
|
return {
|
|
"required": {
|
|
"pool_config": ("LORA_POOL_CONFIG", {}),
|
|
},
|
|
"hidden": {
|
|
# Hidden input to pass through unique node ID for frontend
|
|
"unique_id": "UNIQUE_ID",
|
|
},
|
|
}
|
|
|
|
RETURN_TYPES = ("POOL_CONFIG",)
|
|
RETURN_NAMES = ("POOL_CONFIG",)
|
|
|
|
FUNCTION = "process"
|
|
OUTPUT_NODE = False
|
|
|
|
def process(self, pool_config, unique_id=None):
|
|
"""
|
|
Pass through the pool configuration filters.
|
|
|
|
The config is generated entirely by the frontend widget.
|
|
This function validates and returns only the filters field.
|
|
|
|
Args:
|
|
pool_config: Dict containing filter criteria from widget
|
|
unique_id: Node's unique ID (hidden)
|
|
|
|
Returns:
|
|
Tuple containing the filters dict from pool_config
|
|
"""
|
|
# Validate required structure
|
|
if not isinstance(pool_config, dict):
|
|
logger.warning("Invalid pool_config type, using empty config")
|
|
pool_config = self._default_config()
|
|
|
|
# Ensure version field exists
|
|
if "version" not in pool_config:
|
|
pool_config["version"] = 1
|
|
|
|
# Extract filters field
|
|
filters = pool_config.get("filters", self._default_config()["filters"])
|
|
|
|
# Log for debugging
|
|
logger.debug(f"[LoraPoolLM] Processing filters: {filters}")
|
|
|
|
return (filters,)
|
|
|
|
@staticmethod
|
|
def _default_config():
|
|
"""Return default empty configuration."""
|
|
return {
|
|
"version": 1,
|
|
"filters": {
|
|
"baseModels": [],
|
|
"tags": {"include": [], "exclude": []},
|
|
"folders": {"include": [], "exclude": []},
|
|
"favoritesOnly": False,
|
|
"license": {"noCreditRequired": False, "allowSelling": False},
|
|
},
|
|
"preview": {"matchCount": 0, "lastUpdated": 0},
|
|
}
|