pertpy 0.11.2__tar.gz → 0.11.4__tar.gz

{pertpy-0.11.2 → pertpy-0.11.4}/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,9 +1,9 @@
 name: Bug report
-description: pertpy doesn’t do what it should? Please help us fix it!
+description: pertpy doesn't do what it should? Please help us fix it!
 #title: ...
 labels:
-  - Bug
-  - Triage
+  - bug
+  - triage
 #assignees: []
 body:
   - type: checkboxes
@@ -64,6 +64,6 @@ body:
         Alternatively, run this in a console:
 
         ```python
-        >>> import session_info2; print(session_info2.session_info(dependencies=True)._repr_mimebundle_()["text/markdown"])
+        >>> import pertpy, session_info2; print(session_info2.session_info(dependencies=True)._repr_mimebundle_()["text/markdown"])
         ```
-      render: python
+      render: markdown

{pertpy-0.11.2 → pertpy-0.11.4}/.github/release-drafter.yml

@@ -1,5 +1,5 @@
-name-template: "0.11.2 🌈"
-tag-template: 0.11.2
+name-template: "0.11.4 🌈"
+tag-template: 0.11.4
 exclude-labels:
     - "skip-changelog"
 

{pertpy-0.11.2 → pertpy-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pertpy
-Version: 0.11.2
+Version: 0.11.4
 Summary: Perturbation Analysis in the scverse ecosystem.
 Project-URL: Documentation, https://pertpy.readthedocs.io
 Project-URL: Source, https://github.com/scverse/pertpy
@@ -49,7 +49,6 @@ Requires-Python: <3.14,>=3.11
 Requires-Dist: adjusttext
 Requires-Dist: arviz
 Requires-Dist: blitzgsea
-Requires-Dist: decoupler
 Requires-Dist: fast-array-utils
 Requires-Dist: lamin-utils
 Requires-Dist: mudata
@@ -132,22 +131,50 @@ You can install _pertpy_ in less than a minute via [pip] from [PyPI]:
 pip install pertpy
 ```
 
+### Differential gene expression
+
+If you want to use the differential gene expression interface, please install pertpy by running:
+
+```console
+pip install 'pertpy[de]'
+```
+
+### tascCODA
+
 if you want to use tascCODA, please install pertpy as follows:
 
 ```console
 pip install 'pertpy[tcoda]'
 ```
 
-If you want to use the differential gene expression interface, please install pertpy by running:
+### milo
+
+milo further requires edger, statmod, and rpy2 to be installed:
+
+```R
+BiocManager::install("edgeR")
+BiocManager::install("statmod")
+```
 
 ```console
-pip install 'pertpy[de]'
+pip install rpy2
 ```
 
 ## Citation
 
-[Lukas Heumos, Yuge Ji, Lilly May, Tessa Green, Xinyue Zhang, Xichen Wu, Johannes Ostner, Stefan Peidli, Antonia Schumacher, Karin Hrovatin, Michaela Mueller, Faye Chong, Gregor Sturm, Alejandro Tejada, Emma Dann, Mingze Dong, Mojtaba Bahrami, Ilan Gold, Sergei Rybakov, Altana Namsaraeva, Amir Ali Moinfar, Zihe Zheng, Eljas Roellin, Isra Mekki, Chris Sander, Mohammad Lotfollahi, Herbert B. Schiller, Fabian J. Theis
-bioRxiv 2024.08.04.606516; doi: https://doi.org/10.1101/2024.08.04.606516](https://www.biorxiv.org/content/10.1101/2024.08.04.606516v1)
+```bibtex
+@article {Heumos2024.08.04.606516,
+    author = {Heumos, Lukas and Ji, Yuge and May, Lilly and Green, Tessa and Zhang, Xinyue and Wu, Xichen and Ostner, Johannes and Peidli, Stefan and Schumacher, Antonia and Hrovatin, Karin and Müller, Michaela and Chong, Faye and Sturm, Gregor and Tejada, Alejandro and Dann, Emma and Dong, Mingze and Bahrami, Mojtaba and Gold, Ilan and Rybakov, Sergei and Namsaraeva, Altana and Moinfar, Amir and Zheng, Zihe and Roellin, Eljas and Mekki, Isra and Sander, Chris and Lotfollahi, Mohammad and Schiller, Herbert B. and Theis, Fabian J.},
+    title = {Pertpy: an end-to-end framework for perturbation analysis},
+    elocation-id = {2024.08.04.606516},
+    year = {2024},
+    doi = {10.1101/2024.08.04.606516},
+    publisher = {Cold Spring Harbor Laboratory},
+    URL = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516},
+    eprint = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516.full.pdf},
+    journal = {bioRxiv}
+}
+```
 
 [pip]: https://pip.pypa.io/
 [pypi]: https://pypi.org/

{pertpy-0.11.2 → pertpy-0.11.4}/README.md

@@ -29,22 +29,50 @@ You can install _pertpy_ in less than a minute via [pip] from [PyPI]:
 pip install pertpy
 ```
 
