datamint 1.7.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

datamint/apihandler/root_api_handler.py

@@ -364,6 +364,34 @@ class RootAPIHandler(BaseAPIHandler):
 
         return result[0]
 
+    @staticmethod
+    def _is_dicom_report(file_path: str | IO) -> bool:
+        """
+        Check if a DICOM file is a report (e.g., Structured Report).
+        
+        Args:
+            file_path: Path to the DICOM file or file-like object.
+            
+        Returns:
+            bool: True if the DICOM file is a report, False otherwise.
+        """
+        try:
+            if not is_dicom(file_path):
+                return False
+            
+            ds = pydicom.dcmread(file_path, stop_before_pixels=True)
+            if hasattr(file_path, 'seek'):
+                file_path.seek(0)
+            modality = getattr(ds, 'Modality', None)
+            
+            # Common report modalities
+            report_modalities = {'SR', 'DOC', 'KO', 'PR', 'ESR'}  # SR=Structured Report, DOC=Document, KO=Key Object, PR=Presentation State
+            
+            return modality in report_modalities
+        except Exception as e:
+            _LOGGER.warning(f"Error checking if DICOM is a report: {e}")
+            return False
+
     def upload_resources(self,
                          files_path: str | IO | Sequence[str | IO] | pydicom.dataset.Dataset,
                          mimetype: Optional[str] = None,
@@ -379,7 +407,8 @@ class RootAPIHandler(BaseAPIHandler):
                          transpose_segmentation: bool = False,
                          modality: Optional[str] = None,
                          assemble_dicoms: bool = True,
-                         metadata: list[str | dict | None] | dict | str | None = None
+                         metadata: list[str | dict | None] | dict | str | None = None,
+                         discard_dicom_reports: bool = True
                          ) -> list[str | Exception] | str | Exception:
         """
         Upload resources.
@@ -416,6 +445,17 @@ class RootAPIHandler(BaseAPIHandler):
             list[str | Exception]: A list of resource IDs or errors.
         """
 
+        if discard_dicom_reports:
+            if isinstance(files_path, (str, Path)):
+                files_path = [files_path]
+            elif isinstance(files_path, pydicom.dataset.Dataset):
+                files_path = [files_path]
+
+            old_size = len(files_path)
+            files_path = [f for f in files_path if not RootAPIHandler._is_dicom_report(f)]
+            if old_size != len(files_path):
+                _LOGGER.info(f"Discarded {old_size - len(files_path)} DICOM report files from upload.")
+
         if on_error not in ['raise', 'skip']:
             raise ValueError("on_error must be either 'raise' or 'skip'")
 

{datamint-1.7.0.dist-info → datamint-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamint
-Version: 1.7.0
+Version: 1.7.2
 Summary: A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows.
 Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3

{datamint-1.7.0.dist-info → datamint-1.7.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ datamint/apihandler/api_handler.py,sha256=cdVSddrFCKlF_BJ81LO1aJ0OP49rssjpNEFzJ6
 datamint/apihandler/base_api_handler.py,sha256=dWLiowyuP1XiGfNc-_D5oQSmJdfR0Quy0ToeJlkRA8s,11911
 datamint/apihandler/dto/annotation_dto.py,sha256=qId1RK1VO7dXrvGJ7dqJ31jBQB7Z8yy5x0tLSiMxTB4,7105
 datamint/apihandler/exp_api_handler.py,sha256=hFUgUgBc5rL7odK7gTW3MnrvMY1pVfJUpUdzRNobMQE,6226
-datamint/apihandler/root_api_handler.py,sha256=qedldmtt0oNFoaxyMAskd0A5Uy-6KsuPd7Jl1jKHpGY,55450
+datamint/apihandler/root_api_handler.py,sha256=iwSTqBlgG0DMD052CwiPkfvLUXJIx8teGXPZzIYpNVQ,57063
 datamint/client_cmd_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamint/client_cmd_tools/datamint_config.py,sha256=md7dnWrbl10lPtXKbmD9yo6onLJsajeG8Vz0ZWH1v4M,8181
 datamint/client_cmd_tools/datamint_upload.py,sha256=890USkrtaH23mNjTRYVHWce2q9jSmkUNHIP_e8fnJRM,29502
@@ -22,7 +22,7 @@ datamint/logging.yaml,sha256=a5dsATpul7QHeUHB2TjABFjWaPXBMbO--dgn8GlRqwk,483
 datamint/utils/logging_utils.py,sha256=DvoA35ATYG3JTwfXEXYawDyKRfHeCrH0a9czfkmz8kM,1851
 datamint/utils/torchmetrics.py,sha256=lwU0nOtsSWfebyp7dvjlAggaqXtj5ohSEUXOg3L0hJE,2837
 datamint/utils/visualization.py,sha256=yaUVAOHar59VrGUjpAWv5eVvQSfztFG0eP9p5Vt3l-M,4470
-datamint-1.7.0.dist-info/METADATA,sha256=GWsxt2qSpYc64h5DbgScsg7w-FRy1_35Gi38TJrRLOE,4090
-datamint-1.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-datamint-1.7.0.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
-datamint-1.7.0.dist-info/RECORD,,
+datamint-1.7.2.dist-info/METADATA,sha256=XXJRyuBh70SbkAEX1p2ncW7zHQsgASp3b8OMVxlheLQ,4090
+datamint-1.7.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+datamint-1.7.2.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
+datamint-1.7.2.dist-info/RECORD,,