Refactor logging levels and improve mapper registration

- Changed warning logs to debug logs in CivitaiClient and RecipeScanner for better log granularity.
- Updated the mapper registration function name for clarity and adjusted related logging messages.
- Enhanced extension loading process to automatically register mappers from NODE_MAPPERS_EXT, improving modularity and maintainability.
This commit is contained in:
Will Miao
2025-04-02 10:29:31 +08:00
parent a8ec5af037
commit 5a93c40b79
6 changed files with 33 additions and 58 deletions

View File

@@ -6,9 +6,6 @@ from typing import Dict, Any, List
logger = logging.getLogger(__name__)
# Import the mapper registration functions from the parent module
from workflow.mappers import create_mapper, register_mapper
# =============================================================================
# Transform Functions
# =============================================================================
@@ -121,11 +118,11 @@ def transform_checkpoint_loader(inputs: Dict) -> Dict:
return {"checkpoint": ckpt_name} if ckpt_name else {}
# =============================================================================
# Register Mappers
# Node Mapper Definitions
# =============================================================================
# Define the mappers for ComfyUI core nodes not in main mapper
COMFYUI_CORE_MAPPERS = {
NODE_MAPPERS_EXT = {
# KSamplers
"SamplerCustomAdvanced": {
"inputs_to_track": ["noise", "guider", "sampler", "sigmas", "latent_image"],
@@ -163,16 +160,4 @@ COMFYUI_CORE_MAPPERS = {
"inputs_to_track": ["ckpt_name"],
"transform_func": transform_checkpoint_loader
}
}
# Register all ComfyUI core mappers
for node_type, config in COMFYUI_CORE_MAPPERS.items():
mapper = create_mapper(
node_type=node_type,
inputs_to_track=config["inputs_to_track"],
transform_func=config["transform_func"]
)
register_mapper(mapper)
logger.info(f"Registered ComfyUI core mapper for node type: {node_type}")
logger.info(f"Loaded ComfyUI core extension with {len(COMFYUI_CORE_MAPPERS)} mappers")
}

View File

@@ -7,9 +7,6 @@ from typing import Dict, Any
logger = logging.getLogger(__name__)
# Import the mapper registration functions from the parent module
from workflow.mappers import create_mapper, register_mapper
# =============================================================================
# Transform Functions
# =============================================================================
@@ -53,11 +50,11 @@ def transform_int_constant(inputs: Dict) -> int:
return inputs.get("value", 0)
# =============================================================================
# Register Mappers
# Node Mapper Definitions
# =============================================================================
# Define the mappers for KJNodes
KJNODES_MAPPERS = {
NODE_MAPPERS_EXT = {
"JoinStrings": {
"inputs_to_track": ["string1", "string2", "delimiter"],
"transform_func": transform_join_strings
@@ -74,16 +71,4 @@ KJNODES_MAPPERS = {
"inputs_to_track": ["value"],
"transform_func": transform_int_constant
}
}
# Register all KJNodes mappers
for node_type, config in KJNODES_MAPPERS.items():
mapper = create_mapper(
node_type=node_type,
inputs_to_track=config["inputs_to_track"],
transform_func=config["transform_func"]
)
register_mapper(mapper)
logger.info(f"Registered KJNodes mapper for node type: {node_type}")
logger.info(f"Loaded KJNodes extension with {len(KJNODES_MAPPERS)} mappers")
}