Skip to content

[IO-1496][external] Ensure edges are returned as WFEdgeCore objects #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Oct 20, 2023
Merged

[IO-1496][external] Ensure edges are returned as WFEdgeCore objects #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9ba68e5
Changes to LocalDataset() & get_annotations() to account for releases…
Oct 5, 2023
a651266
Preserve order of annotation files in LocalDataset constructor
Oct 11, 2023
7b8c9ab
Merge branch 'master' into io-1445
Oct 11, 2023
7475f08
Changed job filter so that it only targets darwin/future
Oct 12, 2023
809800f
Fixed GH filtering & restored accidentally changed/deleted files
Oct 12, 2023
23441b2
Change to ensure tests can run without formatting & linting
Oct 12, 2023
08e657e
Added funcitonality to access stage names, types, and edges
Oct 18, 2023
cbe3c53
Merge branch 'master' into io-1496
JBWilkie Oct 18, 2023
760e49c
Formatted stage.py to adhere to Black formatter
Oct 18, 2023
8b0e213
Undo accidental changes meant as part of IO-1445
Oct 18, 2023
f08a319
Added unit tests
Oct 18, 2023
05ff725
Formatting changes to adhere to Black formatter
Oct 18, 2023
4bbb9d1
Linting changes to adhere to ruff linter
Oct 18, 2023
c386df3
Test improvement & change to list comprehension
Oct 19, 2023
98f475b
Further test improvement
Oct 19, 2023
feae78d
Test improvement
Oct 19, 2023
fbc8c86
Ensured edges are returned as WFEdgeCore objects instead of just IDs
Oct 19, 2023
e036e74
Merge branch 'master' into io-1496
JBWilkie Oct 20, 2023
3d558e2
Merge branch 'master' into io-1496
JBWilkie Oct 20, 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
9 changes: 3 additions & 6 deletions darwin/future/meta/objects/stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from uuid import UUID

from darwin.future.core.items import get_item_ids_stage, move_items_to_stage
from darwin.future.data_objects.workflow import WFStageCore
from darwin.future.data_objects.workflow import WFEdgeCore, WFStageCore
from darwin.future.meta.objects.base import MetaBase


Expand Down Expand Up @@ -64,9 +64,6 @@ def type(self) -> str:
return self._element.type.value

@property
def edges(self) -> List[List[UUID]]:
def edges(self) -> List[WFEdgeCore]:
"""Edge ID, source stage ID, target stage ID."""
return [
[edge.id, edge.source_stage_id, edge.target_stage_id]
for edge in self._element.edges
]
return list(self._element.edges)
10 changes: 8 additions & 2 deletions darwin/future/tests/meta/objects/test_stagemeta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,14 @@ def test_get_stage_edges(stage_meta):
},
)
assert len(test_stage.edges) == 2
assert len(test_stage.edges[0]) == 3
assert test_stage.edges[0][0] == UUID("00000000-0000-0000-0000-000000000000")
assert test_stage.edges[0].name == "edge_1"
assert test_stage.edges[0].id == UUID("00000000-0000-0000-0000-000000000000")
assert test_stage.edges[0].source_stage_id == UUID(
"00000000-0000-0000-0000-000000000000"
)
assert test_stage.edges[0].target_stage_id == UUID(
"00000000-0000-0000-0000-000000000000"
)


def test_stage_str_method(stage_meta: Stage) -> None:
Expand Down