Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(shared): dict merging using pydantic deep_update

This commit is contained in:
jo 2022-01-21 19:01:19 +01:00 committed by Kyle Robbertze
parent 27c2221a68
commit d9852940d6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/libretime_shared/config.py
View File

@ -9,6 +9,7 @@ from loguru import logger
# pylint: disable=no-name-in-module # pylint: disable=no-name-in-module
from pydantic import BaseModel, ValidationError from pydantic import BaseModel, ValidationError
from pydantic.fields import ModelField from pydantic.fields import ModelField
from pydantic.utils import deep_update
from yaml import YAMLError, safe_load from yaml import YAMLError, safe_load
DEFAULT_ENV_PREFIX = "LIBRETIME" DEFAULT_ENV_PREFIX = "LIBRETIME"
@ -38,12 +39,7 @@ class BaseConfig(BaseModel):
env_values = self._load_env_values(env_prefix, env_delimiter) env_values = self._load_env_values(env_prefix, env_delimiter)
try: try:
super().__init__( super().__init__(**deep_update(file_values, env_values))
**{
**file_values,
**env_values,
},
)
except ValidationError as error: except ValidationError as error:
logger.critical(error) logger.critical(error)
sys.exit(1) sys.exit(1)