dtomlinson/panaetius
1
0
Fork 0
mirror of https://github.com/dtomlinson91/panaetius.git synced 2025-12-22 21:15:44 +00:00
Code Issues Projects Releases Wiki Activity

adding latest not working on bool

Browse Source
This commit is contained in:
Daniel Tomlinson
2021-10-16 15:29:18 +01:00
parent 957ce56a4c
commit b47170070a
2 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
panaetius/config.py
View File

@@ -39,7 +39,25 @@ class Config:
# no config file, look for env vars
return self._get_env_value(env_key, default, coerce)
def _get_config_value_key_split_once(self, key: str, mask: bool) -> Any:
def _get_config_value(
self, env_key: str, key: str, default: Any, mask: bool, coerce: bool = False
) -> Any:
try:
# look under top header
if len(key.split(".")) == 1:
return self.__get_config_value_key_split_once(key, mask)
if len(key.split(".")) == 2:
return self.__get_config_value_key_split_twice(key, mask)
except (KeyError, TypeError):
value = os.environ.get(env_key.replace("-", "_"))
if value is None:
return self.__get_config_value_missing_key_value_is_none(default)
# if env var, coerce value if flag is set, else return a TOML string
value = self.__get_config_value_missing_key_value_is_not_none(value, coerce)
return self.__get_config_value_missing_key_value_is_not_none(value, coerce)
def __get_config_value_key_split_once(self, key: str, mask: bool) -> Any:
if mask:
# TODO: write mask logic here
pass
@@ -47,7 +65,7 @@ class Config:
name = key.lower()
return self.config[self.header_variable][name]
def _get_config_value_key_split_twice(self, key: str, mask: bool) -> Any:
def __get_config_value_key_split_twice(self, key: str, mask: bool) -> Any:
if mask:
# TODO: write mask logic here
pass
@@ -55,42 +73,13 @@ class Config:
section, name = key.lower().split(".")
return self.config[self.header_variable][section][name]
def _get_config_value_missing_key_value_is_none(self, default: Any) -> Any:
if isinstance(default, str):
# if default is a string, wrap TOML value in quotes
return toml.loads(f'value = "{default}"')["value"]
# if default is not a string, leave TOML value as is
# if default is a bool, convert to lower case for TOML syntax
default = str(default).lower() if isinstance(default, bool) else default
return (
toml.loads(f"value = {default}")["value"] if default is not None else None
)
def __get_config_value_missing_key_value_is_none(self, default: Any) -> Any:
return self.__load_default_value(default)
def _get_config_value_missing_key_value_is_not_none(
def __get_config_value_missing_key_value_is_not_none(
self, value: str, coerce: bool
) -> Any:
return (
toml.loads(f"value = {value}")["value"]
if coerce
else toml.loads(f'value = "{value}"')["value"]
)
def _get_config_value(
self, env_key: str, key: str, default: Any, mask: bool, coerce: bool = False
) -> Any:
try:
# look under top header
if len(key.split(".")) == 1:
return self._get_config_value_key_split_once(key, mask)
if len(key.split(".")) == 2:
return self._get_config_value_key_split_twice(key, mask)
except (KeyError, TypeError):
value = os.environ.get(env_key.replace("-", "_"))
if value is None:
return self._get_config_value_missing_key_value_is_none(default)
# if env var, coerce value if flag is set, else return a TOML string
return self._get_config_value_missing_key_value_is_not_none(value, coerce)
return self.__load_value(value, coerce)
def _get_env_value( # noqa
self, env_key: str, default: Any, coerce: bool = False
@@ -98,19 +87,21 @@ class Config:
# look for an environment variable, fallback to default
value = os.environ.get(env_key.replace("-", "_"))
if value is None:
if isinstance(default, str):
# if default is a string, wrap TOML value in quotes
return toml.loads(f'value = "{default}"')["value"]
# if default is not a string, leave TOML value as is
# if default is a bool, convert to lower case for TOML syntax
default = str(default).lower() if isinstance(default, bool) else default
return (
toml.loads(f"value = {default}")["value"]
if default is not None
else None
)
return self.__load_default_value(default)
return self.__load_value(value, coerce)
def __load_value(self, value: str, coerce: bool) -> Any:
return (
toml.loads(f"value = {value}")["value"]
if coerce
else toml.loads(f'value = "{value}"')["value"]
)
def __load_default_value(self, default: Any) -> Any:
if isinstance(default, str):
return toml.loads(f'value = "{default}"')["value"]
# if default is bool convert to lower case toml syntax
default = str(default).lower() if isinstance(default, bool) else default
return (
toml.loads(f"value = {default}")["value"] if default is not None else None
)