datamint 1.9.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

datamint/apihandler/root_api_handler.py

@@ -429,8 +429,21 @@ class RootAPIHandler(BaseAPIHandler):
 
         # Discard DICOM reports
         if discard_dicom_reports:
-            files_path = [f for f in files_path if not is_dicom_report(f)]
             old_size = len(files_path)
+            # Create filtered lists maintaining index correspondence
+            filtered_files = []
+            filtered_metadata = []
+            
+            for i, f in enumerate(files_path):
+                if not is_dicom_report(f):
+                    filtered_files.append(f)
+                    if metadata is not None:
+                        filtered_metadata.append(metadata[i])
+            
+            files_path = filtered_files
+            if metadata is not None:
+                metadata = filtered_metadata
+                
             if old_size is not None and old_size != len(files_path):
                 _LOGGER.info(f"Discarded {old_size - len(files_path)} DICOM report files from upload.")
 
@@ -1099,16 +1112,46 @@ class RootAPIHandler(BaseAPIHandler):
         """
         if isinstance(resource_ids, str):
             resource_ids = [resource_ids]
-        for rid in resource_ids:
-            url = f"{self._get_endpoint_url(RootAPIHandler.ENDPOINT_RESOURCES)}/{rid}"
-            request_params = {'method': 'DELETE',
-                              'url': url
-                              }
-            try:
-                self._run_request(request_params)
-            except ResourceNotFoundError as e:
-                e.set_params('resource', {'resource_id': rid})
-                raise e
+
+        async def _delete_all_resources_async():
+            async with aiohttp.ClientSession() as session:
+                tasks = [
+                    self._delete_resource_async(resource_id, session)
+                    for resource_id in resource_ids
+                ]
+                await asyncio.gather(*tasks)
+
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(_delete_all_resources_async())
+            
+    
+    async def _delete_resource_async(self,
+                                   resource_id: str,
+                                   session: aiohttp.ClientSession | None = None) -> None:
+        """
+        Asynchronously delete a resource by its unique id.
+
+        Args:
+            resource_id (str): The resource unique id.
+            session (aiohttp.ClientSession | None): The aiohttp session to use for the request.
+
+        Raises:
+            ResourceNotFoundError: If the resource does not exist.
+        """
+        if session is not None and not isinstance(session, aiohttp.ClientSession):
+            raise ValueError("session must be an aiohttp.ClientSession object.")
+
+        url = f"{self._get_endpoint_url(RootAPIHandler.ENDPOINT_RESOURCES)}/{resource_id}"
+        request_params = {
+            'method': 'DELETE',
+            'url': url
+        }
+
+        try:
+            await self._run_request_async(request_params, session)
+        except ResourceNotFoundError as e:
+            e.set_params('resource', {'resource_id': resource_id})
+            raise e
 
     def get_datasets(self) -> list[dict]:
         """

{datamint-1.9.0.dist-info → datamint-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamint
-Version: 1.9.0
+Version: 1.9.1
 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.9.0.dist-info → datamint-1.9.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ datamint/apihandler/api_handler.py,sha256=cdVSddrFCKlF_BJ81LO1aJ0OP49rssjpNEFzJ6
 datamint/apihandler/base_api_handler.py,sha256=GQuJS3FFjxPi-2vkJtbHeNKywoa-PWa3Qvw3NGRzxug,12206
 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=_vgIjqt7jb1yUkhyMez1Tg-vs4xmExby4TqWnfQG4OI,59320
+datamint/apihandler/root_api_handler.py,sha256=yrd1CL6am9a40mIQig8jil2X2LA8I_Np1SmY5_p1jtw,60864
 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=J62xBDTaLxwBFWDmuXhzgbmZfPWaAZLr7CKsbqgTI7U,31389
@@ -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.9.0.dist-info/METADATA,sha256=M1oMNcVYjTVV8tfZcxxcPFijib04QC8Zz9VBQLR7tXg,4100
-datamint-1.9.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-datamint-1.9.0.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
-datamint-1.9.0.dist-info/RECORD,,
+datamint-1.9.1.dist-info/METADATA,sha256=Lz98qJH8boR1qaI50NHESTLOHdVi6qMLZwyYDh8ZId8,4100
+datamint-1.9.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+datamint-1.9.1.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
+datamint-1.9.1.dist-info/RECORD,,