sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #475 from sartography/bug/failed_validation 

Fixing failing validation.
This commit is contained in:
Dan Funk 2022-02-27 11:01:09 -05:00 committed by GitHub
parent 9b004d0dc6 ebbb04a1af
commit 28e8a4b47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crc/api/workflow.py
View File

@ -114,19 +114,16 @@ def validate_workflow_specification(spec_id, study_id=None, test_until=None):
master_spec = WorkflowSpecService().master_spec master_spec = WorkflowSpecService().master_spec
if study_id is not None: if study_id is not None:
study_model = session.query(StudyModel).filter(StudyModel.id == study_id).first() study_model = session.query(StudyModel).filter(StudyModel.id == study_id).first()
if study_model is None:
raise ApiError(code='invalid_study',
message=f"Unable to validate Workflow because the"
f" provided study id ({study_id}) does not exist.")
statuses = WorkflowProcessor.run_master_spec(master_spec, study_model) statuses = WorkflowProcessor.run_master_spec(master_spec, study_model)
if spec_id in statuses and statuses[spec_id]['status'] == 'disabled': if spec_id in statuses and statuses[spec_id]['status'] == 'disabled':
raise ApiError(code='disabled_workflow', raise ApiError(code='disabled_workflow',
message=f"This workflow is disabled. {statuses[spec_id]['message']}") message=f"This workflow is disabled. {statuses[spec_id]['message']}")
ts = time.time()
WorkflowService.test_spec(spec_id, study_id, test_until) WorkflowService.test_spec(spec_id, study_id, test_until)
te = time.time()
print('| %2.4f | % s ' % (te - ts, 'validate and complete all fields'))
ts = time.time()
WorkflowService.test_spec(spec_id, study_id, test_until, required_only=True) WorkflowService.test_spec(spec_id, study_id, test_until, required_only=True)
te = time.time()
print('| %2.4f | % s ' % (te - ts, 'validate only with required fields'))
except ApiError as ae: except ApiError as ae:
error = ae error = ae

10
crc/services/workflow_service.py
View File

@ -167,15 +167,6 @@ class WorkflowService(object):
# We return message so we can use it in a test # We return message so we can use it in a test
return message return message
@staticmethod
def raise_if_disabled(spec_id, study_id):
"""Raise an exception of the workflow is not enabled and can not be executed."""
if study_id is not None:
study_model = session.query(StudyModel).filter(StudyModel.id == study_id).first()
status = StudyService._get_study_status(study_model)
if spec_id in status and status[spec_id]['status'] == 'disabled':
raise ApiError(code='disabled_workflow', message=f"This workflow is disabled. {status[spec_id]['message']}")
@staticmethod @staticmethod
def test_spec(spec_id, validate_study_id=None, test_until=None, required_only=False): def test_spec(spec_id, validate_study_id=None, test_until=None, required_only=False):
"""Runs a spec through it's paces to see if it results in any errors. """Runs a spec through it's paces to see if it results in any errors.
@ -189,7 +180,6 @@ class WorkflowService(object):
""" """
workflow_model = WorkflowService.make_test_workflow(spec_id, validate_study_id) workflow_model = WorkflowService.make_test_workflow(spec_id, validate_study_id)
WorkflowService.raise_if_disabled(spec_id, validate_study_id)
try: try:
processor = WorkflowProcessor(workflow_model, validate_only=True) processor = WorkflowProcessor(workflow_model, validate_only=True)
count = 0 count = 0