Fix missing public transfer syntaxes (#1047)

Author: scaramallion

pynetdicom/__init__.py

@@ -2,11 +2,24 @@
 
 import logging
 
+from pydicom._uid_dict import UID_dictionary
 from pydicom.uid import UID
 
 from ._version import __version__
 
 
+# fmt: off
+# Update pydicom's UID dictionary with any missing transfer syntaxes
+UID_dictionary.update(
+    {
+        '1.2.840.10008.1.2.4.110': ('JPEG XL Lossless', 'Transfer Syntax', '', '', 'JPEGXLLossless'),
+        '1.2.840.10008.1.2.4.111': ('JPEG XL JPEG Recompression', 'Transfer Syntax', '', '', 'JPEGXLJPEGRecompression'),
+        '1.2.840.10008.1.2.4.112': ('JPEG XL', 'Transfer Syntax', '', '', 'JPEGXL'),
+        '1.2.840.10008.1.2.8.1': ('Deflated Image Frame Compression', 'Transfer Syntax', '', '', 'DeflatedImageFrameCompression'),
+    }
+)
+# fmt: on
+
 _version = __version__.split(".")[:3]
 
 # UID prefix provided by https://www.medicalconnections.co.uk/Free_UID

pynetdicom/presentation.py

@@ -119,14 +119,7 @@ class PresentationContextTuple(NamedTuple):
         (False, True): CONTEXT_REJECTED,  # Invalid
     },
 }
-# Transfer Syntaxes not in pydicom v2.4
-_PYDICOM_ADDITIONS = [
-    "1.2.840.10008.1.2.4.201",  # HTJ2KLossless
-    "1.2.840.10008.1.2.4.202",  # HTJ2KLosslessRPCL
-    "1.2.840.10008.1.2.4.203",  # HTJ2K
-    "1.2.840.10008.1.2.4.204",  # JPIPHTJ2KReferenced
-    "1.2.840.10008.1.2.4.205",  # JPIPHTJ2KReferencedDeflate
-]
+
 
 class PresentationContext:
     """A Presentation Context primitive.
@@ -269,24 +262,17 @@ def add_transfer_syntax(self, syntax: None | str | bytes | UID) -> None:
             LOGGER.error("'transfer_syntax' contains an invalid UID")
             raise ValueError("'transfer_syntax' contains an invalid UID")
 
-        if syntax and not syntax.is_valid:
-            LOGGER.warning(f"The Transfer Syntax Name '{syntax}' is non-conformant")
-
-        # If the transfer syntax is rejected we may add an empty str
+        # If the transfer syntax is rejected we may receive an empty str
         if syntax not in self._transfer_syntax and syntax != "":
             if not syntax.is_valid:
                 LOGGER.warning(
-                    "A non-conformant UID has been added to 'transfer_syntax'"
+                    f"A non-conformant UID has been added to 'transfer_syntax': '{syntax}'"
                 )
 
-            if (
-                not syntax.is_private
-                and not syntax.is_transfer_syntax
-                and syntax not in _PYDICOM_ADDITIONS
-            ):
+            if not syntax.is_private and not syntax.is_transfer_syntax:
                 LOGGER.warning(
-                    "A UID has been added to 'transfer_syntax' that is not a "
-                    f"transfer syntax: '{syntax}'"
+                    "A UID has been added to 'transfer_syntax' that is not a known "
+                    f"public transfer syntax: '{syntax}'"
                 )
 
             self._transfer_syntax.append(syntax)

pynetdicom/tests/test_presentation.py

@@ -10,7 +10,7 @@
 from pydicom.uid import UID
 
 from pynetdicom import AE, _config
-from pynetdicom._globals import DEFAULT_TRANSFER_SYNTAXES
+from pynetdicom._globals import DEFAULT_TRANSFER_SYNTAXES, ALL_TRANSFER_SYNTAXES
 from pynetdicom.pdu_primitives import SCP_SCU_RoleSelectionNegotiation
 from pynetdicom.presentation import (
     build_context,
@@ -126,7 +126,7 @@ def test_add_transfer_syntax_nonconformant(self, caplog):
 
         pc.add_transfer_syntax("1.2.840.10008.1.1")
         assert (
-            "A UID has been added to 'transfer_syntax' that is not a "
+            "A UID has been added to 'transfer_syntax' that is not a known public "
             "transfer syntax" in caplog.text
         )
 
@@ -295,11 +295,12 @@ def test_abstract_syntax_nonconformant(self, caplog):
         msg = "Invalid 'abstract_syntax' value '1.4.1.' - UID is non-conformant"
         with pytest.raises(ValueError, match=msg):
             pc.abstract_syntax = UID("1.4.1.")
+
         assert pc.abstract_syntax is None
 
         _config.ENFORCE_UID_CONFORMANCE = False
-        pc.abstract_syntax = UID("1.4.1.")
 
+        pc.abstract_syntax = UID("1.4.1.")
         assert pc.abstract_syntax == UID("1.4.1.")
         assert isinstance(pc.abstract_syntax, UID)
 
@@ -433,6 +434,18 @@ def test_repr(self):
         cx = build_context("1.2.840.10008.1.1")
         assert "Verification SOP Class" == repr(cx)
 
+    def test_transfer_syntaxes_dont_warn(self, caplog):
+        """Test that all transfer syntaxes are known to pydicom"""
+        caplog.set_level(logging.WARNING, logger="pynetdicom.presentation")
+        for ts in ALL_TRANSFER_SYNTAXES:
+            cx = build_context("1.2.3", ts)
+
+        for ts in DEFAULT_TRANSFER_SYNTAXES:
+            cx = build_context("1.2.3", ts)
+
+        assert caplog.text == ""
+
+
 
 class TestNegotiateAsAcceptor:
     """Tests negotiation_as_acceptor."""