Skip to content

Commit

Permalink
Add anndata registration classes to developer API (#1292)
Browse files Browse the repository at this point in the history
* add anndata registration classes to developer API

* move manager to anndata submodule to fix docs
  • Loading branch information
justjhong authored Dec 17, 2021
1 parent 5c3777f commit 2b62e29
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/api/

# PyBuilder
target/
Expand Down
20 changes: 20 additions & 0 deletions docs/api/developer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@ Import scvi-tools as::

.. currentmodule:: scvi

Data Registration
-----------------

.. currentmodule:: scvi

AnnDataFields delineate how scvi-tools refers to fields in AnnData objects. The AnnDataManager provides an interface
for operating over a collection of AnnDataFields and an AnnData object.


.. autosummary::
:toctree: reference/
:nosignatures:

data.anndata.AnnDataManager
data.anndata.fields.BaseAnnDataField
data.anndata.fields.LayerField
data.anndata.fields.CategoricalObsField
data.anndata.fields.NumericalJointObsField
data.anndata.fields.CategoricalJointObsField


Data Loaders
------------
Expand Down
2 changes: 2 additions & 0 deletions scvi/data/anndata/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from ._utils import register_tensor_from_anndata, setup_anndata, transfer_anndata_setup
from .manager import AnnDataManager

__all__ = [
"setup_anndata",
"transfer_anndata_setup",
"register_tensor_from_anndata",
"AnnDataManager",
]
4 changes: 2 additions & 2 deletions scvi/data/anndata/fields/_base_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ def __init__(self) -> None:

@property
@abstractmethod
def registry_key(self):
def registry_key(self) -> str:
"""The key that is referenced by models via a data loader."""
pass

@property
@abstractmethod
def attr_name(self) -> str:
"""The name of the AnnData attribute where the data is stored (e.g. obs)."""
"""The name of the AnnData attribute where the data is stored."""
pass

@property
Expand Down
6 changes: 3 additions & 3 deletions scvi/data/anndata/fields/_layer_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ def __init__(
self.is_count_data = is_count_data

@property
def registry_key(self):
def registry_key(self) -> str:
return self._registry_key

@property
def attr_name(self):
def attr_name(self) -> str:
return self._attr_name

@property
def attr_key(self):
def attr_key(self) -> Optional[str]:
return self._attr_key

@property
Expand Down
6 changes: 3 additions & 3 deletions scvi/data/anndata/fields/_obs_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ def __init__(self, registry_key: str, obs_key: str) -> None:
self._attr_key = obs_key

@property
def registry_key(self):
def registry_key(self) -> str:
return self._registry_key

@property
def attr_name(self):
def attr_name(self) -> str:
return self._attr_name

@property
def attr_key(self):
def attr_key(self) -> str:
return self._attr_key

@property
Expand Down
9 changes: 5 additions & 4 deletions scvi/data/anndata/fields/_obsm_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ def __init__(
self._registry_key = registry_key

@property
def registry_key(self):
def registry_key(self) -> str:
return self._registry_key

@property
def attr_name(self):
def attr_name(self) -> str:
return self._attr_name


Expand Down Expand Up @@ -62,11 +62,12 @@ def _combine_obs_fields(self, adata: AnnData) -> None:
adata.obsm[self.attr_key] = adata.obs[self.obs_keys].copy()

@property
def obs_keys(self):
def obs_keys(self) -> List[str]:
"""List of .obs keys that make up this joint field."""
return self._obs_keys

@property
def attr_key(self):
def attr_key(self) -> str:
return self._attr_key

@property
Expand Down

0 comments on commit 2b62e29

Please sign in to comment.