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

Auto-update: Thu Aug 8 18:24:49 PDT 2024

Browse source
This commit is contained in:
sanj 2024-08-08 18:24:49 -07:00
parent de0b869f03
commit 1b4b242ac8
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sijapi/classes.py
View file

@ -258,28 +258,36 @@ class DirConfig(BaseModel):
elif isinstance(data, list):
return [self.resolve_placeholders(v, secrets_data) for v in data]
elif isinstance(data, str):
return self.resolve_string_placeholders(data, secrets_data, self.HOME)
return self.resolve_string_placeholders(data, secrets_data)
else:
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]) -> Any:
pattern = r'\{\{\s*([^}]+)\s*\}\}'
matches = re.findall(pattern, value)
for match in matches:
parts = match.split('.')
if len(parts) == 1: # Internal reference
replacement = str(home_dir / parts[0].lower())
replacement = getattr(self, parts[0], str(Path(self.HOME) / parts[0].lower()))
elif len(parts) == 2 and parts[0] == 'Dir':
replacement = str(home_dir / parts[1].lower())
replacement = getattr(self, parts[1], str(Path(self.HOME) / parts[1].lower()))
elif len(parts) == 2 and parts[0] == 'ENV':
replacement = os.getenv(parts[1], '')
elif len(parts) == 2 and parts[0] == 'SECRET':
replacement = secrets_data.get(parts[1].strip(), '')
if not replacement:
warn(f"Secret '{parts[1].strip()}' not found in secrets file")
else:
replacement = value
value = value.replace('{{' + match + '}}', replacement)
value = value.replace('{{' + match + '}}', str(replacement))
return Path(value).expanduser() if value.startswith(('/', '~')) else value
# Convert to Path if it looks like a file path
if isinstance(value, str) and (value.startswith(('/', '~')) or (':' in value and value[1] == ':')):
return Path(value).expanduser()
return value
@classmethod
def create_dynamic_model(cls, **data):