MNT: rename indx_data_type to coord_data_type

bluesky · Oct 23, 2024 · c76e4be · c76e4be
1 parent 3256dcc
commit c76e4be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ Write the date in place of the "Unreleased" in the case a new version is release
 
 ### Added
 
-- `data_type` and `indx_data_type` properties for sparse arrays in `COOAdapter` and `COOStructure`.
+- `data_type` and `coord_data_type` properties for sparse arrays in `COOAdapter` and `COOStructure`.
 
 ## v0.1.0b10 (2024-10-11)
 

diff --git a/tiled/adapters/sparse.py b/tiled/adapters/sparse.py
@@ -51,7 +51,7 @@ def from_arrays(
             shape=shape,
             chunks=tuple((dim,) for dim in shape),
             data_type=BuiltinDtype.from_numpy_dtype(data.dtype),
-            indx_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
+            coord_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
             resizable=False,
         )
         return cls(
@@ -137,7 +137,7 @@ def from_global_ref(
             shape=shape,
             chunks=chunks,
             data_type=BuiltinDtype.from_numpy_dtype(data.dtype),
-            indx_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
+            coord_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
             resizable=False,
         )
         return cls(

diff --git a/tiled/client/container.py b/tiled/client/container.py
@@ -895,7 +895,7 @@ def write_sparse(
             chunks=tuple((dim,) for dim in shape),
             dims=dims,
             data_type=BuiltinDtype.from_numpy_dtype(data.dtype),
-            indx_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
+            coord_data_type=BuiltinDtype.from_numpy_dtype(coords.dtype),
         )
         client = self.new(
             StructureFamily.sparse,

diff --git a/tiled/server/pydantic_sparse.py b/tiled/server/pydantic_sparse.py
@@ -10,7 +10,7 @@ class COOStructure(pydantic.BaseModel):
     shape: Tuple[int, ...]  # tuple of ints like (3, 3)
     chunks: Tuple[Tuple[int, ...], ...]  # tuple-of-tuples-of-ints like ((3,), (3,))
     data_type: Optional[Union[BuiltinDtype, StructDtype]] = None
-    indx_data_type: BuiltinDtype = BuiltinDtype(Endianness("little"), Kind("u"), 8)   # numpy 'uint' dtype
+    coord_data_type: BuiltinDtype = BuiltinDtype(Endianness("little"), Kind("u"), 8)   # numpy 'uint' dtype
     dims: Optional[Tuple[str, ...]] = None  # None or tuple of names like ("x", "y")
     resizable: Union[bool, Tuple[bool, ...]] = False
     layout: SparseLayout = SparseLayout.COO

diff --git a/tiled/structures/sparse.py b/tiled/structures/sparse.py
@@ -16,7 +16,7 @@ class COOStructure:
     chunks: Tuple[Tuple[int, ...], ...]  # tuple-of-tuples-of-ints like ((3,), (3,))
     shape: Tuple[int, ...]  # tuple of ints like (3, 3)
     data_type: Optional[Union[BuiltinDtype, StructDtype]] = None
-    indx_data_type: BuiltinDtype = BuiltinDtype(Endianness("little"), Kind("u"), 8)   # numpy 'uint' dtype
+    coord_data_type: BuiltinDtype = BuiltinDtype(Endianness("little"), Kind("u"), 8)   # numpy 'uint' dtype
     dims: Optional[Tuple[str, ...]] = None  # None or tuple of names like ("x", "y")
     resizable: Union[bool, Tuple[bool, ...]] = False
     layout: SparseLayout = SparseLayout.COO
@@ -29,10 +29,10 @@ def from_json(cls, structure):
             data_type = StructDtype.from_json(data_type)
         else:
             data_type = BuiltinDtype.from_json(data_type)
-        indx_data_type = structure.get("indx_data_type", {"endianness":"little", "kind":"u", "itemsize":8})
+        coord_data_type = structure.get("coord_data_type", {"endianness":"little", "kind":"u", "itemsize":8})
         return cls(
             data_type=data_type,
-            indx_data_type=BuiltinDtype.from_json(indx_data_type),
+            coord_data_type=BuiltinDtype.from_json(coord_data_type),
             chunks=tuple(map(tuple, structure["chunks"])),
             shape=tuple(structure["shape"]),
             dims=structure["dims"],