remove getLogger() completely

invokeai/app/api/dependencies.py

@@ -49,7 +49,7 @@ def check_internet() -> bool:
         return False
 
 
-logger = InvokeAILogger.getLogger()
+logger = InvokeAILogger.get_logger()
 
 
 class ApiDependencies:

invokeai/app/api_app.py

@@ -23,7 +23,7 @@ from ..backend.util.logging import InvokeAILogger
 
 app_config = InvokeAIAppConfig.get_config()
 app_config.parse_args()
-logger = InvokeAILogger.getLogger(config=app_config)
+logger = InvokeAILogger.get_logger(config=app_config)
 from invokeai.version.invokeai_version import __version__
 
 # we call this early so that the message appears before
@@ -230,7 +230,7 @@ def invoke_api():
 
     # replace uvicorn's loggers with InvokeAI's for consistent appearance
     for logname in ["uvicorn.access", "uvicorn"]:
-        l = logging.getLogger(logname)
+        l = logging.get_logger(logname)
         l.handlers.clear()
         for ch in logger.handlers:
             l.addHandler(ch)

invokeai/app/cli_app.py

@@ -16,7 +16,7 @@ from invokeai.backend.util.logging import InvokeAILogger
 
 config = InvokeAIAppConfig.get_config()
 config.parse_args()
-logger = InvokeAILogger().getLogger(config=config)
+logger = InvokeAILogger().get_logger(config=config)
 from invokeai.version.invokeai_version import __version__
 
 # we call this early so that the message appears before other invokeai initialization messages

invokeai/backend/install/invokeai_configure.py

@@ -96,7 +96,7 @@ INIT_FILE_PREAMBLE = """# InvokeAI initialization file
 # or renaming it and then running invokeai-configure again.
 """
 
-logger = InvokeAILogger.getLogger()
+logger = InvokeAILogger.get_logger()
 
 
 class DummyWidgetValue(Enum):
@@ -827,7 +827,7 @@ def main():
     if opt.full_precision:
         invoke_args.extend(["--precision", "float32"])
     config.parse_args(invoke_args)
-    logger = InvokeAILogger().getLogger(config=config)
+    logger = InvokeAILogger().get_logger(config=config)
 
     errors = set()
 

invokeai/backend/install/model_install_backend.py

@@ -31,7 +31,7 @@ warnings.filterwarnings("ignore")
 
 # --------------------------globals-----------------------
 config = InvokeAIAppConfig.get_config()
-logger = InvokeAILogger.getLogger(name="InvokeAI")
+logger = InvokeAILogger.get_logger(name="InvokeAI")
 
 # the initial "configs" dir is now bundled in the `invokeai.configs` package
 Dataset_path = Path(configs.__path__[0]) / "INITIAL_MODELS.yaml"
@@ -483,7 +483,7 @@ def yes_or_no(prompt: str, default_yes=True):
 
 # ---------------------------------------------
 def hf_download_from_pretrained(model_class: object, model_name: str, destination: Path, **kwargs):
