large-image-source-dicom 1.34.2.dev4__tar.gz → 1.34.2.dev8__tar.gz

{large_image_source_dicom-1.34.2.dev4/large_image_source_dicom.egg-info → large_image_source_dicom-1.34.2.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-dicom
-Version: 1.34.2.dev4
+Version: 1.34.2.dev8
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,12 +17,12 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.34.2.dev4
+Requires-Dist: large-image>=1.34.2.dev8
 Requires-Dist: wsidicom!=0.21.3,>=0.9.0
 Requires-Dist: pydicom<3; python_version < "3.10"
 Requires-Dist: pydicom; python_version >= "3.10"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.34.2.dev4; extra == "girder"
+Requires-Dist: girder-large-image>=1.34.2.dev8; extra == "girder"
 Requires-Dist: girder<5,>=3.2.3; extra == "girder"
 Dynamic: author
 Dynamic: author-email

{large_image_source_dicom-1.34.2.dev4 → large_image_source_dicom-1.34.2.dev8}/large_image_source_dicom/__init__.py

@@ -4,12 +4,14 @@ import importlib.metadata
 import math
 import os
 import re
+import threading
 import warnings
 
 import numpy as np
 from large_image_source_dicom.dicom_metadata import extract_dicom_metadata
 from large_image_source_dicom.dicomweb_utils import get_dicomweb_metadata
 
+import large_image
 from large_image.cache_util import LruCacheMetaclass, methodcache
 from large_image.constants import TILE_FORMAT_PIL, SourcePriority
 from large_image.exceptions import TileSourceError, TileSourceFileNotFoundError
@@ -187,6 +189,7 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         self.levels = int(max(1, math.ceil(math.log(
             max(self.sizeX / self.tileWidth, self.sizeY / self.tileHeight)) / math.log(2)) + 1))
         self._populatedLevels = len(self._dicom.pyramids[0])
+        self._tileLock = threading.RLock()
         # We need to detect which levels are functionally present if we want to
         # return a sensible _nonemptyLevelsList
 
@@ -370,8 +373,10 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         y1f = min(int(math.ceil(y1 / levelfactor)), self._dicom.pyramids[0][level].size.height)
         bw = int(bw // levelfactor)
         bh = int(bh // levelfactor)
-        tile = self._dicom.read_region(
-            (x0f, y0f), self._dicom.pyramids[0][level].level, (x1f - x0f, y1f - y0f))
+        with self._tileLock:
+            tile = self._dicom.read_region(
+                (x0f, y0f), self._dicom.pyramids[0][level].level, (x1f - x0f, y1f - y0f),
+                threads=large_image.config.cpu_count())
         format = TILE_FORMAT_PIL
         if tile.width < bw or tile.height < bh:
             tile = _imageToNumpy(tile)[0]

{large_image_source_dicom-1.34.2.dev4 → large_image_source_dicom-1.34.2.dev8}/large_image_source_dicom/girder_source.py

@@ -66,7 +66,7 @@ class DICOMGirderTileSource(DICOMFileTileSource, GirderTileSource):
             raise TileSourceError(msg)
         filepath = filelist[0]
         for file in Item().collection.aggregate([
-            {'$match': {'folderId': self.item['folderId']}},
+            {'$match': {'folderId': self.item['folderId'], '_id': {'$ne': self.item['_id']}}},
             {'$lookup': {
                 'from': 'file', 'localField': '_id', 'foreignField': 'itemId', 'as': 'files',
             }},

{large_image_source_dicom-1.34.2.dev4 → large_image_source_dicom-1.34.2.dev8/large_image_source_dicom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-dicom
-Version: 1.34.2.dev4
+Version: 1.34.2.dev8
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,12 +17,12 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.34.2.dev4
+Requires-Dist: large-image>=1.34.2.dev8
 Requires-Dist: wsidicom!=0.21.3,>=0.9.0
 Requires-Dist: pydicom<3; python_version < "3.10"
 Requires-Dist: pydicom; python_version >= "3.10"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.34.2.dev4; extra == "girder"
+Requires-Dist: girder-large-image>=1.34.2.dev8; extra == "girder"
 Requires-Dist: girder<5,>=3.2.3; extra == "girder"
 Dynamic: author
 Dynamic: author-email

{large_image_source_dicom-1.34.2.dev4 → large_image_source_dicom-1.34.2.dev8}/large_image_source_dicom.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image>=1.34.2.dev4
+large-image>=1.34.2.dev8
 wsidicom!=0.21.3,>=0.9.0
 
 [:python_version < "3.10"]
@@ -8,5 +8,5 @@ pydicom<3
 pydicom
 
 [girder]
-girder-large-image>=1.34.2.dev4
+girder-large-image>=1.34.2.dev8
 girder<5,>=3.2.3