mirror of
https://github.com/theroyallab/tabbyAPI.git
synced 2026-03-14 15:57:27 +00:00
Config: Change from gen_logging to logging
More accurately reflects the config.yml's sections. Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
@@ -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"), {})
|
||||
|
||||
|
||||
|
||||
2
main.py
2
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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user