large-image-source-dicom 1.27.5.dev4__tar.gz → 1.30.7.dev10__tar.gz

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.5.dev4
+Version: 1.30.7.dev10
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -15,9 +15,17 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
-Provides-Extra: girder
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: large-image>=1.30.7.dev10
+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.30.7.dev10; extra == "girder"
+Requires-Dist: girder>=3.2.3; extra == "girder"
 
 A DICOM tilesource for large_image.
 

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/README.rst

@@ -15,7 +15,7 @@ Large Image
    :target: https://codecov.io/github/girder/large_image?branch=master
    :alt: codecov.io
 
-.. |doi-badge| image:: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.4723355-blue
+.. |doi-badge| image:: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.4723355-blue.svg
    :target: https://zenodo.org/badge/latestdoi/45569214
 
 .. |pypi-badge| image:: https://img.shields.io/pypi/v/large-image.svg?logo=python&logoColor=white
@@ -39,7 +39,7 @@ Highlights
 Installation
 ------------
 
-In addition to installing the ``large-image`` package, you'll need at least one tile source (a ``large-image-source-xxx`` package).   You can install everything from the main project with one of these commands:
+In addition to installing the base ``large-image`` package, you'll need at least one tile source which corresponds to your target file format(s) (a ``large-image-source-xxx`` package).   You can install everything from the main project with one of these commands:
 
 Pip
 ~~~
@@ -52,7 +52,7 @@ Install all tile sources on linux::
 
     pip install large-image[all] --find-links https://girder.github.io/large_image_wheels
 
-Install all tile sources and all Girder plugins on linux::
+When using large-image with an instance of `Girder`_, install all tile sources and all Girder plugins on linux::
 
     pip install large-image[all] girder-large-image-annotation[tasks] --find-links https://girder.github.io/large_image_wheels
 
@@ -60,8 +60,9 @@ Install all tile sources and all Girder plugins on linux::
 Conda
 ~~~~~
 
-Conda makes dependency management a bit easier if not on Linux. Some of the source modules are available on conda-forge. You can install the following::
+Conda makes dependency management a bit easier if not on Linux. The base module, converter module, and two of the source modules are available on conda-forge. You can install the following::
 
+    conda install -c conda-forge large-image
     conda install -c conda-forge large-image-source-gdal
     conda install -c conda-forge large-image-source-tiff
     conda install -c conda-forge large-image-converter
@@ -118,7 +119,7 @@ Large Image consists of several Python modules designed to work together.  These
 
   - ``large-image-source-deepzoom``: A tile source for reading Deepzoom tiles.
 
-  - ``large-image-source-dicom``: A tile source for reading DICOM WSI images.
+  - ``large-image-source-dicom``: A tile source for reading DICOM Whole Slide Images (WSI).
 
   - ``large-image-source-gdal``: A tile source for reading geotiff files via GDAL.  This handles source data with more complex transforms than the mapnik tile source.
 
@@ -128,62 +129,41 @@ Large Image consists of several Python modules designed to work together.  These
 
   - ``large-image-source-nd2``: A tile source for reading nd2 (NIS Element) images.
 
-  - ``large-image-source-ometiff``: A tile source using the tiff library that can handle some multi-frame OMETiff files.
+  - ``large-image-source-ometiff``: A tile source using the tiff library that can handle most multi-frame OMETiff files that are compliant with the specification.
 
   - ``large-image-source-openjpeg``: A tile source using the Glymur library to read jp2 (JPEG 2000) files.
 
   - ``large-image-source-openslide``: A tile source using the OpenSlide library.  This works with svs, ndpi, Mirax, tiff, vms, and other file formats.
 
-  - ``large-image-source-pil``: A tile source for small images via the Python Imaging Library (Pillow).
+  - ``large-image-source-pil``: A tile source for small images via the Python Imaging Library (Pillow). By default, the maximum size is 4096, but the maximum size can be configured.
 
   - ``large-image-source-tiff``: A tile source for reading pyramidal tiff files in common compression formats.
 
   - ``large-image-source-tifffile``: A tile source using the tifffile library that can handle a wide variety of tiff-like files.
 
-  - ``large-image-source-vips``: A tile source for reading any files handled by libvips.  This also can be used for writing tiled images from numpy arrays.
+  - ``large-image-source-vips``: A tile source for reading any files handled by libvips.  This also can be used for writing tiled images from numpy arrays (up to 4 dimensions).
 
