Skip to content

Commit 1d43672

Browse files
Migrate iterators.py for datatree. (pydata#8879)
* Migrate iterators.py for datatree. * Add __future__.annotations for Python 3.9. * Fix documentation typo in GitHub URL. * Improve type hints and documentation strings. * Fix DataTree docstring examples. * Add anytree license. * DAS-2063: Changes to use just LevelOrderIter * Minor whitespace tweaks. --------- Co-authored-by: Matt Savoie <[email protected]>
1 parent 0bc686c commit 1d43672

File tree

8 files changed

+345
-143
lines changed

8 files changed

+345
-143
lines changed

Diff for: doc/whats-new.rst

+3
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ Internal Changes
113113
- Migrates ``datatree`` functionality into ``xarray/core``. (:pull: `8789`)
114114
By `Owen Littlejohns <https://github.com/owenlittlejohns>`_, `Matt Savoie
115115
<https://github.com/flamingbear>`_ and `Tom Nicholas <https://github.com/TomNicholas>`_.
116+
- Migrates ``iterator`` functionality into ``xarray/core`` (:pull: `8879`)
117+
By `Owen Littlejohns <https://github.com/owenlittlejohns>`_, `Matt Savoie
118+
<https://github.com/flamingbear>`_ and `Tom Nicholas <https://github.com/TomNicholas>`_.
116119

117120

118121
.. _whats-new.2024.02.0:

Diff for: licenses/ANYTREE_LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

Diff for: xarray/core/iterators.py

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
from __future__ import annotations
2+
3+
from collections import abc
4+
from collections.abc import Iterator
5+
from typing import Callable
6+
7+
from xarray.core.treenode import Tree
8+
9+
"""These iterators are copied from anytree.iterators, with minor modifications."""
10+
11+
12+
class LevelOrderIter(abc.Iterator):
13+
"""Iterate over tree applying level-order strategy starting at `node`.
14+
This is the iterator used by `DataTree` to traverse nodes.
15+
16+
Parameters
17+
----------
18+
node : Tree
19+
Node in a tree to begin iteration at.
20+
filter_ : Callable, optional
21+
Function called with every `node` as argument, `node` is returned if `True`.
22+
Default is to iterate through all ``node`` objects in the tree.
23+
stop : Callable, optional
24+
Function that will cause iteration to stop if ``stop`` returns ``True``
25+
for ``node``.
26+
maxlevel : int, optional
27+
Maximum level to descend in the node hierarchy.
28+
29+
Examples
30+
--------
31+
>>> from xarray.core.datatree import DataTree
32+
>>> from xarray.core.iterators import LevelOrderIter
33+
>>> f = DataTree(name="f")
34+
>>> b = DataTree(name="b", parent=f)
35+
>>> a = DataTree(name="a", parent=b)
36+
>>> d = DataTree(name="d", parent=b)
37+
>>> c = DataTree(name="c", parent=d)
38+
>>> e = DataTree(name="e", parent=d)
39+
>>> g = DataTree(name="g", parent=f)
40+
>>> i = DataTree(name="i", parent=g)
41+
>>> h = DataTree(name="h", parent=i)
42+
>>> print(f)
43+
DataTree('f', parent=None)
44+
├── DataTree('b')
45+
│ ├── DataTree('a')
46+
│ └── DataTree('d')
47+
│ ├── DataTree('c')
48+
│ └── DataTree('e')
49+
└── DataTree('g')
50+
└── DataTree('i')
51+
└── DataTree('h')
52+
>>> [node.name for node in LevelOrderIter(f)]
53+
['f', 'b', 'g', 'a', 'd', 'i', 'c', 'e', 'h']
54+
>>> [node.name for node in LevelOrderIter(f, maxlevel=3)]
55+
['f', 'b', 'g', 'a', 'd', 'i']
56+
>>> [
57+
... node.name
58+
... for node in LevelOrderIter(f, filter_=lambda n: n.name not in ("e", "g"))
59+
... ]
60+
['f', 'b', 'a', 'd', 'i', 'c', 'h']
61+
>>> [node.name for node in LevelOrderIter(f, stop=lambda n: n.name == "d")]
62+
['f', 'b', 'g', 'a', 'i', 'h']
63+
"""
64+
65+
def __init__(
66+
self,
67+
node: Tree,
68+
filter_: Callable | None = None,
69+
stop: Callable | None = None,
70+
maxlevel: int | None = None,
71+
):
72+
self.node = node
73+
self.filter_ = filter_
74+
self.stop = stop
75+
self.maxlevel = maxlevel
76+
self.__iter = None
77+
78+
def __init(self):
79+
node = self.node
80+
maxlevel = self.maxlevel
81+
filter_ = self.filter_ or LevelOrderIter.__default_filter
82+
stop = self.stop or LevelOrderIter.__default_stop
83+
children = (
84+
[]
85+
if LevelOrderIter._abort_at_level(1, maxlevel)
86+
else LevelOrderIter._get_children([node], stop)
87+
)
88+
return self._iter(children, filter_, stop, maxlevel)
89+
90+
@staticmethod
91+
def __default_filter(node: Tree) -> bool:
92+
return True
93+
94+
@staticmethod
95+
def __default_stop(node: Tree) -> bool:
96+
return False
97+
98+
def __iter__(self) -> Iterator[Tree]:
99+
return self
100+
101+
def __next__(self) -> Iterator[Tree]:
102+
if self.__iter is None:
103+
self.__iter = self.__init()
104+
item = next(self.__iter) # type: ignore[call-overload]
105+
return item
106+
107+
@staticmethod
108+
def _abort_at_level(level: int, maxlevel: int | None) -> bool:
109+
return maxlevel is not None and level > maxlevel
110+
111+
@staticmethod
112+
def _get_children(children: list[Tree], stop: Callable) -> list[Tree]:
113+
return [child for child in children if not stop(child)]
114+
115+
@staticmethod
116+
def _iter(
117+
children: list[Tree], filter_: Callable, stop: Callable, maxlevel: int | None
118+
) -> Iterator[Tree]:
119+
level = 1
120+
while children:
121+
next_children = []
122+
for child in children:
123+
if filter_(child):
124+
yield child
125+
next_children += LevelOrderIter._get_children(
126+
list(child.children.values()), stop
127+
)
128+
children = next_children
129+
level += 1
130+
if LevelOrderIter._abort_at_level(level, maxlevel):
131+
break

Diff for: xarray/core/treenode.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ def subtree(self: Tree) -> Iterator[Tree]:
333333
--------
334334
DataTree.descendants
335335
"""
336-
from xarray.datatree_.datatree import iterators
336+
from xarray.core.iterators import LevelOrderIter
337337

338-
return iterators.PreOrderIter(self)
338+
return LevelOrderIter(self)
339339

340340
@property
341341
def descendants(self: Tree) -> tuple[Tree, ...]:

0 commit comments

Comments
 (0)