Skip to content

Commit

Permalink
DICOM redactor improvement: Enabling compatibility with compressed im…
Browse files Browse the repository at this point in the history 
…ages (#1105)

* Adding in methods for compression and modifying existing unit test for adding redact boxes

* Adding unit tests

* Linting fixes

* Fixing exception type

* Adding in python-gdcm dependency

* Adding python-gdcm to piplock

* Updating pipfile.lock

* Switching from gdcm license to python-gdcm license

* Adding in methods for compression and modifying existing unit test for adding redact boxes

* Adding unit tests

* Linting fixes

* Fixing exception type

* Adding in python-gdcm dependency

* Switching from gdcm license to python-gdcm license

* fix ammend

* comment out new tests

* revert

* Incorporating bug fix that was merged in

* Linting fix

* Temporarily commenting out one integration test to see effect on build pipeline hangup

* Adding _strip_score back in

* Commenting out entire integration test for DICOM Image PII verify engine

* Trying alternate assertion for test_eval_dicom_correctly

* Removing all assertions in test_eval_dicom_correctly

* Explicitly including argument names and adding some temporary print statements

* Using deepcopy of passed-in mock DICOM verify results

* Using deepcopy for the passed-in example instance as well

* Renaming any variables that may have overlap with existing variables in the method being test

* Testing effect of mocking verify_dicom_instance in eval_dicom_instance

* Mocking all calls except get_bboxes_from_ocr_results in test_eval_dicom_correctly

* Removing call to method and assertions

* Commenting out test_verify_correctly

* Adding test_verify_correctly back and reducing ambiguity as much as possible

* Removing ambiguity even more

* Changing _strip_score back to not returning but keeping input arg name change

* Commenting out assertions for test_verify_correctly

* Comment out test_verify_correctly assertions and full test_eval_dicom_correctly test

* Adding assertions back into test_verify_correctly

* Commenting out last assertion in test_verify_correctly

* Reformatting to avoid use of all in assert

* Using frozen set comparison for final assert in test_verify_correctly

* Removing final assertion from test_verify_correctly while keeping test_eval_dicom_correctly in

* Commenting out act and assert in test_verify_correctly while keeping test_eval_dicom_correctly in

* Using module-level mock variables and moving act call to less lines in test_verify_correctly

* Removing all assertions but keeping other sections for both tests

* Adding back in first assertions for each test

* Removing all assertions except fist image type assertion in verify test

* Removing all assertions except image type assertion in test_eval_dicom_correctly

* Remove image type assertions but keep all other assertions in

* Remove image type assertions and all assertions for eval test

* Only keep final assertion in verify test

* Only keep the second assertion in verify and nothing else

* Only keep final assertion in eval test

* Enable all assertions and move helper methods above test methods

* Simplifying assertions

* Removing unused code now that we have simplified assertions

* Reverting back but simplifying asserts another way

* Removing eval integration test since unit test for that covers functionality

* Remvoing analyzer results assertion

* Removing unused import

---------

Co-authored-by: Sharon Hart <[email protected]>
  • Loading branch information
@niwilso @SharonHart
niwilso and SharonHart authored Jul 13, 2023
1 parent 0a4c76d commit 67833d5
Show file tree
Hide file tree
Showing 6 changed files with 412 additions and 67 deletions.
206 changes: 206 additions & 0 deletions NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1014,3 +1014,209 @@ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


*******
python-gdcm

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2022 Thiago Franco de Moraes

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
22 changes: 19 additions & 3 deletions presidio-image-redactor/Pipfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions presidio-image-redactor/presidio_image_redactor/dicom_image_redactor_engine.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,52 @@ def _set_bbox_color(

return box_color

@staticmethod
def _check_if_compressed(instance: pydicom.dataset.FileDataset) -> bool:
"""Check if the pixel data is compressed.
:param instance: DICOM instance.
:return: Boolean for whether the pixel data is compressed.
"""
# Calculate expected bytes
rows = instance.Rows
columns = instance.Columns
samples_per_pixel = instance.SamplesPerPixel
bits_allocated = instance.BitsAllocated
try:
number_of_frames = instance[0x0028, 0x0008].value
except KeyError:
number_of_frames = 1
expected_num_bytes = (rows * columns * number_of_frames
* samples_per_pixel * (bits_allocated/8))

# Compare expected vs actual
is_compressed = (int(expected_num_bytes)) > len(instance.PixelData)

return is_compressed

@staticmethod
def _compress_pixel_data(
instance: pydicom.dataset.FileDataset
) -> pydicom.dataset.FileDataset:
"""Recompress pixel data that was decompressed during redaction.
:param instance: Loaded DICOM instance.
:return: Instance with compressed pixel data.
"""
compression_method = pydicom.uid.RLELossless

# Temporarily change syntax to an "uncompressed" method
instance.file_meta.TransferSyntaxUID = pydicom.uid.UID('1.2.840.10008.1.2')

# Compress and update syntax
instance.compress(compression_method, encoding_plugin='gdcm')
instance.file_meta.TransferSyntaxUID = compression_method

return instance

@staticmethod
def _check_if_has_image_icon_sequence(
instance: pydicom.dataset.FileDataset
Expand Down Expand Up @@ -731,6 +777,10 @@ def _add_redact_box(
"""
# Copy instance
redacted_instance = deepcopy(instance)
is_compressed = cls._check_if_compressed(redacted_instance)
has_image_icon_sequence = cls._check_if_has_image_icon_sequence(
redacted_instance
)

# Select masking box color
is_greyscale = cls._check_if_greyscale(instance)
Expand All @@ -752,6 +802,13 @@ def _add_redact_box(

redacted_instance.PixelData = redacted_instance.pixel_array.tobytes()

# If original pixel data is compressed, recompress after redaction
if is_compressed or has_image_icon_sequence:
# Temporary "fix" to manually set all YBR photometric interp as YBR_FULL
if "YBR" in redacted_instance.PhotometricInterpretation:
redacted_instance.PhotometricInterpretation = "YBR_FULL"
redacted_instance = cls._compress_pixel_data(redacted_instance)

return redacted_instance

def _redact_single_dicom_image(
Expand Down
Loading

0 comments on commit 67833d5

Please sign in to comment.