Add dicom back to response spec

Author: idenc

README.md

@@ -10,6 +10,18 @@ The SDK helps you containerize your model into a Flask app with a predefined API
   - [The healthcheck endpoint](#the-healthcheck-endpoint)
   - [Handling an inference request](#handling-an-inference-request)
     - [Standard model outputs](#standard-model-outputs)
+      - [Bounding box](#bounding-box)
+      - [Classification labels (and other additional information)](#classification-labels-and-other-additional-information)
+      - [Segmentation masks](#segmentation-masks)
+        - [Probability mask for 3D Series](#probability-mask-for-3d-series)
+        - [Boolean mask for 3D Series](#boolean-mask-for-3d-series)
+        - [Heatmaps for 3D series](#heatmaps-for-3d-series)
+        - [Heatmaps for 2D series (e.g. X-Rays)](#heatmaps-for-2d-series-eg-x-rays)
+        - [Numeric label mask for 3D series](#numeric-label-mask-for-3d-series)
+      - [Linear measurements](#linear-measurements)
+      - [Secondary capture support](#secondary-capture-support)
+      - [DICOM structured report](#dicom-structured-report)
+      - [Returning DICOM conformance errors](#returning-dicom-conformance-errors)
     - [Request JSON format](#request-json-format)
   - [Build and run the mock inference service container](#build-and-run-the-mock-inference-service-container)
     - [Adding GPU support](#adding-gpu-support)
@@ -358,7 +370,7 @@ For an example, the `write_dataset_to_bytes` function on [this Pydicom help page
 
 ##### DICOM structured report
 
-If your model returns a DICOM Structured Report then do the same as for secondary captures explained in the previous section, just change `'binary_type'` to `'dicom_structured_report'`.
+If your model returns a DICOM Structured Report then do the same as for secondary captures explained in the previous section, just change `'binary_type'` to `'dicom'`.
 
 ##### Returning DICOM conformance errors
 

inference-test-tool/run.py

@@ -32,7 +32,7 @@
 def save_secondary_captures(json_response, output_folder_path, multipart_data):
     secondary_capture_parts = [
         p for p in json_response['parts'] if p['binary_type'] in
-        ['dicom_structured_report', 'dicom_secondary_capture']
+        ['dicom', 'dicom_structured_report', 'dicom_secondary_capture']
     ]
 
     # Create DICOM files for secondary capture outputs

inference-test-tool/utils.py

@@ -11,7 +11,7 @@
 import SimpleITK as sitk
 from PIL import Image
 
-DICOM_BINARY_TYPES = {'dicom_secondary_capture', 'dicom_structured_report'}
+DICOM_BINARY_TYPES = {'dicom_secondary_capture', 'dicom', 'dicom_structured_report'}
 
 class DCM_Image:
     def __init__(self, dcm, path):

tests/test_secondary_capture.py

@@ -40,7 +40,7 @@ def testOutputFiles(self):
         output_files = os.listdir(output_folder_path)
         count_masks = len([f for f in output_files if f.startswith("sc_")])
         secondary_capture_parts = [p for p in data["parts"] if p['binary_type']
-                                   in {'dicom_secondary_capture', 'dicom_structured_report'}]
+                                   in {'dicom_secondary_capture', 'dicom', 'dicom_structured_report'}]
         self.assertEqual(count_masks, len(secondary_capture_parts))
 
         # Read and verify output secondary capture dicom files