biopipen 0.27.2__tar.gz → 0.27.4__tar.gz

{biopipen-0.27.2 → biopipen-0.27.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biopipen
-Version: 0.27.2
+Version: 0.27.4
 Summary: Bioinformatics processes/pipelines that can be run from `pipen run`
 License: MIT
 Author: pwwang
@@ -17,6 +17,6 @@ Requires-Dist: datar[pandas] (>=0.15.6,<0.16.0)
 Requires-Dist: pipen-board[report] (>=0.15,<0.16)
 Requires-Dist: pipen-cli-run (>=0.13,<0.14)
 Requires-Dist: pipen-filters (>=0.12,<0.13)
-Requires-Dist: pipen-poplog (>=0.1,<0.2)
+Requires-Dist: pipen-poplog (>=0.1.2,<0.2.0)
 Requires-Dist: pipen-runinfo (>=0.6,<0.7) ; extra == "runinfo"
 Requires-Dist: pipen-verbose (>=0.11,<0.12)

biopipen-0.27.4/biopipen/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.27.4"

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/delim.py

@@ -113,7 +113,7 @@ class SampleInfo(Proc):
         "exclude_cols": None,
         "defaults": {
             "on": "Sample",
-            "distinct": None,
+            # "distinct": None,
             "group": None,
             "na_group": False,
             "each": None,

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/plot.py

@@ -114,3 +114,39 @@ class Heatmap(Proc):
         "globals": "",
     }
     script = "file://../scripts/plot/Heatmap.R"
+
+
+class ROC(Proc):
+    """Plot ROC curve using [`plotROC`](https://cran.r-project.org/web/packages/plotROC/vignettes/examples.html).
+
+    Input:
+        infile: The input file for data, tab-separated.
+            The first column should be ids of the records (this is optional if `envs.noids` is True).
+            The second column should be the labels of the records (1 for positive, 0 for negative).
+            If they are not binary, you can specify the positive label by `envs.pos_label`.
+            From the third column, it should be the scores of the different models.
+
+    Output:
+        outfile: The output figure file
+
+    Envs:
+        noids: Whether the input file has ids (first column) or not.
+        pos_label: The positive label.
+        ci: Whether to use `geom_rocci()` instead of `geom_roc()`.
+        devpars: The parameters for `png()`
+        args: Additional arguments for `geom_roc()` or `geom_rocci()` if `envs.ci` is True.
+        style_roc: Arguments for `style_roc()`
+    """  # noqa: E501
+    input = "infile:file"
+    output = "outfile:file:{{in.infile | stem}}.roc.png"
+    lang = config.lang.rscript
+    envs = {
+        "noids": False,
+        "pos_label": 1,
+        "ci": False,
+        "devpars": {"res": 100, "width": 750, "height": 600},
+        "args": {"labels": False},
+        "style_roc": {},
+        "show_auc": True,
+    }
+    script = "file://../scripts/plot/ROC.R"

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/scrna.py

@@ -201,6 +201,13 @@ class SeuratPreparing(Proc):
                 - scvi: Same as `scVIIntegration`.
             - <more>: See <https://satijalab.org/seurat/reference/integratelayers>
 
+        DoubletFinder (ns): Arguments to run [`DoubletFinder`](https://github.com/chris-mcginnis-ucsf/DoubletFinder).
+            See also <https://demultiplexing-doublet-detecting-docs.readthedocs.io/en/latest/DoubletFinder.html>.
+            To disable `DoubletFinder`, set `envs.DoubletFinder` to `None` or `False`; or set `pcs` to `0`.
+            - PCs (type=int): Number of PCs to use for 'doubletFinder' function.
+            - doublets (type=float): Number of expected doublets as a proportion of the pool size.
+            - pN (type=float): Number of doublets to simulate as a proportion of the pool size.
+
     Requires:
         r-seurat:
             - check: {{proc.lang}} <(echo "library(Seurat)")
@@ -227,6 +234,7 @@ class SeuratPreparing(Proc):
             "min_cells": 5,
         },
         "IntegrateLayers": {"method": "harmony"},
+        "DoubletFinder": {"PCs": 0, "pN": 0.25, "doublets": 0.075},
     }
     script = "file://../scripts/scrna/SeuratPreparing.R"
     plugin_opts = {
@@ -405,7 +413,7 @@ class SeuratClusterStats(Proc):
         nCells_All = { }
         ```
 
-        ![nCells_All](https://pwwang.github.io/immunopipe/processes/images/SeuratClusterStats_nCells_All.png){: width="80%" }
+        ![nCells_All](https://pwwang.github.io/immunopipe/latest/processes/images/SeuratClusterStats_nCells_All.png){: width="80%" }
 
         ### Number of cells in each cluster by groups
 
@@ -414,7 +422,7 @@ class SeuratClusterStats(Proc):
         nCells_Sample = { group-by = "Sample" }
         ```
 
-        ![nCells_Sample](https://pwwang.github.io/immunopipe/processes/images/SeuratClusterStats_nCells_Sample.png){: width="80%" }
+        ![nCells_Sample](https://pwwang.github.io/immunopipe/latest/processes/images/SeuratClusterStats_nCells_Sample.png){: width="80%" }
 
         ### Violin plots for the gene expressions
 
@@ -427,8 +435,8 @@ class SeuratClusterStats(Proc):
         vlnplots_1 = { features = ["FOXP3", "IL2RA"], pt-size = 0, kind = "vln" }
         ```
 
-        ![vlnplots](https://pwwang.github.io/immunopipe/processes/images/SeuratClusterStats_vlnplots.png){: width="80%" }
-        ![vlnplots_1](https://pwwang.github.io/immunopipe/processes/images/SeuratClusterStats_vlnplots_1.png){: width="80%" }
+        ![vlnplots](https://pwwang.github.io/immunopipe/latest/processes/images/SeuratClusterStats_vlnplots.png){: width="80%" }
+        ![vlnplots_1](https://pwwang.github.io/immunopipe/latest/processes/images/SeuratClusterStats_vlnplots_1.png){: width="80%" }
 
         ### Dimension reduction plot with labels
 
@@ -439,7 +447,7 @@ class SeuratClusterStats(Proc):
         repel = true
         ```
 
-        ![dimplots](https://pwwang.github.io/immunopipe/processes/images/SeuratClusterStats_dimplots.png){: width="80%" }
+        ![dimplots](https://pwwang.github.io/immunopipe/latest/processes/images/SeuratClusterStats_dimplots.png){: width="80%" }
 
     Input:
         srtobj: The seurat object loaded by `SeuratClustering`
@@ -849,7 +857,7 @@ class CellsDistribution(Proc):
         group_order = [ "Tumor", "Normal" ]
         ```
 
-        ![CellsDistribution_example](https://pwwang.github.io/immunopipe/processes/images/CellsDistribution_example.png)
+        ![CellsDistribution_example](https://pwwang.github.io/immunopipe/latest/processes/images/CellsDistribution_example.png)
 
     Input:
         srtobj: The seurat object in RDS format
@@ -1862,7 +1870,7 @@ class RadarPlots(Proc):
 
         Then we will have a radar plots like this:
 
-        ![Radar plots](https://pwwang.github.io/immunopipe/processes/images/RadarPlots-default.png)
+        ![Radar plots](https://pwwang.github.io/immunopipe/latest/processes/images/RadarPlots-default.png)
 
         We can use `each` to separate the cells into different cases:
 
@@ -1874,7 +1882,7 @@ class RadarPlots(Proc):
 
         Then we will have two radar plots, one for `Pre` and one for `Post`:
 
-        ![Radar plots](https://pwwang.github.io/immunopipe/processes/images/RadarPlots-each.png)
+        ![Radar plots](https://pwwang.github.io/immunopipe/latest/processes/images/RadarPlots-each.png)
 
         Using `cluster_order` to change the order of the clusters and show only the first 3 clusters:
 
@@ -1885,7 +1893,7 @@ class RadarPlots(Proc):
         breaks = [0, 50, 100]  # also change the breaks
         ```
 
-        ![Radar plots cluster_order](https://pwwang.github.io/immunopipe/processes/images/RadarPlots-cluster_order.png)
+        ![Radar plots cluster_order](https://pwwang.github.io/immunopipe/latest/processes/images/RadarPlots-cluster_order.png)
 
 
         /// Attention

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/scrna_metabolic_landscape.py

@@ -22,11 +22,11 @@ class MetabolicPathwayActivity(Proc):
     For each subset, a heatmap and a violin plot will be generated.
     The heatmap shows the pathway activities for each group and each metabolic pathway
 
-    ![MetabolicPathwayActivity_heatmap](https://pwwang.github.io/immunopipe/processes/images/MetabolicPathwayActivity_heatmap.png){: width="80%"}
+    ![MetabolicPathwayActivity_heatmap](https://pwwang.github.io/immunopipe/latest/processes/images/MetabolicPathwayActivity_heatmap.png){: width="80%"}
 
     The violin plot shows the distribution of the pathway activities for each group
 
-    ![MetabolicPathwayActivity_violin](https://pwwang.github.io/immunopipe/processes/images/MetabolicPathwayActivity_violin.png){: width="45%"}
+    ![MetabolicPathwayActivity_violin](https://pwwang.github.io/immunopipe/latest/processes/images/MetabolicPathwayActivity_violin.png){: width="45%"}
 
     Envs:
         ntimes (type=int): Number of times to do the permutation
@@ -294,7 +294,7 @@ class MetabolicPathwayHeterogeneity(Proc):
     The heterogeneity can be reflected by the NES values and the p-values in
     different groups for the metabolic pathways.
 
-    ![MetabolicPathwayHeterogeneity](https://pwwang.github.io/immunopipe/processes/images/MetabolicPathwayHeterogeneity.png)
+    ![MetabolicPathwayHeterogeneity](https://pwwang.github.io/immunopipe/latest/processes/images/MetabolicPathwayHeterogeneity.png)
 
 
     Envs:

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/snp.py

@@ -71,3 +71,68 @@ class PlinkSimulation(Proc):
         "sample_prefix": None,
     }
     script = "file://../scripts/snp/PlinkSimulation.py"
+
+
+class MatrixEQTL(Proc):
+    """Run Matrix eQTL
+
+    See also <https://www.bios.unc.edu/research/genomic_software/Matrix_eQTL/>
+
+    Input:
+        geno: Genotype matrix file with rows representing SNPs and columns
+            representing samples.
+        expr: Expression matrix file with rows representing genes and columns
+            representing samples.
+        cov: Covariate matrix file with rows representing covariates and columns
+            representing samples.
+
+    Output:
+        alleqtls: Matrix eQTL output file
+        cisqtls: The cis-eQTL file if `snppos` and `genepos` are provided.
+            Otherwise it'll be empty.
+
+    Envs:
+        model (choice): The model to use.
+            - `linear`: Linear model
+            - `modelLINEAR`: Same as `linear`
+            - `anova`: ANOVA model
+            - `modelANOVA`: Same as `anova`
+        pval (type=float): P-value threshold for eQTLs
+        transp (type=float): P-value threshold for trans-eQTLs.
+            If cis-eQTLs are not enabled (`snppos` and `genepos` are not set),
+            this defaults to 1e-5.
+            If cis-eQTLs are enabled, this defaults to `None`, which will disable
+            trans-eQTL analysis.
+        fdr (flag): Do FDR calculation or not (save memory if not).
+        snppos: The path of the SNP position file.
+            It could be a BED, GFF, VCF or a tab-delimited file with
+            `snp`, `chr`, `pos` as the first 3 columns.
+        genepos: The path of the gene position file.
+            It could be a BED or GFF file.
+        dist (type=int): Distance threshold for cis-eQTLs.
+        transpose_geno (flag): If set, the genotype matrix (`in.geno`)
+            will be transposed.
+        transpose_expr (flag): If set, the expression matrix (`in.expr`)
+            will be transposed.
+        transpose_cov (flag): If set, the covariate matrix (`in.cov`)
+            will be transposed.
+    """
+    input = "geno:file, expr:file, cov:file"
+    output = [
+        "alleqtls:file:{{in.geno | stem}}.alleqtls.txt",
+        "cisqtls:file:{{in.geno | stem}}.cisqtls.txt",
+    ]
+    lang = config.lang.rscript
+    envs = {
+        "model": "linear",
+        "pval": 1e-3,
+        "transp": None,
+        "fdr": False,
+        "snppos": None,
+        "genepos": config.ref.refgene,
+        "dist": 250000,
+        "transpose_geno": False,
+        "transpose_expr": False,
+        "transpose_cov": False,
+    }
+    script = "file://../scripts/snp/MatrixEQTL.R"

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/ns/tcr.py

@@ -923,7 +923,7 @@ class CloneResidency(Proc):
 
     - Residency plots showing the residency of clones in the two groups
 
-        ![CloneResidency_residency](https://pwwang.github.io/immunopipe/processes/images/CloneResidency.png)
+        ![CloneResidency_residency](https://pwwang.github.io/immunopipe/latest/processes/images/CloneResidency.png)
 
         The points in the plot are jittered to avoid overplotting. The x-axis is the residency in the first group and
         the y-axis is the residency in the second group. The size of the points are relative to the normalized size of
@@ -943,7 +943,7 @@ class CloneResidency(Proc):
 
     - Venn diagrams showing the overlap of the clones in the two groups
 
-        ![CloneResidency_venn](https://pwwang.github.io/immunopipe/processes/images/CloneResidency_venn.png){: width="60%"}
+        ![CloneResidency_venn](https://pwwang.github.io/immunopipe/latest/processes/images/CloneResidency_venn.png){: width="60%"}
 
     Input:
         immdata: The data loaded by `immunarch::repLoad()`
@@ -1259,7 +1259,7 @@ class TCRClusterStats(Proc):
         by = "Sample"
         ```
 
-        ![Cluster_size](https://pwwang.github.io/immunopipe/processes/images/TCRClusteringStats_cluster_size.png){: width="80%"}
+        ![Cluster_size](https://pwwang.github.io/immunopipe/latest/processes/images/TCRClusteringStats_cluster_size.png){: width="80%"}
 
         ### Shared clusters
 
@@ -1269,7 +1269,7 @@ class TCRClusterStats(Proc):
         heatmap_meta = ["region"]
         ```
 
-        ![Shared_clusters](https://pwwang.github.io/immunopipe/processes/images/TCRClusteringStats_shared_clusters.png){: width="80%"}
+        ![Shared_clusters](https://pwwang.github.io/immunopipe/latest/processes/images/TCRClusteringStats_shared_clusters.png){: width="80%"}
 
         ### Sample diversity
 
@@ -1278,11 +1278,11 @@ class TCRClusterStats(Proc):
         method = "gini"
         ```
 
-        ![Sample_diversity](https://pwwang.github.io/immunopipe/processes/images/TCRClusteringStats_sample_diversity.png){: width="80%"}
+        ![Sample_diversity](https://pwwang.github.io/immunopipe/latest/processes/images/TCRClusteringStats_sample_diversity.png){: width="80%"}
 
         Compared to the sample diversity using TCR clones:
 
-        ![Sample_diversity](https://pwwang.github.io/immunopipe/processes/images/Immunarch_sample_diversity.png){: width="80%"}
+        ![Sample_diversity](https://pwwang.github.io/immunopipe/latest/processes/images/Immunarch_sample_diversity.png){: width="80%"}
 
     Input:
         immfile: The immunarch object with TCR clusters attached

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/scripts/delim/SampleInfo.R

@@ -113,14 +113,14 @@ for (name in names(stats)) {
     if (stat$plot == "boxplot" || stat$plot == "box") {
         p <- ggplot(data, aes(x=!!group, y=!!sym(stat$on), fill=!!group)) +
             geom_boxplot(position = "dodge") +
-            scale_fill_biopipen() +
+            scale_fill_biopipen(alpha = .6) +
             xlab("")
     } else if (stat$plot == "violin" ||
                stat$plot == "violinplot" ||
                stat$plot == "vlnplot") {
         p <- ggplot(data, aes(x = !!group, y = !!sym(stat$on), fill=!!group)) +
             geom_violin(position = "dodge") +
-            scale_fill_biopipen() +
+            scale_fill_biopipen(alpha = .6) +
             xlab("")
     } else if (
         (grepl("violin", stat$plot) || grepl("vln", stat$plot)) &&
@@ -129,12 +129,12 @@ for (name in names(stats)) {
         p <- ggplot(data, aes(x = !!group, y = !!sym(stat$on), fill = !!group)) +
             geom_violin(position = "dodge") +
             geom_boxplot(width = 0.1, position = position_dodge(0.9), fill="white") +
-            scale_fill_biopipen() +
+            scale_fill_biopipen(alpha = .6) +
             xlab("")
     } else if (stat$plot == "histogram" || stat$plot == "hist") {
         p <- ggplot(data, aes(x = !!sym(stat$on), fill = !!group)) +
             geom_histogram(bins = 10, position = "dodge", alpha = 0.8, color = "white") +
-            scale_fill_biopipen()
+            scale_fill_biopipen(alpha = .6)
     } else if (stat$plot == "pie" || stat$plot == "piechart") {
         if (is.null(stat$each)) {
             data <- data %>% distinct(!!group, .keep_all = TRUE)
@@ -157,7 +157,7 @@ for (name in names(stats)) {
                 fill="#EEEEEE",
                 size=4
             ) +
-            scale_fill_biopipen(name = group) +
+            scale_fill_biopipen(alpha = .6, name = group) +
             ggtitle(paste0("# ", stat$on))
     } else if (stat$plot == "bar" || stat$plot == "barplot") {
         if (is.null(stat$each)) {
@@ -169,7 +169,7 @@ for (name in names(stats)) {
             data,
             aes(x = !!group, y = !!sym(count_on), fill = !!group)) +
             geom_bar(stat = "identity") +
-            scale_fill_biopipen() +
+            scale_fill_biopipen(alpha = .6) +
             ylab(paste0("# ", stat$on))
     } else {
         stop("Unknown plot type: ", stat$plot)

biopipen-0.27.4/biopipen/scripts/plot/ROC.R

@@ -0,0 +1,88 @@
+
+source("{{biopipen_dir}}/utils/misc.R")
+
+library(rlang)
+library(ggplot2)
+library(plotROC)
+
+infile <- {{in.infile | r}}
+outfile <- {{out.outfile | r}}
+joboutdir <- {{job.outdir | r}}
+noids <- {{envs.noids | r}}
+pos_label <- {{envs.pos_label | r}}
+ci <- {{envs.ci | r}}
+devpars <- {{envs.devpars | r}}
+show_auc <- {{envs.show_auc | r}}
+args <- {{envs.args | r: todot="-"}}
+style_roc_args <- {{envs.style_roc | r: todot="-"}}
+if (!is.null(style_roc_args$theme)) {
+    style_roc_args$theme <- eval(parse(text=style_roc_args$theme))
+}
+
+data <- read.table(infile, header=TRUE, sep="\t", row.names = NULL, check.names = FALSE, stringsAsFactors=FALSE)
+if (!noids) {
+    data <- data[, -1]
+}
+
+# Normalize the first column (labels) into 0 and 1.
+# If they are not 0/1, use pos_label to determine the positive class.
+label_col <- colnames(data)[1]
+if (is.character(data[[label_col]])) {
+    data[[label_col]] <- as.numeric(data[[label_col]] == pos_label)
+}
+
+models <- colnames(data)[2:ncol(data)]
+
+if (length(models) > 1) {
+    # pivot longer the models, and put the model names into the column 'model'
+    data <- melt_roc(data, label_col, colnames(data)[2:ncol(data)])
+} else {
+    data <- data.frame(
+        D = data[[label_col]],
+        M = data[[models]],
+        name = rep(models, nrow(data))
+    )
+}
+
+# Plot the ROC curve
+p <- ggplot(data, aes(d = D, m = M, color = name))
+
+if (isTRUE(ci)) {
+    p <- p + do.call(geom_rocci, args)
+} else {
+    p <- p + do.call(geom_roc, args)
+}
+
+p <- p + do.call(style_roc, style_roc_args)
+p <- p + scale_color_biopipen()
+
+if (length(models) > 1) {
+    p <- p + theme(legend.title = element_blank())
+} else {
+    p <- p + theme(legend.position = "none")
+}
+
+aucs = calc_auc(p)
+write.table(aucs, file=file.path(joboutdir, "aucs.tsv"), sep="\t", quote=FALSE, row.names=FALSE)
+
+if (show_auc) {
+    aucs = split(aucs$AUC, aucs$name)
+    if (length(aucs) > 1) {
+        # Add AUC values to the legend items
+        p <- p +
+            scale_color_manual(
+                values = pal_biopipen()(length(models)),
+                labels = sapply(models, function(m) paste(m, " (AUC =", round(aucs[[m]], 2), ")")),
+                breaks = models)
+    } else {
+        p <- p +
+            geom_text(
+                x = 0.8, y = 0.2, label = paste("AUC =", round(unlist(aucs), 2)),
+                color = "black", size = 4)
+    }
+}
+
+devpars$filename <- outfile
+do.call(png, devpars)
+print(p)
+dev.off()

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/scripts/scrna/MarkersFinder.R

@@ -120,7 +120,7 @@ expand_each <- function(name, case) {
                     pull(case$each) %>% na.omit() %>% unique() %>% as.vector()
             }
             for (each in eachs) {
-                by <- make.names(paste0(".", name, "_", case$each,"_", each))
+                by <- make.names(paste0("..", name, "_", case$each,"_", each))
                 srtobj@meta.data <<- srtobj@meta.data %>% mutate(
                     !!sym(by) := if_else(
                         !!sym(case$each) == each,
@@ -364,6 +364,16 @@ add_case_report <- function(info, sigmarkers, siggenes) {
     }
 }
 
+ensure_sobj <- function(expr, allow_empty) {
+    tryCatch({ expr }, error = function(e) {
+        if (allow_empty) {
+            log_warn("  Ignoring this case: {e$message}")
+            return(NULL)
+        } else {
+            stop(e)
+        }
+    })
+}
 
 do_case_findall <- function(casename) {
     # casename
@@ -382,10 +392,17 @@ do_case_findall <- function(casename) {
     # args$min.cells.group <- args$min.cells.group %||% 1
     # args$min.cells.feature <- args$min.cells.feature %||% 1
     # args$min.pct <- args$min.pct %||% 0
+    allow_empty = startsWith(case$group.by, "..")
     if (!is.null(case$subset)) {
-        args$object <- srtobj %>% filter(!!parse_expr(case$subset) & !is.na(!!sym(case$group.by)))
+        args$object <- ensure_sobj({
+            srtobj %>% filter(!!parse_expr(case$subset) & !is.na(!!sym(case$group.by)))
+        }, allow_empty)
+        if (is.null(args$object)) { return() }
     } else {
-        args$object <- srtobj %>% filter(!is.na(!!sym(case$group.by)))
+        args$object <- ensure_sobj({
+            srtobj %>% filter(!is.na(!!sym(case$group.by)))
+        }, allow_empty)
+        if (is.null(args$object)) { return() }
     }
     Idents(args$object) <- case$group.by
 
@@ -486,11 +503,19 @@ do_case <- function(casename) {
     # sigmarkers
     # rest
     args <- case$rest
+    allow_empty = startsWith(case$group.by, "..")
     if (!is.null(case$subset)) {
-        args$object <- srtobj %>% filter(!!parse_expr(case$subset) & !is.na(!!sym(case$group.by)))
+        args$object <- ensure_sobj({
+            srtobj %>% filter(!!parse_expr(case$subset) & !is.na(!!sym(case$group.by)))
+        }, allow_empty)
+        if (is.null(args$object)) { return() }
     } else {
-        args$object <- srtobj %>% filter(!is.na(!!sym(case$group.by)))
+        args$object <- ensure_sobj({
+            srtobj %>% filter(!is.na(!!sym(case$group.by)))
+        }, allow_empty)
+        if (is.null(args$object)) { return() }
     }
+
     args$assay <- case$assay
     args$group.by <- case$group.by
     args$ident.1 <- case$ident.1

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/scripts/scrna/MetaMarkers.R

@@ -76,7 +76,7 @@ expand_each <- function(name, case) {
                 pull(case$each) %>% unique() %>% na.omit()
         }
         for (each in eachs) {
-            by = make.names(paste0(".", name, "_", case$each, "_", each))
+            by = make.names(paste0("..", name, "_", case$each, "_", each))
             idents <- case$idents
             if (is.null(idents) || length(idents) == 0) {
                 srtobj@meta.data = srtobj@meta.data %>%
@@ -169,17 +169,31 @@ do_enrich <- function(info, markers, sig) {
     }
 }
 
+ensure_sobj <- function(expr, allow_empty) {
+    tryCatch({ expr }, error = function(e) {
+        if (allow_empty) {
+            log_warn("  Ignoring this case: {e$message}")
+            return(NULL)
+        } else {
+            stop(e)
+        }
+    })
+}
+
 do_case <- function(casename) {
     log_info("- Dealing with case: {casename} ...")
     info <- casename_info(casename, cases, outdir, create = TRUE)
     case <- cases[[casename]]
+    allow_empty = startsWith(case$group_by, "..")
 
     if (sum(!is.na(srtobj@meta.data[[case$group_by]])) == 0) {
         msg = "Not enough cells to run tests."
     } else {
-        sobj <- srtobj %>% filter(!is.na(!!sym(case$group_by)))
+        sobj <- ensure_sobj({ srtobj %>% filter(!is.na(!!sym(case$group_by))) }, allow_empty)
+        if (is.null(sobj)) { return() }
         if (!is.null(case$subset)) {
-            sobj <- srtobj %>% filter(!is.na(!!sym(case$group_by)), !!parse_expr(case$subset))
+            sobj <- ensure_sobj({ sobj %>% filter(!!parse_expr(case$subset)) }, allow_empty)
+            if (is.null(sobj)) { return() }
         }
         df <- tryCatch({
                 GetAssayData(sobj, layer = "data")

{biopipen-0.27.2 → biopipen-0.27.4}/biopipen/scripts/scrna/ScFGSEA.R

@@ -72,7 +72,7 @@ expand_each <- function(name, case) {
                 pull(case$each) %>% na.omit() %>% unique() %>% as.vector()
         }
         for (each in eachs) {
-            by <- make.names(paste0(".", name, "_", case$each,"_", each))
+            by <- make.names(paste0("..", name, "_", case$each,"_", each))
             srtobj@meta.data <<- srtobj@meta.data %>%
                 mutate(!!sym(by) := if_else(
                     !!sym(case$each) == each,
@@ -97,18 +97,35 @@ log_info("- Expanding cases...")
 cases <- expand_cases(cases, defaults, expand_each)
 
 
+ensure_sobj <- function(expr, allow_empty) {
+    tryCatch({ expr }, error = function(e) {
+        if (allow_empty) {
+            log_warn("  Ignoring this case: {e$message}")
+            return(NULL)
+        } else {
+            stop(e)
+        }
+    })
+}
+
+
 do_case <- function(name, case) {
     log_info("- Handling case: {name} ...")
     info <- casename_info(name, cases, outdir, create = TRUE)
 
+    allow_empty = startsWith(case$group.by, "..")
     # prepare expression matrix
     log_info("  Preparing expression matrix...")
-    sobj <- srtobj %>% filter(!is.na(!!sym(case$group.by)))
+    sobj <- ensure_sobj({ srtobj %>% filter(!is.na(!!sym(case$group.by))) }, allow_empty)
+    if (is.null(sobj)) { return() }
+
     if (!is.null(case$subset)) {
-        sobj <- sobj %>% filter(!!!parse_exprs(case$subset))
+        sobj <- ensure_sobj({ sobj %>% filter(!!!parse_exprs(case$subset)) }, allow_empty)
+        if (is.null(sobj)) { return() }
     }
     if (!is.null(case$ident.2)) {
-        sobj <- sobj %>% filter(!!sym(case$group.by) %in% c(case$ident.1, case$ident.2))
+        sobj <- ensure_sobj({ sobj %>% filter(!!sym(case$group.by) %in% c(case$ident.1, case$ident.2)) }, allow_empty)
+        if (is.null(sobj)) { return() }
     }
 
     allclasses <- sobj@meta.data[, case$group.by, drop = TRUE]