Dustin
aa09a44a8b
Fixed critical bugs in sync_web_files.py that caused copies instead of symlinks: 1. Mode detection now checks ALL nodes instead of just first one - Prevents false "prod" mode when mixed symlink/submodule states exist - Returns "dev" if ANY node is a symlink 2. Symlink creation uses absolute paths instead of relative - Fixes "Source not found" errors during sync - Ensures symlinks work after atomic temp-to-final move - Eliminates code duplication in web/ directory 3. Windows console compatibility - Replaced Unicode characters with ASCII for verbose output Also adds auto-sync integration to __init__.py and web_src/core/ source directory. Tested: All 3 JS files created as symlinks (0 copies), zero duplication verified
121 lines
4.4 KiB
Python
121 lines
4.4 KiB
Python
"""
|
|
@author: djdarcy
|
|
@title: DazzleNodes
|
|
@nickname: DazzleNodes
|
|
@description: Collection of productivity custom nodes for ComfyUI workflows
|
|
"""
|
|
|
|
import sys
|
|
import importlib.util
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
# ============================================================================
|
|
# Auto-sync web resources
|
|
# ============================================================================
|
|
def _sync_web_resources():
|
|
"""Sync web resources from submodules and core nodes to web/ directory."""
|
|
sync_script = Path(__file__).parent / "scripts" / "sync_web_files.py"
|
|
if not sync_script.exists():
|
|
print("[DazzleNodes] Warning: sync_web_files.py not found")
|
|
return
|
|
|
|
try:
|
|
result = subprocess.run(
|
|
[sys.executable, str(sync_script), "--quiet"],
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=10,
|
|
check=False
|
|
)
|
|
if result.returncode != 0:
|
|
print(f"[DazzleNodes] Web sync warning: {result.stderr}")
|
|
except Exception as e:
|
|
print(f"[DazzleNodes] Web sync failed: {e}")
|
|
|
|
# Run auto-sync before loading nodes
|
|
_sync_web_resources()
|
|
|
|
# Initialize aggregator dictionaries
|
|
NODE_CLASS_MAPPINGS = {}
|
|
NODE_DISPLAY_NAME_MAPPINGS = {}
|
|
_loaded_nodes = []
|
|
_failed_nodes = []
|
|
|
|
print("[DazzleNodes] Loading node collection...")
|
|
|
|
# Current directory
|
|
_current_dir = Path(__file__).parent
|
|
_nodes_dir = _current_dir / "nodes"
|
|
|
|
# Helper function to load a node module from directory with hyphens
|
|
def load_node_module(node_dir_name, display_name):
|
|
"""Load a node module from a directory (even with hyphens in name)"""
|
|
node_path = _nodes_dir / node_dir_name
|
|
init_file = node_path / "__init__.py"
|
|
|
|
if not init_file.exists():
|
|
raise FileNotFoundError(f"__init__.py not found in {node_path}")
|
|
|
|
# Load the module using importlib
|
|
spec = importlib.util.spec_from_file_location(
|
|
node_dir_name.replace("-", "_"), # Module name (replace hyphens)
|
|
init_file
|
|
)
|
|
module = importlib.util.module_from_spec(spec)
|
|
sys.modules[spec.name] = module
|
|
spec.loader.exec_module(module)
|
|
|
|
# Extract NODE_CLASS_MAPPINGS and NODE_DISPLAY_NAME_MAPPINGS
|
|
if hasattr(module, 'NODE_CLASS_MAPPINGS'):
|
|
NODE_CLASS_MAPPINGS.update(module.NODE_CLASS_MAPPINGS)
|
|
else:
|
|
raise AttributeError(f"Module {node_dir_name} has no NODE_CLASS_MAPPINGS")
|
|
|
|
if hasattr(module, 'NODE_DISPLAY_NAME_MAPPINGS'):
|
|
NODE_DISPLAY_NAME_MAPPINGS.update(module.NODE_DISPLAY_NAME_MAPPINGS)
|
|
|
|
return len(module.NODE_CLASS_MAPPINGS)
|
|
|
|
# ============================================================================
|
|
# Load Smart Resolution Calculator
|
|
# ============================================================================
|
|
try:
|
|
num_nodes = load_node_module("smart-resolution-calc", "Smart Resolution Calculator")
|
|
_loaded_nodes.append(f"Smart Resolution Calculator ({num_nodes} nodes)")
|
|
except Exception as e:
|
|
_failed_nodes.append(("Smart Resolution Calculator", str(e)))
|
|
print(f"[DazzleNodes] ⚠️ Could not load Smart Resolution Calculator: {e}")
|
|
|
|
# ============================================================================
|
|
# Load Fit Mask to Image
|
|
# ============================================================================
|
|
try:
|
|
num_nodes = load_node_module("fit-mask-to-image", "Fit Mask to Image")
|
|
_loaded_nodes.append(f"Fit Mask to Image ({num_nodes} nodes)")
|
|
except Exception as e:
|
|
_failed_nodes.append(("Fit Mask to Image", str(e)))
|
|
print(f"[DazzleNodes] ⚠️ Could not load Fit Mask to Image: {e}")
|
|
|
|
# ============================================================================
|
|
# Report Loading Status
|
|
# ============================================================================
|
|
if _loaded_nodes:
|
|
print(f"[DazzleNodes] ✓ Loaded {len(_loaded_nodes)} nodes: {', '.join(_loaded_nodes)}")
|
|
print(f"[DazzleNodes] ✓ {len(NODE_CLASS_MAPPINGS)} node(s) available")
|
|
|
|
if _failed_nodes:
|
|
print(f"[DazzleNodes] ⚠️ Failed to load {len(_failed_nodes)} nodes:")
|
|
for node_name, error in _failed_nodes:
|
|
print(f"[DazzleNodes] - {node_name}: {error}")
|
|
|
|
if not _loaded_nodes:
|
|
print("[DazzleNodes] ❌ No nodes loaded! Check submodule initialization.")
|
|
print("[DazzleNodes] Run: git submodule update --init --recursive")
|
|
|
|
# Web directory for JavaScript widgets
|
|
WEB_DIRECTORY = "./web"
|
|
|
|
# Export for ComfyUI
|
|
__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS', 'WEB_DIRECTORY']
|