Make some Experiment/Query classes abstract

pyproject.toml

@@ -13,7 +13,6 @@ readme = "./python-spec/README.md"
 dependencies = [
   "anndata",
   "attrs>=22.1",
-  "numba",
   "numpy>=1.21",
   "pandas",
   "pyarrow",

python-spec/requirements-py3.10.txt

@@ -5,7 +5,6 @@ exceptiongroup==1.2.1
 h5py==3.11.0
 llvmlite==0.43.0
 natsort==8.4.0
-numba==0.60.0
 numpy==2.0.0
 packaging==24.1
 pandas==2.2.2

python-spec/requirements-py3.11.txt

@@ -4,7 +4,6 @@ attrs==23.2.0
 h5py==3.11.0
 llvmlite==0.43.0
 natsort==8.4.0
-numba==0.60.0
 numpy==2.0.0
 packaging==24.1
 pandas==2.2.2

python-spec/requirements-py3.12.txt

@@ -4,7 +4,6 @@ attrs==23.2.0
 h5py==3.11.0
 llvmlite==0.43.0
 natsort==8.4.0
-numba==0.60.0
 numpy==2.0.0
 packaging==24.1
 pandas==2.2.2

python-spec/requirements-py3.9.txt

@@ -7,7 +7,6 @@ h5py==3.11.0
 jmespath==1.0.1
 llvmlite==0.43.0
 natsort==8.4.0
-numba==0.60.0
 numpy==2.0.0
 packaging==24.1
 pandas==2.2.2

python-spec/src/somacore/experiment.py

@@ -1,6 +1,7 @@
+import abc
 from typing import Generic, Optional, TypeVar
 
-from typing_extensions import Final, Self
+from typing_extensions import Final
 
 from . import _mixin
 from . import base
@@ -9,6 +10,7 @@
 from . import measurement
 from . import query
 from . import scene
+from .query import ExperimentAxisQuery
 
 _DF = TypeVar("_DF", bound=data.DataFrame)
 """An implementation of a DataFrame."""
@@ -20,8 +22,10 @@
 """The root SOMA object type of the implementation."""
 
 
-class Experiment(
-    collection.BaseCollection[_RootSO], Generic[_DF, _MeasColl, _SceneColl, _RootSO]
+class Experiment(  # type: ignore[misc]  # __eq__ false positive
+    collection.BaseCollection[_RootSO],
+    Generic[_DF, _MeasColl, _SceneColl, _RootSO],
+    abc.ABC,
 ):
     """A collection subtype representing an annotated 2D matrix of measurements.
 
@@ -33,22 +37,6 @@ class Experiment(
     Lifecycle: maturing
     """
 
-    # This class is implemented as a mixin to be used with SOMA classes.
-    # For example, a SOMA implementation would look like this:
-    #
-    #     # This type-ignore comment will always be needed due to limitations
-    #     # of type annotations; it is (currently) expected.
-    #     class Experiment(  # type: ignore[type-var]
-    #         ImplBaseCollection[ImplSOMAObject],
-    #         somacore.Experiment[
-    #             ImplDataFrame,    # _DF
-    #             ImplMeasurement,  # _MeasColl
-    #             ImplScene,        # _SceneColl
-    #             ImplSOMAObject,   # _RootSO
-    #         ],
-    #     ):
-    #         ...
-
     __slots__ = ()
     soma_type: Final = "SOMAExperiment"  # type: ignore[misc]
 
@@ -83,18 +71,11 @@ def axis_query(
         *,
         obs_query: Optional[query.AxisQuery] = None,
         var_query: Optional[query.AxisQuery] = None,
-    ) -> "query.ExperimentAxisQuery[Self]":
+    ) -> ExperimentAxisQuery:
         """Creates an axis query over this experiment.
 
         See :class:`query.ExperimentAxisQuery` for details on usage.
 
         Lifecycle: maturing
         """
-        # mypy doesn't quite understand descriptors so it issues a spurious
-        # error here.
-        return query.ExperimentAxisQuery(  # type: ignore[type-var]
-            self,
-            measurement_name,
-            obs_query=obs_query or query.AxisQuery(),
-            var_query=var_query or query.AxisQuery(),
-        )
+        raise NotImplementedError

python-spec/src/somacore/query/__init__.py

@@ -3,10 +3,12 @@
 
 ExperimentAxisQuery = query.ExperimentAxisQuery
 AxisColumnNames = query.AxisColumnNames
+AxisIndexer = query.AxisIndexer
 AxisQuery = axis.AxisQuery
 
 __all__ = (
     "ExperimentAxisQuery",
     "AxisColumnNames",
+    "AxisIndexer",
     "AxisQuery",
 )