bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

_helpers: remove resource folder separation by wildcard

Browse Source 
This was not working reliably as the number of input and output wildcards could vary, which the function did not acknowledge
This commit is contained in:
Fabian Neumann 2024-02-17 18:15:43 +01:00
parent db7c983950
commit 84c3852c2e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/_helpers.py
View File

@ -39,10 +39,9 @@ def get_run_path(fn, dir, rdir, shared_resources):
The base directory. The base directory.
rdir : str rdir : str
Relative directory for non-shared resources. Relative directory for non-shared resources.
shared_resources : str, list, or bool shared_resources : str or bool
Specifies which resources should be shared. Specifies which resources should be shared.
- If string or list, assumed to be superset of wildcards for sharing. - If string is "base", special handling for shared "base" resources (see notes).
- If "base", special handling for shared "base" resources.
- If boolean, directly specifies if the resource is shared. - If boolean, directly specifies if the resource is shared.
Returns Returns
@ -54,24 +53,23 @@ def get_run_path(fn, dir, rdir, shared_resources):
----- -----
Special case for "base" allows no wildcards other than "technology", "year" Special case for "base" allows no wildcards other than "technology", "year"
and "scope" and excludes filenames starting with "networks/elec" or and "scope" and excludes filenames starting with "networks/elec" or
"add_electricity". "add_electricity". All other resources are shared.
""" """
pattern = r"\{([^{}]+)\}"
existing_wildcards = set(re.findall(pattern, fn))
if shared_resources == "base": if shared_resources == "base":
# special case for shared "base" resources pattern = r"\{([^{}]+)\}"
existing_wildcards = set(re.findall(pattern, fn))
irrelevant_wildcards = {"technology", "year", "scope"} irrelevant_wildcards = {"technology", "year", "scope"}
no_relevant_wildcards = not len(existing_wildcards - irrelevant_wildcards) no_relevant_wildcards = not (existing_wildcards - irrelevant_wildcards)
no_elec_rule = not fn.startswith("networks/elec") and not fn.startswith( no_elec_rule = not fn.startswith("networks/elec") and not fn.startswith(
"add_electricity" "add_electricity"
) )
is_shared = no_relevant_wildcards and no_elec_rule is_shared = no_relevant_wildcards and no_elec_rule
elif isinstance(shared_resources, (str, list)): elif isinstance(shared_resources, bool):
if isinstance(shared_resources, str):
shared_resources = [shared_resources]
is_shared = (existing_wildcards).issubset(shared_resources)
else:
is_shared = shared_resources is_shared = shared_resources
else:
raise ValueError(
"shared_resources must be a boolean or 'base' for special handling."
)
if is_shared: if is_shared:
return f"{dir}{fn}" return f"{dir}{fn}"