large-image-source-vips 1.30.7.dev71__tar.gz → 1.31.1.dev2__tar.gz

{large_image_source_vips-1.30.7.dev71 → large_image_source_vips-1.31.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-vips
-Version: 1.30.7.dev71
+Version: 1.31.1.dev2
 Summary: A libvips tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.7.dev71
+Requires-Dist: large-image>=1.31.1.dev2
 Requires-Dist: numpy
 Requires-Dist: packaging
 Requires-Dist: pyvips

{large_image_source_vips-1.30.7.dev71 → large_image_source_vips-1.31.1.dev2}/large_image_source_vips/__init__.py

@@ -16,7 +16,7 @@ from large_image.constants import (NEW_IMAGE_PATH_FLAG, TILE_FORMAT_NUMPY,
                                    dtypeToGValue)
 from large_image.exceptions import TileSourceError, TileSourceFileNotFoundError
 from large_image.tilesource import FileTileSource
-from large_image.tilesource.utilities import _imageToNumpy, _newFromFileLock
+from large_image.tilesource.utilities import _imageToNumpy, _newFromFileLock, nearPowerOfTwo
 
 logging.getLogger('pyvips').setLevel(logging.ERROR)
 
@@ -98,6 +98,7 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         if 'n-pages' in self._image.get_fields():
             pages = self._image.get('n-pages')
         self._frames = [0]
+        self._lowres = {}
         for page in range(1, pages):
             subInputPath = self._largeImagePath + f'[page={page}{self._suffix}]'
             with _newFromFileLock:
@@ -113,8 +114,13 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 self._frames.append(page)
                 continue
             if subImage.width * subImage.height < self.sizeX * self.sizeY:
+                if (nearPowerOfTwo(self.sizeX, subImage.width) and
+                        nearPowerOfTwo(self.sizeY, subImage.height)):
+                    level = int(round(math.log(self.sizeX / subImage.width) / math.log(2)))
+                    self._lowres.setdefault(len(self._frames) - 1, {})[level] = page
                 continue
             self._frames = [page]
+            self._lowres = {}
             self.sizeX = subImage.width
             self.sizeY = subImage.height
             try:
@@ -122,12 +128,41 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             except Exception:
                 pass
             self._image = subImage
+        self._checkLowerLevels()
         self.levels = int(max(1, math.ceil(math.log(
             float(max(self.sizeX, self.sizeY)) / self.tileWidth) / math.log(2)) + 1))
-        if len(self._frames) > 1:
+        if len(self._frames) > 1 or self._lowres is not None:
             self._recentFrames = cachetools.LRUCache(maxsize=6)
             self._frameLock = threading.RLock()
 
+    def _checkLowerLevels(self):
+        if (len(self._lowres) != len(self._frames) or
+                min(len(v) for v in self._lowres.values()) !=
+                max(len(v) for v in self._lowres.values()) or
+                min(len(v) for v in self._lowres.values()) == 0):
+            self._lowres = None
+            if len(self._frames) == 1 and 'openslide.level-count' in self._image.get_fields():
+                self._lowres = [{}]
+                for oslevel in range(1, int(self._image.get('openslide.level-count'))):
+                    with _newFromFileLock:
+                        try:
+                            subImage = pyvips.Image.new_from_file(
+                                self._largeImagePath, level=oslevel)
+                        except Exception:
+                            continue
+                        if subImage.width * subImage.height < self.sizeX * self.sizeY:
+                            if (nearPowerOfTwo(self.sizeX, subImage.width) and
+                                    nearPowerOfTwo(self.sizeY, subImage.height)):
+                                level = int(round(math.log(
+                                    self.sizeX / subImage.width) / math.log(2)))
+                                self._lowres[0][level] = (self._frames[0], oslevel)
+                if not len(self._lowres[0]):
+                    self._lowres = None
+        else:
+            self._lowres = list(self._lowres.values())
+        if self._lowres is not None:
+            self._populatedLevels = len(self._lowres[0]) + 1
+
     def _initNew(self, **kwargs):
         """
         Initialize the tile class for creating a new image.
@@ -139,6 +174,7 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         self.sizeX = self.sizeY = self.levels = 0
         self.tileWidth = self.tileHeight = self._tileSize
         self._frames = [0]
+        self._lowres = None
         self._cacheValue = str(uuid.uuid4())
         self._output = None
         self._editable = True
@@ -194,25 +230,38 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             self._addMetadataFrameInformation(result)
         return result
 
-    def _getFrameImage(self, frame=0):
+    def _getFrameImage(self, frame=0, lowres=None):
         """
         Get the vips image associated with a specific frame.
 
         :param frame: the 0-based frame to get.
+        :param lowres: the lower resolution part of the frame
         :returns: a vips image.
         """
         if self._image is None and self._output:
             self._outputToImage()
         img = self._image
-        if frame > 0:
+        if frame > 0 or lowres:
             with self._frameLock:
-                if frame not in self._recentFrames:
-                    subpath = self._largeImagePath + f'[page={self._frames[frame]}{self._suffix}]'
+                key = (frame, lowres)
+                frameval = self._frames[frame]
+                params = {}
+                if lowres is not None:
+                    if isinstance(self._lowres[frame][lowres], tuple):
+                        frameval = self._lowres[frame][lowres][0]
+                        params = {'level': self._lowres[frame][lowres][1]}
+                    else:
+                        frameval = self._lowres[frame][lowres]
+                if key not in self._recentFrames:
+                    if frameval:
+                        subpath = self._largeImagePath + f'[page={frameval}{self._suffix}]'
+                    else:
+                        subpath = self._largeImagePath
                     with _newFromFileLock:
-                        img = pyvips.Image.new_from_file(subpath)
-                    self._recentFrames[frame] = img
+                        img = pyvips.Image.new_from_file(subpath, **params)
+                    self._recentFrames[key] = img
                 else:
-                    img = self._recentFrames[frame]
+                    img = self._recentFrames[key]
         return img
 
     def getNativeMagnification(self):
@@ -231,8 +280,22 @@ class VipsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
     def getTile(self, x, y, z, pilImageAllowed=False, numpyAllowed=False, **kwargs):
         frame = self._getFrame(**kwargs)
         self._xyzInRange(x, y, z, frame, len(self._frames))
-        img = self._getFrameImage(frame)
         x0, y0, x1, y1, step = self._xyzToCorners(x, y, z)
+        lowres = None
+        if self._lowres and step > 1:
+            use = 0
+            for ll in self._lowres[frame].keys():
+                if 2 ** ll <= step:
+                    use = max(use, ll)
+            if use:
+                lowres = use
+                div = 2 ** use
+                x0 //= div
+                y0 //= div
+                x1 //= div
+                y1 //= div
+                step //= div
+        img = self._getFrameImage(frame, lowres)
         tileimg = img.crop(min(x0, img.width), min(y0, img.height),
                            min(x1, img.width) - min(x0, img.width),
                            min(y1, img.height) - min(y0, img.height))

{large_image_source_vips-1.30.7.dev71 → large_image_source_vips-1.31.1.dev2}/large_image_source_vips.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-vips
-Version: 1.30.7.dev71
+Version: 1.31.1.dev2
 Summary: A libvips tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.7.dev71
+Requires-Dist: large-image>=1.31.1.dev2
 Requires-Dist: numpy
 Requires-Dist: packaging
 Requires-Dist: pyvips

{large_image_source_vips-1.30.7.dev71 → large_image_source_vips-1.31.1.dev2}/large_image_source_vips.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image>=1.30.7.dev71
+large-image>=1.31.1.dev2
 numpy
 packaging
 pyvips