Skip to content

Commit

Permalink
[refactor] NodeDefiniton.iterate_solid_defs -> iterate_op_defs (#12336)
Browse files Browse the repository at this point in the history
### Summary & Motivation

Rename NodeDefinition.iterate_solid_defs -> iterate_node_defs

### How I Tested These Changes

BK
  • Loading branch information
smackesey committed Feb 15, 2023
1 parent 915feb5 commit 3fe5dcd
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ def _validate_resource_reqs_for_asset_group(
present_resource_keys = present_resource_keys.union(provided_resource_keys)

required_resource_keys: Set[str] = set()
for op_def in asset_def.node_def.iterate_solid_defs():
for op_def in asset_def.node_def.iterate_op_defs():
required_resource_keys.update(set(op_def.required_resource_keys or {}))
missing_resource_keys = list(set(required_resource_keys) - present_resource_keys)
if missing_resource_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,9 @@ def iterate_node_defs(self) -> Iterator[NodeDefinition]:
for outer_node_def in self._node_defs:
yield from outer_node_def.iterate_node_defs()

def iterate_solid_defs(self) -> Iterator["OpDefinition"]:
def iterate_op_defs(self) -> Iterator["OpDefinition"]:
for outer_node_def in self._node_defs:
yield from outer_node_def.iterate_solid_defs()
yield from outer_node_def.iterate_op_defs()

def iterate_node_handles(
self, parent_node_handle: Optional[NodeHandle] = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def iterate_node_defs(self) -> Iterable["NodeDefinition"]:
...

@abstractmethod
def iterate_solid_defs(self) -> Iterable["OpDefinition"]:
def iterate_op_defs(self) -> Iterable["OpDefinition"]:
...

@abstractmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def all_dagster_types(self) -> Iterator[DagsterType]:
def iterate_node_defs(self) -> Iterator[NodeDefinition]:
yield self

def iterate_solid_defs(self) -> Iterator["OpDefinition"]:
def iterate_op_defs(self) -> Iterator["OpDefinition"]:
yield self

T_Handle = TypeVar("T_Handle", bound=Optional[NodeHandle])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ def y(e, f):
job = AssetGroup([foo, x, y], resource_defs={"io_manager": io_manager_def}).build_job("job")

# should produce a job with foo(a,b,c,d,f) -> x -> foo(e,g) -> y -> foo(h)
assert len(list(job.graph.iterate_solid_defs())) == 5
assert len(list(job.graph.iterate_op_defs())) == 5
result = job.execute_in_process()

assert _all_asset_keys(result) == {AssetKey(x) for x in "a,b,c,d,e,f,g,h,x,y".split(",")}
Expand Down Expand Up @@ -735,7 +735,7 @@ def y(b, c):
job = AssetGroup([foo, x, y], resource_defs={"io_manager": io_manager_def}).build_job("job")

# should produce a job with foo -> x -> foo -> y -> foo
assert len(list(job.graph.iterate_solid_defs())) == 5
assert len(list(job.graph.iterate_op_defs())) == 5
result = job.execute_in_process()

assert _all_asset_keys(result) == {AssetKey(x) for x in "a,b,c,d,e,f,x,y".split(",")}
Expand Down Expand Up @@ -795,7 +795,7 @@ def foo_prime(context, a, b):
).build_job("job")

# should produce a job with foo -> foo_prime -> foo_2 -> foo_prime_2
assert len(list(job.graph.iterate_solid_defs())) == 4
assert len(list(job.graph.iterate_op_defs())) == 4

result = job.execute_in_process()
assert result.output_for_node("foo", "a") == 1
Expand Down

0 comments on commit 3fe5dcd

Please sign in to comment.