+### Differential gene expression
+
+If you want to use the differential gene expression interface, please install pertpy by running:
+
+```console
+pip install 'pertpy[de]'
+```
+
+### tascCODA
+
 if you want to use tascCODA, please install pertpy as follows:
 
 ```console
 pip install 'pertpy[tcoda]'
 ```
 
-If you want to use the differential gene expression interface, please install pertpy by running:
+### milo
+
+milo further requires edger, statmod, and rpy2 to be installed:
+
+```R
+BiocManager::install("edgeR")
+BiocManager::install("statmod")
+```
 
 ```console
-pip install 'pertpy[de]'
+pip install rpy2
 ```
 
 ## Citation
 
-[Lukas Heumos, Yuge Ji, Lilly May, Tessa Green, Xinyue Zhang, Xichen Wu, Johannes Ostner, Stefan Peidli, Antonia Schumacher, Karin Hrovatin, Michaela Mueller, Faye Chong, Gregor Sturm, Alejandro Tejada, Emma Dann, Mingze Dong, Mojtaba Bahrami, Ilan Gold, Sergei Rybakov, Altana Namsaraeva, Amir Ali Moinfar, Zihe Zheng, Eljas Roellin, Isra Mekki, Chris Sander, Mohammad Lotfollahi, Herbert B. Schiller, Fabian J. Theis
-bioRxiv 2024.08.04.606516; doi: https://doi.org/10.1101/2024.08.04.606516](https://www.biorxiv.org/content/10.1101/2024.08.04.606516v1)
+```bibtex
+@article {Heumos2024.08.04.606516,
+    author = {Heumos, Lukas and Ji, Yuge and May, Lilly and Green, Tessa and Zhang, Xinyue and Wu, Xichen and Ostner, Johannes and Peidli, Stefan and Schumacher, Antonia and Hrovatin, Karin and Müller, Michaela and Chong, Faye and Sturm, Gregor and Tejada, Alejandro and Dann, Emma and Dong, Mingze and Bahrami, Mojtaba and Gold, Ilan and Rybakov, Sergei and Namsaraeva, Altana and Moinfar, Amir and Zheng, Zihe and Roellin, Eljas and Mekki, Isra and Sander, Chris and Lotfollahi, Mohammad and Schiller, Herbert B. and Theis, Fabian J.},
+    title = {Pertpy: an end-to-end framework for perturbation analysis},
+    elocation-id = {2024.08.04.606516},
+    year = {2024},
+    doi = {10.1101/2024.08.04.606516},
+    publisher = {Cold Spring Harbor Laboratory},
+    URL = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516},
+    eprint = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516.full.pdf},
+    journal = {bioRxiv}
+}
+```
 
 [pip]: https://pip.pypa.io/
 [pypi]: https://pypi.org/

pertpy-0.11.4/docs/about/background.md

@@ -0,0 +1,49 @@
+# About Pertpy
+
+Pertpy is an end-to-end framework for the analysis of large-scale single-cell perturbation experiments.
+It provides access to harmonized perturbation datasets and metadata databases along with numerous fast and user-friendly implementations of both established and novel methods such as automatic metadata annotation or perturbation distances to efficiently analyze perturbation data.
+As part of the scverse ecosystem, pertpy interoperates with existing single-cell analysis libraries and is designed to be easily extended.
+If you find pertpy useful for your research, please check out {doc}`cite`.
+
+## Design principles
+
+Our framework is based on three key principles: `Modularity`, `Flexibility`, and `Scalability`.
+
+### Modularity
+
+Pertpy includes modules for analysis of single and combinatorial perturbations covering diverse types of perturbation data including genetic knockouts, drug screens, and disease states.
+The framework is designed for flexibility, offering more than 100 composable and interoperable analysis functions organized in modules which further ease downstream interpretation and visualization.
+These modules host fundamental building blocks for implementation and methods that share functionality and can be chained into custom pipelines.
+
+A typical Pertpy workflow consists of several steps:
+
+* Initial **data transformation** such as guide RNA assignment for CRISPR screens
+* **Quality control** to address confounding factors and technical variation
+* **Metadata annotation** against ontologies and enrichment from databases
+* **Perturbation space analysis** to learn biologically interpretable embeddings
+* **Downstream analysis** including differential expression, compositional analysis, and distance calculation
+
+This modular approach yields a powerful and flexible framework as many analysis steps can be independently applied or chained together.
+
+### Flexibility
+
+Pertpy is purpose-built to organize, analyze, and visualize complex perturbation datasets.
+It is flexible and can be applied to datasets of different assays, data types, sizes, and perturbations, thereby unifying previous data-type- or assay-specific single-problem approaches.
+Designed to integrate external metadata with measured data, it enables unprecedented contextualization of results through swiftly built, experiment-specific pipelines, leading to more robust outcomes.
+
+The inputs to a typical analysis with pertpy are unimodal scRNA-seq or multimodal perturbation readouts stored in AnnData or MuData objects.
+While pertpy is primarily designed to explore perturbations such as genetic modifications, drug treatments, exposure to pathogens, and other environmental conditions, its utility extends to various other perturbation settings, including diverse disease states where experimental perturbations have not been applied.
+
+### Scalability
+
+Pertpy addresses a wide array of use-cases and different types of growing datasets through its sparse and memory-efficient implementations, which leverage the parallelization and GPU acceleration library Jax, and numba, thereby making them substantially faster than original implementations.
+The framework can be applied to datasets ranging from thousands to millions of cells.
+
+For example, when analyzing CRISPR screens, Pertpy's implementation of Mixscape is optimized using PyNNDescent for nearest neighbor search during the calculation of perturbation signatures.
+Other methods such as scCODA and tascCODA are accelerated by replacing the Hamiltonian Monte Carlo algorithm in TensorFlow with the no-U-turn sampler from numpyro.
+CINEMA-OT is optimized with ott-jax to make the implementation portable across hardware, enabling GPU acceleration.
+
+## Why is it called "Pertpy"?
+
+Pertpy is named for its core purpose: The analysis of **pert**urbations in **Py**thon.
+The framework unifies perturbation analysis approaches across different data types and experimental designs, providing a comprehensive solution for understanding cellular responses to various stimuli.

pertpy-0.11.4/docs/about/cite.md

@@ -0,0 +1,20 @@
+# Citing pertpy
+
+If you find pertpy useful for your research, please consider citing our work as follows:
+
+```bibtex
+@article {Heumos2024.08.04.606516,
+    author = {Heumos, Lukas and Ji, Yuge and May, Lilly and Green, Tessa and Zhang, Xinyue and Wu, Xichen and Ostner, Johannes and Peidli, Stefan and Schumacher, Antonia and Hrovatin, Karin and Müller, Michaela and Chong, Faye and Sturm, Gregor and Tejada, Alejandro and Dann, Emma and Dong, Mingze and Bahrami, Mojtaba and Gold, Ilan and Rybakov, Sergei and Namsaraeva, Altana and Moinfar, Amir and Zheng, Zihe and Roellin, Eljas and Mekki, Isra and Sander, Chris and Lotfollahi, Mohammad and Schiller, Herbert B. and Theis, Fabian J.},
+    title = {Pertpy: an end-to-end framework for perturbation analysis},
+    elocation-id = {2024.08.04.606516},
+    year = {2024},
+    doi = {10.1101/2024.08.04.606516},
+    publisher = {Cold Spring Harbor Laboratory},
+    URL = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516},
+    eprint = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516.full.pdf},
+    journal = {bioRxiv}
+}
+```
+
+If you are using any previously published tool, please also cite the original publication.
+All tool specific references can be found here: {doc}`../references`.

{pertpy-0.11.2 → pertpy-0.11.4}/docs/changelog.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.11.3
+
+### 🧰 Maintenance
+
+* Remove decoupler [#783]((https://github.com/scverse/pertpy/pull/783)) @Zethson
+
+## v0.11.3
+
+## 🚀 Features
+
+* add about page [#770]((https://github.com/scverse/pertpy/pull/770)) @Zethson
+* Simplify Metadata errors [#765]((https://github.com/scverse/pertpy/pull/765)) @Zethson
+* Standardize scCODA plot palette interface [#773]((https://github.com/scverse/pertpy/pull/773)) @mschilli87
+
 ## v0.11.2
 
 ### 🚀 Features

{pertpy-0.11.2 → pertpy-0.11.4}/docs/conf.py

@@ -128,6 +128,7 @@ nitpick_ignore = [
     ("py:class", "pertpy.tools._distances._distances.MeanVar"),
     ("py:class", "The requested data as a NumPy array."),
     ("py:class", "The full registry saved with the model"),
+    ("py:class", "The requested data."),
     ("py:class", "Model with loaded state dictionaries."),
     ("py:class", "pertpy.tools.lazy_import.<locals>.Placeholder"),
 ]

{pertpy-0.11.2 → pertpy-0.11.4}/docs/index.md

@@ -46,7 +46,7 @@ It provides tools for harmonizing perturbation datasets, automating metadata ann
 ```
 
 ```{toctree}
-:caption: 'General:'
+:caption: 'General'
 :hidden: true
 :maxdepth: 1
 
@@ -58,7 +58,7 @@ references
 ```
 
 ```{toctree}
-:caption: 'Gallery:'
+:caption: 'Gallery'
 :hidden: true
 :maxdepth: 1
 
@@ -66,10 +66,32 @@ tutorials
 usecases
 ```
 
+```{toctree}
+:caption: 'About'
+:hidden: true
+:maxdepth: 1
+
+about/background
+about/cite
+GitHub <https://github.com/scverse/pertpy>
+Discourse <https://discourse.scverse.org/c/ecosystem/pertpy/46>
+```
+
 ## Citation
 
-[Lukas Heumos, Yuge Ji, Lilly May, Tessa Green, Xinyue Zhang, Xichen Wu, Johannes Ostner, Stefan Peidli, Antonia Schumacher, Karin Hrovatin, Michaela Mueller, Faye Chong, Gregor Sturm, Alejandro Tejada, Emma Dann, Mingze Dong, Mojtaba Bahrami, Ilan Gold, Sergei Rybakov, Altana Namsaraeva, Amir Ali Moinfar, Zihe Zheng, Eljas Roellin, Isra Mekki, Chris Sander, Mohammad Lotfollahi, Herbert B. Schiller, Fabian J. Theis
-bioRxiv 2024.08.04.606516; doi: https://doi.org/10.1101/2024.08.04.606516](https://www.biorxiv.org/content/10.1101/2024.08.04.606516v1)
+```bibtex
+@article {Heumos2024.08.04.606516,
+    author = {Heumos, Lukas and Ji, Yuge and May, Lilly and Green, Tessa and Zhang, Xinyue and Wu, Xichen and Ostner, Johannes and Peidli, Stefan and Schumacher, Antonia and Hrovatin, Karin and Müller, Michaela and Chong, Faye and Sturm, Gregor and Tejada, Alejandro and Dann, Emma and Dong, Mingze and Bahrami, Mojtaba and Gold, Ilan and Rybakov, Sergei and Namsaraeva, Altana and Moinfar, Amir and Zheng, Zihe and Roellin, Eljas and Mekki, Isra and Sander, Chris and Lotfollahi, Mohammad and Schiller, Herbert B. and Theis, Fabian J.},
+    title = {Pertpy: an end-to-end framework for perturbation analysis},
+    elocation-id = {2024.08.04.606516},
+    year = {2024},
+    doi = {10.1101/2024.08.04.606516},
+    publisher = {Cold Spring Harbor Laboratory},
+    URL = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516},
+    eprint = {https://www.biorxiv.org/content/early/2024/08/07/2024.08.04.606516.full.pdf},
+    journal = {bioRxiv}
+}
+```
 
 ## NumFOCUS
 

{pertpy-0.11.2 → pertpy-0.11.4}/docs/installation.md

@@ -16,17 +16,9 @@ This is the preferred method to install pertpy, as it will always install the mo
 
 If you don't have [pip] installed, this [Python installation guide] can guide you through the process.
 
-## Additional dependency groups
+### Additional dependency groups
 
-### scCODA and tascCODA
-
-TascCODA requires an additional set of dependencies (ete4, pyqt6, and toytree) that can be installed by running:
-
-```console
-pip install pertpy[tcoda]
-```
-
-## Differential gene expression interface
+#### Differential gene expression interface
 
 The DGE interface of pertpy requires additional dependencies that can be installed by running:
 
@@ -44,21 +36,25 @@ BiocManager::install("edgeR")
 pip install rpy2
 ```
 
-## From sources
+#### milo
 
-The sources for pertpy can be downloaded from the [Github repo].
-Please note that you require [poetry] to be installed.
+milo further requires edger, statmod, and rpy2 to be installed:
 
-You can either clone the public repository:
+```R
+BiocManager::install("edgeR")
+BiocManager::install("statmod")
+```
 
 ```console
-$ git clone git://github.com/scverse/pertpy
+pip install rpy2
 ```
 
-Or download the [tarball]:
+#### tascCODA
+
+TascCODA requires an additional set of dependencies (ete4, pyqt6, and toytree) that can be installed by running:
 
 ```console
-$ curl -OJL https://github.com/scverse/pertpy/tarball/master
+pip install pertpy[tcoda]
 ```
 
 ## Apple Silicon
@@ -100,6 +96,22 @@ Follow these steps to install pertpy on an Apple Silicon machine (tested on a Ma
 
 Now you're ready to use pertpy as usual within the environment (`import pertpy`).
 
+## From sources
+
+The sources for pertpy can be downloaded from the [Github repo].
+
+You can either clone the public repository:
+
+```console
+$ git clone git://github.com/scverse/pertpy
+```
+
+Or download the [tarball]:
+
+```console
+$ curl -OJL https://github.com/scverse/pertpy/tarball/master
+```
+
 [github repo]: https://github.com/scverse/pertpy
 [pip]: https://pip.pypa.io
 [poetry]: https://python-poetry.org/

{pertpy-0.11.2 → pertpy-0.11.4}/pertpy/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = "Lukas Heumos"
 __email__ = "lukas.heumos@posteo.net"
-__version__ = "0.11.2"
+__version__ = "0.11.4"
 
 import warnings
 

{pertpy-0.11.2 → pertpy-0.11.4}/pertpy/tools/_coda/_base_coda.py

@@ -16,7 +16,7 @@ from jax import config, random
 from lamin_utils import logger
 from matplotlib import cm, rcParams
 from matplotlib import image as mpimg
-from matplotlib.colors import ListedColormap
+from matplotlib.colors import Colormap
 from mudata import MuData
 from numpyro.infer import HMC, MCMC, NUTS, initialization
 from rich import box, print
@@ -34,7 +34,6 @@ if TYPE_CHECKING:
     from ete4 import Tree
     from jax._src.typing import Array
     from matplotlib.axes import Axes
-    from matplotlib.colors import Colormap
     from matplotlib.figure import Figure
 
 config.update("jax_enable_x64", True)
@@ -1141,7 +1140,7 @@ class CompositionalModel2(ABC):
         level_names: list[str],
         figsize: tuple[float, float] | None = None,
         dpi: int | None = 100,
-        palette: ListedColormap | None = cm.tab20,
+        palette: str | Colormap | None = cm.tab20,
         show_legend: bool | None = True,
     ) -> plt.Axes:
         """Plots a stacked barplot for one (discrete) covariate.
@@ -1156,12 +1155,15 @@ class CompositionalModel2(ABC):
             level_names: Names of the covariate's levels
             figsize: Figure size (matplotlib).
             dpi: Resolution in DPI (matplotlib).
-            palette: The color map for the barplot.
+            palette: The color map (name) for the barplot.
             show_legend: If True, adds a legend.
 
         Returns:
             A :class:`~matplotlib.axes.Axes` object
         """
+        if isinstance(palette, str):
+            palette = getattr(cm, palette)
+
         n_bars, n_types = y.shape
 
         figsize = rcParams["figure.figsize"] if figsize is None else figsize
@@ -1202,7 +1204,7 @@ class CompositionalModel2(ABC):
         feature_name: str,
         *,
         modality_key: str = "coda",
-        palette: ListedColormap | None = cm.tab20,
+        palette: str | Colormap | None = cm.tab20,
         show_legend: bool | None = True,
         level_order: list[str] = None,
         figsize: tuple[float, float] | None = None,
@@ -1217,7 +1219,7 @@ class CompositionalModel2(ABC):
             modality_key: If data is a MuData object, specify which modality to use.
             figsize: Figure size.
             dpi: Dpi setting.
-            palette: The matplotlib color map for the barplot.
+            palette: The matplotlib color map (name) for the barplot.
             show_legend: If True, adds a legend.
             level_order: Custom ordering of bars on the x-axis.
             {common_plot_args}
@@ -1299,7 +1301,7 @@ class CompositionalModel2(ABC):
         plot_facets: bool = True,
         plot_zero_covariate: bool = True,
         plot_zero_cell_type: bool = False,
-        palette: str | ListedColormap | None = cm.tab20,
+        palette: str | Colormap | None = cm.tab20,
         level_order: list[str] = None,
         args_barplot: dict | None = None,
         figsize: tuple[float, float] | None = None,
@@ -1321,7 +1323,7 @@ class CompositionalModel2(ABC):
             plot_zero_cell_type: If True, plot cell type that have zero effect. If False, do not plot.
             figsize: Figure size.
             dpi: Figure size.
-            palette: The seaborn color map for the barplot.
+            palette: The seaborn color map (name) for the barplot.
             level_order: Custom ordering of bars on the x-axis.
             args_barplot: Arguments passed to sns.barplot.
             {common_plot_args}
@@ -1397,7 +1399,7 @@ class CompositionalModel2(ABC):
 
         # If plot as facets, create a FacetGrid and map barplot to it.
         if plot_facets:
-            if isinstance(palette, ListedColormap):
+            if isinstance(palette, Colormap):
                 palette = np.array([palette(i % palette.N) for i in range(len(plot_df["Cell Type"].unique()))]).tolist()
             if figsize is not None:
                 height = figsize[0]
@@ -1437,7 +1439,7 @@ class CompositionalModel2(ABC):
         else:
             _, ax = plt.subplots(figsize=figsize, dpi=dpi)
             if len(covariate_names) == 1:
-                if isinstance(palette, ListedColormap):
+                if isinstance(palette, Colormap):
                     palette = np.array(
                         [palette(i % palette.N) for i in range(len(plot_df["Cell Type"].unique()))]
                     ).tolist()
@@ -1451,7 +1453,7 @@ class CompositionalModel2(ABC):
                 )
                 ax.set_title(covariate_names[0])
             else:
-                if isinstance(palette, ListedColormap):
+                if isinstance(palette, Colormap):
                     palette = np.array([palette(i % palette.N) for i in range(len(covariate_names))]).tolist()
                 sns.barplot(
                     data=plot_df,
@@ -1485,7 +1487,7 @@ class CompositionalModel2(ABC):
         cell_types: list | None = None,
         args_boxplot: dict | None = None,
         args_swarmplot: dict | None = None,
-        palette: str | None = "Blues",
+        palette: str | Colormap | None = "Blues",
         show_legend: bool | None = True,
         level_order: list[str] = None,
         figsize: tuple[float, float] | None = None,
@@ -1510,7 +1512,7 @@ class CompositionalModel2(ABC):
             args_swarmplot: Arguments passed to sns.swarmplot.
             figsize: Figure size.
             dpi: Dpi setting.
-            palette: The seaborn color map for the barplot.
+            palette: The seaborn color map (name) for the barplot.
             show_legend: If True, adds a legend.
             level_order: Custom ordering of bars on the x-axis.
             {common_plot_args}
@@ -1535,6 +1537,8 @@ class CompositionalModel2(ABC):
             args_swarmplot = {}
         if isinstance(data, MuData):
             data = data[modality_key]
+        if isinstance(palette, Colormap):
+            palette = palette(range(2))
 
         # y scale transformations
         if y_scale == "relative":
@@ -2104,7 +2108,7 @@ class CompositionalModel2(ABC):
         modality_key_1: str = "rna",
         modality_key_2: str = "coda",
         color_map: Colormap | str | None = None,
-        palette: str | Sequence[str] | None = None,
+        palette: str | Sequence[str] | Colormap | None = None,
         ax: Axes = None,
         return_fig: bool = False,
         **kwargs,
@@ -2122,7 +2126,7 @@ class CompositionalModel2(ABC):
             modality_key_1: Key to the cell-level AnnData in the MuData object.
             modality_key_2: Key to the aggregated sample-level AnnData object in the MuData object.
             color_map: The color map to use for plotting.
-            palette: The color palette to use for plotting.
+            palette: The color palette (name) to use for plotting.
             ax: A matplotlib axes object. Only works if plotting a single component.
             {common_plot_args}
             **kwargs: All other keyword arguments are passed to `scanpy.plot.umap()`
@@ -2154,9 +2158,6 @@ class CompositionalModel2(ABC):
             >>> tasccoda_model.run_nuts(
             ...     tasccoda_data, modality_key="coda", rng_key=1234, num_samples=10000, num_warmup=1000
             ... )
-            >>> tasccoda_model.run_nuts(
-            ...     tasccoda_data, modality_key="coda", rng_key=1234, num_samples=10000, num_warmup=1000
-            ... )
             >>> sc.tl.umap(tasccoda_data["rna"])
             >>> tasccoda_model.plot_effects_umap(tasccoda_data,
             >>>                         effect_name=["effect_df_condition[T.Salmonella]",
@@ -2173,6 +2174,10 @@ class CompositionalModel2(ABC):
         data_coda = mdata[modality_key_2]
         if isinstance(effect_name, str):
             effect_name = [effect_name]
+        if isinstance(palette, Colormap):
+            palette = {
+                cluster: palette(i % palette.N) for i, cluster in enumerate(data_rna.obs[cluster_key].unique().tolist())
+            }
         for _, effect in enumerate(effect_name):
             data_rna.obs[effect] = [data_coda.varm[effect].loc[f"{c}", "Effect"] for c in data_rna.obs[cluster_key]]
         if kwargs.get("vmin"):

{pertpy-0.11.2 → pertpy-0.11.4}/pertpy/tools/_dialogue.py

@@ -80,7 +80,7 @@ class Dialogue:
         Returns:
             A Pandas DataFrame of pseudobulk counts
         """
-        # TODO: Replace with decoupler's implementation
+        # TODO: Replace with scanpy get implementation
         pseudobulk = {"Genes": adata.var_names.values}
 
         for category in adata.obs.loc[:, groupby].cat.categories:

{pertpy-0.11.2 → pertpy-0.11.4}/pertpy/tools/_differential_gene_expression/_base.py

@@ -572,9 +572,7 @@ class MethodBase(ABC):
         if any(adata.obs[[groupby, pairedby]].value_counts() > 1):
             logger.info("Performing pseudobulk for paired samples")
             ps = PseudobulkSpace()
-            adata = ps.compute(
-                adata, target_col=groupby, groups_col=pairedby, layer_key=layer, mode="sum", min_cells=1, min_counts=1
-            )
+            adata = ps.compute(adata, target_col=groupby, groups_col=pairedby, layer_key=layer, mode="sum")
 
         X = adata.layers[layer] if layer is not None else adata.X
         with contextlib.suppress(AttributeError):