feat: restructure sr/templates → package; add Supplement 247 TIDs 6001/6004/6005

src/highdicom/sr/__init__.py

@@ -33,10 +33,13 @@
 )
 from highdicom.sr.templates import (
     AlgorithmIdentification,
+    CircumpapillaryRNFLKeyMeasurements,
     DeviceObserverIdentifyingAttributes,
     ImageLibrary,
     ImageLibraryEntryDescriptors,
     LanguageOfContentItemAndDescendants,
+    MacularMeasurementsGroup,
+    MacularThicknessKeyMeasurements,
     Measurement,
     MeasurementProperties,
     MeasurementReport,
@@ -45,9 +48,12 @@
     NormalRangeProperties,
     ObserverContext,
     ObservationContext,
+    OphthalmologyMeasurementsGroup,
     PersonObserverIdentifyingAttributes,
     PlanarROIMeasurementsAndQualitativeEvaluations,
     QualitativeEvaluation,
+    RNFLClockfaceMeasurementsGroup,
+    RNFLSectorMeasurementsGroup,
     SubjectContext,
     SubjectContextDevice,
     SubjectContextFetus,
@@ -97,6 +103,7 @@
 
 __all__ = [
     'AlgorithmIdentification',
+    'CircumpapillaryRNFLKeyMeasurements',
     'CodeContentItem',
     'CodedConcept',
     'CompositeContentItem',
@@ -122,6 +129,8 @@
     'ImageRegion3D',
     'LanguageOfContentItemAndDescendants',
     'LongitudinalTemporalOffsetFromEvent',
+    'MacularMeasurementsGroup',
+    'MacularThicknessKeyMeasurements',
     'Measurement',
     'MeasurementProperties',
     'MeasurementReport',
@@ -131,11 +140,14 @@
     'NumContentItem',
     'ObservationContext',
     'ObserverContext',
+    'OphthalmologyMeasurementsGroup',
     'PersonObserverIdentifyingAttributes',
     'PixelOriginInterpretationValues',
     'PlanarROIMeasurementsAndQualitativeEvaluations',
     'PnameContentItem',
     'QualitativeEvaluation',
+    'RNFLClockfaceMeasurementsGroup',
+    'RNFLSectorMeasurementsGroup',
     'RealWorldValueMap',
     'ReferencedSegment',
     'ReferencedSegmentationFrame',

src/highdicom/sr/templates/__init__.py

@@ -0,0 +1,87 @@
+"""DICOM structured reporting templates.
+
+This package contains implementations of DICOM SR templates defined in
+DICOM PS3.16. Each sub-module covers one top-level template family:
+
+- :mod:`tid1500` — TID 1500 Measurement Report (general imaging measurements)
+- :mod:`tid2120` — Eyecare Measurement Templates (TID 2120, 2123, 2124),
+  ratified in DICOM PS3.16 2025b (formerly circulated as Supplement 247
+  draft TIDs 6001, 6004, 6005)
+"""
+
+# Re-export everything from tid1500 for backwards compatibility.
+# All names that were previously importable from highdicom.sr.templates
+# remain importable without change.
+from highdicom.sr.templates.tid1500 import (
+    AlgorithmIdentification,
+    DeviceObserverIdentifyingAttributes,
+    ImageLibrary,
+    ImageLibraryEntry,
+    ImageLibraryEntryDescriptors,
+    LanguageOfContentItemAndDescendants,
+    Measurement,
+    MeasurementProperties,
+    MeasurementReport,
+    MeasurementsAndQualitativeEvaluations,
+    MeasurementStatisticalProperties,
+    NormalRangeProperties,
+    ObserverContext,
+    ObservationContext,
+    PersonObserverIdentifyingAttributes,
+    PlanarROIMeasurementsAndQualitativeEvaluations,
+    QualitativeEvaluation,
+    SubjectContext,
+    SubjectContextDevice,
+    SubjectContextFetus,
+    SubjectContextSpecimen,
+    Template,
+    TimePointContext,
+    TrackingIdentifier,
+    VolumetricROIMeasurementsAndQualitativeEvaluations,
+)
+
+# Eyecare Measurement Templates (TID 2120, 2123, 2124)
+from highdicom.sr.templates.tid2120 import (
+    CircumpapillaryRNFLKeyMeasurements,
+    MacularMeasurementsGroup,
+    MacularThicknessKeyMeasurements,
+    OphthalmologyMeasurementsGroup,
+    RNFLClockfaceMeasurementsGroup,
+    RNFLSectorMeasurementsGroup,
+)
+
+__all__ = [
+    # TID 1500 family
+    "AlgorithmIdentification",
+    "DeviceObserverIdentifyingAttributes",
+    "ImageLibrary",
+    "ImageLibraryEntry",
+    "ImageLibraryEntryDescriptors",
+    "LanguageOfContentItemAndDescendants",
+    "Measurement",
+    "MeasurementProperties",
+    "MeasurementReport",
+    "MeasurementsAndQualitativeEvaluations",
+    "MeasurementStatisticalProperties",
+    "NormalRangeProperties",
+    "ObserverContext",
+    "ObservationContext",
+    "PersonObserverIdentifyingAttributes",
+    "PlanarROIMeasurementsAndQualitativeEvaluations",
+    "QualitativeEvaluation",
+    "SubjectContext",
+    "SubjectContextDevice",
+    "SubjectContextFetus",
+    "SubjectContextSpecimen",
+    "Template",
+    "TimePointContext",
+    "TrackingIdentifier",
+    "VolumetricROIMeasurementsAndQualitativeEvaluations",
+    # Eyecare Measurement Templates family
+    "OphthalmologyMeasurementsGroup",
+    "RNFLSectorMeasurementsGroup",
+    "RNFLClockfaceMeasurementsGroup",
+    "MacularMeasurementsGroup",
+    "CircumpapillaryRNFLKeyMeasurements",
+    "MacularThicknessKeyMeasurements",
+]