Skip to content

Commit

Permalink
Merge 3e8554b into d5cdcff
Browse files Browse the repository at this point in the history
  • Loading branch information
Dinos Kousidis committed Apr 16, 2018
2 parents d5cdcff + 3e8554b commit 0d14eab
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 19 deletions.
64 changes: 46 additions & 18 deletions reana_workflow_controller/rest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,11 @@ def seed_workflow_workspace(workflow_id_or_name):
return jsonify({'message': 'File successfully transferred'}), 200

except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment'
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except (KeyError, ValueError) as e:
return jsonify({"message": str(e)}), 400
except Exception as e:
Expand Down Expand Up @@ -527,8 +530,11 @@ def get_workflow_outputs_file(workflow_id_or_name, file_name): # noqa
as_attachment=True), 200

except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except KeyError:
return jsonify({"message": "Malformed request."}), 400
except NotFound as e:
Expand Down Expand Up @@ -633,8 +639,11 @@ def get_workflow_files(workflow_id_or_name): # noqa
return jsonify(file_list), 200

except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except KeyError:
return jsonify({"message": "Malformed request."}), 400
except Exception as e:
Expand Down Expand Up @@ -738,8 +747,11 @@ def get_workflow_logs(workflow_id_or_name): # noqa
'user': user_uuid}), 200

except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except KeyError as e:
return jsonify({"message": str(e)}), 400
except Exception as e:
Expand Down Expand Up @@ -1145,8 +1157,11 @@ def get_workflow_status(workflow_id_or_name): # noqa
'organization': organization,
'user': user_uuid}), 200
except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except KeyError as e:
return jsonify({"message": str(e)}), 400
except Exception as e:
Expand Down Expand Up @@ -1297,8 +1312,11 @@ def set_workflow_status(workflow_id_or_name): # noqa
raise NotImplemented("Status {} is not supported yet"
.format(status))
except WorkflowInexistentError:
return jsonify({'message': 'Workflow {0} does not exist.'.format(
workflow_id_or_name)}), 404
return jsonify({'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_id_or_name)}), 404
except REANAWorkflowControllerError as e:
return jsonify({"message": str(e)}), 409
except KeyError as e:
Expand Down Expand Up @@ -1411,8 +1429,12 @@ def _get_workflow_by_name(workflow_name, user_uuid):
Workflow.owner_id == user_uuid). \
order_by(Workflow.run_number.desc()).first()
if not workflow:
raise WorkflowInexistentError('No Workflow with UUID {} found.'.
format(workflow_name))
raise WorkflowInexistentError(
'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_name))
return workflow


Expand All @@ -1426,8 +1448,12 @@ def _get_workflow_by_uuid(workflow_uuid):
"""
workflow = Workflow.query.filter(Workflow.id_ == workflow_uuid).first()
if not workflow:
raise WorkflowInexistentError('No Workflow with UUID {} found.'.
format(workflow_uuid))
raise WorkflowInexistentError(
'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_uuid))
return workflow


Expand Down Expand Up @@ -1523,8 +1549,10 @@ def _get_workflow_with_uuid_or_name(uuid_or_name, user_uuid):
one_or_none()
if not workflow:
raise WorkflowInexistentError(
'No Workflow with name {} and '
'run number of {} found.'.
'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(workflow_name, run_number))

return workflow
5 changes: 4 additions & 1 deletion tests/test_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,10 @@ def test_get_unknown_workflow_files(app, default_user, file_type):

assert res.status_code == 404
response_data = json.loads(res.get_data(as_text=True))
expected_data = {'message': 'Workflow {0} does not exist.'.
expected_data = {'message': 'REANA_WORKON is set to {0}, but '
'that workflow does not exist. '
'Please set your REANA_WORKON environment '
'variable appropriately.'.
format(random_workflow_uuid)}
assert response_data == expected_data

Expand Down

0 comments on commit 0d14eab

Please sign in to comment.