large-image-source-dicom 1.26.1.dev2__tar.gz → 1.26.1.dev8__tar.gz

{large-image-source-dicom-1.26.1.dev2 → large-image-source-dicom-1.26.1.dev8}/PKG-INFO

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

{large-image-source-dicom-1.26.1.dev2 → large-image-source-dicom-1.26.1.dev8}/large_image_source_dicom/assetstore/rest.py

@@ -17,7 +17,7 @@ class DICOMwebAssetstoreResource(Resource):
         self.resourceName = 'dicomweb_assetstore'
         self.route('POST', (':id', 'import'), self.importData)
 
-    def _importData(self, assetstore, params):
+    def _importData(self, assetstore, params, progress):
         """
 
         :param assetstore: the destination assetstore.
@@ -51,28 +51,22 @@ class DICOMwebAssetstoreResource(Resource):
             msg = f'Invalid filters: {e}'
             raise RestException(msg)
 
-        progress = self.boolParam('progress', params, default=False)
-
         adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
+        items = adapter.importData(
+            parent,
+            destinationType,
+            {
+                'limit': limit,
+                'search_filters': search_filters,
+                'auth': None,
+            },
+            progress,
+            user,
+        )
 
-        with ProgressContext(
-            progress, user=user, title='Importing DICOM references',
-        ) as ctx:
-            items = adapter.importData(
-                parent,
-                destinationType,
-                {
-                    'limit': limit,
-                    'search_filters': search_filters,
-                    'auth': None,
-                },
-                ctx,
-                user,
-            )
-
-            if not items:
-                msg = 'No DICOM objects matching the search filters were found'
-                raise RestException(msg)
+        if not items:
+            msg = 'No DICOM objects matching the search filters were found'
+            raise RestException(msg)
 
     @access.admin(scope=TokenScope.DATA_WRITE)
     @autoDescribeRoute(
@@ -87,11 +81,21 @@ class DICOMwebAssetstoreResource(Resource):
         .param('limit', 'The maximum number of results to import.',
                required=False, dataType='int')
         .param('filters', 'Any search parameters to filter DICOM objects.',
-               required=False, default={})
-        .param('progress', 'Whether to record progress on this operation ('
-               'default=False)', required=False, default=False, dataType='boolean')
+               required=False, default='{}')
+        .param('progress', 'Whether to record progress on this operation.',
+               required=False, default=False, dataType='boolean')
         .errorResponse()
         .errorResponse('You are not an administrator.', 403),
     )
-    def importData(self, assetstore, params):
-        return self._importData(assetstore, params)
+    def importData(self, assetstore, destinationId, destinationType, limit, filters, progress):
+        user = self.getCurrentUser()
+
+        with ProgressContext(
+            progress, user=user, title='Importing DICOM references',
+        ) as ctx:
+            return self._importData(assetstore, params={
+                'destinationId': destinationId,
+                'destinationType': destinationType,
+                'limit': limit,
+                'filters': filters,
+            }, progress=ctx)

{large-image-source-dicom-1.26.1.dev2 → large-image-source-dicom-1.26.1.dev8}/large_image_source_dicom.egg-info/PKG-INFO

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

large-image-source-dicom-1.26.1.dev8/large_image_source_dicom.egg-info/requires.txt

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

{large-image-source-dicom-1.26.1.dev2 → large-image-source-dicom-1.26.1.dev8}/setup.py

@@ -27,7 +27,7 @@ try:
     from setuptools_scm import get_version
 
     version = get_version(root='../..', local_scheme=prerelease_local_scheme)
-    limit_version = f'>={version}' if '+' not in version else ''
+    limit_version = f'>={version}' if '+' not in version and not os.getenv('TOX_ENV_NAME') else ''
 except (ImportError, LookupError):
     limit_version = ''
 

large-image-source-dicom-1.26.1.dev2/large_image_source_dicom.egg-info/requires.txt

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