Skip to content

Commit

Permalink
Properly set workflow type for rerun (#41)
Browse files Browse the repository at this point in the history
Co-authored-by: Ziyang Li <[email protected]>
  • Loading branch information
WIIASD and Ziyang Li authored Jul 8, 2024
1 parent 3510bb4 commit d255a8f
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions omics/cli/rerun/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ def get_run_resources(logs, run):
rqst["nextToken"] = token
return sorted(resources, key=lambda x: x.get("creationTime"))

def get_workflow_type(run):
if not run.get("workflow", None) or len(run["workflow"].split(":")) < 5:
die(f"Failed to retrieve workflow type from run {run['arn']}")
return "READY2RUN" if not run["workflow"].split(":")[4] else "PRIVATE"

def start_run_request(run, opts={}):
"""Build StartRun request"""
Expand All @@ -178,18 +182,17 @@ def set_param(rqst, key, key0, val=None):
rqst = {}
if opts.get("--workflow-id"):
set_param(rqst, "workflowId", "--workflow-id")
if opts.get("--workflow-type"):
rqst["workflowType"] = opts["--workflow-type"]
elif opts.get("--run-id"):
set_param(rqst, "runId", "--run-id")
elif run.get("run"):
set_param(rqst, "runId", None, run["run"].split("/")[-1])
else:
set_param(rqst, "workflowId", None, run["workflow"].split("/")[-1])
if opts.get("--workflow-type"):
rqst["workflowType"] = opts["--workflow-type"]
elif not run["workflow"].split(":")[4]:
rqst["workflowType"] = "READY2RUN"

if opts.get("--workflow-type"):
set_param(rqst, "workflowType", "--workflow-type")
else:
rqst["workflowType"] = get_workflow_type(run)

set_param(rqst, "roleArn", "--role-arn")
set_param(rqst, "name", "--name")
Expand Down

0 comments on commit d255a8f

Please sign in to comment.