-  - ``large-image-source-zarr``: A tile source using the zarr library that can handle OME-Zarr (OME-NGFF) files as well as some other zarr files.
+  - ``large-image-source-zarr``: A tile source using the zarr library that can handle OME-Zarr (OME-NGFF) files as well as some other zarr files. This can also be used for writing N-dimensional tiled images from numpy arrays. Written images can be saved as any supported format.
 
   - ``large-image-source-test``: A tile source that generates test tiles, including a simple fractal pattern.  Useful for testing extreme zoom levels.
 
-  - ``large-image-source-dummy``: A tile source that does nothing.
+  - ``large-image-source-dummy``: A tile source that does nothing. This is an absolutely minimal implementation of a tile source used for testing. If you want to create a custom tile source, start with this implementation.
 
-  Most tile sources can be used with girder-large-image.  You can specific an extras_require of ``girder`` to include ``girder-large-image`` with the source.
 
-- As a Girder plugin:
+As a `Girder`_ plugin, ``large-image`` adds end points to access all of the image formats it can read both to get metadata and to act as a tile server.
+In the Girder UI, ``large-image`` shows images on item pages, and can show thumbnails in item lists when browsing folders.
+There is also cache management to balance memory use and speed of response in Girder when ``large-image`` is used as a tile server.
 
-  - ``girder-large-image``: Large Image as a Girder_ 3.x plugin.
-    You can specify extras_require of ``tasks`` to install a Girder Worker task that can convert otherwise unreadable images to pyramidal tiff files.
+Most tile sources can be used with Girder Large Image.  You can specify an extras_require of ``girder`` to install the following packages:
 
-  - ``girder-large-image-annotation``: Annotations for large images as a Girder_ 3.x plugin.
+  - ``girder-large-image``: Large Image as a Girder 3.x plugin.
+    You can install ``large-image[tasks]`` to install a Girder Worker task that can convert otherwise unreadable images to pyramidal tiff files.
+
+  - ``girder-large-image-annotation``: Adds models to the Girder database for supporting annotating large images.  These annotations can be rendered on images. Annotations can include polygons, points, image overlays, and other types. Each annotation can have a label and metadata.
 
   - ``large-image-tasks``: A utility for running the converter via Girder Worker.
     You can specify an extras_require of ``girder`` to include modules needed to work with the Girder remote worker or ``worker`` to include modules needed on the remote side of the Girder remote worker.  If neither is specified, some conversion tasks can be run using Girder local jobs.
 
 
-Developer Installation
-----------------------
-
-To install all packages from source, clone the repository::
-
-    git clone https://github.com/girder/large_image.git
-    cd large_image
-
-Install all packages and dependencies::
-
-    pip install -e . -r requirements-dev.txt
-
-If you aren't developing with Girder 3, you can skip installing those components.  Use ``requirements-dev-core.txt`` instead of ``requirements-dev.txt``::
-
-    pip install -e . -r requirements-dev-core.txt
-
-
-Tile source prerequisites
-=========================
-
-Many tile sources have complex prerequisites.  These can be installed directly using your system's package manager or from some prebuilt Python wheels for Linux.  The prebuilt wheels are not official packages, but they can be used by instructing pip to use them by preference::
-
-    pip install -e . -r requirements-dev.txt --find-links https://girder.github.io/large_image_wheels
-
 
-.. _Girder: https://github.com/girder/girder
+.. _Girder: https://girder.readthedocs.io/en/latest/

large_image_source_dicom-1.30.7.dev10/docs/dicomweb_assetstore.rst

@@ -0,0 +1,8 @@
+DICOMweb Assetstore
+===================
+
+The DICOM source also provides a Girder Assetstore plugin for accessing data on DICOMweb servers.  This is available if the package is installed in the same python environment as Girder and the Girder client is built after installation.
+
+A DICOMweb assetstore can be added through the Girder Admin Console by selecting the "Create new DICOMweb assetstore" button.  It requires an appropriate URL; for those using DCM4CHEE, this might be something like "https://some.server.com/dcm4chee-arc/aets/DCM4CHEE/rs".  Check with the DICOMweb provider for appropriate QIDO and WADO prefixes.
+
+Existing images have to be imported from the assetstore via the standard Girder import process.  A json specification to filter the import can be added.  A common filter is to only import Slide Modality images via ``{ "ModalitiesInStudy": "SM" }``.

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/__init__.py

