diff --git a/app/logger.py b/app/logger.py index 17662c9e794..4ca0ea88e45 100644 --- a/app/logger.py +++ b/app/logger.py @@ -10,14 +10,14 @@ def get_logs(): return "\n".join([formatter.format(x) for x in logs]) -def setup_logger(verbose: bool = False, capacity: int = 300): +def setup_logger(log_level: str = 'INFO', capacity: int = 300): global logs if logs: return # Setup default global logger logger = logging.getLogger() - logger.setLevel(logging.DEBUG if verbose else logging.INFO) + logger.setLevel(log_level) stream_handler = logging.StreamHandler() stream_handler.setFormatter(logging.Formatter("%(message)s")) diff --git a/comfy/cli_args.py b/comfy/cli_args.py index ed0bbec60cb..20b9f4749c4 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -136,7 +136,7 @@ class LatentPreviewMethod(enum.Enum): parser.add_argument("--multi-user", action="store_true", help="Enables per-user storage.") -parser.add_argument("--verbose", action="store_true", help="Enables more debug prints.") +parser.add_argument("--verbose", default='INFO', const='DEBUG', nargs="?", choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Set the logging level') # The default built-in provider hosted under web/ DEFAULT_VERSION_STRING = "comfyanonymous/ComfyUI@latest" diff --git a/comfy/clip_vision.py b/comfy/clip_vision.py index 20dc3345d0f..64392e2704f 100644 --- a/comfy/clip_vision.py +++ b/comfy/clip_vision.py @@ -109,8 +109,7 @@ def load_clipvision_from_sd(sd, prefix="", convert_keys=False): keys = list(sd.keys()) for k in keys: if k not in u: - t = sd.pop(k) - del t + sd.pop(k) return clip def load(ckpt_path): diff --git a/comfy/float.py b/comfy/float.py index 4a6ae677680..0c8f1d6cff5 100644 --- a/comfy/float.py +++ b/comfy/float.py @@ -1,5 +1,4 @@ import torch -import math def calc_mantissa(abs_x, exponent, normal_mask, MANTISSA_BITS, EXPONENT_BIAS, generator=None): mantissa_scaled = torch.where( diff --git a/comfy/sd.py b/comfy/sd.py index 3b4cff7477b..a494e531c47 100644 --- a/comfy/sd.py +++ b/comfy/sd.py @@ -29,7 +29,6 @@ import comfy.model_patcher import comfy.lora import comfy.t2i_adapter.adapter -import comfy.supported_models_base import comfy.taesd.taesd def load_lora_for_models(model, clip, lora, strength_model, strength_clip): diff --git a/main.py b/main.py index 3f5e2137eeb..c232108616b 100644 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ from app.logger import setup_logger -setup_logger(verbose=args.verbose) +setup_logger(log_level=args.verbose) def execute_prestartup_script():