jalr/tabbyAPI-ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config: Change from gen_logging to logging

Browse source 
More accurately reflects the config.yml's sections.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-07-22 21:15:16 -04:00
parent 191600a150
commit 522999ebb4
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/config.py
View file

@ -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"), {})