@@ -186,9 +186,8 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         if isinstance(path, dict):
             # Use the DICOMweb open method
             return self._open_wsi_dicomweb(path)
-        else:
-            # Use the regular open method
-            return wsidicom.WsiDicom.open(path)
+        # Use the regular open method
+        return wsidicom.WsiDicom.open(path)
 
     def _open_wsi_dicomweb(self, info):
         # These are the required keys in the info dict
@@ -333,22 +332,21 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             study_uid = self._dicom.uids.study_instance
             series_uid = self._dicom.uids.series_instance
             return get_dicomweb_metadata(client, study_uid, series_uid)
-        else:
-            # Find the first volume instance and extract the metadata
-            volume = None
-            for level in self._dicom.pyramids[0]:
-                for ds in level.datasets:
-                    if ds.image_type.value == 'VOLUME':
-                        volume = ds
-                        break
-
-                if volume:
+        # Find the first volume instance and extract the metadata
+        volume = None
+        for level in self._dicom.pyramids[0]:
+            for ds in level.datasets:
+                if ds.image_type.value == 'VOLUME':
+                    volume = ds
                     break
 
-            if not volume:
-                return None
+            if volume:
+                break
+
+        if not volume:
+            return None
 
-            return extract_dicom_metadata(volume)
+        return extract_dicom_metadata(volume)
 
     @methodcache()
     def getTile(self, x, y, z, pilImageAllowed=False, numpyAllowed=False, **kwargs):

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/assetstore/dicomweb_assetstore_adapter.py

@@ -1,3 +1,5 @@
+import json
+
 import cherrypy
 import requests
 from large_image_source_dicom.dicom_tags import dicom_key_to_tag
@@ -157,10 +159,9 @@ class DICOMwebAssetstoreAdapter(AbstractAssetstoreAdapter):
                         # Skip over the whole chunk...
                         bytes_read += len(chunk)
                         continue
-                    else:
-                        # Discard all bytes before the offset
-                        chunk = chunk[bytes_needed:]
-                        bytes_read += bytes_needed
+                    # Discard all bytes before the offset
+                    chunk = chunk[bytes_needed:]
+                    bytes_read += bytes_needed
 
                 if endByte is not None and bytes_read + len(chunk) >= endByte:
                     # We have reached the end... remove all bytes after endByte
@@ -377,48 +378,27 @@ class DICOMwebAssetstoreAdapter(AbstractAssetstoreAdapter):
             response = self._request_retrieve_instance(file, multipart=False)
         except requests.HTTPError:
             # If there is an HTTPError, the server might not accept single-part requests...
-            return
+            return None
 
         if not self._is_singlepart_response(response):
             # Does not support single-part requests...
-            return
+            return None
 
         content_length = response.headers.get('Content-Length')
         if not content_length:
             # The server did not return a Content-Length
-            return
+            return None
 
         try:
             # The DICOM file size is equal to the Content-Length
             return int(content_length)
         except ValueError:
-            return
-
-    def importData(self, parent, parentType, params, progress, user, **kwargs):
-        """
-        Import DICOMweb WSI instances from a DICOMweb server.
-
-        :param parent: The parent object to import into.
-        :param parentType: The model type of the parent object.
-        :type parentType: str
-        :param params: Additional parameters required for the import process.
-            This dictionary may include the following keys:
-
-            :limit: (optional) limit the number of studies imported.
-            :search_filters: (optional) a dictionary of additional search
-                filters to use with dicomweb_client's `search_for_series()`
-                function.
+            return None
 
-        :type params: dict
-        :param progress: Object on which to record progress if possible.
-        :type progress: :py:class:`girder.utility.progress.ProgressContext`
-        :param user: The Girder user performing the import.
-        :type user: dict or None
-        :return: a list of items that were created
-        """
+    def _importData(self, parent, parentType, params, progress, user):
         if parentType not in ('folder', 'user', 'collection'):
             msg = f'Invalid parent type: {parentType}'
-            raise RuntimeError(msg)
+            raise ValidationException(msg)
 
         limit = params.get('limit')
         search_filters = params.get('search_filters', {})
@@ -512,6 +492,65 @@ class DICOMwebAssetstoreAdapter(AbstractAssetstoreAdapter):
 
         return items
 
