biopipen 0.21.1__py3-none-any.whl → 0.22.0__py3-none-any.whl

biopipen/reports/tcr/Immunarch.svelte

@@ -1,167 +1,16 @@
 {% from "utils/misc.liq" import report_jobs, table_of_images -%}
 <script>
-    import { Image, DataTable } from "$libs";
-    import { Tabs, Tab, TabContent, Accordion, AccordionItem } from "$ccs";
+    import { Image, DataTable, Descr } from "$libs";
+    import { Tabs, Tab, TabContent } from "$ccs";
 </script>
 
 {%- macro report_job(job, h=1) -%}
-
-<h{{h}}>Exploratory analysis</h{{h}}>
-
-    <h{{h+1}}>CDR3 length distribution</h{{h+1}}>
-
-    {% assign lenpngs = job.out.outdir | glob: "len", "*.png" %}
-    {{ table_of_images(lenpngs) }}
-
-    <h{{h+1}}>Clonotype volume (# clonotypes)</h{{h+1}}>
-
-    {% assign volpngs = job.out.outdir | glob: "volume", "*.png" %}
-    {{ table_of_images(volpngs) }}
-
-    <h{{h+1}}>Clonotype abundances</h{{h+1}}>
-
-    {% assign cntpngs = job.out.outdir | glob: "count", "*.png" %}
-    {{ table_of_images(cntpngs) }}
-
-<h{{h}}>Clonality</h{{h}}>
-
-    <h{{h+1}}>Top clones</h{{h+1}}>
-
-    {% assign tcpngs = job.out.outdir | glob: "top_clones", "*.png" %}
-    {{ table_of_images(tcpngs) }}
-
-    <h{{h+1}}>Rare clones</h{{h+1}}>
-
-    {% assign rcpngs = job.out.outdir | glob: "rare_clones", "*.png" %}
-    {{ table_of_images(rcpngs) }}
-
-    <h{{h+1}}>Clonal space homeostasis</h{{h+1}}>
-
-    <p>The proportion of the repertoire occupied by the clones of a given size</p>
-
-    {% assign hcpngs = job.out.outdir | glob: "homeo_clones", "*.png" %}
-{{ table_of_images(hcpngs) }}
-
-<h{{h}}>Repertoire overlaps</h{{h}}>
-
-    {% if job.index == 0 %}
-    <Accordion>
-        <AccordionItem title="Overlapping methods">
-            <p>
-                Repertoire overlap is the most common approach to measure repertoire similarity.
-                Immunarch provides several indices:
-            </p>
-            <p>
-                - number of public clonotypes (.method = "public") - a classic measure of overlap similarity.
-            </p>
-            <p>
-                - overlap coefficient (.method = "overlap") - a normalised measure of overlap
-                similarity. It is defined as the size of the intersection divided by the smaller of the size of the two sets.
-            </p>
-            <p>
-                - Jaccard index (.method = "jaccard") - it measures similarity between finite
-                sample sets, and is defined as the size of the intersection divided by the size of the union of the sample sets.
-            </p>
-            <p>
-                - Tversky index (.method = "tversky") - an asymmetric similarity measure on sets
-                that compares a variant to a prototype. If using default arguments, it’s similar to Dice’s coefficient.
-            </p>
-            <p>
-                - cosine similarity (.method = "cosine") - a measure of similarity between two non-zero vectors
-            </p>
-            <p>
-                - Morisita’s overlap index (.method = "morisita") - a statistical measure of dispersion of individuals in a population.
-                It is used to compare overlap among samples.
-            </p>
-            <p>
-                - incremental overlap - overlaps of the N most abundant clonotypes with incrementally growing N
-                (.method = "inc+METHOD", e.g., "inc+public" or "inc+morisita").
-            </p>
-        </AccordionItem>
-    </Accordion>
-    {% endif %}
-
-    {% for ovdir in job.out.outdir | glob: "overlap", "*" | sort %}
-        {% set ovname = ovdir | basename %}
-        <h{{h+1}}>{{ovname}}</h{{h+1}}>
-        {% assign ovpngs = ovdir | glob: "*.png" | sort %}
-        {{ table_of_images(ovpngs) }}
-    {% endfor %}
-
-<h{{h}}>Gene usage</h{{h}}>
-    {% for gu_dir in job.out.outdir | glob: "gene_usage", "*" | sort %}
-        {% set gu_name = gu_dir | basename %}
-        {% if gu_name != "DEFAULT" %}
-            <h{{h+1}}>{{gu_name}}</h{{h+1}}>
-        {% endif %}
-        {% assign gupngs = gu_dir | glob: "*.png" | sort %}
-        {{ table_of_images(gupngs) }}
-    {% endfor %}
-
-<h{{h}}>Spectratyping</h{{h}}>
-    {% for spect_sam_dir in job.out.outdir | glob: "spectratyping", "*" | sort %}
-        <h{{h+1}}>{{ spect_sam_dir | basename }}</h{{h+1}}>
-        {% assign spectpngs = spect_sam_dir | glob: "*.png" | sort %}
-        {{ table_of_images(spectpngs) }}
-    {% endfor %}
-
-<h{{h}}>Diversity estimation</h{{h}}>
-    {% assign div_met_dirs = job.out.outdir | glob: "diversity", "*" | sort %}
-    {% for dm_dir in div_met_dirs %}
-        <h{{h+1}}>{{dm_dir | basename}}</h{{h+1}}>
-        {% if dm_dir | glob: "diversity.test.*.txt" %}
-            {% assign dm_test_file = dm_dir | glob0: "diversity.test.*.txt" %}
-            {% assign dm_test_method = dm_test_file | stem | replace: "diversity.test.", "" %}
-            <Tabs>
-                <Tab label="Plot" />
-                <Tab label="Test: {{dm_test_method}}" />
-                <div slot="content">
-                    <TabContent>
-                        <Image src={{ dm_dir | joinpaths: "diversity.png" | quote }} />
-                    </TabContent>
-                    <TabContent>
-                        <DataTable src={{ dm_test_file | quote }} data={ {{ dm_test_file | datatable: sep="\t" }} } />
-                    </TabContent>
-                </div>
-            </Tabs>
-        {% else %}
-            <Image src={{ dm_dir | joinpaths: "diversity.png" | quote }} />
-        {% endif %}
-    {% endfor %}
-
-{% if job.out.outdir | glob: "rarefraction", "*" %}
-<h{{h}}>Rarefaction analysis</h{{h}}>
-    {% for rfdir in job.out.outdir | glob: "rarefraction", "*" | sort %}
-        {% assign rfname = rfdir | basename %}
-        {% if rfname != "DEFAULT" %}
-            <h{{h+1}}>{{rfname}}</h{{h+1}}>
-        {% endif %}
-        {% assign rfpngs = rfdir | glob: "*.png" | sort %}
-        {{ table_of_images(rfpngs) }}
-    {% endfor %}
-{% endif %}
-
-{% if job.out.outdir | glob: "tracking", "*.png" %}
-<h{{h}}>Tracking of clonotypes</h{{h}}>
-    {% assign trackpngs = job.out.outdir | glob: "tracking", "*.png" | sort %}
-    {{ table_of_images(trackpngs) }}
-{% endif %}
-
-<h{{h}}>Kmer and sequence motif analysis</h{{h}}>
-    {% for kmerdir in job.out.outdir | glob: "kmer", "*" | sort %}
-        {% assign kmercase = kmerdir | basename %}
-        {% if kmercase != "DEFAULT" %}
-            <h{{h+1}}>{{kmercase}}</h{{h+1}}>
-        {% endif %}
-        {% assign kmerpngs = kmerdir | glob: "*.png" | sort %}
-        {{ table_of_images(kmerpngs) }}
-    {% endfor %}
-
+    {{ job | render_job: h=h }}
 {%- endmacro -%}
 
 
 {%- macro head_job(job) -%}
-<h1>{{job.out.outdir | stem | replace: ".immunarch", ""}}</h1>
+    <h1>{{job.out.outdir | stem | replace: ".immunarch", ""}}</h1>
 {%- endmacro -%}
 
 {{ report_jobs(jobs, head_job, report_job) }}

biopipen/reports/tcr/TCRClusterStats.svelte

@@ -1,57 +1,15 @@
 {% from "utils/misc.liq" import report_jobs -%}
 <script>
-    import { Image, DataTable } from "$libs";
+    import { Image, DataTable, Descr } from "$libs";
     import { Tabs, Tab, TabContent } from "$ccs";
 </script>
 
 {%- macro report_job(job, h=1) -%}
-<h{{h}}>TCR Cluster size distribution</h{{h}}>
-
-{% for casedir in job.out.outdir | glob: "ClusterSizeDistribution", "*" %}
-    {% set casename = casedir | basename %}
-    {% if casename != "DEFAULT" %}
-        <h{{h+1}}>{{casename}}</h{{h+1}}>
-    {% endif %}
-    <Image src={{casedir | joinpaths: "cluster_size_distribution.png" | quote}} />
-{% endfor %}
-
-<h{{h}}>Shared TCR clusters among samples</h{{h}}>
-
-{% for casedir in job.out.outdir | glob: "SharedClusters", "*" %}
-    {% set casename = casedir | basename %}
-    {% if casename != "DEFAULT" %}
-        <h{{h+1}}>{{casename}}</h{{h+1}}>
-    {% endif %}
-    <Image src={{casedir | joinpaths: "shared_clusters.png" | quote}} />
-{% endfor %}
-
-
-<h{{h}}>Sample diversity using TCR clusters</h{{h}}>
-
-{% for casedir in job.out.outdir | glob: "SampleDiversity", "*" %}
-    {% set casename = casedir | basename %}
-    {% if casename != "DEFAULT" %}
-        <h{{h+1}}>{{casename}}</h{{h+1}}>
-    {% endif %}
-
-    <Tabs>
-        <Tab label="Plot" />
-        <Tab label="Table" />
-        <svelte:fragment slot="content">
-            <TabContent>
-                <Image src={{casedir | joinpaths: "diversity.png" | quote}} />
-            </TabContent>
-            <TabContent>
-                <DataTable src={{casedir | joinpaths: "diversity.txt" | quote}}
-                    data={ {{ casedir | joinpaths: "diversity.txt" | datatable: sep="\t", index_col=0 }} } />
-            </TabContent>
-        </svelte:fragment>
-    </Tabs>
-{% endfor %}
+    {{ job | render_job: h=h }}
 {%- endmacro -%}
 
 {%- macro head_job(job) -%}
-<h1>{{job.in.immfile | stem | replace: ".immunarch", ""}}</h1>
+    <h1>{{job.in.immfile | stem | replace: ".immunarch", ""}}</h1>
 {%- endmacro -%}
 
 {{ report_jobs(jobs, head_job, report_job) }}

biopipen/reports/tcr/TESSA.svelte

@@ -1,39 +1,22 @@
 {% from "utils/misc.liq" import report_jobs, table_of_images -%}
 <script>
-    import { Image, DataTable } from "$libs";
-    import { Tile } from "$ccs";
+    import { Image, DataTable, Descr } from "$libs";
+    import { UnorderedList, ListItem } from "$ccs";
 </script>
 
-<Tile>
+<Descr>
+    <h1>Introduction</h1>
     <p><a href="https://github.com/jcao89757/TESSA" target="_blank">Tessa</a> is a Bayesian model to integrate T cell receptor (TCR) sequence profiling with transcriptomes of T cells. Enabled by the recently developed single cell sequencing techniques, which provide both TCR sequences and RNA sequences of each T cell concurrently, Tessa maps the functional landscape of the TCR repertoire, and generates insights into understanding human immune response to diseases. As the first part of tessa, BriseisEncoder is employed prior to the Bayesian algorithm to capture the TCR sequence features and create numerical embeddings. We showed that the reconstructed Atchley Factor matrices and CDR3 sequences, generated through the numerical embeddings, are highly similar to their original counterparts. The CDR3 peptide sequences are constructed via a RandomForest model applied on the reconstructed Atchley Factor matrices.</p>
-
+    <p></p>
     <p>For more information, please refer to the following papers:</p>
-    <ul>
-        <li>- <a href="https://www.nature.com/articles/s41592-020-01020-3" target="_blank">Mapping the Functional Landscape of TCR Repertoire</a>, Zhang, Z., Xiong, D., Wang, X. et al. 2021.</li>
-        <li>- <a href="https://www.nature.com/articles/s42256-021-00383-2" target="_blank">Deep learning-based prediction of the T cell receptor–antigen binding specificity</a>, Lu, T., Zhang, Z., Zhu, J. et al. 2021.</li>
-    </ul>
-</Tile>
-<p>&nbsp;</p>
+    <UnorderedList>
+        <ListItem><a href="https://www.nature.com/articles/s41592-020-01020-3" target="_blank">Mapping the Functional Landscape of TCR Repertoire</a>, Zhang, Z., Xiong, D., Wang, X. et al. 2021.</ListItem>
+        <ListItem><a href="https://www.nature.com/articles/s42256-021-00383-2" target="_blank">Deep learning-based prediction of the T cell receptor–antigen binding specificity</a>, Lu, T., Zhang, Z., Zhu, J. et al. 2021.</ListItem>
+    </UnorderedList>
+</Descr>
 
 {%- macro report_job(job, h=1) -%}
-{{ table_of_images(
-    [
-        joinpaths(job.outdir, "result", "Cluster_size_dist.png"),
-        joinpaths(job.outdir, "result", "clone_size.png"),
-        joinpaths(job.outdir, "result", "exp_TCR_pair_plot.png"),
-        joinpaths(job.outdir, "result", "TCR_dist_density.png"),
-        joinpaths(job.outdir, "result", "TCR_explore.png"),
-        joinpaths(job.outdir, "result", "TCR_explore_clusters.png"),
-    ],
-    [
-        "TESSA cluster size distribution",
-        "Cluster center size vs. non-center cluster size",
-        "Expression-TCR distance plot",
-        "Density of TCR distances",
-        "Exploratory plot at the TCR level",
-        "TESSA clusters",
-    ],
-) }}
+    {{ job | render_job: h=h }}
 {%- endmacro -%}
 
 {%- macro head_job(job) -%}

biopipen/scripts/delim/SampleInfo.R

@@ -4,7 +4,6 @@ library(rlang)
 library(dplyr)
 library(ggplot2)
 library(ggprism)
-library(ggsci)
 library(ggrepel)
 
 infile <- {{in.infile | r}}
@@ -14,6 +13,13 @@ mutaters <- {{envs.mutaters | r}}
 save_mutated <- {{envs.save_mutated | r}}
 defaults <- {{envs.defaults | r}}
 stats <- {{envs.stats | r}}
+exclude_cols <- {{envs.exclude_cols | r}}
+
+if (is.null(exclude_cols)) {
+    exclude_cols <- c()
+} else {
+    exclude_cols <- trimws(unlist(strsplit(exclude_cols, ",")))
+}
 
 outdir <- dirname(outfile)
 indata <- read.delim(infile, sep = sep, header = TRUE, row.names = NULL)
@@ -37,6 +43,20 @@ write.table(
     col.names = TRUE,
     quote = FALSE
 )
+add_report(
+    list(
+        kind = "descr",
+        content = "The samples used in the analysis. Each row is a sample, and columns are the meta information about the sample. This is literally the input sample information file, but the paths to the scRNA-seq and scTCR-seq data are hidden.",
+        once = TRUE
+    ),
+    list(
+        kind = "table",
+        pageSize = 50,
+        data = list(file = outfile, sep = sep, excluded = exclude_cols),
+        src = FALSE
+    ),
+    h1 = "Sample Information"
+)
 
 theme_set(theme_prism())
 for (name in names(stats)) {
@@ -93,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_ucscgb(alpha = .8) +
+            scale_fill_biopipen() +
             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_ucscgb(alpha = .8) +
+            scale_fill_biopipen() +
             xlab("")
     } else if (
         (grepl("violin", stat$plot) || grepl("vln", stat$plot)) &&
@@ -109,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_ucscgb(alpha = .8) +
+            scale_fill_biopipen() +
             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_ucscgb(alpha = .8)
+            scale_fill_biopipen()
     } else if (stat$plot == "pie" || stat$plot == "piechart") {
         if (is.null(stat$each)) {
             data <- data %>% distinct(!!group, .keep_all = TRUE)
@@ -137,7 +157,7 @@ for (name in names(stats)) {
                 fill="#EEEEEE",
                 size=4
             ) +
-            scale_fill_ucscgb(alpha = .7, name = group) +
+            scale_fill_biopipen(name = group) +
             ggtitle(paste0("# ", stat$on))
     } else if (stat$plot == "bar" || stat$plot == "barplot") {
         if (is.null(stat$each)) {
@@ -149,7 +169,7 @@ for (name in names(stats)) {
             data,
             aes(x = !!group, y = !!sym(count_on), fill = !!group)) +
             geom_bar(stat = "identity") +
-            scale_fill_ucscgb(alpha = .8) +
+            scale_fill_biopipen() +
             ylab(paste0("# ", stat$on))
     } else {
         stop("Unknown plot type: ", stat$plot)
@@ -159,4 +179,18 @@ for (name in names(stats)) {
     }
     print(p)
     dev.off()
+
+    by_desc <- ifelse(is.null(stat$by), "", paste0(" by ", stat$by))
+    descr <- ifelse(
+        is_continuous,
+        paste0("The distribution of ", stat$on, by_desc),
+        paste0("The number of ", stat$on, by_desc)
+    )
+    add_report(
+        list(kind = "table_image", src = plotfile, name = name, descr = descr),
+        h1 = "Statistics",
+        ui = "table_of_images:2"
+    )
 }
+
+save_report(outdir)

biopipen/scripts/scrna/CellsDistribution.R

@@ -5,12 +5,13 @@ library(rlang)
 library(tidyr)
 library(dplyr)
 library(ggplot2)
-library(ggsci)
 library(ggVennDiagram)
 library(UpSetR)
+library(slugify)
 
 srtfile <- {{in.srtobj | r}}  # nolint
 outdir <- {{out.outdir | r}}  # nolint
+joboutdir <- {{job.outdir | r}}  # nolint
 mutaters <- {{envs.mutaters | r}}  # nolint
 group_by <- {{envs.group_by | r}}  # nolint
 group_order <- {{envs.group_order | r}}  # nolint
@@ -19,6 +20,7 @@ cells_order <- {{envs.cells_order | r}}  # nolint
 cells_orderby <- {{envs.cells_orderby | r}}  # nolint
 cells_n <- {{envs.cells_n | r}}  # nolint
 subset <- {{envs.subset | r}}  # nolint
+descr <- {{envs.descr | r}}  # nolint
 devpars <- {{envs.devpars | r}}  # nolint
 each <- {{envs.each | r}}  # nolint
 section <- {{envs.section | r}}  # nolint
@@ -27,11 +29,11 @@ cases <- {{envs.cases | r}}  # nolint
 
 if (is.null(overlap)) { overlap = c() }
 overlaps <- list()
-print("- Loading seurat object ...")
+log_info("- Loading seurat object ...")
 srtobj <- readRDS(srtfile)
 
 if (!is.null(mutaters) && length(mutaters) > 0) {
-    print("- Mutating seurat object ...")
+    log_info("- Mutating seurat object ...")
     srtobj@meta.data <- srtobj@meta.data %>%
         mutate(!!!lapply(mutaters, parse_expr))
 }
@@ -41,6 +43,7 @@ if (!is.factor(all_clusters)) {
     all_clusters = factor(all_clusters, levels = sort(unique(all_clusters)))
 }
 
+single_section <- TRUE
 expand_cases <- function() {
     # fill up cases with missing parameters
     if (is.null(cases) || length(cases) == 0) {
@@ -55,7 +58,8 @@ expand_cases <- function() {
                 devpars = devpars,
                 each = each,
                 section = section,
-                subset = subset
+                subset = subset,
+                descr = descr
             )
         )
     } else {
@@ -72,7 +76,8 @@ expand_cases <- function() {
                 devpars = devpars,
                 each = each,
                 section = section,
-                subset = subset
+                subset = subset,
+                descr = descr
             )
             case$devpars <- list_setdefault(case$devpars, devpars)
             filled_cases[[name]] <- case
@@ -80,12 +85,15 @@ expand_cases <- function() {
     }
 
     outcases <- list()
+    sections <- c()
     # expand each
     for (name in names(filled_cases)) {
         case <- filled_cases[[name]]
         if (is.null(case$each) || nchar(case$each) == 0) {
+            sections <- c(sections, case$section)
             outcases[[paste0(case$section, ":", name)]] <- case
         } else {
+            sections <- c(sections, case$each)
             eachs <- srtobj@meta.data %>% pull(case$each) %>% na.omit() %>% unique() %>% as.vector()
             for (ea in eachs) {
                 by <- make.names(paste0(".", name, "_", case$each,"_", ea))
@@ -101,25 +109,46 @@ expand_cases <- function() {
             }
         }
     }
+    single_section <<- length(unique(sections)) == 1
     outcases
 }
 
+casename_info <- function(casename, create = FALSE) {
+    sec_case_names <- strsplit(casename, ":")[[1]]
+    cname <- paste(sec_case_names[-1], collapse = ":")
+
+    out <- list(
+        casename = casename,
+        section = sec_case_names[1],
+        case = cname,
+        section_slug = slugify(sec_case_names[1], tolower = FALSE),
+        case_slug = slugify(cname, tolower = FALSE)
+    )
+    out$sec_dir <- file.path(outdir, out$section_slug)
+    if (create) {
+        dir.create(out$sec_dir, showWarnings = FALSE, recursive = TRUE)
+    }
+    out
+}
+
 do_case <- function(name, case) {
-    print(paste("- Running for case:", name))
+    log_info(paste("- Running for case:", name))
     if (is.null(case$group_by) || nchar(case$group_by) == 0) {
         stop(paste0("`group_by` must be specified for case", name))
     }
     if (is.null(case$cells_by) || nchar(case$cells_by) == 0) {
         stop(paste0("`cells_by` must be specified for case", name))
     }
+    info <- casename_info(name, create = TRUE)
     cells_by <- trimws(strsplit(case$cells_by, ",")[[1]])
 
     sec_case_names <- strsplit(name, ":")[[1]]
     sec_dir <- file.path(outdir, sec_case_names[1])
     casename <- paste(sec_case_names[-1], collapse = ":")
     dir.create(sec_dir, showWarnings = FALSE, recursive = TRUE)
-    outfile <- file.path(sec_dir, paste0("case-", casename, ".png"))
-    txtfile <- file.path(sec_dir, paste0("case-", casename, ".txt"))
+
+    outfile <- file.path(info$sec_dir, paste0("case-", info$case_slug, ".png"))
+    txtfile <- file.path(info$sec_dir, paste0("case-", info$case_slug, ".txt"))
 
     # subset the seurat object
     meta <- srtobj@meta.data
@@ -148,11 +177,11 @@ do_case <- function(name, case) {
         meta <- meta1
     }
 
-    if (sec_case_names[1] %in% overlap) {
-        if (is.null(overlaps[[sec_case_names[1]]])) {
-            overlaps[[sec_case_names[1]]] <<- list()
+    if (info$section %in% overlap) {
+        if (is.null(overlaps[[info$section]])) {
+            overlaps[[info$section]] <<- list()
         }
-        overlaps[[sec_case_names[1]]][[casename]] <<- meta %>% pull(case$cells_by) %>% unique()
+        overlaps[[info$section]][[info$case]] <<- meta %>% pull(case$cells_by) %>% unique()
     }
 
     # add sizes
@@ -197,7 +226,14 @@ do_case <- function(name, case) {
     }
 
     write.table(
-        meta,
+        meta %>% select(
+            !!sym(cells_by),
+            !!sym(case$group_by),
+            CloneSize,
+            CloneGroupSize,
+            CloneClusterSize,
+            CloneGroupClusterSize,
+        ),
         txtfile,
         sep = "\t",
         row.names = TRUE,
@@ -226,7 +262,7 @@ do_case <- function(name, case) {
         geom_col(width=.01, position="fill", color = "#888888") +
         geom_bar(stat = "identity", position = position_fill(reverse = TRUE)) +
         coord_polar("y", start = 0) +
-        scale_fill_ucscgb(name = "Cluster", alpha = 1, limits = levels(all_clusters)) +
+        scale_fill_biopipen(name = "Cluster", limits = levels(all_clusters)) +
         theme_void() +
         theme(
             plot.margin = unit(c(1,1,1,1), "cm"),
@@ -238,16 +274,63 @@ do_case <- function(name, case) {
     png(outfile, res = devpars$res, width = devpars$width, height = devpars$height)
     print(p)
     dev.off()
+
+    add_report(
+        list(
+            kind = "descr",
+            content = ifelse(
+                is.null(case$descr) || nchar(case$descr) == 0,
+                paste0(
+                    "Distribution for cells in ",
+                    "<code>", html_escape(cells_by), "</code>",
+                    " for ",
+                    "<code>", html_escape(case$group_by), "</code>"
+                ),
+                case$descr
+            )
+        ),
+        h1 = ifelse(
+            info$section == "DEFAULT",
+            info$case,
+            ifelse(single_section, paste0(info$section, " - ", info$case), info$section)
+        ),
+        h2 = ifelse(single_section, "#", info$case)
+    )
+
+    add_report(
+        list(
+            name = "Distribution Plot",
+            contents = list(list(
+                kind = "image",
+                src = outfile
+            ))
+        ),
+        list(
+            name = "Distribution Table",
+            contents = list(list(
+                kind = "table",
+                data = list(nrows = 100),
+                src = txtfile
+            ))
+        ),
+        h1 = ifelse(
+            info$section == "DEFAULT",
+            info$case,
+            ifelse(single_section, paste0(info$section, " - ", info$case), info$section)
+        ),
+        h2 = ifelse(single_section, "#", info$case),
+        ui = "tabs"
+    )
 }
 
 do_overlap <- function(section) {
-    print(paste("- Running overlaps for section:", section))
+    log_info(paste("- Running overlaps for section:", section))
     overlap_cases <- overlaps[[section]]
     if (length(overlap_cases) < 2) {
         stop(paste0("Not enough cases for overlap for section: ", section))
     }
 
-    sec_dir <- file.path(outdir, section)
+    sec_dir <- file.path(outdir, slugify(section, tolower = FALSE))
     venn_plot <- file.path(sec_dir, "venn.png")
     venn_p <- ggVennDiagram(overlap_cases, label_percent_digit = 1) +
         scale_fill_distiller(palette = "Reds", direction = 1) +
@@ -261,8 +344,30 @@ do_overlap <- function(section) {
     png(upset_plot, res = 100, width = 800, height = 600)
     print(upset_p)
     dev.off()
+
+    add_report(
+        list(
+            name = "Venn Plot",
+            contents = list(list(
+                kind = "image",
+                src = venn_plot
+            ))
+        ),
+        list(
+            name = "UpSet Plot",
+            contents = list(list(
+                kind = "image",
+                src = upset_plot
+            ))
+        ),
+        h1 = "Overlapping Groups",
+        h2 = section,
+        ui = "tabs"
+    )
 }
 
 cases <- expand_cases()
 sapply(sort(names(cases)), function(name) do_case(name, cases[[name]]))
 sapply(sort(names(overlaps)), do_overlap)
+
+save_report(joboutdir)