From 2a6e8315a1c1f879f20e69ea6d3187c57a298afa Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Mon, 7 Feb 2022 11:22:45 -0500 Subject: [PATCH] *** WIP *** Committing to deal w/ the migration --- crc/scripts/get_spec_from_workflow_id.py | 8 +++++--- crc/scripts/reset_workflow.py | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/crc/scripts/get_spec_from_workflow_id.py b/crc/scripts/get_spec_from_workflow_id.py index 78f16787..3fbe5934 100644 --- a/crc/scripts/get_spec_from_workflow_id.py +++ b/crc/scripts/get_spec_from_workflow_id.py @@ -1,7 +1,8 @@ from crc import session from crc.api.common import ApiError -from crc.models.workflow import WorkflowModel, WorkflowSpecModel, WorkflowSpecModelSchema +from crc.models.workflow import WorkflowModel, WorkflowSpecInfo, WorkflowSpecInfoSchema # WorkflowSpecModel, WorkflowSpecModelSchema from crc.scripts.script import Script +from crc.services.workflow_spec_service import WorkflowSpecService class ScriptTemplate(Script): @@ -18,6 +19,7 @@ class ScriptTemplate(Script): message='Please pass in a workflow_id to use in the search.') passed_workflow_id = args[0] workflow = session.query(WorkflowModel).filter(WorkflowModel.id == passed_workflow_id).first() - workflow_spec = session.query(WorkflowSpecModel).filter(WorkflowSpecModel.id==workflow.workflow_spec_id).first() + workflow_spec = WorkflowSpecService.get_spec(workflow.workflow_spec_id) + # TODO: Find out what type of object is returned by get_spec, and how to get info out of it if workflow_spec: - return WorkflowSpecModelSchema().dump(workflow_spec) + return WorkflowSpecInfoSchema().dump(workflow_spec) diff --git a/crc/scripts/reset_workflow.py b/crc/scripts/reset_workflow.py index 898a8957..e90672df 100644 --- a/crc/scripts/reset_workflow.py +++ b/crc/scripts/reset_workflow.py @@ -1,8 +1,9 @@ from crc import session from crc.api.common import ApiError -from crc.models.workflow import WorkflowModel, WorkflowSpecModel +from crc.models.workflow import WorkflowModel, WorkflowSpecInfo from crc.scripts.script import Script from crc.services.workflow_processor import WorkflowProcessor +from crc.services.workflow_spec_service import WorkflowSpecService class ResetWorkflow(Script): @@ -19,7 +20,9 @@ class ResetWorkflow(Script): if 'reset_id' in kwargs.keys(): reset_id = kwargs['reset_id'] - workflow_spec: WorkflowSpecModel = session.query(WorkflowSpecModel).filter_by(id=reset_id).first() + # TODO: Find out what type of object is returned by get_spec, and how to get info out of it + workflow_spec = WorkflowSpecService().get_spec(reset_id) + # workflow_spec: WorkflowSpecModel = session.query(WorkflowSpecModel).filter_by(id=reset_id).first() if workflow_spec: workflow_model: WorkflowModel = session.query(WorkflowModel).filter_by( workflow_spec_id=workflow_spec.id,