Skip to content

Commit

Permalink
Merge branch 'refactor_loadable_variables' of https://github.com/TomN…
Browse files Browse the repository at this point in the history
…icholas/VirtualiZarr into refactor_loadable_variables
  • Loading branch information
TomNicholas committed Mar 7, 2025
2 parents 7f0ee4d + 618da43 commit 6e020d3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
6 changes: 4 additions & 2 deletions virtualizarr/readers/common.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from collections.abc import Iterable, Mapping
from typing import (
Hashable,
Any,
Hashable,
MutableMapping,
Optional,
)
Expand Down Expand Up @@ -62,7 +62,9 @@ def replace_virtual_with_loadable_vars(
if isinstance(loadable_variables, list):
# this will automatically keep any IndexVariables needed for loadable 1D coordinates
ds_loadable_to_keep = loadable_ds[loadable_variables]
ds_virtual_to_keep = fully_virtual_dataset.drop_vars(loadable_variables, errors='ignore')
ds_virtual_to_keep = fully_virtual_dataset.drop_vars(
loadable_variables, errors="ignore"
)
elif loadable_variables is None:
# TODO if loadable_variables is None then we have to explicitly match default behaviour of xarray
# i.e. load and create indexes only for dimension coordinate variables
Expand Down
2 changes: 1 addition & 1 deletion virtualizarr/readers/hdf/hdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def open_virtual_dataset(
group=group,
loadable_variables=loadable_variables,
reader_options=reader_options,
#drop_variables=drop_variables,
# drop_variables=drop_variables,
indexes=indexes,
decode_times=decode_times,
)
Expand Down
2 changes: 1 addition & 1 deletion virtualizarr/readers/hdf5.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def open_virtual_dataset(
group=group,
loadable_variables=loadable_variables,
reader_options=reader_options,
#drop_variables=drop_variables,
# drop_variables=drop_variables,
indexes=indexes,
decode_times=decode_times,
)
Expand Down
9 changes: 5 additions & 4 deletions virtualizarr/readers/netcdf3.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
from xarray import Dataset, Index

from virtualizarr.readers.api import VirtualBackend
#from virtualizarr.readers.common import (
# construct_virtual_dataset,
# maybe_open_loadable_vars_and_indexes,
#)

# from virtualizarr.readers.common import (
# construct_virtual_dataset,
# maybe_open_loadable_vars_and_indexes,
# )
from virtualizarr.translators.kerchunk import (
virtual_vars_and_metadata_from_kerchunk_refs,
)
Expand Down
9 changes: 5 additions & 4 deletions virtualizarr/readers/tiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
from xarray import Dataset, Index

from virtualizarr.readers.api import VirtualBackend
#from virtualizarr.readers.common import (
# construct_virtual_dataset,
# maybe_open_loadable_vars_and_indexes,
#)

# from virtualizarr.readers.common import (
# construct_virtual_dataset,
# maybe_open_loadable_vars_and_indexes,
# )
from virtualizarr.translators.kerchunk import (
extract_group,
virtual_vars_and_metadata_from_kerchunk_refs,
Expand Down

0 comments on commit 6e020d3

Please sign in to comment.