+    def importData(self, parent, parentType, params, progress, user, **kwargs):
+        """
+        Import DICOMweb WSI instances from a DICOMweb server.
+
+        :param parent: The parent object to import into.
+        :param parentType: The model type of the parent object.
+        :type parentType: str
+        :param params: Additional parameters required for the import process.
+            This dictionary may include the following keys:
+
+            :limit: (optional) limit the number of studies imported.
+            :filters: (optional) a dictionary/JSON string of additional search
+                filters to use with dicomweb_client's `search_for_series()`
+                function.
+
+        :type params: dict
+        :param progress: Object on which to record progress if possible.
+        :type progress: :py:class:`girder.utility.progress.ProgressContext`
+        :param user: The Girder user performing the import.
+        :type user: dict or None
+        :return: a list of items that were created
+        """
+        # Validate the parameters
+        limit = params.get('limit') or None
+        if limit is not None:
+            error_msg = f'Invalid limit: {limit}'
+            try:
+                limit = int(limit)
+            except ValueError:
+                raise ValidationException(error_msg)
+
+            if limit < 1:
+                raise ValidationException(error_msg)
+
+        search_filters = params.get('filters', {})
+        if isinstance(search_filters, str):
+            try:
+                search_filters = json.loads(search_filters)
+            except json.JSONDecodeError as e:
+                msg = f'Invalid filters: "{params.get("filters")}". {e}'
+                raise ValidationException(msg)
+
+        items = self._importData(
+            parent,
+            parentType,
+            {
+                'limit': limit,
+                'search_filters': search_filters,
+            },
+            progress,
+            user,
+        )
+
+        if not items:
+            msg = 'No studies matching the search filters were found'
+            raise ValidationException(msg)
+
+        return items
+
     @property
     def auth_session(self):
         return _create_auth_session(self.assetstore_meta)

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/assetstore/rest.py

@@ -1,15 +1,14 @@
-import json
-
 from girder.api import access
 from girder.api.describe import Description, autoDescribeRoute
 from girder.api.rest import Resource
 from girder.constants import TokenScope
 from girder.exceptions import RestException
 from girder.models.assetstore import Assetstore
-from girder.utility import assetstore_utilities
 from girder.utility.model_importer import ModelImporter
 from girder.utility.progress import ProgressContext
 
+from .dicomweb_assetstore_adapter import DICOMwebAssetstoreAdapter
+
 
 class DICOMwebAssetstoreResource(Resource):
     def __init__(self):
@@ -34,39 +33,14 @@ class DICOMwebAssetstoreResource(Resource):
         parent = ModelImporter.model(destinationType).load(params['destinationId'], force=True,
                                                            exc=True)
 
