Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Derived Catalog: test for all needed variables and skip if existing #441

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Derived Catalog: test for all needed variables and skip if existing #441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0657c04
Test for all needed variables and skip if existing
aulemahal Feb 1, 2022
4db5e61
Add prefer_derived option
aulemahal Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions intake_esm/derived.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,11 @@ def update_datasets(

for dset_key, dataset in datasets.items():
for _, derived_variable in self.items():
if set(dataset.variables).intersection(
derived_variable.dependent_variables(variable_key_name)
if (
set(dataset.variables).issuperset(
derived_variable.dependent_variables(variable_key_name)
)
and derived_variable.variable not in dataset.variables
):
try:
# Assumes all dependent variables are in the same dataset
Expand Down
25 changes: 24 additions & 1 deletion tests/test_derived.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ def func(ds):
ds['FOO'] = ds.air // 100
return ds

@dvr.register(variable='lon', query={'variable': 'air'})
def func2(ds):
ds['lon'] = ds.air.lon // 100
return ds

dsets = dvr.update_datasets(datasets={'test': ds.copy()}, variable_key_name='variable')
assert 'test' in dsets
assert 'FOO' in dsets['test']
Expand Down Expand Up @@ -98,10 +103,28 @@ def funcb(ds):
dsets = dvr.update_datasets(
datasets={'test': ds.copy()}, variable_key_name='variable', skip_on_error=True
)

assert 'FOO' not in dsets['test']

with pytest.raises(DerivedVariableError):
dsets = dvr.update_datasets(
datasets={'test': ds.copy()}, variable_key_name='variable', skip_on_error=False
)

@dvr.register(variable='BAR', query={'variable': ['air', 'water']})
def funcc(ds):
ds['BAR'] = ds.air / ds.water
return ds

@dvr.register(variable='FOO', query={'variable': ['air']})
def funcd(ds):
ds['FOO'] = ds.air * 2
return ds

# No error, nothing is done.
dsets = dvr.update_datasets(
datasets={'test': ds.assign(FOO=ds.air).copy()},
variable_key_name='variable',
skip_on_error=False,
)
assert {'air', 'FOO'} == dsets['test'].data_vars.keys()
assert ds.air.equals(dsets['test'].FOO)