From b3d2ccf951903ac0b7d717357fb1cccca26fbd15 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 19 Aug 2020 15:19:07 -0400 Subject: Consolidate steps to scale graph generation workflow Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- bh20seqanalyzer/main.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'bh20seqanalyzer') diff --git a/bh20seqanalyzer/main.py b/bh20seqanalyzer/main.py index ad3c3d7..13efbeb 100644 --- a/bh20seqanalyzer/main.py +++ b/bh20seqanalyzer/main.py @@ -181,13 +181,7 @@ class SeqAnalyzer: if self.schema_ref is None: self.upload_schema() - validated = arvados.util.list_all(self.api.collections().list, filters=[ - ["owner_uuid", "=", self.validated_project], - ["properties.status", "=", "validated"]]) inputobj = { - "inputReads": [], - "metadata": [], - "subjects": [], "metadataSchema": { "class": "File", "location": self.schema_ref @@ -195,19 +189,10 @@ class SeqAnalyzer: "exclude": { "class": "File", "location": self.exclude_list - } + }, + "src_project": self.validated_project } - validated.sort(key=lambda v: v["portable_data_hash"]) - for v in validated: - inputobj["inputReads"].append({ - "class": "File", - "location": "keep:%s/sequence.fasta" % v["portable_data_hash"] - }) - inputobj["metadata"].append({ - "class": "File", - "location": "keep:%s/metadata.yaml" % v["portable_data_hash"] - }) - inputobj["subjects"].append("http://collections.lugli.arvadosapi.com/c=%s/sequence.fasta" % v["portable_data_hash"]) + self.run_workflow(self.pangenome_analysis_project, self.pangenome_workflow_uuid, "Pangenome analysis", inputobj) -- cgit v1.2.3