diff --git a/__init__.py b/__init__.py index 4f19a16..da88b60 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,5 @@ import traceback -from .log import log, blue_text, get_summary, get_label +from .log import log, blue_text, cyan_text, get_summary, get_label from .utils import here import importlib import os @@ -70,10 +70,10 @@ for node_class in nodes: NODE_CLASS_MAPPINGS_DEBUG[node_name] = node_class.__doc__ -log.debug( +log.info( f"Loaded the following nodes:\n\t" + "\n\t".join( - f"{k}: {blue_text(get_summary(doc)) if doc else '-'}" + f"{cyan_text(k)}: {blue_text(get_summary(doc)) if doc else '-'}" for k, doc in NODE_CLASS_MAPPINGS_DEBUG.items() ) ) diff --git a/log.py b/log.py index 4e35904..3ca4d7d 100644 --- a/log.py +++ b/log.py @@ -1,9 +1,14 @@ import logging import re +import os + +base_log_level = logging.DEBUG if os.environ.get("MTB_DEBUG") else logging.INFO class Formatter(logging.Formatter): grey = "\x1b[38;20m" + cyan = "\x1b[36;20m" + purple = "\x1b[35;20m" yellow = "\x1b[33;20m" red = "\x1b[31;20m" bold_red = "\x1b[31;1m" @@ -12,8 +17,8 @@ class Formatter(logging.Formatter): format = "[%(name)s] | %(levelname)s -> %(message)s" FORMATS = { - logging.DEBUG: grey + format + reset, - logging.INFO: grey + format + reset, + logging.DEBUG: purple + format + reset, + logging.INFO: cyan + format + reset, logging.WARNING: yellow + format + reset, logging.ERROR: red + format + reset, logging.CRITICAL: bold_red + format + reset, @@ -25,13 +30,13 @@ class Formatter(logging.Formatter): return formatter.format(record) -def mklog(name, level=logging.DEBUG): +def mklog(name, level=base_log_level): logger = logging.getLogger(name) # set this to the highest level of all handlers - logger.setLevel(logging.FATAL) + logger.setLevel(level) # create console handler with a higher log level ch = logging.StreamHandler() - ch.setLevel(logging.DEBUG) + ch.setLevel(level) ch.setFormatter(Formatter()) @@ -40,7 +45,7 @@ def mklog(name, level=logging.DEBUG): # - The main app logger -log = mklog(__package__) +log = mklog(__package__, base_log_level) def log_user(arg): @@ -55,6 +60,10 @@ def blue_text(text): return f"\033[94m{text}\033[0m" +def cyan_text(text): + return f"\033[96m{text}\033[0m" + + def get_label(label): words = re.findall(r"(?:^|[A-Z])[a-z]*", label) return " ".join(words).strip() diff --git a/nodes/faceswap.py b/nodes/faceswap.py index 6e11779..ef04935 100644 --- a/nodes/faceswap.py +++ b/nodes/faceswap.py @@ -8,7 +8,6 @@ import folder_paths import glob import insightface import numpy as np -import onnxruntime import os import tempfile import torch diff --git a/nodes/image_processing.py b/nodes/image_processing.py index deb83de..abb1b3c 100644 --- a/nodes/image_processing.py +++ b/nodes/image_processing.py @@ -18,7 +18,7 @@ import os try: from cv2.ximgproc import guidedFilter except ImportError: - log.error("guidedFilter not found, use opencv-contrib-python") + log.warning("cv2.ximgproc.guidedFilter not found, use opencv-contrib-python") class ColorCorrect: