large-image-source-tifffile 1.28.1.dev12__tar.gz → 1.28.2__tar.gz

{large-image-source-tifffile-1.28.1.dev12 → large-image-source-tifffile-1.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tifffile
-Version: 1.28.1.dev12
+Version: 1.28.2
 Summary: A tifffile tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -16,8 +16,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Provides-Extra: girder
 License-File: LICENSE
+Requires-Dist: large-image>=1.28.2
+Requires-Dist: dask[array]
+Requires-Dist: tifffile[all]
+Requires-Dist: zarr
+Provides-Extra: girder
+Requires-Dist: girder-large-image>=1.28.2; extra == "girder"
 
 A tifffile tilesource for large_image.
 

{large-image-source-tifffile-1.28.1.dev12 → large-image-source-tifffile-1.28.2}/large_image_source_tifffile/__init__.py

@@ -474,19 +474,12 @@ class TifffileFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             sidx = frame // self._basis['P'][0]
         else:
             sidx = 0
-        series = self._tf.series[self._series[sidx]]
         nonempty = [None] * self.levels
         nonempty[self.levels - 1] = True
+        series = self._tf.series[self._series[sidx]]
+        za, hasgbs = self._getZarrArray(series, sidx)
         xidx = series.axes.index('X')
         yidx = series.axes.index('Y')
-        with self._zarrlock:
-            if sidx not in self._zarrcache:
-                if len(self._zarrcache) > 10:
-                    self._zarrcache = {}
-                za = zarr.open(series.aszarr(), mode='r')
-                hasgbs = hasattr(za[0], 'get_basic_selection')
-                self._zarrcache[sidx] = (za, hasgbs)
-            za, hasgbs = self._zarrcache[sidx]
         for ll in range(1, len(series.levels)):
             scale = round(math.log(max(za[0].shape[xidx] / za[ll].shape[xidx],
                                        za[0].shape[yidx] / za[ll].shape[yidx])) / math.log(2))
@@ -497,6 +490,19 @@ class TifffileFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         self._nonempty_levels_list[frame] = nonempty
         return nonempty
 
+    def _getZarrArray(self, series, sidx):
+        with self._zarrlock:
+            if sidx not in self._zarrcache:
+                if len(self._zarrcache) > 10:
+                    self._zarrcache = {}
+                za = zarr.open(series.aszarr(), mode='r')
+                hasgbs = hasattr(za[0], 'get_basic_selection')
+                if not hasgbs and math.prod(series.shape) < 256 * 1024 ** 2:
+                    za = series.asarray()
+                self._zarrcache[sidx] = (za, hasgbs)
+            za, hasgbs = self._zarrcache[sidx]
+        return za, hasgbs
+
     @methodcache()
     def getTile(self, x, y, z, pilImageAllowed=False, numpyAllowed=False, **kwargs):
         frame = self._getFrame(**kwargs)
@@ -507,14 +513,7 @@ class TifffileFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         else:
             sidx = 0
         series = self._tf.series[self._series[sidx]]
-        with self._zarrlock:
-            if sidx not in self._zarrcache:
-                if len(self._zarrcache) > 10:
-                    self._zarrcache = {}
-                za = zarr.open(series.aszarr(), mode='r')
-                hasgbs = hasattr(za[0], 'get_basic_selection')
-                self._zarrcache[sidx] = (za, hasgbs)
-            za, hasgbs = self._zarrcache[sidx]
+        za, hasgbs = self._getZarrArray(series, sidx)
         xidx = series.axes.index('X')
         yidx = series.axes.index('Y')
         if hasgbs:

{large-image-source-tifffile-1.28.1.dev12 → large-image-source-tifffile-1.28.2}/large_image_source_tifffile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tifffile
-Version: 1.28.1.dev12
+Version: 1.28.2
 Summary: A tifffile tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -16,8 +16,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Provides-Extra: girder
 License-File: LICENSE
+Requires-Dist: large-image>=1.28.2
+Requires-Dist: dask[array]
+Requires-Dist: tifffile[all]
+Requires-Dist: zarr
+Provides-Extra: girder
+Requires-Dist: girder-large-image>=1.28.2; extra == "girder"
 
 A tifffile tilesource for large_image.
 

large-image-source-tifffile-1.28.2/large_image_source_tifffile.egg-info/requires.txt

@@ -0,0 +1,7 @@
+large-image>=1.28.2
+dask[array]
+tifffile[all]
+zarr
+
+[girder]
+girder-large-image>=1.28.2

large-image-source-tifffile-1.28.1.dev12/large_image_source_tifffile.egg-info/requires.txt

@@ -1,7 +0,0 @@
-large-image>=1.28.1.dev12
-dask[array]
-tifffile[all]
-zarr
-
-[girder]
-girder-large-image>=1.28.1.dev12