10th temp commitment instanceuid only #30
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nly on sop instance uid (temporarily)
danielbeaudreau
requested changes
Aug 12, 2019
| .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid()); | ||
| // current (v1beta1) healthcare api wrongly returns | ||
| // "SOPClassUID is not a supported instance or study or series level attribute" | ||
| //queryAttributes |
There was a problem hiding this comment.
I'd prefer deleting the code for now, and we can use commit history to add it back once the issue is resolved on the server side.
|
Thanks, can you please rebase this as well? (I guess all the rebasing is getting a bit problematic, but this PR doesn't remove the duplicate test script file, so it's necessary here anyway) |
|
Done. |
red1408
pushed a commit
to red1408/healthcare-dicom-dicomweb-adapter
that referenced
this pull request
Sep 4, 2019
…itment_instanceuid_only 10th temp commitment instanceuid only
psavery
added a commit
to psavery/wsidicom
that referenced
this pull request
Jan 30, 2024
This change adds support for Google Healthcare API DICOMweb servers, such as the NCI's [Imaging Data Commons](https://datacommons.cancer.gov/repository/imaging-data-commons). The problem: Google Healthcare API raises an error if `AvailableTransferSyntaxUID` is a field, or if `SOPClassUID` is used as a search filter. The `SOPClassUID` should definitely be allowed as an instance-level search filter, as documented in [Table 10.6.1-5. Required Matching Attributes](https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_10.6.html). However, this has apparently been a long-standing problem of nearly four years (see [here](GoogleCloudPlatform/healthcare-dicom-dicomweb-adapter#30 (comment))), so it may not be fixed anytime soon. And even if it is fixed, the Imaging Data Commons may not update their software anytime soon. It would be highly advantageous to support such a large DICOMweb repository by working around the issue. The fix in this PR is as follows: 1. The two `search_for_instances()` calls are still performed identically as before, as long as there are no HTTP errors. 2. If there is an HTTP error with a 400 status_code, and a message is present matching the errors from Google Healthcare API, then the `search_for_instances()` arguments are patched to work for Google Healthcare API, as follows: a) `AvailableTransferSyntaxUID` is simply removed, if present. b) `SOPClassUID` is manually filtered, if present (meaning it is not supplied in the `search_filters`, but only instances with a matching `SOPClassUID` are returned). These changes shouldn't have any impact on any situations except where an error occurs from a Google Healthcare API server. And in that case, the function calls are patched and then work properly. The following example works after this fix: ```python from wsidicom import WsiDicom, WsiDicomWebClient url = 'https://proxy.imaging.datacommons.cancer.gov/current/viewer-only-no-downloads-see-tinyurl-dot-com-slash-3j3d9jyp/dicomWeb' study_uid = '2.25.227261840503961430496812955999336758586' series_uid = '1.3.6.1.4.1.5962.99.1.1334438926.1589741711.1637717011470.2.0' client = WsiDicomWebClient.create_client(url) slide = WsiDicom.open_web(client, study_uid, series_uid) ``` Fixes: imi-bigpicture#141 Signed-off-by: Patrick Avery <[email protected]>
psavery
added a commit
to psavery/wsidicom
that referenced
this pull request
Jan 30, 2024
This change adds support for Google Healthcare API DICOMweb servers, such as the NCI's [Imaging Data Commons](https://datacommons.cancer.gov/repository/imaging-data-commons). The problem: Google Healthcare API raises an error if `AvailableTransferSyntaxUID` is a field, or if `SOPClassUID` is used as a search filter. The `SOPClassUID` should definitely be allowed as an instance-level search filter, as documented in [Table 10.6.1-5. Required Matching Attributes](https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_10.6.html). However, this has apparently been a long-standing problem of nearly four years (see [here](GoogleCloudPlatform/healthcare-dicom-dicomweb-adapter#30 (comment))), so it may not be fixed anytime soon. And even if it is fixed, the Imaging Data Commons may not update their software anytime soon. It would be highly advantageous to support such a large DICOMweb repository by working around the issue. The fix in this PR is as follows: 1. The two `search_for_instances()` calls are still performed identically as before, as long as there are no HTTP errors. 2. If there is an HTTP error with a 400 status_code, and a message is present matching the errors from Google Healthcare API, then the `search_for_instances()` arguments are patched to work for Google Healthcare API, as follows: a) `AvailableTransferSyntaxUID` is simply removed, if present. b) `SOPClassUID` is manually filtered, if present (meaning it is not supplied in the `search_filters`, but only instances with a matching `SOPClassUID` are returned). These changes shouldn't have any impact on any situations except where an error occurs from a Google Healthcare API server. And in that case, the function calls are patched and then work properly. The following example works after this fix: ```python from wsidicom import WsiDicom, WsiDicomWebClient url = 'https://proxy.imaging.datacommons.cancer.gov/current/viewer-only-no-downloads-see-tinyurl-dot-com-slash-3j3d9jyp/dicomWeb' study_uid = '2.25.227261840503961430496812955999336758586' series_uid = '1.3.6.1.4.1.5962.99.1.1334438926.1589741711.1637717011470.2.0' client = WsiDicomWebClient.create_client(url) slide = WsiDicom.open_web(client, study_uid, series_uid) ``` Fixes: imi-bigpicture#141 Signed-off-by: Patrick Avery <[email protected]>
psavery
added a commit
to psavery/wsidicom
that referenced
this pull request
Jan 31, 2024
This change adds support for Google Healthcare API DICOMweb servers, such as the NCI's [Imaging Data Commons](https://datacommons.cancer.gov/repository/imaging-data-commons). The problem: Google Healthcare API raises an error if `AvailableTransferSyntaxUID` is a field, or if `SOPClassUID` is used as a search filter. The `SOPClassUID` should definitely be allowed as an instance-level search filter, as documented in [Table 10.6.1-5. Required Matching Attributes](https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_10.6.html). However, this has apparently been a long-standing problem of nearly four years (see [here](GoogleCloudPlatform/healthcare-dicom-dicomweb-adapter#30 (comment))), so it may not be fixed anytime soon. And even if it is fixed, the Imaging Data Commons may not update their software anytime soon. It would be highly advantageous to support such a large DICOMweb repository by working around the issue. The fix in this PR is as follows: 1. The two `search_for_instances()` calls are still performed identically as before, as long as there are no HTTP errors. 2. If there is an HTTP error with a 400 status_code, and a message is present matching the errors from Google Healthcare API, then the `search_for_instances()` arguments are patched to work for Google Healthcare API, as follows: a) `AvailableTransferSyntaxUID` is simply removed, if present. b) `SOPClassUID` is manually filtered, if present (meaning it is not supplied in the `search_filters`, but only instances with a matching `SOPClassUID` are returned). These changes shouldn't have any impact on any situations except where an error occurs from a Google Healthcare API server. And in that case, the function calls are patched and then work properly. The following example works after this fix: ```python from wsidicom import WsiDicom, WsiDicomWebClient url = 'https://proxy.imaging.datacommons.cancer.gov/current/viewer-only-no-downloads-see-tinyurl-dot-com-slash-3j3d9jyp/dicomWeb' study_uid = '2.25.227261840503961430496812955999336758586' series_uid = '1.3.6.1.4.1.5962.99.1.1334438926.1589741711.1637717011470.2.0' client = WsiDicomWebClient.create_client(url) slide = WsiDicom.open_web(client, study_uid, series_uid) ``` Fixes: imi-bigpicture#141 Signed-off-by: Patrick Avery <[email protected]>
erikogabrielsson
pushed a commit
to imi-bigpicture/wsidicom
that referenced
this pull request
Feb 12, 2024
This change adds support for Google Healthcare API DICOMweb servers, such as the NCI's [Imaging Data Commons](https://datacommons.cancer.gov/repository/imaging-data-commons). The problem: Google Healthcare API raises an error if `AvailableTransferSyntaxUID` is a field, or if `SOPClassUID` is used as a search filter. The `SOPClassUID` should definitely be allowed as an instance-level search filter, as documented in [Table 10.6.1-5. Required Matching Attributes](https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_10.6.html). However, this has apparently been a long-standing problem of nearly four years (see [here](GoogleCloudPlatform/healthcare-dicom-dicomweb-adapter#30 (comment))), so it may not be fixed anytime soon. And even if it is fixed, the Imaging Data Commons may not update their software anytime soon. It would be highly advantageous to support such a large DICOMweb repository by working around the issue. The fix in this PR is as follows: 1. The two `search_for_instances()` calls are still performed identically as before, as long as there are no HTTP errors. 2. If there is an HTTP error with a 400 status_code, and a message is present matching the errors from Google Healthcare API, then the `search_for_instances()` arguments are patched to work for Google Healthcare API, as follows: a) `AvailableTransferSyntaxUID` is simply removed, if present. b) `SOPClassUID` is manually filtered, if present (meaning it is not supplied in the `search_filters`, but only instances with a matching `SOPClassUID` are returned). These changes shouldn't have any impact on any situations except where an error occurs from a Google Healthcare API server. And in that case, the function calls are patched and then work properly. The following example works after this fix: ```python from wsidicom import WsiDicom, WsiDicomWebClient url = 'https://proxy.imaging.datacommons.cancer.gov/current/viewer-only-no-downloads-see-tinyurl-dot-com-slash-3j3d9jyp/dicomWeb' study_uid = '2.25.227261840503961430496812955999336758586' series_uid = '1.3.6.1.4.1.5962.99.1.1334438926.1589741711.1637717011470.2.0' client = WsiDicomWebClient.create_client(url) slide = WsiDicom.open_web(client, study_uid, series_uid) ``` Fixes: #141 Signed-off-by: Patrick Avery <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[#28] Modify storage commitment adapter to query only on sop instance uid (temporarily)
Needs 9th pull request.