Skip to content

Commit b856d80

Browse files
committed
Explicitly set job status to pass info message
1 parent 83146b0 commit b856d80

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

singlecell/api-src/org/labkey/api/singlecell/pipeline/AbstractSingleCellPipelineStep.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.apache.commons.lang3.math.NumberUtils;
77
import org.jetbrains.annotations.Nullable;
88
import org.json.JSONObject;
9+
import org.labkey.api.pipeline.PipelineJob;
910
import org.labkey.api.pipeline.PipelineJobException;
1011
import org.labkey.api.reader.Readers;
1112
import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
@@ -577,6 +578,7 @@ private void handlePossibleFailure(SequenceOutputHandler.JobContext ctx, String
577578
ctx.getLogger().info("HTML not found: " + html.getPath());
578579
}
579580

581+
ctx.getJob().setStatus(PipelineJob.TaskStatus.error, " Errors: " + StringUtils.join(errors, ";"));
580582
throw new PipelineJobException(getProvider().getName() + " Errors: " + StringUtils.join(errors, ";"));
581583
}
582584
catch (IOException e)

singlecell/resources/chunks/RunSingleR.R

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
for (datasetId in names(seuratObjects)) {
22
seuratObj <- readRDS(seuratObjects[[datasetId]])
33

4-
if (!is.na(Sys.getenv('SEQUENCEANALYSIS_MAX_THREADS', unset = NA))) {
5-
nThreads <- Sys.getenv('SEQUENCEANALYSIS_MAX_THREADS')
6-
}
7-
84
seuratObj <- bindArgs(CellMembrane::RunSingleR, seuratObj, disallowedArgNames = c('assay'))()
95

106
saveData(seuratObj, datasetId)

singlecell/src/org/labkey/singlecell/pipeline/singlecell/RunSingleR.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ public Provider()
2222
super("RunSingleR", "Run SingleR", "CellMembrane/SingleR", "This will run singleR on the input object(s), and save the results in metadata.", Arrays.asList(
2323
SeuratToolParameter.create("showHeatmap", "Generate Heatmaps", "If checked, the SingleR heatmaps will be generated. These can be expensive for large datasets and are often less useful than the DimPlots, so skipping them sometimes makes sense.", "checkbox", new JSONObject(){{
2424

25-
}}, false, "showHeatmap", true)
25+
}}, false, "showHeatmap", true),
26+
SeuratToolParameter.create("nThreads", "# Threads", "If provided, this value will be passed to BiocParallel::MulticoreParam().", "ldk-integerfield", new JSONObject(){{
27+
put("minValue", 0);
28+
}}, null)
2629
), null, null);
2730
}
2831

0 commit comments

Comments
 (0)