Make DICOMweb assetstore imports compatible with Girder generics #1504
Conversation
sources/dicom/setup.py
Outdated
| @@ -69,6 +69,7 @@ def prerelease_local_scheme(version): | |||
| install_requires=[ | |||
| f'large-image{limit_version}', | |||
| 'wsidicom>=0.9.0', | |||
| 'girder>=3.2.3', | |||
There was a problem hiding this comment.
@manthey I think you set up this package so that girder should be an optional dependency, right?
There was a problem hiding this comment.
Yes. We really do not want girder as a core dependency. It is already an extras dependency transitively with the girder extra and girder-large-image.
There was a problem hiding this comment.
I've moved the requirement to be in the extras_require for 'girder', does this properly address the issue?
There was a problem hiding this comment.
Can you also add it so it only does this if we are on Python >= 3.9, since the dicomweb plugin isn't available in 3.8?
There was a problem hiding this comment.
Okay, I've added a conditional requirement append now. Let me know if that was what you were describing
sources/dicom/large_image_source_dicom/assetstore/dicomweb_assetstore_adapter.py
Outdated
Show resolved
Hide resolved
sources/dicom/large_image_source_dicom/assetstore/dicomweb_assetstore_adapter.py
Outdated
Show resolved
Hide resolved
This PR adds switches the implementation of dicomweb assetstore imports away from the custom defined
Resourcemethods to be interoperable with other GirderAssetstoreAdapters.Moving the code to
DICOMwebAssetstoreAdaptermeans girder can utilize its normal assetstore adapter polymorphism, which removes the need for dicomweb methods written to re-implement girder functionality.These changes rely on the following PRs, which have been merged into girder:
girder/girder#3526
girder/girder#3527