Skip to content
This repository has been archived by the owner on Oct 24, 2024. It is now read-only.

Keep attrs in map_over_subtree #279

Merged
merged 3 commits into from
Nov 27, 2023
Merged

Keep attrs in map_over_subtree #279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ccf1ef
keep attrs in map_over_subtree
slevang Nov 20, 2023
fd539a1
more intelligible logic
slevang Nov 20, 2023
bfa59b0
Merge branch 'main' into keep-attrs-empty-nodes
TomNicholas Nov 27, 2023
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
2 changes: 2 additions & 0 deletions datatree/mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ def _map_over_subtree(*args, **kwargs) -> DataTree | Tuple[DataTree, ...]:
*node_args_as_datasetviews, **node_kwargs_as_datasetviews
)
if node_of_first_tree.has_data
else node_of_first_tree.ds
if node_of_first_tree.has_attrs
else None
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not even know that this double if else was valid python!

Could we perhaps rewrite this to be more intuitive, e.g.

if node.has_data:
    result = func_with_error_context(...)
elif node.has_attrs:
    # propagate attrs
    result = node.ds
else:
    # nothing to propagate so use fastpath to create empty node in new tree
    result = None

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol, neither did I. For some reason when I first looked at these lines I thought it was a list comprehension and had to have google remind me whether you can elif in a comprehension (you can not, but you can do this weird syntax 🤷 ). Fixed.

)

Expand Down
11 changes: 11 additions & 0 deletions datatree/tests/test_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,17 @@ def check_for_data(ds):

dt.map_over_subtree(check_for_data)

def test_keep_attrs_on_empty_nodes(self, create_test_datatree):
# GH278
dt = create_test_datatree()
dt["set1/set2"].attrs["foo"] = "bar"

def empty_func(ds):
return ds

result = dt.map_over_subtree(empty_func)
assert result["set1/set2"].attrs == dt["set1/set2"].attrs

@pytest.mark.xfail(
reason="probably some bug in pytests handling of exception notes"
)
Expand Down
2 changes: 2 additions & 0 deletions docs/source/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Deprecations

Bug fixes
~~~~~~~~~
- Keep attributes on nodes containing no data in :py:func:`map_over_subtree`. (:issue:`278`, :pull:`279`)
By `Sam Levang <https://github.com/slevang>`_.

Documentation
~~~~~~~~~~~~~
Expand Down
Loading