biopipen 0.33.1__tar.gz → 0.34.0__tar.gz

{biopipen-0.33.1 → biopipen-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: biopipen
-Version: 0.33.1
+Version: 0.34.0
 Summary: Bioinformatics processes/pipelines that can be run from `pipen run`
 License: MIT
 Author: pwwang
@@ -17,6 +17,7 @@ Provides-Extra: runinfo
 Requires-Dist: datar[pandas] (>=0.15.8,<0.16.0)
 Requires-Dist: pipen-board[report] (>=0.17,<0.18)
 Requires-Dist: pipen-cli-run (>=0.15,<0.16)
+Requires-Dist: pipen-deprecated (>=0.0,<0.1)
 Requires-Dist: pipen-filters (>=0.15,<0.16)
 Requires-Dist: pipen-poplog (>=0.3,<0.4)
 Requires-Dist: pipen-runinfo (>=0.9,<0.10) ; extra == "runinfo"

biopipen-0.34.0/biopipen/__init__.py

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

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/core/filters.py

@@ -6,9 +6,10 @@ import shlex
 from pathlib import Path
 from typing import Any, List, Mapping
 
-from argx import Namespace
+from argx import Namespace  # pyright: ignore[reportPrivateImportUsage]
 from liquid.filters.manager import FilterManager
-from pipen_report.filters import register_component, render_ui, _tag
+from yunpath import CloudPath
+from pipen_report.filters import register_component, _tag
 
 # from .defaults import BIOPIPEN_DIR
 
@@ -172,14 +173,14 @@ def r(
             return "TRUE"
         if obj.upper() == "FALSE":
             return "FALSE"
-        if obj.upper() == "NA" or obj.upper() == "NULL":
+        if obj.upper() == "NA" or obj.upper() == "NULL" or obj == "None":
             return obj.upper()
         if re.match(r"^\d+:\d+$", obj):
             return obj
         if obj.startswith("r:") or obj.startswith("R:"):
             return str(obj)[2:]
         return repr(str(obj))
-    if isinstance(obj, Path):
+    if isinstance(obj, (Path, CloudPath)):
         return repr(str(obj))
     if isinstance(obj, (list, tuple, set)):
         if any(isinstance(i, dict) for i in obj):
@@ -233,6 +234,11 @@ def source_r(path: str | Path, chdir: bool = False) -> str:
     In addition to generating `source(path)`, we also include the mtime for the script
     to trigger the job not cached when the script is updated.
 
+    If your process is used in a cloud environment, it is recommended to
+    use the `read` filter to load the script content instead of sourcing it using
+    the `source` function in R to void the path issue (path could be different
+    in different environments).
+
     Args:
         path: The path to the R script
 
@@ -248,98 +254,6 @@ def source_r(path: str | Path, chdir: bool = False) -> str:
     )
 
 
-@register_component("fgsea")
-def _render_fgsea(
-    cont: Mapping[str, Any],
-    job: Mapping[str, Any],
-    level: int,
-    na_arg: str = "10",
-) -> str:
-    """Render fgsea report"""
-    # cont["dir"] is required
-    n_pathways = int(na_arg)
-    pathways = []
-    with Path(cont["dir"]).joinpath("fgsea.txt").open() as f:
-        next(f)  # skip header
-        for line in f:
-            items = line.strip().split("\t")
-            pathways.append((items[0], items[-1]))
-            if len(pathways) >= n_pathways:
-                break
-
-    components = [
-        # Summary
-        {
-            "title": "Enrichment Analysis Summary",
-            "ui": "tabs",
-            "contents": [
-                {
-                    "title": "Plot",
-                    "ui": "flat",
-                    "contents": [
-                        {
-                            "kind": "descr",
-                            "content": (
-                                "This table presents a comprehensive summary of the "
-                                "top enriched pathways derived from the fgsea. "
-                                "Each row corresponds to a pathway, and the gene ranks "
-                                "are shown based on the ranking metric used in the "
-                                "analysis. The enrichment score, p-value, and adjusted "
-                                "p-value are also provided to assess the significance "
-                                "of the enrichment."
-                            )
-                        },
-                        {
-                            "kind": "image",
-                            "src": str(Path(cont["dir"]).joinpath("gsea_table.png")),
-                            "download": str(Path(cont["dir"]).joinpath("gsea_table.pdf"))
-                        }
-                    ],
-                },
-                {
-                    "title": "Table",
-                    "ui": "flat",
-                    "contents": [
-                        {
-                            "kind": "descr",
-                            "content": (
-                                "This plot represents the GSEA results for a specified "
-                                "gene set, illustrating the distribution and impact of "
-                                "the gene set along the ranked list of genes. "
-                                "The running enrichment score curve shows the "
-                                "cumulative enrichment score as genes from the input "
-                                "list are encountered. Positive peaks on the curve "
-                                "indicate regions where members of the gene set are "
-                                "predominantly found."
-                            )
-                        },
-                        {
-                            "kind": "table",
-                            "src": str(Path(cont["dir"]).joinpath("fgsea.txt")),
-                            "data": {"excluded": {"slug"}},
-                        }
-                    ],
-                },
-            ]
-        },
-        # Pathways
-        {
-            "title": f"Enriched Pathways (Top {n_pathways})",
-            "ui": "table_of_images",
-            "contents": [
-                {
-                    "src": str(Path(cont["dir"]) / f"fgsea_{slug}.png"),
-                    "download": str(Path(cont["dir"]) / f"fgsea_{slug}.pdf"),
-                    "title": pw,
-                }
-                for pw, slug in pathways
-            ]
-        },
-    ]
-
-    return render_ui(components, "accordion", job, level)  # type: ignore
-
-
 @register_component("pdf")
 def _render_pdf(
     cont: Mapping[str, Any],
@@ -367,90 +281,3 @@ def _render_gsea(
     """Render gsea report"""
     # cont["dir"] is required
     raise NotImplementedError()
-
-
-@register_component("enrichr")
-def _render_enrichr(
-    cont: Mapping[str, Any],
-    job: Mapping[str, Any],
-    level: int,
-) -> str:
-    """Render enrichr report"""
-    # cont["dir"] is required
-    dbs = [sumfile.stem[8:] for sumfile in Path(cont["dir"]).glob("Enrichr-*.txt")]
-    components = []
-
-    for db in dbs:
-        enrichr_plots = list(Path(cont["dir"]).glob(f"Enrichr-{db}.*.png"))
-        if len(enrichr_plots) == 0:
-            components.append(
-                {
-                    "title": db,
-                    "ui": "tabs",
-                    "contents": [
-                        {
-                            "title": "Error",
-                            "ui": "flat",
-                            "contents": [
-                                {
-                                    "kind": "descr",
-                                    "content": (
-                                        "The enrichment analysis results of the top "
-                                        "biological pathways associated with the input "
-                                        "gene set. Each bar represents a pathway, "
-                                        "with the length of the bar indicating the "
-                                        "number of input genes overlapping with genes "
-                                        "in that pathway. The color intensity of the "
-                                        "bars reflects the statistical significance of "
-                                        "the enrichment (p-value). "
-                                    )
-                                },
-                                {
-                                    "kind": "error",
-                                    "content": "No enriched terms found.",
-                                }
-                            ],
-                        },
-                    ],
-                }
-            )
-        else:
-            contents = []
-            for enrichr_plot in enrichr_plots:
-                plot_type = enrichr_plot.stem.split(".")[-1]
-                pdf = enrichr_plot.with_suffix(".pdf")
-                contents.append(
-                    {
-                        "src": str(enrichr_plot),
-                        "title": f"{plot_type.title()} Plot",
-                        "download": str(pdf),
-                    }
-                )
-
-            components.append(
-                {
-                    "title": db,
-                    "ui": "tabs",
-                    "contents": [
-                        {
-                            "title": "Plots",
-                            "ui": "table_of_images",
-                            "contents": contents,
-                        },
-                        {
-                            "title": "Table",
-                            "ui": "flat",
-                            "contents": [
-                                {
-                                    "kind": "table",
-                                    "src": str(
-                                        Path(cont["dir"]).joinpath(f"Enrichr-{db}.txt")
-                                    ),
-                                }
-                            ],
-                        },
-                    ],
-                }
-            )
-
-    return render_ui(components, "accordion", job, level)

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/core/proc.py

@@ -1,7 +1,9 @@
 """Provides a base class for the processes to subclass"""
-from diot import Diot
+from __future__ import annotations
+
+from diot import Diot  # type: ignore
 from liquid.defaults import SEARCH_PATHS
-from pipen import Proc as PipenProc
+from pipen import Proc as PipenProc  # type: ignore
 from pipen_filters.filters import FILTERS
 
 from .filters import filtermanager
@@ -23,7 +25,7 @@ class Proc(PipenProc):
     template_opts = {
         "globals": {**FILTERS, "biopipen_dir": str(BIOPIPEN_DIR)},
         "filters": {**FILTERS, **filtermanager.filters},
-        "search_paths": SEARCH_PATHS + [str(REPORT_DIR)],
+        "search_paths": SEARCH_PATHS + [str(REPORT_DIR)],  # type: ignore
     }
 
     plugin_opts = {

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/core/testing.py

@@ -44,12 +44,19 @@ def get_pipeline(testfile, loglevel="debug", enable_report=False, **kwargs):
     """Get a pipeline for a test file"""
     name, workdir, outdir = _get_test_dirs(testfile, False)
     report_plugin_prefix = "+" if enable_report else "-"
+    plugins = kwargs.pop("plugins", [])
+    if any("report" in p for p in plugins if isinstance(p, str)):
+        raise ValueError(
+            "Do not pass `report` plugin to `get_pipeline(plugins=[...])`, "
+            "use `enable_report` instead."
+        )
+    plugins.append(f"{report_plugin_prefix}report")
     kws = {
         "name": name,
         "workdir": workdir,
         "outdir": outdir,
         "loglevel": loglevel,
-        "plugins": [f"{report_plugin_prefix}report"],
+        "plugins": plugins,
     }
     kws.update(kwargs)
     return Pipen(**kws)

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/bam.py

@@ -4,6 +4,9 @@ from ..core.proc import Proc
 from ..core.config import config
 
 
+# +-------------------------------------------------------------------+
+# | CNV callers                                                       |
+# +-------------------------------------------------------------------+
 class CNVpytor(Proc):
     """Detect CNV using CNVpytor
 
@@ -26,15 +29,14 @@ class CNVpytor(Proc):
         binsizes: The binsizes
         snp: How to read snp data
         filters: The filters to filter the result
-            See - https://github.com/abyzovlab/CNVpytor/blob/master
-            /GettingStarted.md#predicting-cnv-regions
+            See - https://github.com/abyzovlab/CNVpytor/blob/master/GettingStarted.md#predicting-cnv-regions
         mask_snps: Whether mask 1000 Genome snps
         baf_nomask: Do not use P mask in BAF histograms
 
     Requires:
         cnvpytor:
            - check: {{proc.envs.cnvpytor}} --version
-    """
+    """  # noqa: E501
     input = "bamfile:file, snpfile:file"
     output = "outdir:dir:{{in.bamfile | stem}}.cnvpytor"
     lang = config.lang.python
@@ -150,7 +152,7 @@ class CNAClinic(Proc):
             A list of sample names
             A float number (0 < x <= 1), the fraction of samples to use
             A integer number (x > 1), the number of samples to use
-        binsize: Directly use this binsize for CNAClinic, in kbp.
+        binsize: Directly use this binsize for CNAClinic, in bp.
         genome: The genome assembly
         run_args: The arguments for CNAClinic::runSegmentation
         plot_args: The arguments for CNAClinic::plotSampleData
@@ -181,6 +183,9 @@ class CNAClinic(Proc):
     }
 
 
+# +-------------------------------------------------------------------+
+# | Bam processing tools                                              |
+# +-------------------------------------------------------------------+
 class BamSplitChroms(Proc):
     """Split bam file by chromosomes
 
@@ -368,3 +373,34 @@ class BamSort(Proc):
         "index": True,
     }
     script = "file://../scripts/bam/BamSort.py"
+
+
+class SamtoolsView(Proc):
+    """View bam file using samtools, mostly used for filtering
+
+    This is a wrapper for `samtools view` command.
+    It will create a new bam file with the same name as the input bam file.
+
+    Input:
+        bamfile: The bam file
+
+    Output:
+        outfile: The output bam file
+
+    Envs:
+        ncores: Number of cores to use
+        samtools: Path to samtools executable
+        index: Whether to index the output bam file
+            Requires the input bam file to be sorted.
+        <more>: Other arguments passed to the view tool
+            See `samtools view` or `sambamba view`.
+    """
+    input = "bamfile:file"
+    output = "outfile:file:{{in.bamfile | stem}}.bam"
+    lang = config.lang.python
+    envs = {
+        "ncores": config.misc.ncores,
+        "samtools": config.exe.samtools,
+        "index": True,
+    }
+    script = "file://../scripts/bam/SamtoolsView.py"

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/cnv.py

@@ -150,7 +150,7 @@ class TMADScore(Proc):
         excl_chroms (list): The chromosomes to be excluded
     """
     input = "segfile:file"
-    output = "outfile:file:{{in.segfile | stem0}}.tmad.txt"
+    output = "outfile:file:{{in.segfile | stem}}.tmad.txt"
     lang = config.lang.rscript
     envs = {
         "chrom_col": "chrom",

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/cnvkit.py

@@ -482,7 +482,7 @@ class CNVkitDiagram(Proc):
     }
     script = "file://../scripts/cnvkit/CNVkitDiagram.py"
     plugin_opts = {
-        "report": "file://../reports/cnvkit/CNVkitScatter.svelte",
+        "report": "file://../reports/cnvkit/CNVkitDiagram.svelte",
         "report_paging": 10,
     }
 

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/delim.py

@@ -132,4 +132,4 @@ class SampleInfo(Proc):
     }
     lang = config.lang.rscript
     script = "file://../scripts/delim/SampleInfo.R"
-    plugin_opts = {"report": "file://../reports/delim/SampleInfo.svelte"}
+    plugin_opts = {"report": "file://../reports/common.svelte"}

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/gsea.py

@@ -1,8 +1,10 @@
 """Gene set enrichment analysis"""
+from pipen.utils import mark
 from ..core.proc import Proc
 from ..core.config import config
 
 
+@mark(deprecated='[{proc.name}] is deprecated, use `FGSEA` instead.')
 class GSEA(Proc):
     """Gene set enrichment analysis
 
@@ -51,6 +53,7 @@ class GSEA(Proc):
     plugin_opts = {"report": "file://../reports/gsea/GSEA.svelte"}
 
 
+@mark(deprecated='[{proc.name}] is deprecated, use `FGSEA` directly.')
 class PreRank(Proc):
     """PreRank the genes for GSEA analysis
 
@@ -100,59 +103,82 @@ class PreRank(Proc):
 class FGSEA(Proc):
     """Gene set enrichment analysis using `fgsea`
 
-    Need `devtools::install_github("ctlab/fgsea")`
-
     Input:
-        infile: The expression file.
-            Either a tab-delimited matrix or an RDS file (on envs.inopts)
+        infile: The expression file (genes x samples).
+            Either a tab-delimited file.
         metafile: The meta data file, determining the class of the samples
-            Two columns are required
-            Sample: The unique sample id for each sample
-            `[Group]`: The groups/classes of the samples
-        gmtfile: The GMT file of reference gene sets
-        configfile: The configuration file in TOML format to specify some envs.
-            `clscol`: If not provided, will use `envs.clscol`
-            `classes`: Defines pos and neg labels. If not provided, use will
-            `envs.classes`.
+            Two columns are required. If column `Sample` is found, it will be used
+            as the samples; otherwise the first column should be the samples.
+            The other column should be the group/class of the samples, whose
+            name is specified by `envs.clscol`.
 
     Output:
-        outdir: The output directory
+        outdir: The output directory containing the results, including
+            the table and plots.
 
     Envs:
-        inopts: The options for `read.table()` to read the input file
-            If `rds` will use `readRDS()`
-        metaopts: The options for `read.table()` to read the meta file
-        method: The method to do the preranking.
-            Supported: `s2n(signal_to_noise)`, `abs_s2n(abs_signal_to_noise)`,
-            `t_test`, `ratio_of_classes`, `diff_of_classes` and
-            `log2_ratio_of_classes`.
+        ncores (type=int): Number of cores for parallelization
+            Passed to `nproc` of `fgseaMultilevel()`.
+        case: The case label for the positive class.
+        control: The control label for the negative class.
+            When there are only two classes in `in.metafile` at column `envs.clscol`,
+            either `case` or `control` can be specified and the other will be
+            automatically set to the other class.
+        gmtfile: The pathways in GMT format, with the gene names/ids in the same format as the seurat object.
+            One could also use a URL to a GMT file. For example, from <https://download.baderlab.org/EM_Genesets/current_release/Human/symbol/Pathways/>.
+        method (choice): The method to do the preranking.
+            - signal_to_noise: Signal to noise.
+                The larger the differences of the means (scaled by the standard deviations);
+                that is, the more distinct the gene expression is in each phenotype and the more the gene
+                acts as a "class marker".
+            - s2n: Alias of signal_to_noise.
+            - abs_signal_to_noise: The absolute value of signal_to_noise.
+            - abs_s2n: Alias of abs_signal_to_noise.
+            - t_test: T test.
+                Uses the difference of means scaled by the standard deviation and number of samples.
+            - ratio_of_classes: Also referred to as fold change.
+                Uses the ratio of class means to calculate fold change for natural scale data.
+            - diff_of_classes: Difference of class means.
+                Uses the difference of class means to calculate fold change for nature scale data
+            - log2_ratio_of_classes: Log2 ratio of class means.
+                Uses the log2 ratio of class means to calculate fold change for natural scale data.
+                This is the recommended statistic for calculating fold change for log scale data.
         clscol: The column of metafile specifying the classes of the samples
-        classes: The classes to specify the pos and neg labels.
-            It could be a pair of labels (e.g. `["CASE", "CNTRL"]`), where
-            the first one is pos and second is neg. Or you can have multiple
-            pairs of labels (e.g. `[["CASE1", "CNTRL"], ["CASE2", "CNTRL"]]`)
-        top: Do gsea table and enrich plot for top N pathways. If it is < 1,
-            will apply it to `padj`
-        `<rest>`: Rest arguments for `fgsea()`
+            When `in.metafile` is not specified, it can also be specified as a list of
+            classes, in the same order as the samples in `in.infile`.
+        top (type=auto): Do gsea table and enrich plot for top N pathways.
+            If it is < 1, will apply it to `padj`, selecting pathways with `padj` < `top`.
+        eps (type=float): This parameter sets the boundary for calculating the p value.
+            See <https://rdrr.io/bioc/fgsea/man/fgseaMultilevel.html>
+        minsize (type=int): Minimal size of a gene set to test. All pathways below the threshold are excluded.
+        maxsize (type=int): Maximal size of a gene set to test. All pathways above the threshold are excluded.
+        rest (type=json;order=98): Rest arguments for [`fgsea()`](https://rdrr.io/bioc/fgsea/man/fgsea.html)
+            See also <https://rdrr.io/bioc/fgsea/man/fgseaMultilevel.html>
+        cases (type=json;order=99): If you have multiple cases, you can specify them here.
+            The keys are the names of the cases and the values are the above options except `mutaters`.
+            If some options are not specified, the default values specified above will be used.
+            If no cases are specified, the default case will be added with the name `GSEA`.
 
     Requires:
         bioconductor-fgsea:
             - check: {{proc.lang}} -e "library(fgsea)"
-    """
-    input = "infile:file, metafile:file, gmtfile:file, configfile:file"
+    """  # noqa: E501
+    input = "infile:file, metafile:file"
     output = "outdir:dir:{{in.infile | stem}}.fgsea"
     lang = config.lang.rscript
     envs = {
-        "inopts": {"header": True, "row.names": -1},
-        "metaopts": {"header": True, "row.names": -1},
-        "method": "s2n",
-        "clscol": None,
-        "classes": None,
-        "top": 20,
         "ncores": config.misc.ncores,
-        "minSize": 10,
-        "maxSize": 100,
+        "case": None,
+        "control": None,
+        "gmtfile": None,
+        "method": "signal_to_noise",
+        "clscol": None,
+        "top": 10,
         "eps": 0,
+        "minsize": 10,
+        "maxsize": 100,
+        "rest": {},
+        "cases": {},
     }
     script = "file://../scripts/gsea/FGSEA.R"
     plugin_opts = {"report": "file://../reports/gsea/FGSEA.svelte"}

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/misc.py

@@ -106,3 +106,41 @@ class Shell(Proc):
     envs = {"cmd": "", "outdir": False}
     lang = config.lang.bash
     script = "file://../scripts/misc/Shell.sh"
+
+
+class Plot(Proc):
+    """Plot given data using plotthis package in R
+
+    Input:
+        datafile: The input data file in RDS or qs/qs2 format.
+            If it is not in RDS nor qs/qs2 format, read.table will be used
+            to read the data file with the options provided by `envs.read_opts`.
+
+    Output:
+        plotfile: The output plot file in PNG format
+
+    envs:
+        fn: The plot function to use. Required.
+        devpars (ns): The device parameters for the plot.
+            - width: The width of the plot in pixels.
+            - height: The height of the plot in pixels.
+            - res: The resolution of the plot in DPI.
+        more_formats: The additional formats to save the plot in other than PNG.
+            The file will be saved in the same directory as the plotfile.
+        save_code: Whether to save the R code used for plotting.
+        read_opts: Options to read the data file.
+            If the data file is not in RDS nor qs/qs2 format, these options
+            will be passed to `read.table`.
+        <more>: Additional parameters to the plot function.
+    """
+    input = "datafile:file"
+    output = "plotfile:file:{{in.datafile | stem}}.png"
+    envs = {
+        "fn": None,
+        "devpars": {"res": 100},
+        "more_formats": [],
+        "save_code": False,
+        "read_opts": {},
+    }
+    lang = config.lang.rscript
+    script = "file://../scripts/misc/Plot.R"

{biopipen-0.33.1 → biopipen-0.34.0}/biopipen/ns/plot.py

@@ -1,8 +1,16 @@
 """Plotting data"""
 
+import warnings
+
 from ..core.proc import Proc
 from ..core.config import config
 
+warnings.warn(
+    "The `biopipen.ns.plot` module is deprecated and will be removed in the future. "
+    "Please use `biopipen.ns.misc.Plot` process instead.",
+    DeprecationWarning,
+)
+
 
 class VennDiagram(Proc):
     """Plot Venn diagram