large-image-source-dicom 1.27.1.dev59__tar.gz → 1.27.1.dev63__tar.gz

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev59
+Version: 1.27.1.dev63
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/large_image_source_dicom/__init__.py

@@ -53,6 +53,7 @@ def _lazyImportPydicom():
 
     if pydicom is None:
         import pydicom
+    return pydicom
 
 
 def dicom_to_dict(ds, base=None):
@@ -138,6 +139,12 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             if not os.path.isfile(path):
                 raise TileSourceFileNotFoundError(path) from None
             root = os.path.dirname(path) or '.'
+            try:
+                _lazyImportPydicom()
+                pydicom.filereader.dcmread(path, stop_before_pixels=True)
+            except Exception as exc:
+                msg = f'File cannot be opened via dicom tile source ({exc}).'
+                raise TileSourceError(msg)
             self._largeImagePath = [
                 os.path.join(root, entry) for entry in os.listdir(root)
                 if os.path.isfile(os.path.join(root, entry)) and

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/large_image_source_dicom/girder_source.py

@@ -5,8 +5,9 @@ from girder.models.file import File
 from girder.models.folder import Folder
 from girder.models.item import Item
 from girder.utility import assetstore_utilities
+from large_image.exceptions import TileSourceError
 
-from . import DICOMFileTileSource
+from . import DICOMFileTileSource, _lazyImportPydicom
 from .assetstore import DICOMWEB_META_KEY
 
 
@@ -46,8 +47,13 @@ class DICOMGirderTileSource(DICOMFileTileSource, GirderTileSource):
         filelist = [
             File().getLocalFilePath(file) for file in Item().childFiles(self.item)
             if self._pathMightBeDicom(file['name'])]
-        if len(filelist) > 1:
+        if len(filelist) != 1:
             return filelist
+        try:
+            _lazyImportPydicom().filereader.dcmread(filelist[0], stop_before_pixels=True)
+        except Exception as exc:
+            msg = f'File cannot be opened via dicom tile source ({exc}).'
+            raise TileSourceError(msg)
         filelist = []
         folder = Folder().load(self.item['folderId'], force=True)
         for item in Folder().childItems(folder):

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/large_image_source_dicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev59
+Version: 1.27.1.dev63
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-dicom-1.27.1.dev63/large_image_source_dicom.egg-info/requires.txt

@@ -0,0 +1,5 @@
+large-image>=1.27.1.dev63
+wsidicom>=0.9.0
+
+[girder]
+girder-large-image>=1.27.1.dev63

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/test_dicom/test_web_client.py

@@ -28,6 +28,13 @@ def testDICOMWebClient(boundServer, fsAssetstore, db):
     dicomweb_test_url = os.environ['DICOMWEB_TEST_URL']
     data = data.replace('DICOMWEB_TEST_URL', f"'{dicomweb_test_url}'")
 
+    dicomweb_test_token = os.getenv('DICOMWEB_TEST_TOKEN')
+    if dicomweb_test_token:
+        dicomweb_test_token = f"'{dicomweb_test_token}'"
+    else:
+        dicomweb_test_token = 'null'
+    data = data.replace('DICOMWEB_TEST_TOKEN', dicomweb_test_token)
+
     # Need to avoid context manager for this to work on Windows
     tf = tempfile.NamedTemporaryFile(delete=False)
     try:

{large-image-source-dicom-1.27.1.dev59 → large-image-source-dicom-1.27.1.dev63}/test_dicom/web_client_specs/dicomWebSpec.js

@@ -1,5 +1,6 @@
 // These will be replaced by templating
 const url = DICOMWEB_TEST_URL;
+const token = DICOMWEB_TEST_TOKEN;
 
 girderTest.importPlugin('jobs', 'large_image', 'dicomweb');
 
@@ -59,8 +60,13 @@ describe('DICOMWeb assetstore', function () {
         }, 'No token provided check');
 
         runs(function () {
-            // Change the auth type back to None
-            $('#g-new-dwas-auth-type').val(null);
+            if (token == null) {
+                // Change the auth type back to None
+                $('#g-new-dwas-auth-type').val(null);
+            } else {
+                // Set the token
+                $('#g-new-dwas-auth-token').val(token);
+            }
 
             // This should work now
             $('#g-new-dwas-form input.btn-primary').click();

large-image-source-dicom-1.27.1.dev59/large_image_source_dicom.egg-info/requires.txt

@@ -1,5 +0,0 @@
-large-image>=1.27.1.dev59
-wsidicom>=0.9.0
-
-[girder]
-girder-large-image>=1.27.1.dev59