From 522999ebb4478300aa1e5a13443b06dca228cba8 Mon Sep 17 00:00:00 2001 From: kingbri Date: Mon, 22 Jul 2024 21:15:16 -0400 Subject: [PATCH] Config: Change from gen_logging to logging More accurately reflects the config.yml's sections. Signed-off-by: kingbri --- common/config.py | 16 ++++++++-------- main.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/config.py b/common/config.py index 86aedac..4de7d6b 100644 --- a/common/config.py +++ b/common/config.py @@ -46,14 +46,14 @@ def from_args(args: dict): GLOBAL_CONFIG["model"] = {**cur_model_config, **model_override} # Generation Logging config - gen_logging_override = args.get("logging") - if gen_logging_override: - cur_gen_logging_config = gen_logging_config() + logging_override = args.get("logging") + if logging_override: + cur_logging_config = logging_config() GLOBAL_CONFIG["logging"] = { - **cur_gen_logging_config, + **cur_logging_config, **{ - k.replace("log_", ""): gen_logging_override[k] - for k in gen_logging_override + k.replace("log_", ""): logging_override[k] + for k in logging_override }, } @@ -90,8 +90,8 @@ def network_config(): return unwrap(GLOBAL_CONFIG.get("network"), {}) -def gen_logging_config(): - """Returns the generation logging config from the global config""" +def logging_config(): + """Returns the logging config from the global config""" return unwrap(GLOBAL_CONFIG.get("logging"), {}) diff --git a/main.py b/main.py index e089d81..fd29297 100644 --- a/main.py +++ b/main.py @@ -97,7 +97,7 @@ async def entrypoint(args: Optional[dict] = None): load_auth_keys(unwrap(network_config.get("disable_auth"), False)) # Override the generation log options if given - log_config = config.gen_logging_config() + log_config = config.logging_config() if log_config: gen_logging.update_from_dict(log_config)