large-image-source-ometiff 1.23.2.dev14__py3-none-any.whl → 1.23.3__py3-none-any.whl

large_image_source_ometiff/__init__.py

@@ -19,7 +19,7 @@ import math
 import os
 from collections import OrderedDict
 
-import numpy
+import numpy as np
 import PIL.Image
 from large_image_source_tiff import TiffFileTileSource
 from large_image_source_tiff.exceptions import InvalidOperationTiffError, IOTiffError, TiffError
@@ -107,10 +107,12 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
         except TiffError:
             if not os.path.isfile(self._largeImagePath):
                 raise TileSourceFileNotFoundError(self._largeImagePath) from None
-            raise TileSourceError('Not a recognized OME Tiff')
+            msg = 'Not a recognized OME Tiff'
+            raise TileSourceError(msg)
         info = getattr(base, '_description_record', None)
         if not info or not info.get('OME'):
-            raise TileSourceError('Not an OME Tiff')
+            msg = 'Not an OME Tiff'
+            raise TileSourceError(msg)
         self._omeinfo = info['OME']
         self._checkForOMEZLoop(self._largeImagePath)
         self._parseOMEInfo()
@@ -137,8 +139,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
             _maxChunk = min(base.imageWidth, base.tileWidth * self._skippedLevels ** 2) * \
                 min(base.imageHeight, base.tileHeight * self._skippedLevels ** 2)
             if _maxChunk > self._maxUntiledChunk:
-                raise TileSourceError(
-                    'Untiled image is too large to access with the OME Tiff source')
+                msg = 'Untiled image is too large to access with the OME Tiff source'
+                raise TileSourceError(msg)
         self.tileWidth = base.tileWidth
         self.tileHeight = base.tileHeight
         self.levels = len(self._tiffDirectories)
@@ -240,15 +242,17 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
                 self._omebase['TiffData'] = [self._omebase['TiffData']]
             if len({entry.get('UUID', {}).get('FileName', '')
                     for entry in self._omebase['TiffData']}) > 1:
-                raise TileSourceError('OME Tiff references multiple files')
+                msg = 'OME Tiff references multiple files'
+                raise TileSourceError(msg)
             if (len(self._omebase['TiffData']) != int(self._omebase['SizeC']) *
                     int(self._omebase['SizeT']) * int(self._omebase['SizeZ']) or
                     len(self._omebase['TiffData']) != len(
                         self._omebase.get('Plane', self._omebase['TiffData']))):
-                raise TileSourceError(
-                    'OME Tiff contains frames that contain multiple planes')
+                msg = 'OME Tiff contains frames that contain multiple planes'
+                raise TileSourceError(msg)
         except (KeyError, ValueError, IndexError, TypeError):
-            raise TileSourceError('OME Tiff does not contain an expected record')
+            msg = 'OME Tiff does not contain an expected record'
+            raise TileSourceError(msg)
 
     def getMetadata(self):
         """
@@ -329,7 +333,8 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
                 **kwargs)
         frame = self._getFrame(**kwargs)
         if frame < 0 or frame >= len(self._omebase['TiffData']):
-            raise TileSourceError('Frame does not exist')
+            msg = 'Frame does not exist'
+            raise TileSourceError(msg)
         subdir = None
         if self._omeLevels[z] is not None:
             dirnum = int(self._omeLevels[z]['TiffData'][frame].get('IFD', frame))
@@ -353,7 +358,7 @@ class OMETiffFileTileSource(TiffFileTileSource, metaclass=LruCacheMetaclass):
             format = 'JPEG'
             if isinstance(tile, PIL.Image.Image):
                 format = TILE_FORMAT_PIL
-            if isinstance(tile, numpy.ndarray):
+            if isinstance(tile, np.ndarray):
                 format = TILE_FORMAT_NUMPY
             return self._outputTile(tile, format, x, y, z, pilImageAllowed,
                                     numpyAllowed, **kwargs)

{large_image_source_ometiff-1.23.2.dev14.dist-info → large_image_source_ometiff-1.23.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-ometiff
-Version: 1.23.2.dev14
+Version: 1.23.3
 Summary: An OMETiff tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -18,11 +18,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.6
 License-File: LICENSE
-Requires-Dist: large-image (>=1.23.2.dev14)
-Requires-Dist: large-image-source-tiff (>=1.23.2.dev14)
+Requires-Dist: large-image (>=1.23.3)
+Requires-Dist: large-image-source-tiff (>=1.23.3)
 Requires-Dist: importlib-metadata (<5) ; python_version < "3.8"
 Provides-Extra: girder
-Requires-Dist: girder-large-image (>=1.23.2.dev14) ; extra == 'girder'
+Requires-Dist: girder-large-image (>=1.23.3) ; extra == 'girder'
 
 An OMETiff tilesource for large_image.
 

large_image_source_ometiff-1.23.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+large_image_source_ometiff/__init__.py,sha256=13KhKaapOLpAVqVsPaHsF1sS7jLz2IbA9Bir4kmBKrY,17556
+large_image_source_ometiff/girder_source.py,sha256=QotYLsC_JY3pOixVOXZ_wwtHJABSuWw_f_8Q5pDnNWo,1047
+large_image_source_ometiff-1.23.3.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+large_image_source_ometiff-1.23.3.dist-info/METADATA,sha256=QnPC73gGJ2Z6VAhmacFI2hHyaQOIJ9WTR65BlwUNyyg,1136
+large_image_source_ometiff-1.23.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+large_image_source_ometiff-1.23.3.dist-info/entry_points.txt,sha256=-xiaxFJTzRayHYwLkPsBXF0grk8j5nQy5cizSazP404,184
+large_image_source_ometiff-1.23.3.dist-info/top_level.txt,sha256=Me0pziNZRmyYLdGAKu9zgDHHINn_7ayKLLYxTGXv5lo,27
+large_image_source_ometiff-1.23.3.dist-info/RECORD,,

large_image_source_ometiff-1.23.2.dev14.dist-info/RECORD

@@ -1,8 +0,0 @@
-large_image_source_ometiff/__init__.py,sha256=LcRtVtU15BeBJwMaIuhQySsbkpCLjIBL7J3SxjkSWwE,17429
-large_image_source_ometiff/girder_source.py,sha256=QotYLsC_JY3pOixVOXZ_wwtHJABSuWw_f_8Q5pDnNWo,1047
-large_image_source_ometiff-1.23.2.dev14.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-large_image_source_ometiff-1.23.2.dev14.dist-info/METADATA,sha256=imsLeze3AH5ncsso9-nbNwGW3Y3mlP5gTls114fVYAo,1160
-large_image_source_ometiff-1.23.2.dev14.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-large_image_source_ometiff-1.23.2.dev14.dist-info/entry_points.txt,sha256=-xiaxFJTzRayHYwLkPsBXF0grk8j5nQy5cizSazP404,184
-large_image_source_ometiff-1.23.2.dev14.dist-info/top_level.txt,sha256=Me0pziNZRmyYLdGAKu9zgDHHINn_7ayKLLYxTGXv5lo,27
-large_image_source_ometiff-1.23.2.dev14.dist-info/RECORD,,