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

Config: Alter migration error handling and cleanup

Browse source 
Rollback to the old config if automigration fails.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-09-16 18:02:18 -04:00
parent e60c4ba5bc
commit ebe7f3567e
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/tabby_config.py
View file

@ -2,7 +2,7 @@ import yaml
import pathlib import pathlib
from loguru import logger from loguru import logger
from typing import Optional from typing import Optional
from os import getenv, replace from os import getenv
from common.utils import unwrap, merge_dicts from common.utils import unwrap, merge_dicts
from common.config_models import TabbyConfigModel, generate_config_file from common.config_models import TabbyConfigModel, generate_config_file
@ -98,11 +98,15 @@ class TabbyConfig(TabbyConfigModel):
new_cfg = TabbyConfigModel.model_validate(cfg) new_cfg = TabbyConfigModel.model_validate(cfg)
try: try:
replace(config_path, f"{config_path}.bak") config_path.rename(f"{config_path}.bak")
generate_config_file(model=new_cfg, filename=config_path) generate_config_file(model=new_cfg, filename=config_path)
except Exception as e: except Exception as e:
logger.error(f"Auto migration failed: {e}") logger.error(f"Auto migration failed: {e}")
# Restore the old config
config_path.unlink(missing_ok=True)
pathlib.Path(f"{config_path}.bak").rename(config_path)
return unwrap(cfg, {}) return unwrap(cfg, {})
def _from_args(self, args: dict): def _from_args(self, args: dict):
@ -118,9 +122,6 @@ class TabbyConfig(TabbyConfigModel):
for key in TabbyConfigModel.model_fields.keys(): for key in TabbyConfigModel.model_fields.keys():
override = args.get(key) override = args.get(key)
if override: if override:
if key == "logging":
# Strip the "log_" prefix from logging keys if present
override = {k.replace("log_", ""): v for k, v in override.items()}
config[key] = override config[key] = override
return config return config

2
common/utils.py
View file

@ -1,7 +1,7 @@
"""Common utility functions""" """Common utility functions"""
from types import NoneType from types import NoneType
from typing import Optional, Type, Union, get_args, get_origin from typing import Type, Union, get_args, get_origin
def unwrap(wrapped, default=None): def unwrap(wrapped, default=None):