Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Remove redundant fields from status file #59

Merged
merged 1 commit into from
Jan 19, 2025
Merged

Remove redundant fields from status file #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/workflows_manager/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,18 @@ def to_dict(self) -> List[Dict]:
'name': step.path.name,
'status': step.status.value,
'parameters': step.parameters,
'stdout': step.stdout,
'stderr': step.stderr,
'error': str(step.error) if step.error else None,
'return_value': step.return_value,
'children': children,
}
if step.path.type == StepType.NORMAL:
data.update({
'stdout': step.stdout,
'stderr': step.stderr,
'return_value': step.return_value,
})
elif step.path.type in (StepType.WORKFLOW, StepType.PARALLEL):
data.update({
'children': children,
})
dictionary_steps.append(data)
step = step.next_step
return dictionary_steps
Expand Down
14 changes: 0 additions & 14 deletions tests/workflows_manager/unit_tests/actions/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ def test_expected_status() -> Dict:
{
'children': [
{
'children': None,
'error': None,
'name': 'Normal Step',
'parameters': {
Expand All @@ -111,28 +110,21 @@ def test_expected_status() -> Dict:
'error': None,
'name': 'Parallel Step',
'parameters': None,
'return_value': None,
'status': 'success',
'stderr': None,
'stdout': None,
'type': 'parallel'
}
],
'error': None,
'name': 'Workflow Step',
'parameters': None,
'return_value': None,
'status': 'success',
'stderr': None,
'stdout': None,
'type': 'workflow'
},
{
'children': [
{
'children': [
{
'children': None,
'error': 'error message',
'name': 'Normal Step',
'parameters': {
Expand All @@ -152,20 +144,14 @@ def test_expected_status() -> Dict:
'error': 'error message',
'name': 'Parallel Step',
'parameters': None,
'return_value': None,
'status': 'failed',
'stderr': None,
'stdout': None,
'type': 'parallel'
}
],
'error': 'error message',
'name': 'Another Workflow Step',
'parameters': None,
'return_value': None,
'status': 'failed',
'stderr': None,
'stdout': None,
'type': 'workflow',
}
]
Expand Down
1 change: 0 additions & 1 deletion tests/workflows_manager/unit_tests/actions/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def test_run_error_missing_parameters(self, mock_file_open, mock_dump,
expected_error = 'Missing the following required parameters: [\'integer\']'
expected_status = 'failed'
expected_step = {
'children': None,
'error': expected_error,
'name': 'Normal Step',
'parameters': None,
Expand Down
8 changes: 0 additions & 8 deletions tests/workflows_manager/unit_tests/test_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ def steps_information_dictionary():
'name': 'workflow_step',
'status': StepStatus.RUNNING.value,
'parameters': None,
'stdout': None,
'stderr': None,
'error': None,
'return_value': None,
'children': [
{
'type': StepType.NORMAL.value,
Expand All @@ -60,17 +57,13 @@ def steps_information_dictionary():
'stderr': None,
'error': None,
'return_value': None,
'children': None,
},
{
'type': StepType.PARALLEL.value,
'name': 'parallel_step',
'status': StepStatus.SUCCESS.value,
'parameters': None,
'stdout': None,
'stderr': None,
'error': None,
'return_value': None,
'children': [
{
'type': StepType.NORMAL.value,
Expand All @@ -81,7 +74,6 @@ def steps_information_dictionary():
'stderr': None,
'error': None,
'return_value': None,
'children': None,
}
]
}
Expand Down
Loading