sij/sijapi
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Auto-update: Thu Aug 8 18:05:55 PDT 2024

Browse source
This commit is contained in:
sanj 2024-08-08 18:05:55 -07:00
parent eb9abb1060
commit 774a0a3334
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sijapi/classes.py
View file

@ -107,13 +107,13 @@ class Configuration(BaseModel):
for item in config_data: for item in config_data:
if isinstance(item, dict): if isinstance(item, dict):
item.update(secrets_data) item.update(secrets_data)
else: elif isinstance(config_data, dict):
config_data.update(secrets_data) config_data.update(secrets_data)
if isinstance(config_data, list): if isinstance(config_data, list):
config_data = {"configurations": config_data} config_data = {"configurations": config_data}
if not isinstance(config_data, dict) or config_data.get('HOME') is None:
if 'HOME' not in config_data: config_data = config_data if isinstance(config_data, dict) else {}
config_data['HOME'] = str(Path.home()) config_data['HOME'] = str(Path.home())
debug(f"HOME was not in config, set to default: {config_data['HOME']}") debug(f"HOME was not in config, set to default: {config_data['HOME']}")
@ -141,9 +141,10 @@ class Configuration(BaseModel):
return path return path
@classmethod @classmethod
def resolve_placeholders(cls, data: Any, secrets_data: Dict[str, Any], home_dir: Path) -> Any: def resolve_placeholders(self, data: Any) -> Any:
if isinstance(data, dict): if isinstance(data, dict):
resolved_data = {k: cls.resolve_placeholders(v, secrets_data, home_dir) for k, v in data.items()} resolved_data = {k: self.resolve_placeholders(v) for k, v in data.items()}
home_dir = Path(resolved_data.get('HOME', self.HOME)).expanduser()
base_dir = Path(__file__).parent.parent base_dir = Path(__file__).parent.parent
data_dir = base_dir / "data" data_dir = base_dir / "data"
resolved_data['HOME'] = str(home_dir) resolved_data['HOME'] = str(home_dir)
@ -151,9 +152,9 @@ class Configuration(BaseModel):
resolved_data['DATA'] = str(data_dir) resolved_data['DATA'] = str(data_dir)
return resolved_data return resolved_data
elif isinstance(data, list): elif isinstance(data, list):
return [cls.resolve_placeholders(v, secrets_data, home_dir) for v in data] return [self.resolve_placeholders(v) for v in data]
elif isinstance(data, str): elif isinstance(data, str):
return cls.resolve_string_placeholders(data, secrets_data, home_dir) return self.resolve_string_placeholders(data)
else: else:
return data return data