biopipen 0.34.6__py3-none-any.whl → 0.34.7__py3-none-any.whl

biopipen/__init__.py

@@ -1 +1 @@
-__version__ = "0.34.6"
+__version__ = "0.34.7"

biopipen/scripts/scrna/MarkersFinder.R

@@ -165,10 +165,12 @@ post_casing <- function(name, case) {
 
         if (length(cases) == 0 && name == "Marker Discovery") {
             name <- case$each
+        } else {
+            name <- paste0(name, " (", case$each, ")")
         }
 
         for (each in eachs) {
-            newname <- paste0(name, " - ", each)
+            newname <- paste0(name, "::", each)
             newcase <- case
 
             newcase$original_case <- name

biopipen/scripts/scrna/PseudoBulkDEG.R

@@ -131,12 +131,14 @@ expand_each <- function(name, case) {
 
         if (length(cases) == 0 && name == "DEG Analysis") {
             name <- case$each
+        } else {
+            name <- paste0(name, " (", case$each, ")")
         }
 
         case$aggregate_by <- unique(c(case$aggregate_by, case$group_by, case$paired_by, case$each))
 
         for (each in eachs) {
-            newname <- paste0(case$each, "::", each)
+            newname <- paste0(name, "::", each)
             newcase <- case
 
             newcase$original_case <- name
@@ -212,7 +214,52 @@ process_markers <- function(markers, info, case) {
     # markers <- markers %>%
     #     mutate(gene = as.character(gene)) %>%
     #     arrange(p_val_adj, desc(abs(avg_log2FC)))
+
+    empty <- if (case$enrich_style == "enrichr") {
+        data.frame(
+            Database = character(0),
+            Term = character(0),
+            Overlap = character(0),
+            P.value = numeric(0),
+            Adjusted.P.value = numeric(0),
+            Odds.Ratio = numeric(0),
+            Combined.Score = numeric(0),
+            Genes = character(0),
+            Rank = numeric(0)
+        )
+    } else {  # clusterProfiler
+        data.frame(
+            ID = character(0),
+            Description = character(0),
+            GeneRatio = character(0),
+            BgRatio = character(0),
+            Count = integer(0),
+            pvalue = numeric(0),
+            p.adjust = numeric(0),
+            qvalue = numeric(0),
+            geneID = character(0),
+            Database = character(0)
+        )
+    }
+    if (is.null(markers) || nrow(markers) == 0) {
+        if (case$error) {
+            stop("Error: No markers found in case '", info$name, "'.")
+        } else {
+            log$warn("! Warning: No markers found in case '", info$name, "'.")
+            reporter$add2(
+                list(
+                    name = "Warning",
+                    contents = list(list(kind = "error", content = "No markers found.", kind_ = "warning"))),
+                hs = c(info$section, info$name),
+                hs2 = "DEG Analysis",
+                ui = "tabs"
+            )
+            return(empty)
+        }
+    }
     markers$gene <- as.character(markers$gene)
+    markers$p_val_adj <- as.numeric(markers$p_val_adj)
+    markers$log2FC <- as.numeric(markers$log2FC)
     markers <- markers[order(markers$p_val_adj, -abs(markers$log2FC)), ]
 
     # Save markers
@@ -287,7 +334,7 @@ process_markers <- function(markers, info, case) {
             stop("Error: Not enough significant DEGs with '", case$sigmarkers, "' in case '", info$name, "' found (< 5) for enrichment analysis.")
         } else {
             message <- paste0("Not enough significant DEGs with '", case$sigmarkers, "' found (< 5) for enrichment analysis.")
-            log$warn("  ! Error: {message}")
+            log$warn("! Error: {message}")
             reporter$add2(
                 list(
                     name = "Warning",
@@ -345,7 +392,7 @@ process_markers <- function(markers, info, case) {
             if (case$error) {
                 stop("Error: ", e$message)
             } else {
-                log$warn("  ! Error: {e$message}")
+                log$warn("! Error: {e$message}")
                 reporter$add2(
                     list(
                         name = "Warning",
@@ -478,6 +525,7 @@ process_overlaps <- function(markers, ovcases, casename, groupname) {
 
 run_case <- function(name) {
     case <- cases[[name]]
+    log$info("----------------------------------------")
     log$info("Case: {name} ...")
 
     case <- extract_vars(
@@ -558,16 +606,35 @@ run_case <- function(name) {
         return(invisible())
     }
 
+    info <- case_info(name, outdir, create = TRUE)
     exprs <- AggregateExpressionPseudobulk(
         srtobj, aggregate_by = aggregate_by, layer = layer, assay = assay,
         subset = subset, log = log
     )
-    markers <- RunDEGAnalysis(
-        exprs, group_by = group_by, ident_1 = ident_1, ident_2 = ident_2,
-        paired_by = paired_by, tool = tool, log = log
+    markers <- tryCatch(
+        {
+            RunDEGAnalysis(
+                exprs, group_by = group_by, ident_1 = ident_1, ident_2 = ident_2,
+                paired_by = paired_by, tool = tool, log = log
+            )
+        }, error = function(e) {
+            if (error) {
+                stop("Error: ", e$message)
+            } else {
+                log$warn("! Error: {e$message}")
+                reporter$add2(
+                    list(
+                        name = "Warning",
+                        contents = list(list(kind = "error", content = e$message, kind_ = "warning"))),
+                    hs = c(info$section, info$name),
+                    hs2 = "DEG Analysis",
+                    ui = "tabs"
+                )
+                return(invisible())
+            }
+        }
     )
 
-    info <- case_info(name, outdir, create = TRUE)
     enrich <- process_markers(markers, info = info, case = list(
         dbs = dbs,
         sigmarkers = sigmarkers,

biopipen/scripts/scrna/ScFGSEA.R

@@ -83,10 +83,12 @@ expand_each <- function(name, case) {
 
         if (length(cases) == 0 && name == "GSEA") {
             name <- case$each
+        } else {
+            name <- paste0(name, " (", case$each, ")")
         }
 
         for (each in eachs) {
-            newname <- paste0(case$each, "::", each)
+            newname <- paste0(name, "::", each)
             newcase <- case
 
             newcase$original_case <- paste0(name, " (all ", case$each,")")

{biopipen-0.34.6.dist-info → biopipen-0.34.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: biopipen
-Version: 0.34.6
+Version: 0.34.7
 Summary: Bioinformatics processes/pipelines that can be run from `pipen run`
 License: MIT
 Author: pwwang

{biopipen-0.34.6.dist-info → biopipen-0.34.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-biopipen/__init__.py,sha256=QHGuacl6zpfoE0OOXgLhITO4iY3VuSxXyJ6Kvvrpg-E,23
+biopipen/__init__.py,sha256=vVRUKRt0zUNKxfGQQE5WrQiVWQ-bg4UrgyEGX7LclcA,23
 biopipen/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biopipen/core/config.py,sha256=edK5xnDhM8j27srDzsxubi934NMrglLoKrdcC8qsEPk,1069
 biopipen/core/config.toml,sha256=lZV_vbYWk6uqm19ZWJcsZCcSNqAdIfN2fOfamzxZpg4,2148
@@ -155,13 +155,13 @@ biopipen/scripts/scrna/ExprImputation-rmagic.R,sha256=ePgbMZ_3bKbeUrjsMdkdtBM_MS
 biopipen/scripts/scrna/ExprImputation-scimpute.R,sha256=MI_bYfvCDKJsuGntUxfx_-NdrssBoQgL95-DGwJVE5s,1191
 biopipen/scripts/scrna/ExprImputation.R,sha256=GcdZJpkDpq88hRQjtLZY5-byp8V43stEFm5T-pQbU6A,319
 biopipen/scripts/scrna/LoomTo10X.R,sha256=c6F0p1udsL5UOlb84-53K5BsjSDWkdFyYTt5NQmlIec,1059
-biopipen/scripts/scrna/MarkersFinder.R,sha256=P6BgseCrXTeJR8X52hzD16qBUuCeHmPc96h5pKE_-qY,24207
+biopipen/scripts/scrna/MarkersFinder.R,sha256=A-YCJ2WogU2QR8PqVn71lXCP63Vq1sMyAAIhqZYYawg,24278
 biopipen/scripts/scrna/MetaMarkers.R,sha256=BgYaWYEj6obwqaZaDWqNPtxb1IEEAnXAeBE0Ji9PvBA,12426
 biopipen/scripts/scrna/ModuleScoreCalculator.R,sha256=-tByCPk7i070LynAb0z2ANeRxr1QqiKP0dfrJm52jH4,4198
-biopipen/scripts/scrna/PseudoBulkDEG.R,sha256=32Hd3x2WyTFv175Os4bxf6goAcIq7QN8m1i7i7emnMI,22308
+biopipen/scripts/scrna/PseudoBulkDEG.R,sha256=Y5OuVCaIIppBqMxxXM3HpJQk5kA42wSgbBBIC1Rr1s0,24608
 biopipen/scripts/scrna/RadarPlots.R,sha256=Kn1E-hpczuujpgNjR8MqeIIVN-S3PbpmfcKWGKcNCVY,14546
 biopipen/scripts/scrna/SCImpute.R,sha256=dSJOHhmJ3x_72LBRXT72dbCti5oiB85CJ-OjWtqONbk,2958
-biopipen/scripts/scrna/ScFGSEA.R,sha256=Cbr1RE4jD3CbR7K4Y1XWKfcqiqhZmzATCKEd3ysCnCc,11517
+biopipen/scripts/scrna/ScFGSEA.R,sha256=EyRbsH5d1daIxtOHjYz24Udmv1PhV0nUC9HqEtzRnpE,11584
 biopipen/scripts/scrna/ScSimulation.R,sha256=q0-dXD9px1cApc_TxGmR-OdNHE8W1VSVWfSI57B96bo,1697
 biopipen/scripts/scrna/ScVelo.py,sha256=SPUZFgZW1Zhw-bnjJo98RK0vpuNFODQ8Q3eTguNc84k,21359
 biopipen/scripts/scrna/Seurat2AnnData.R,sha256=F8g5n2CqX4-KBggxd8ittz8TejYuqqNLMudAHdFt1QM,184
@@ -284,7 +284,7 @@ biopipen/utils/misc.py,sha256=pDZ-INWVNqHuXYvcjmu8KqNAigkh2lsHy0BxX44CPvc,4048
 biopipen/utils/reference.py,sha256=Oc6IlA1giLxymAuI7DO-IQLHQ7-DbsWzOQE86oTDfMU,5955
 biopipen/utils/reporter.py,sha256=VwLl6xyVDWnGY7NEXyqBlkW8expKJoNQ5iTyZSELf5c,4922
 biopipen/utils/vcf.py,sha256=MmMbAtLUcKPp02jUdk9TzuET2gWSeoWn7xgoOXFysK0,9393
-biopipen-0.34.6.dist-info/METADATA,sha256=xjkZ-4jHx3uZyZwVYbfc0vlPlatZ927dHLpxm6y9ys0,975
-biopipen-0.34.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-biopipen-0.34.6.dist-info/entry_points.txt,sha256=BYqHGBQJxyFDNLYqgH64ycI5PYwnlqwYcCFsMvJgzAU,653
-biopipen-0.34.6.dist-info/RECORD,,
+biopipen-0.34.7.dist-info/METADATA,sha256=uR3Q2oygeFSoT96Lp0wQGCcigCJGaIyzbYzdJ2wlWVw,975
+biopipen-0.34.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+biopipen-0.34.7.dist-info/entry_points.txt,sha256=BYqHGBQJxyFDNLYqgH64ycI5PYwnlqwYcCFsMvJgzAU,653
+biopipen-0.34.7.dist-info/RECORD,,