Also allow image/x-jls

Author: erikogabrielsson

src/dicomweb_client/web.py

@@ -1077,13 +1077,13 @@ def _http_get_multipart(
         default_media_type = '*/*'
         supported_media_types = {
             '1.2.840.10008.1.2.1': 'application/octet-stream',
-            '1.2.840.10008.1.2.5': ('image/x-dicom-rle', 'image/dicom-rle'),
+            '1.2.840.10008.1.2.5': ('image/dicom-rle', 'image/x-dicom-rle'),
             '1.2.840.10008.1.2.4.50': 'image/jpeg',
             '1.2.840.10008.1.2.4.51': 'image/jpeg',
             '1.2.840.10008.1.2.4.57': 'image/jpeg',
             '1.2.840.10008.1.2.4.70': 'image/jpeg',
-            '1.2.840.10008.1.2.4.80': 'image/jls',
-            '1.2.840.10008.1.2.4.81': 'image/jls',
+            '1.2.840.10008.1.2.4.80': ('image/jls', 'image/x-jls'),
+            '1.2.840.10008.1.2.4.81': ('image/jls', 'image/x-jls'),
             '1.2.840.10008.1.2.4.90': 'image/jp2',
             '1.2.840.10008.1.2.4.91': 'image/jp2',
             '1.2.840.10008.1.2.4.92': 'image/jpx',
@@ -1201,13 +1201,13 @@ def _http_get_multipart_image(
         """  # noqa: E501
         headers = {}
         supported_media_types = {
-            '1.2.840.10008.1.2.5': ('image/x-dicom-rle', 'image/dicom-rle'),
+            '1.2.840.10008.1.2.5': ('image/dicom-rle', 'image/x-dicom-rle'),
             '1.2.840.10008.1.2.4.50': 'image/jpeg',
             '1.2.840.10008.1.2.4.51': 'image/jpeg',
             '1.2.840.10008.1.2.4.57': 'image/jpeg',
             '1.2.840.10008.1.2.4.70': 'image/jpeg',
-            '1.2.840.10008.1.2.4.80': 'image/jls',
-            '1.2.840.10008.1.2.4.81': 'image/jls',
+            '1.2.840.10008.1.2.4.80': ('image/jls', 'image/x-jls'),
+            '1.2.840.10008.1.2.4.81': ('image/jls', 'image/x-jls'),
             '1.2.840.10008.1.2.4.90': 'image/jp2',
             '1.2.840.10008.1.2.4.91': 'image/jp2',
             '1.2.840.10008.1.2.4.92': 'image/jpx',

tests/test_web.py

@@ -880,22 +880,31 @@ def test_retrieve_instance_frames_jp2(httpserver, client, cache_dir):
     assert request.accept_mimetypes[0][0][:35] == headers['content-type'][:35]
 
 
-def test_retrieve_instance_frames_jls(httpserver, client, cache_dir):
+@pytest.mark.parametrize(
+    "media_type", ["image/dicom-rle", "image/x-dicom-rle"]
+)
+def test_retrieve_instance_frames_jls(
+    httpserver,
+    client,
+    cache_dir,
+    media_type
+):
     cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.jls'))
     with open(cache_filename, 'rb') as f:
         content = f.read()
-    headers = {
-        'content-type': 'multipart/related; type="image/jls"',
-    }
+    headers = {'content-type': f'multipart/related; type="{media_type}"',}
     httpserver.serve_content(content=content, code=200, headers=headers)
     study_instance_uid = '1.2.3'
     series_instance_uid = '1.2.4'
     sop_instance_uid = '1.2.5'
     frame_numbers = [114]
     frame_list = ','.join([str(n) for n in frame_numbers])
     result = client.retrieve_instance_frames(
-        study_instance_uid, series_instance_uid, sop_instance_uid,
-        frame_numbers, media_types=('image/jls', )
+        study_instance_uid,
+        series_instance_uid,
+        sop_instance_uid,
+        frame_numbers,
+        media_types=(media_type, )
     )
     assert list(result) == [content]
     request = httpserver.requests[0]
@@ -909,7 +918,7 @@ def test_retrieve_instance_frames_jls(httpserver, client, cache_dir):
     assert request.accept_mimetypes[0][0][:35] == headers['content-type'][:35]
 
 @pytest.mark.parametrize(
-        "media_type", ["image/dicom-rle", "image/x-dicom-rle"]
+    "media_type", ["image/dicom-rle", "image/x-dicom-rle"]
 )
 def test_retrieve_instance_frames_rle(
     httpserver,
@@ -920,9 +929,7 @@ def test_retrieve_instance_frames_rle(
     cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.rle'))
     with open(cache_filename, 'rb') as f:
         content = f.read()
-    headers = {
-        'content-type': f'multipart/related; type="{media_type}"',
-    }
+    headers = {'content-type': f'multipart/related; type="{media_type}"',}
     httpserver.serve_content(content=content, code=200, headers=headers)
     study_instance_uid = '1.2.3'
     series_instance_uid = '1.2.4'