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

Auto-update: Thu Aug 8 18:04:17 PDT 2024

Browse source
This commit is contained in:
sanj 2024-08-08 18:04:17 -07:00
parent 750d8f853e
commit eb9abb1060
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sijapi/classes.py
View file

@ -93,37 +93,43 @@ class Configuration(BaseModel):
yaml_path = cls._resolve_path(yaml_path, 'config') yaml_path = cls._resolve_path(yaml_path, 'config')
if secrets_path: if secrets_path:
secrets_path = cls._resolve_path(secrets_path, 'config') secrets_path = cls._resolve_path(secrets_path, 'config')
try: try:
with yaml_path.open('r') as file: with yaml_path.open('r') as file:
config_data = yaml.safe_load(file) config_data = yaml.safe_load(file)
debug(f"Loaded configuration data from {yaml_path}") debug(f"Loaded configuration data from {yaml_path}")
secrets_data = {}
if secrets_path: if secrets_path:
with secrets_path.open('r') as file: with secrets_path.open('r') as file:
secrets_data = yaml.safe_load(file) secrets_data = yaml.safe_load(file)
debug(f"Loaded secrets data from {secrets_path}") debug(f"Loaded secrets data from {secrets_path}")
if isinstance(config_data, list):
# Set default HOME if not present for item in config_data:
if isinstance(item, dict):
item.update(secrets_data)
else:
config_data.update(secrets_data)
if isinstance(config_data, list):
config_data = {"configurations": config_data}
if 'HOME' not in config_data: if 'HOME' not in config_data:
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']}")
# Resolve placeholders using secrets load_dotenv()
config_data = cls.resolve_placeholders(config_data, secrets_data, Path(config_data['HOME']))
if isinstance(config_data, list):
config_data = {"configurations": config_data}
instance = cls.create_dynamic_model(**config_data) instance = cls.create_dynamic_model(**config_data)
instance._dir_config = dir_config or instance instance._dir_config = dir_config or instance
resolved_data = instance.resolve_placeholders(config_data)
instance = cls.create_dynamic_model(**resolved_data)
instance._dir_config = dir_config or instance
return instance return instance
except Exception as e: except Exception as e:
err(f"Error loading configuration: {str(e)}") err(f"Error loading configuration: {str(e)}")
raise raise
@classmethod @classmethod
def _resolve_path(cls, path: Union[str, Path], default_dir: str) -> Path: def _resolve_path(cls, path: Union[str, Path], default_dir: str) -> Path:
base_path = Path(__file__).parent.parent base_path = Path(__file__).parent.parent