Reduce number of sample images

The sample images will be packaged in every deploy, we can reduce the archive size by including an example for each view position and flip them to represent both lateralities.

Author: steventux

sample_images/RCC.jpg

@@ -27,18 +27,19 @@
 logger = logging.getLogger(__name__)
 
 
-MWL_DB_PATH = os.getenv("MWL_DB_PATH", "/var/lib/pacs/worklist.db")
-PACS_DB_PATH = os.getenv("PACS_DB_PATH", "/var/lib/pacs/pacs.db")
+DICOM_LATERALITIES = ["L", "R"]
+DICOM_VIEWS = ["CC", "MLO"]
+EMULATED_PROCEDURE_DURATION_SECONDS = int(os.getenv("EMULATED_PROCEDURE_DURATION_SECONDS", "5"))
+MODALITY = "MG"
 MWL_AET = os.getenv("MWL_AET", "SCREENING_MWL")
+MWL_DB_PATH = os.getenv("MWL_DB_PATH", "/var/lib/pacs/worklist.db")
 MWL_HOST = os.getenv("MWL_HOST", "localhost")
 MWL_PORT = int(os.getenv("MWL_PORT", "4243"))
 PACS_AET = os.getenv("PACS_AET", "SCREENING_PACS")
+PACS_DB_PATH = os.getenv("PACS_DB_PATH", "/var/lib/pacs/pacs.db")
 PACS_HOST = os.getenv("PACS_HOST", "localhost")
 PACS_PORT = int(os.getenv("PACS_PORT", "4244"))
-DICOM_LATERALITIES = ["L", "R"]
-DICOM_VIEWS = ["CC", "MLO"]
 SAMPLE_IMAGES_PATH = os.getenv("SAMPLE_IMAGES_PATH", "/app/sample_images")
-EMULATED_PROCEDURE_DURATION_SECONDS = int(os.getenv("EMULATED_PROCEDURE_DURATION_SECONDS", "5"))
 
 
 class DicomExample:
@@ -58,8 +59,10 @@ def generate_dicom(self) -> Dataset:
             logger.error("No dataset provided for DICOM generation")
             return ds
 
-        img_path = f"{SAMPLE_IMAGES_PATH}/{self.laterality}{self.view}.jpg"
+        img_path = f"{SAMPLE_IMAGES_PATH}/L{self.view}.jpg"
         img = Image.open(img_path).convert("L")
+        if self.laterality == "R":
+            img = img.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
         columns, rows = img.size
         pixel_array = np.array(img, dtype=np.uint8)
         pixel_bytes = pixel_array.tobytes()
@@ -98,7 +101,7 @@ def generate_dicom(self) -> Dataset:
         ds.StudyID = f"STUDY{self.study_instance_uid[-8:]}"
         ds.SeriesInstanceUID = generate_uid()
         ds.SeriesNumber = self.series_number
-        ds.Modality = "MG"
+        ds.Modality = MODALITY
         ds.InstanceNumber = 1
         ds.file_meta = file_meta
 
@@ -170,9 +173,9 @@ def c_find_dataset(self) -> Dataset:
         date_today = datetime.date.today()
         ds = Dataset()
         sps_dataset = Dataset()
-        sps_dataset.Modality = "MG"
+        sps_dataset.Modality = MODALITY
         sps_dataset.ScheduledProcedureStepStartDate = date_today.strftime("%Y%m%d")
-        sps_dataset.ScheduledProcedureStepStartTime = "080000-"
+        sps_dataset.ScheduledProcedureStepStartTime = "000000-"
         ds.ScheduledProcedureStepSequence = [sps_dataset]
         return ds
 

sample_images/RMLO.jpg

@@ -104,7 +104,8 @@ def test_process_worklist_items_sends_all_dicoms(
         pending_status,
         success_status,
     ):
-        mock_generate_uid.return_value = "1.2.3.study"  # gitleaks: ignore
+        study_instance_uid = generate_uid()
+        mock_generate_uid.return_value = study_instance_uid
 
         mwl_storage = MagicMock()
 
@@ -135,6 +136,11 @@ def test_process_worklist_items_sends_all_dicoms(
 
         emulator.process_worklist_items(ae)
 
+        mock_dicom_example.assert_any_call(ds, "L", "CC", study_instance_uid, 1)
+        mock_dicom_example.assert_any_call(ds, "L", "MLO", study_instance_uid, 2)
+        mock_dicom_example.assert_any_call(ds, "R", "CC", study_instance_uid, 3)
+        mock_dicom_example.assert_any_call(ds, "R", "MLO", study_instance_uid, 4)
+
         expected_send_count = len(DICOM_LATERALITIES) * len(DICOM_VIEWS)
 
         assert mwl_assoc.send_c_find.call_count == 1