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

Auto-update: Thu Aug 8 18:07:02 PDT 2024

Browse source
This commit is contained in:
sanj 2024-08-08 18:07:02 -07:00
parent 774a0a3334
commit 95441ae20e
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sijapi/classes.py
View file

@ -99,6 +99,7 @@ class Configuration(BaseModel):
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)
@ -120,7 +121,7 @@ class Configuration(BaseModel):
load_dotenv() load_dotenv()
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) resolved_data = instance.resolve_placeholders(config_data, secrets_data)
instance = cls.create_dynamic_model(**resolved_data) instance = cls.create_dynamic_model(**resolved_data)
instance._dir_config = dir_config or instance instance._dir_config = dir_config or instance
return instance return instance
@ -129,7 +130,6 @@ class Configuration(BaseModel):
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
@ -140,10 +140,9 @@ class Configuration(BaseModel):
path = base_path / path path = base_path / path
return path return path
@classmethod def resolve_placeholders(self, data: Any, secrets_data: Dict[str, Any]) -> Any:
def resolve_placeholders(self, data: Any) -> Any:
if isinstance(data, dict): if isinstance(data, dict):
resolved_data = {k: self.resolve_placeholders(v) for k, v in data.items()} resolved_data = {k: self.resolve_placeholders(v, secrets_data) for k, v in data.items()}
home_dir = Path(resolved_data.get('HOME', self.HOME)).expanduser() 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"
@ -152,14 +151,13 @@ 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 [self.resolve_placeholders(v) for v in data] return [self.resolve_placeholders(v, secrets_data) for v in data]
elif isinstance(data, str): elif isinstance(data, str):
return self.resolve_string_placeholders(data) return self.resolve_string_placeholders(data, secrets_data, self.HOME)
else: else:
return data return data
@classmethod def resolve_string_placeholders(self, value: str, secrets_data: Dict[str, Any], home_dir: Path) -> Any:
def resolve_string_placeholders(cls, value: str, secrets_data: Dict[str, Any], home_dir: Path) -> Any:
pattern = r'\{\{\s*([^}]+)\s*\}\}' pattern = r'\{\{\s*([^}]+)\s*\}\}'
matches = re.findall(pattern, value) matches = re.findall(pattern, value)
@ -207,7 +205,6 @@ class Configuration(BaseModel):
class DirConfig(BaseModel): class DirConfig(BaseModel):
HOME: Path = Path.home() HOME: Path = Path.home()