Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion tests/test_20_open_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ def test_open_dataset(tmp_path: Path, index_node: str, download: bool) -> None:
)

# Data vars
assert set(ds.data_vars) == {"tas", "pr"}
assert set(ds.data_vars) == {"pr", "tas"}
assert ds["pr"].coordinates == "areacella experiment_id height lat lon time"
assert ds["tas"].coordinates == "areacella experiment_id height lat lon time"

# Attributes
assert (
ds.coordinates
== "areacella experiment_id height lat lat_bnds lon lon_bnds time time_bnds"
)
assert ds.dataset_ids == [
"CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-CC.ssp245.r1i1p1f1.Amon.pr.gr.v20210113",
"CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-CC.ssp245.r1i1p1f1.Amon.tas.gr.v20210113",
Expand Down
9 changes: 8 additions & 1 deletion xarray_esgf/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ def combine_datasets(datasets: list[Dataset]) -> Dataset:
return obj


def add_coordinates_attr_inplace(obj: Dataset | DataArray) -> None:
obj.attrs["coordinates"] = " ".join(sorted(str(coord) for coord in obj.coords))
if isinstance(obj, Dataset):
for da in obj.data_vars.values():
add_coordinates_attr_inplace(da)


@dataclasses.dataclass
class Client:
selection: dict[str, str | list[str]]
Expand Down Expand Up @@ -205,6 +212,6 @@ def open_dataset(
if name not in obj.dims:
var.encoding["preferred_chunks"] = dict(var.chunksizes)

add_coordinates_attr_inplace(obj)
obj.attrs["dataset_ids"] = sorted(combined_datasets)

return obj