-    logger = InvokeAILogger.getLogger("InvokeAI")
+    logger = InvokeAILogger.get_logger("InvokeAI")
     logger.addFilter(lambda x: "fp16 is not a valid" not in x.getMessage())
 
     model = model_class.from_pretrained(

invokeai/backend/model_management/convert_ckpt_to_diffusers.py

@@ -80,7 +80,7 @@ if is_accelerate_available():
     from accelerate import init_empty_weights
     from accelerate.utils import set_module_tensor_to_device
 
-logger = InvokeAILogger.getLogger(__name__)
+logger = InvokeAILogger.get_logger(__name__)
 CONVERT_MODEL_ROOT = InvokeAIAppConfig.get_config().models_path / "core/convert"
 
 

invokeai/backend/util/logging.py

@@ -8,9 +8,9 @@ Usage:
 
 from invokeai.backend.util.logging import InvokeAILogger
 
-logger = InvokeAILogger.getLogger(name='InvokeAI') // Initialization
+logger = InvokeAILogger.get_logger(name='InvokeAI') // Initialization
 (or)
-logger = InvokeAILogger.getLogger(__name__) // To use the filename
+logger = InvokeAILogger.get_logger(__name__) // To use the filename
 logger.configure()
 
 logger.critical('this is critical') // Critical Message
@@ -33,7 +33,7 @@ IAILogger.debug('this is a debugging message')
 ## Configuration
 
 The default configuration will print to stderr on the console. To add
-additional logging handlers, call getLogger with an initialized InvokeAIAppConfig
+additional logging handlers, call get_logger with an initialized InvokeAIAppConfig
 object:
 
 
@@ -41,9 +41,6 @@ object:
  config.parse_args()
  logger = InvokeAILogger.get_logger(config=config)
 
-For backward compatibility, getLogger() is an alias for get_logger(),
-but without the camel case.
-
 ### Three command-line options control logging:
 
 `--log_handlers <handler1> <handler2> ...`
@@ -197,39 +194,35 @@ except:
 
 # module level functions
 def debug(msg, *args, **kwargs):
-    InvokeAILogger.getLogger().debug(msg, *args, **kwargs)
+    InvokeAILogger.get_logger().debug(msg, *args, **kwargs)
 
 
 def info(msg, *args, **kwargs):
-    InvokeAILogger.getLogger().info(msg, *args, **kwargs)
+    InvokeAILogger.get_logger().info(msg, *args, **kwargs)
 
 
 def warning(msg, *args, **kwargs):
-    InvokeAILogger.getLogger().warning(msg, *args, **kwargs)
+    InvokeAILogger.get_logger().warning(msg, *args, **kwargs)
 
 
 def error(msg, *args, **kwargs):
-    InvokeAILogger.getLogger().error(msg, *args, **kwargs)
+    InvokeAILogger.get_logger().error(msg, *args, **kwargs)
 
 
 def critical(msg, *args, **kwargs):
-    InvokeAILogger.getLogger().critical(msg, *args, **kwargs)
+    InvokeAILogger.get_logger().critical(msg, *args, **kwargs)
 
 
 def log(level, msg, *args, **kwargs):
-    InvokeAILogger.getLogger().log(level, msg, *args, **kwargs)
+    InvokeAILogger.get_logger().log(level, msg, *args, **kwargs)
 
 
 def disable(level=logging.CRITICAL):
-    InvokeAILogger.getLogger().disable(level)
+    InvokeAILogger.get_logger().disable(level)
 
 
 def basicConfig(**kwargs):
-    InvokeAILogger.getLogger().basicConfig(**kwargs)
-
-
-def getLogger(name: str = None) -> logging.Logger:
-    return InvokeAILogger.getLogger(name)
+    InvokeAILogger.get_logger().basicConfig(**kwargs)
 
 
 _FACILITY_MAP = (
@@ -355,7 +348,7 @@ class InvokeAILogger(object):
     loggers = dict()
 
     @classmethod
-    def getLogger(
+    def get_logger(
         cls, name: str = "InvokeAI", config: InvokeAIAppConfig = InvokeAIAppConfig.get_config()
     ) -> logging.Logger:
         if name in cls.loggers:
@@ -364,18 +357,13 @@ class InvokeAILogger(object):
         else:
             logger = logging.getLogger(name)
         logger.setLevel(config.log_level.upper())  # yes, strings work here
-        for ch in cls.getLoggers(config):
+        for ch in cls.get_loggers(config):
             logger.addHandler(ch)
             cls.loggers[name] = logger
         return cls.loggers[name]
 
-    # same thing without the camel case
     @classmethod
-    def get_logger(cls, *arg, **kwarg) -> logging.Logger:
-        return cls.getLogger(*arg, **kwarg)
-
-    @classmethod
-    def getLoggers(cls, config: InvokeAIAppConfig) -> list[logging.Handler]:
+    def get_loggers(cls, config: InvokeAIAppConfig) -> list[logging.Handler]:
         handler_strs = config.log_handlers
         handlers = list()
         for handler in handler_strs:

invokeai/frontend/install/model_install.py

@@ -50,7 +50,7 @@ from invokeai.frontend.install.widgets import (
 from invokeai.app.services.config import InvokeAIAppConfig
 
 config = InvokeAIAppConfig.get_config()
-logger = InvokeAILogger.getLogger()
+logger = InvokeAILogger.get_logger()
 
 # build a table mapping all non-printable characters to None
 # for stripping control characters
@@ -657,7 +657,7 @@ def process_and_execute(
         translator = StderrToMessage(conn_out)
         sys.stderr = translator
         sys.stdout = translator
-        logger = InvokeAILogger.getLogger()
+        logger = InvokeAILogger.get_logger()
         logger.handlers.clear()
         logger.addHandler(logging.StreamHandler(translator))
 
@@ -771,7 +771,7 @@ def main():
     if opt.full_precision:
         invoke_args.extend(["--precision", "float32"])
     config.parse_args(invoke_args)
-    logger = InvokeAILogger().getLogger(config=config)
+    logger = InvokeAILogger().get_logger(config=config)
 
     if not config.model_conf_path.exists():
         logger.info("Your InvokeAI root directory is not set up. Calling invokeai-configure.")