Skip to content

Commit 1301d33

Browse files
committed
Wrapper changes added
1 parent 73358f5 commit 1301d33

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/vitessce/wrappers.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ def auto_view_config(self, vc):
13991399

14001400
class SpatialDataWrapper(AnnDataWrapper):
14011401

1402-
def __init__(self, sdata_path: Optional[str] = None, sdata_url: Optional[str] = None, sdata_store: Optional[Union[str, zarr.storage.StoreLike]] = None, sdata_artifact: Optional[ln.Artifact] = None, image_path: Optional[str] = None, region: Optional[str] = None, coordinate_system: Optional[str] = None, obs_spots_path: Optional[str] = None, obs_segmentations_path: Optional[str] = None, table_path: str = "tables/table", coordination_values=None, **kwargs):
1402+
def __init__(self, sdata_path: Optional[str] = None, sdata_url: Optional[str] = None, sdata_store: Optional[Union[str, zarr.storage.StoreLike]] = None, sdata_artifact: Optional[ln.Artifact] = None, image_path: Optional[str] = None, region: Optional[str] = None, coordinate_system: Optional[str] = None, obs_spots_path: Optional[str] = None, obs_segmentations_path: Optional[str] = None, table_path: str = "tables/table", is_zip=None, coordination_values=None, **kwargs):
14031403
"""
14041404
Wrap a SpatialData object.
14051405
@@ -1415,6 +1415,7 @@ def __init__(self, sdata_path: Optional[str] = None, sdata_url: Optional[str] =
14151415
:type image_path: Optional[str]
14161416
:param coordinate_system: Name of a target coordinate system.
14171417
:type coordinate_system: Optional[str]
1418+
:param is_zip: Boolean indicating whether the Zarr store is in a zipped format.
14181419
:param affine_transformation: Transformation to be applied to the image. By default, None. Prefer coordinate_system.
14191420
:type affine_transformation: Optional[np.ndarray]
14201421
:param obs_spots_path: Location of shapes that should be interpreted as spot observations, by default None
@@ -1434,7 +1435,7 @@ def __init__(self, sdata_path: Optional[str] = None, sdata_url: Optional[str] =
14341435
kwargs.get('adata_store', None),
14351436
kwargs.get('adata_artifact', None)
14361437
])
1437-
super().__init__(adata_path=sdata_path, adata_url=sdata_url, adata_store=sdata_store, adata_artifact=sdata_artifact, **kwargs)
1438+
super().__init__(adata_path=sdata_path, adata_url=sdata_url, adata_store=sdata_store, adata_artifact=sdata_artifact, is_zip=is_zip, **kwargs)
14381439
if "labels_path" in kwargs:
14391440
warnings.warn("`labels_path` is deprecated. Use `obs_segmentations_path` instead.", DeprecationWarning)
14401441
self._obs_segmentations_path = kwargs["labels_path"]
@@ -1540,7 +1541,7 @@ def generator(base_url):
15401541
options = gen_feature_labels_schema(self._feature_labels, options)
15411542
if len(options.keys()) > 0:
15421543
obj_file_def = {
1543-
"fileType": ft.SPATIALDATA_ZARR.value,
1544+
"fileType": ft.SPATIALDATA_ZARR_ZIP.value if self.is_zip else ft.SPATIALDATA_ZARR.value,
15441545
"url": self.get_zarr_url(base_url, dataset_uid, obj_i),
15451546
"options": options
15461547
}

0 commit comments

Comments
 (0)