large-image-source-zarr 1.31.2.dev113__tar.gz → 1.31.2.dev115__tar.gz

{large_image_source_zarr-1.31.2.dev113 → large_image_source_zarr-1.31.2.dev115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-zarr
-Version: 1.31.2.dev113
+Version: 1.31.2.dev115
 Summary: A OME Zarr tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,12 +19,12 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.31.2.dev113
+Requires-Dist: large-image>=1.31.2.dev115
 Requires-Dist: zarr<3
 Requires-Dist: numcodecs
 Requires-Dist: imagecodecs-numcodecs!=2024.9.22
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.31.2.dev113; extra == "girder"
+Requires-Dist: girder-large-image>=1.31.2.dev115; extra == "girder"
 Provides-Extra: all
 Requires-Dist: large-image-converter; extra == "all"
 

{large_image_source_zarr-1.31.2.dev113 → large_image_source_zarr-1.31.2.dev115}/large_image_source_zarr/__init__.py

@@ -1,3 +1,4 @@
+import json
 import math
 import multiprocessing
 import os
@@ -92,6 +93,10 @@ class ZarrFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             self._initNew(path, **kwargs)
         else:
             self._initOpen(**kwargs)
+            internal = self.getInternalMetadata().get('zarr', {}).get('base', {})
+            multiscale = internal.get('multiscales', [None])[0]
+            if multiscale is not None:
+                self._imageDescription = multiscale.get('metadata', {}).get('description')
         self._tileLock = threading.RLock()
 
     def _initOpen(self, **kwargs):
@@ -1066,12 +1071,54 @@ class ZarrFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
 
     @property
     def imageDescription(self):
+        if not hasattr(self, '_imageDescription'):
+            return None
+        if isinstance(self._imageDescription, dict):
+            return self._imageDescription.get('description')
         return self._imageDescription
 
     @imageDescription.setter
     def imageDescription(self, description):
         self._checkEditable()
-        self._imageDescription = description
+        try:
+            json.dumps(description)
+        except TypeError:
+            msg = 'Description must be JSON serializable'
+            raise TileSourceError(msg)
+        if (
+            hasattr(self, '_imageDescription') and
+            isinstance(self._imageDescription, dict)
+        ):
+            self._imageDescription['description'] = description
+        else:
+            self._imageDescription = description
+
+    @property
+    def additionalMetadata(self):
+        if not hasattr(self, '_imageDescription'):
+            return None
+        if isinstance(self._imageDescription, dict):
+            return self._imageDescription.get('additionalMetadata')
+        return None
+
+    @additionalMetadata.setter
+    def additionalMetadata(self, data):
+        self._checkEditable()
+        try:
+            json.dumps(data)
+        except TypeError:
+            msg = 'Metadata must be JSON serializable'
+            raise TileSourceError(msg)
+        if (
+            hasattr(self, '_imageDescription') and
+            isinstance(self._imageDescription, dict)
+        ):
+            self._imageDescription['additionalMetadata'] = data
+        else:
+            self.imageDescription = dict(
+                description=self._imageDescription,
+                additionalMetadata=data,
+            )
 
     @property
     def channelNames(self):
@@ -1179,7 +1226,10 @@ class ZarrFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                     output=iterator_output,
                     resample=False,  # TODO: incorporate resampling in core
                 ):
-                    new_tile = downsampleTileHalfRes(tile['tile'], resample_method)
+                    tile_data = tile['tile']
+                    if tile_data.shape[-1] == 1:
+                        tile_data = np.squeeze(tile['tile'], axis=(-1,))
+                    new_tile = downsampleTileHalfRes(tile_data, resample_method)
                     overlap = {k: int(v / 2) for k, v in tile['tile_overlap'].items()}
                     new_tile = new_tile[
                         slice(overlap['top'], new_tile.shape[0] - overlap['bottom']),

{large_image_source_zarr-1.31.2.dev113 → large_image_source_zarr-1.31.2.dev115}/large_image_source_zarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-zarr
-Version: 1.31.2.dev113
+Version: 1.31.2.dev115
 Summary: A OME Zarr tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,12 +19,12 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.31.2.dev113
+Requires-Dist: large-image>=1.31.2.dev115
 Requires-Dist: zarr<3
 Requires-Dist: numcodecs
 Requires-Dist: imagecodecs-numcodecs!=2024.9.22
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.31.2.dev113; extra == "girder"
+Requires-Dist: girder-large-image>=1.31.2.dev115; extra == "girder"
 Provides-Extra: all
 Requires-Dist: large-image-converter; extra == "all"
 

{large_image_source_zarr-1.31.2.dev113 → large_image_source_zarr-1.31.2.dev115}/large_image_source_zarr.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image>=1.31.2.dev113
+large-image>=1.31.2.dev115
 zarr<3
 numcodecs
 imagecodecs-numcodecs!=2024.9.22
@@ -7,4 +7,4 @@ imagecodecs-numcodecs!=2024.9.22
 large-image-converter
 
 [girder]
-girder-large-image>=1.31.2.dev113
+girder-large-image>=1.31.2.dev115