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

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

Browse source
This commit is contained in:
sanj 2024-08-08 18:21:55 -07:00
parent 57b54218ba
commit ba7aa79229
1 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
sijapi/classes.py
View file

@ -211,30 +211,30 @@ class Configuration(BaseModel):
class DirConfig(BaseModel): class DirConfig(BaseModel):
HOME: Path = Path.home() HOME: Path = Path.home()
@classmethod @classmethod
def load(cls, yaml_path: Union[str, Path]) -> 'DirConfig': def load(cls, yaml_path: Union[str, Path]) -> 'DirConfig':
yaml_path = cls._resolve_path(yaml_path, 'config') yaml_path = cls._resolve_path(yaml_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)
print(f"Loaded configuration data from {yaml_path}") print(f"Loaded configuration data from {yaml_path}")
# Ensure HOME is set # Ensure HOME is set
if 'HOME' not in config_data: if 'HOME' not in config_data:
config_data['HOME'] = str(Path.home()) config_data['HOME'] = str(Path.home())
print(f"HOME was not in config, set to default: {config_data['HOME']}") print(f"HOME was not in config, set to default: {config_data['HOME']}")
instance = cls.create_dynamic_model(**config_data) instance = cls.create_dynamic_model(**config_data)
resolved_data = instance.resolve_placeholders(config_data) resolved_data = instance.resolve_placeholders(config_data, {})
return cls.create_dynamic_model(**resolved_data) return cls.create_dynamic_model(**resolved_data)
except Exception as e: except Exception as e:
print(f"Error loading configuration: {str(e)}") print(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
@ -244,10 +244,10 @@ class DirConfig(BaseModel):
elif not path.is_absolute(): elif not path.is_absolute():
path = base_path / path path = base_path / path
return path return path
def resolve_placeholders(self, data: Any) -> Any: def resolve_placeholders(self, data: Any, secrets_data: Dict[str, 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"
@ -256,16 +256,16 @@ class DirConfig(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
def resolve_string_placeholders(self, value: str, secrets_data: Dict[str, Any], home_dir: Path) -> Any: def resolve_string_placeholders(self, 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)
for match in matches: for match in matches:
parts = match.split('.') parts = match.split('.')
if len(parts) == 1: # Internal reference if len(parts) == 1: # Internal reference
@ -274,23 +274,13 @@ class DirConfig(BaseModel):
replacement = str(home_dir / parts[1].lower()) replacement = str(home_dir / parts[1].lower())
elif len(parts) == 2 and parts[0] == 'ENV': elif len(parts) == 2 and parts[0] == 'ENV':
replacement = os.getenv(parts[1], '') replacement = os.getenv(parts[1], '')
elif len(parts) == 2 and parts[0] == 'SECRET':
secret_key = parts[1].strip() # Remove any leading/trailing whitespace
replacement = secrets_data.get(secret_key)
if replacement is None:
warn(f"Secret '{secret_key}' not found in secrets file")
replacement = ''
else: else:
replacement = value replacement = value
value = value.replace('{{' + match + '}}', str(replacement)) value = value.replace('{{' + match + '}}', replacement)
# Convert to Path if it looks like a file path return Path(value).expanduser() if value.startswith(('/', '~')) else value
if isinstance(value, str) and (value.startswith(('/', '~')) or (':' in value and value[1] == ':')):
return Path(value).expanduser()
return value
@classmethod @classmethod
def create_dynamic_model(cls, **data): def create_dynamic_model(cls, **data):
DynamicModel = create_model( DynamicModel = create_model(
@ -299,11 +289,12 @@ class DirConfig(BaseModel):
**{k: (Path, v) for k, v in data.items()} **{k: (Path, v) for k, v in data.items()}
) )
return DynamicModel(**data) return DynamicModel(**data)
class Config: class Config:
arbitrary_types_allowed = True arbitrary_types_allowed = True
# Configuration class for API & Database methods. # Configuration class for API & Database methods.
class APIConfig(BaseModel): class APIConfig(BaseModel):
HOST: str HOST: str