Use scalar timestamp types in Sequence and Slice. (#140)

Sequences don't want ndarrays of timestamps, they want just timestamps. Also introduces pyarrow timestamps to dataframe coordinates.
single-cell-data · Feb 24, 2023 · b337106 · b337106
1 parent 0c4939d
commit b337106
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/python-spec/src/somacore/options.py b/python-spec/src/somacore/options.py
@@ -126,15 +126,20 @@ class ResultOrder(enum.Enum):
 # https://github.com/single-cell-data/TileDB-SOMA/issues/960
 SparseDFCoord = Union[
     DenseCoord,
+    float,
+    np.datetime64,
+    pa.TimestampType,
     Sequence[int],
     Sequence[float],
     Sequence[str],
     Sequence[bytes],
-    Sequence[npt.NDArray[np.datetime64]],
+    Sequence[np.datetime64],
+    Sequence[pa.TimestampType],
     types.Slice[float],
     types.Slice[str],
     types.Slice[bytes],
-    types.Slice[npt.NDArray[np.datetime64]],
+    types.Slice[np.datetime64],
+    types.Slice[pa.TimestampType],
     pa.Array,
     pa.ChunkedArray,
     npt.NDArray[np.integer],

diff --git a/python-spec/src/somacore/query/axis.py b/python-spec/src/somacore/query/axis.py
@@ -43,7 +43,7 @@ def _canonicalize_coord(coord: options.SparseDFCoord) -> options.SparseDFCoord:
             pa.ChunkedArray,
             np.ndarray,
             np.datetime64,
-            pa.lib.TimestampType,
+            pa.TimestampType,
         ),
     ):
         return coord