new 'endpoint' arg to upload_files_dicom_web

Author: amazy

orthanc_api_client/api_client.py

@@ -244,8 +244,8 @@ def upload_folder_return_details(self, folder_path: str, unzip_before_upload: bo
 
         return dicom_ids_set, orthanc_ids_set, rejected_files_list
 
-    def upload_files_dicom_web(self, paths: List[str], ignore_errors: bool = False) -> any:
-        """Uploads a file to Orthanc through its DicomWeb API (only DICOM files, no zip files)
+    def upload_files_dicom_web(self, paths: List[str], ignore_errors: bool = False, endpoint: str = "dicom-web/studies") -> any:
+        """Uploads files to Orthanc through its DicomWeb API (only DICOM files, no zip files)
 
         Parameters
         ----------
@@ -262,7 +262,7 @@ def upload_files_dicom_web(self, paths: List[str], ignore_errors: bool = False)
                 counter += 1
 
         body, content_type = encode_multipart_related(fields=files)
-        r = self.post(endpoint="dicom-web/studies",
+        r = self.post(endpoint=endpoint,
                       data=body,
                       headers = {
                           'Accept':'application/json',

release-notes.md

@@ -1,4 +1,7 @@
- 
+v 0.18.5
+========
+
+- New `endpoint` argument to `upload_files_dicom_web` method.
 - #7: fix wrong exception handling 
 
 v 0.18.4

setup.py

@@ -28,7 +28,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version='0.18.4',  # Required
+    version='0.18.5',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:

tests/test_api_client.py

@@ -259,10 +259,18 @@ def test_upload_folder_return_details_error_case(self):
 
     def test_upload_file_dicom_web(self):
         self.oa.delete_all_content()
-
         self.oa.upload_files_dicom_web([here / "stimuli/CT_small.dcm"])
+        self.assertEqual(1, len(self.oa.studies.get_all_ids()))
+
+
+    def test_upload_file_dicom_web_study_level(self):
+        self.oa.delete_all_content()
+
+        self.oa.upload_files_dicom_web([here / "stimuli/MR/Brain/1/IM0"])
+        self.oa.upload_files_dicom_web([here / "stimuli/MR/Brain/1/IM1"], endpoint="dicom-web/studies/2.16.840.1.113669.632.20.1211.10000357775")
 
         self.assertEqual(1, len(self.oa.studies.get_all_ids()))
+        self.assertEqual(2, len(self.oa.instances.get_all_ids()))
 
 
     def test_generate_and_upload_test_file_find_study(self):