-        limit = params.get('limit') or None
-        if limit is not None:
-            error_msg = 'Invalid limit'
-            try:
-                limit = int(limit)
-            except ValueError:
-                raise RestException(error_msg)
-
-            if limit < 1:
-                raise RestException(error_msg)
-
-        try:
-            search_filters = json.loads(params.get('filters') or '{}')
-        except json.JSONDecodeError as e:
-            msg = f'Invalid filters: {e}'
-            raise RestException(msg)
-
-        adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
-        items = adapter.importData(
+        return DICOMwebAssetstoreAdapter(assetstore).importData(
             parent,
             destinationType,
-            {
-                'limit': limit,
-                'search_filters': search_filters,
-            },
+            params,
             progress,
             user,
         )
 
-        if not items:
-            msg = 'No studies matching the search filters were found'
-            raise RestException(msg)
-
     @access.admin(scope=TokenScope.DATA_WRITE)
     @autoDescribeRoute(
         Description('Import references to DICOM objects from a DICOMweb server')

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/girder_source.py

@@ -40,8 +40,7 @@ class DICOMGirderTileSource(DICOMFileTileSource, GirderTileSource):
         assetstore_type = assetstore['type'] if assetstore else None
         if assetstore_type == getattr(AssetstoreType, 'DICOMWEB', '__undefined__'):
             return self._getDICOMwebLargeImagePath(assetstore)
-        else:
-            return self._getFilesystemLargeImagePath()
+        return self._getFilesystemLargeImagePath()
 
     def _getFilesystemLargeImagePath(self):
         filelist = [

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/web_client/main.js

@@ -1,7 +1,6 @@
-import './routes';
-
 // Extends and overrides API
 import './constants';
+import './views/DICOMwebImportView';
 import './views/AssetstoresView';
 import './views/EditAssetstoreWidget';
 import './views/NewAssetstoreWidget';

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/web_client/templates/dicomwebAssetstoreImportButton.pug

@@ -1,6 +1,6 @@
 .g-assetstore-import-button-container
   a.g-dwas-import-button.btn.btn-sm.btn-success(
-      href=`#dicomweb_assetstore/${assetstore.get('_id')}/import`,
+      href=`#assetstore/${assetstore.get('_id')}/import`,
       title="Import references to DICOM objects from a DICOMweb server")
     i.icon-link-ext
     |  Import data

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom/web_client/views/DICOMwebImportView.js

@@ -5,6 +5,9 @@ import router from '@girder/core/router';
 import View from '@girder/core/views/View';
 import { restRequest } from '@girder/core/rest';
 
+import { assetstoreImportViewMap } from '@girder/core/views/body/AssetstoresView';
+import { AssetstoreType } from '@girder/core/constants';
+
 import DWASImportTemplate from '../templates/assetstoreImport.pug';
 
 const DICOMwebImportView = View.extend({
@@ -24,12 +27,12 @@ const DICOMwebImportView = View.extend({
             }
 
             this.$('.g-submit-dwas-import').addClass('disabled');
-            this.model.off().on('g:imported', function () {
+            this.assetstore.off().on('g:imported', function () {
                 router.navigate(destinationType + '/' + destinationId, { trigger: true });
             }, this).on('g:error', function (err) {
                 this.$('.g-submit-dwas-import').removeClass('disabled');
                 this.$('.g-validation-failed-message').html(err.responseJSON.message);
-            }, this).dicomwebImport({
+            }, this).import({
                 destinationId,
                 destinationType,
                 limit,
@@ -40,7 +43,7 @@ const DICOMwebImportView = View.extend({
         'click .g-open-browser': '_openBrowser'
     },
 
-    initialize: function () {
+    initialize: function (settings) {
         this._browserWidgetView = new BrowserWidget({
             parentView: this,
             titleText: 'Destination',
@@ -75,12 +78,13 @@ const DICOMwebImportView = View.extend({
                 }
             });
         });
+        this.assetstore = settings.assetstore;
         this.render();
     },
 
     render: function () {
         this.$el.html(DWASImportTemplate({
-            assetstore: this.model
+            assetstore: this.assetstore
         }));
 
         return this;
@@ -91,4 +95,6 @@ const DICOMwebImportView = View.extend({
     }
 });
 
+assetstoreImportViewMap[AssetstoreType.DICOMWEB] = DICOMwebImportView;
+
 export default DICOMwebImportView;

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.5.dev4
+Version: 1.30.7.dev10
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -15,9 +15,17 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
-Provides-Extra: girder
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: large-image>=1.30.7.dev10
+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.30.7.dev10; extra == "girder"
+Requires-Dist: girder>=3.2.3; extra == "girder"
 
 A DICOM tilesource for large_image.
 

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/large_image_source_dicom.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.rst
 pyproject.toml
 setup.py
+docs/dicomweb_assetstore.rst
 large_image_source_dicom/__init__.py
 large_image_source_dicom/dicom_metadata.py
 large_image_source_dicom/dicom_tags.py
@@ -20,8 +21,6 @@ large_image_source_dicom/assetstore/rest.py
 large_image_source_dicom/web_client/constants.js
 large_image_source_dicom/web_client/main.js
 large_image_source_dicom/web_client/package.json
-large_image_source_dicom/web_client/routes.js
-large_image_source_dicom/web_client/models/AssetstoreModel.js
 large_image_source_dicom/web_client/templates/assetstoreImport.pug
 large_image_source_dicom/web_client/templates/dicomwebAssetstoreCreate.pug
 large_image_source_dicom/web_client/templates/dicomwebAssetstoreEditFields.pug

large_image_source_dicom-1.30.7.dev10/large_image_source_dicom.egg-info/requires.txt

@@ -0,0 +1,12 @@
+large-image>=1.30.7.dev10
+wsidicom!=0.21.3,>=0.9.0
+
+[:python_version < "3.10"]
+pydicom<3
+
+[:python_version >= "3.10"]
+pydicom
+
+[girder]
+girder-large-image>=1.30.7.dev10
+girder>=3.2.3

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/setup.py

@@ -20,8 +20,7 @@ def prerelease_local_scheme(version):
 
     if os.getenv('CIRCLE_BRANCH') in ('master', ):
         return ''
-    else:
-        return get_local_node_and_date(version)
+    return get_local_node_and_date(version)
 
 
 try:
@@ -41,11 +40,14 @@ entry_points = {
     ],
 }
 
+girder_extras = [f'girder-large-image{limit_version}']
+
 if sys.version_info >= (3, 9):
     # For Python >= 3.9, include the DICOMweb plugin
     entry_points['girder.plugin'] = [
         'dicomweb = large_image_source_dicom.girder_plugin:DICOMwebPlugin',
     ]
+    girder_extras.append('girder>=3.2.3')
 
 setup(
     name='large-image-source-dicom',
@@ -53,6 +55,7 @@ setup(
                      'fallback_version': '0.0.0'},
     description=description,
     long_description=long_description,
+    long_description_content_type='text/x-rst',
     license='Apache Software License 2.0',
     author='Kitware, Inc.',
     author_email='kitware@kitware.com',
@@ -65,13 +68,16 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     install_requires=[
         f'large-image{limit_version}',
-        'wsidicom>=0.9.0',
+        'wsidicom>=0.9.0,!=0.21.3',
+        'pydicom<3; python_version < "3.10"',
+        'pydicom; python_version >= "3.10"',
     ],
     extras_require={
-        'girder': f'girder-large-image{limit_version}',
+        'girder': girder_extras,
     },
     include_package_data=True,
     keywords='large_image, tile source',

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/test_dicom/test_web_client.py

@@ -12,8 +12,8 @@ pytestmark = [
 ]
 
 
-@pytest.mark.girder()
-@pytest.mark.girder_client()
+@pytest.mark.girder
+@pytest.mark.girder_client
 @pytest.mark.plugin('large_image')
 @pytest.mark.plugin('dicomweb')
 def testDICOMWebClient(boundServer, fsAssetstore, db):

{large-image-source-dicom-1.27.5.dev4 → large_image_source_dicom-1.30.7.dev10}/test_dicom/web_client_specs/dicomWebSpec.js

@@ -143,7 +143,7 @@ describe('DICOMWeb assetstore', function () {
         });
 
         waitsFor(function () {
-            return $('.g-validation-failed-message').html() === 'Invalid limit';
+            return $('.g-validation-failed-message').html() === 'Invalid limit: 1.3';
         }, 'Invalid limit check (float)');
 
         runs(function () {
@@ -156,7 +156,7 @@ describe('DICOMWeb assetstore', function () {
         });
 
         waitsFor(function () {
-            return $('.g-validation-failed-message').html() === 'Invalid limit';
+            return $('.g-validation-failed-message').html() === 'Invalid limit: -1';
         }, 'Invalid limit check (negative)');
 
         runs(function () {

large-image-source-dicom-1.27.5.dev4/large_image_source_dicom/web_client/models/AssetstoreModel.js

@@ -1,20 +0,0 @@
-import AssetstoreModel from '@girder/core/models/AssetstoreModel';
-import { restRequest } from '@girder/core/rest';
-
-/**
- * Extends the core assetstore model to add DICOMweb-specific functionality.
- */
-AssetstoreModel.prototype.dicomwebImport = function (params) {
-    return restRequest({
-        url: 'dicomweb_assetstore/' + this.get('_id') + '/import',
-        type: 'POST',
-        data: params,
-        error: null
-    }).done(() => {
-        this.trigger('g:imported');
-    }).fail((err) => {
-        this.trigger('g:error', err);
-    });
-};
-
-export default AssetstoreModel;

large-image-source-dicom-1.27.5.dev4/large_image_source_dicom/web_client/routes.js

@@ -1,17 +0,0 @@
-import router from '@girder/core/router';
-import events from '@girder/core/events';
-
-import AssetstoreModel from './models/AssetstoreModel';
-import DICOMwebImportView from './views/DICOMwebImportView';
-
-router.route('dicomweb_assetstore/:id/import', 'dwasImport', function (id) {
-    // Fetch the assetstore by id, then render the view.
-    const assetstore = new AssetstoreModel({ _id: id });
-    assetstore.once('g:fetched', function () {
-        events.trigger('g:navigateTo', DICOMwebImportView, {
-            model: assetstore
-        });
-    }).once('g:error', function () {
-        router.navigate('assetstores', { trigger: true });
-    }).fetch();
-});

large-image-source-dicom-1.27.5.dev4/large_image_source_dicom.egg-info/requires.txt

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