qmenta-client 2.1.dev1515__py3-none-any.whl → 2.1.dev1517__py3-none-any.whl

qmenta/client/Project.py

@@ -257,20 +257,20 @@ class Project:
 
     def upload_file(
         self,
-        file_path,
-        subject_name,
-        ssid="",
-        date_of_scan="",
-        description="",
-        result=False,
-        name="",
-        input_data_type="qmenta_medical_image_data:3.11.3",
-        add_to_container_id=0,
-        chunk_size=2**24,  # Optimized for GCS Bucket Storage
-        max_retries=5,
-        split_data=False,
-        mock_response=None,
-    ):
+        file_path: str,
+        subject_name: str,
+        ssid: str = "",
+        date_of_scan: str = "",
+        description: str = "",
+        result: bool = False,
+        name: str = "",
+        input_data_type: str = "",
+        add_to_container_id: int = 0,
+        chunk_size: int = 2**24,  # Optimized for GCS Bucket Storage
+        max_retries: int = 5,
+        split_data: bool = False,
+        mock_response: Any = None,
+    ) -> bool:
         """
         Upload a ZIP file to the platform.
 
@@ -291,7 +291,8 @@ class Project:
         name : str
             Name of the file in the platform
         input_data_type : str
-            qmenta_medical_image_data:3.11
+            upload tool to be used, default is empty which means the Platform
+            will decide.
         add_to_container_id : int
             ID of the container to which this file should be added (if id > 0)
         chunk_size : int
@@ -459,7 +460,7 @@ class Project:
                 "The name of the file to download (file_name) should be of "
                 "type string."
             )
-        if not isinstance(local_filename, str):
+        if local_filename is not None and not isinstance(local_filename, str):
             raise ValueError(
                 "The name of the output file (local_filename) should be of "
                 "type string."
@@ -485,7 +486,6 @@ class Project:
             data=params,
             stream=True,
         ) as response, open(local_filename, "wb") as f:
-
             for chunk in response.iter_content(chunk_size=2**9 * 1024):
                 f.write(chunk)
             f.flush()
@@ -535,7 +535,7 @@ class Project:
 
         if files_not_in_container:
             msg = (
-                f"The following files are missing in container "
+                "The following files are missing in container "
                 f"{container_id}: {', '.join(files_not_in_container)}"
             )
             raise Exception(msg)
@@ -551,7 +551,6 @@ class Project:
             data=params,
             stream=True,
         ) as response, open(zip_name, "wb") as f:
-
             for chunk in response.iter_content(chunk_size=2**9 * 1024):
                 f.write(chunk)
             f.flush()
@@ -874,19 +873,17 @@ class Project:
         if len(items) != 2:
             raise ValueError(
                 f"The number of elements in items '{len(items)}' "
-                f"should be equal to two."
+                "should be equal to two."
             )
 
         if not all([isinstance(item, int) for item in items]):
-            raise ValueError(
-                f"All values in items " f"'{items}' must be integers"
-            )
+            raise ValueError(f"All values in items '{items}' must be integers")
 
         if search_criteria != {} and not all(
             [item.startswith("pars_") for item in search_criteria.keys()]
         ):
             raise ValueError(
-                f"All keys of the search_criteria dictionary "
+                "All keys of the search_criteria dictionary "
                 f"'{search_criteria.keys()}' must start with 'pars_'."
             )
 
@@ -946,7 +943,7 @@ class Project:
         except ValueError:
             raise ValueError(
                 f"'patient_id': '{patient_id}' not valid. Must be convertible "
-                f"to int."
+                "to int."
             )
 
         if not isinstance(tags, list) or not all(
@@ -977,7 +974,7 @@ class Project:
         if not (all(has_md_prefix) or not any(has_md_prefix)):
             raise ValueError(
                 f"metadata: '{metadata}' must be a dictionary whose keys are "
-                f"either all starting with 'md_' or none."
+                "either all starting with 'md_' or none."
             )
 
         metadata_keys = []
@@ -1279,7 +1276,7 @@ class Project:
         if not session_to_del:
             logger.error(
                 f"Session {subject_name}/{session_id} could not be found in "
-                f"this project."
+                "this project."
             )
             return False
         elif len(session_to_del) > 1:
@@ -1310,13 +1307,13 @@ class Project:
         except errors.PlatformError:
             logger.error(
                 f"Session \"{subject_name}/{session['ssid']}\" could "
-                f"not be deleted."
+                "not be deleted."
             )
             return False
 
         logger.info(
             f"Session \"{subject_name}/{session['ssid']}\" successfully "
-            f"deleted."
+            "deleted."
         )
         return True
 
@@ -1433,7 +1430,7 @@ class Project:
         if len(items) != 2:
             raise ValueError(
                 f"The number of elements in items '{len(items)}' "
-                f"should be equal to two."
+                "should be equal to two."
             )
         if not all(isinstance(item, int) for item in items):
             raise ValueError(
@@ -1662,7 +1659,7 @@ class Project:
                 ]
                 if any(excluded_bool):
                     raise Exception(
-                        f"p_n does not allow "
+                        "p_n does not allow "
                         f"characters {ANALYSIS_NAME_EXCLUDED_CHARACTERS}"
                     )
         else:
@@ -1740,7 +1737,7 @@ class Project:
         if len(items) != 2:
             raise ValueError(
                 f"The number of elements in items '{len(items)}' "
-                f"should be equal to two."
+                "should be equal to two."
             )
         if not all(isinstance(item, int) for item in items):
             raise ValueError(
@@ -1764,20 +1761,16 @@ class Project:
         for key in search_condition.keys():
             if key not in search_keys.keys():
                 raise Exception(
-                    (
-                        f"This key '{key}' is not accepted by this search "
-                        f"condition"
-                    )
+                    f"This key '{key}' is not accepted by this search "
+                    "condition"
                 )
             if (
                 not isinstance(search_condition[key], search_keys[key])
                 and search_condition[key] is not None
             ):
                 raise Exception(
-                    (
-                        f"The key {key} in the search condition is not type "
-                        f"{search_keys[key]}"
-                    )
+                    f"The key {key} in the search condition is not type "
+                    f"{search_keys[key]}"
                 )
             if "p_n" == key:
                 excluded_bool = [
@@ -2013,7 +2006,7 @@ class Project:
 
         if not res.ok:
             logger.error(
-                f"The log file could not be extracted for Analysis ID:"
+                "The log file could not be extracted for Analysis ID:"
                 f" {analysis_id}."
             )
             return False
@@ -2057,7 +2050,7 @@ class Project:
         except ValueError:
             raise ValueError(
                 f"analysis_id: '{analysis_id}' not valid. Must be convertible "
-                f"to int."
+                "to int."
             )
 
         try:
@@ -2075,7 +2068,7 @@ class Project:
             )
         except Exception:
             logger.error(
-                f"It was not possible to change the QC status of Analysis ID:"
+                "It was not possible to change the QC status of Analysis ID:"
                 f" {analysis_id}"
             )
             return False
@@ -2114,7 +2107,7 @@ class Project:
         except ValueError:
             raise ValueError(
                 f"'patient_id': '{patient_id}' not valid. Must be convertible"
-                f" to int."
+                " to int."
             )
 
         try:
@@ -2132,7 +2125,7 @@ class Project:
             )
         except Exception:
             logger.error(
-                f"It was not possible to change the QC status of Patient ID:"
+                "It was not possible to change the QC status of Patient ID:"
                 f" {patient_id}"
             )
             return False
@@ -2166,14 +2159,14 @@ class Project:
         except IndexError:
             # Handle the case where no matching analysis is found
             logging.error(
-                f"No analysis was found with such Analysis ID: "
+                "No analysis was found with such Analysis ID: "
                 f"'{analysis_id}'."
             )
             return False, False
         except Exception:
             # Handle other potential exceptions
             logging.error(
-                f"It was not possible to extract the QC status from Analysis "
+                "It was not possible to extract the QC status from Analysis "
                 f"ID: {analysis_id}"
             )
             return False, False
@@ -2340,7 +2333,7 @@ class Project:
 
         if "rules" not in res or project_has_no_rules:
             logger.error(
-                f"There was an error extracting the protocol adherence rules"
+                "There was an error extracting the protocol adherence rules"
                 f" from {self._project_name}."
             )
             logger.error(platform.parse_response(res))
@@ -2355,7 +2348,7 @@ class Project:
                 json.dump(res["rules"], fr, indent=4)
         except FileNotFoundError:
             logger.error(
-                f"Protocol adherence rules could not be exported to file: "
+                "Protocol adherence rules could not be exported to file: "
                 f"'{rules_file_path}'."
             )
             return False
@@ -2583,7 +2576,6 @@ class Project:
         )
 
         for qc_results in qc_results_list:
-
             # Count passed files distribution
             for rule in qc_results["passed"]:
                 num_files = len(rule["files"])
@@ -2618,17 +2610,15 @@ class Project:
         # Calculate condition failure percentages
         for condition in stats["condition_failure_rates"]:
             if total_failures > 0:
-                stats["condition_failure_rates"][condition]["percentage"] = (
-                    round(
-                        (
-                            stats["condition_failure_rates"][condition][
-                                "count"
-                            ]
-                            / total_failures
-                        )
-                        * 100,
-                        2,
+                stats["condition_failure_rates"][condition][
+                    "percentage"
+                ] = round(
+                    (
+                        stats["condition_failure_rates"][condition]["count"]
+                        / total_failures
                     )
+                    * 100,
+                    2,
                 )
 
         # Calculate rule success rates
@@ -2679,8 +2669,8 @@ class Project:
         logger = logging.getLogger(logger_name)
         if n_calls > call_limit:
             logger.error(
-                f"__handle_start_analysis_response called itself more\
-                          than {n_calls} times: aborting."
+                "__handle_start_analysis_response called itself more         "
+                f"                 than {n_calls} times: aborting."
             )
             return None
         response = None
@@ -2706,7 +2696,7 @@ class Project:
                     "requirements and parameter ignore_file_selection==True."
                 )
                 logger.error(
-                    f"Unable to start the analysis: "
+                    "Unable to start the analysis: "
                     f"{post_data['script_name']}:"
                     f"{post_data['version']} with input "
                     f"{post_data['as_input']}."
@@ -2775,7 +2765,7 @@ class Project:
         chosen_files = {}
         for settings_key in choose_data.data_to_choose:
             logger.warning(
-                f"Type next the file/s for the input with ID: "
+                "Type next the file/s for the input with ID: "
                 f"'{settings_key}'."
             )
             chosen_files[settings_key] = {}
@@ -2831,7 +2821,7 @@ class Project:
                         )
                         logger.error(
                             f"Selected: {len(names)} vs. "
-                            f"Number of files to select: "
+                            "Number of files to select: "
                             f"{number_of_files_to_select}."
                         )
                         logger.error("Cancelling analysis.")
@@ -2840,7 +2830,7 @@ class Project:
                     elif any([name not in save_file_ids for name in names]):
                         logger.error(
                             f"Some selected file/s '{', '.join(names)}' "
-                            f"do not exist. Cancelling analysis..."
+                            "do not exist. Cancelling analysis..."
                         )
                         post_data["cancel"] = "1"
                     else:
@@ -2992,7 +2982,7 @@ class Project:
                 modalities = value.split(";")[1].split(",")
                 if len(modalities) != 1:
                     raise ValueError(
-                        f"A file can only have one modality. "
+                        "A file can only have one modality. "
                         f"Provided Modalities: {', '.join(modalities)}."
                     )
                 modality = modalities[0]

{qmenta_client-2.1.dev1515.dist-info → qmenta_client-2.1.dev1517.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qmenta-client
-Version: 2.1.dev1515
+Version: 2.1.dev1517
 Summary: Python client lib to interact with the QMENTA platform.
 Author: QMENTA
 Author-email: dev@qmenta.com

{qmenta_client-2.1.dev1515.dist-info → qmenta_client-2.1.dev1517.dist-info}/RECORD

@@ -1,10 +1,10 @@
 qmenta/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 qmenta/client/Account.py,sha256=7oockGEJpbOfESCBXS4I5dWHP78CSJmW1c2F7abpwwY,9936
 qmenta/client/File.py,sha256=kEa6-a6jRz9QGoC186Pu1t6Thn5_XZ1PGrp-zAt1V0M,5440
-qmenta/client/Project.py,sha256=psABULftm8ky-7dACdjS3mi9iBBpVHONlzLK0cJc0l4,108357
+qmenta/client/Project.py,sha256=XHuEiwJf870MJpD2T5LI7BzBbmEVo2Pyv0oM5xN6prE,108271
 qmenta/client/Subject.py,sha256=madwhqFpz9su5OAynoLzIRQ6F1camzi6NOlbpWvs4Qk,8803
 qmenta/client/__init__.py,sha256=Mtqe4zf8n3wuwMXSALENQgp5atQY5VcsyXWs2hjBs28,133
 qmenta/client/utils.py,sha256=5DK2T_HQprrCwLS0Ycm2CjseaYmAUKaJkJvYoW-Rqzc,2479
-qmenta_client-2.1.dev1515.dist-info/METADATA,sha256=G_H6BASMyx68piDcYRu3ZCW4F1qd30OoDy9KTqxviAU,706
-qmenta_client-2.1.dev1515.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-qmenta_client-2.1.dev1515.dist-info/RECORD,,
+qmenta_client-2.1.dev1517.dist-info/METADATA,sha256=NqTundGCqwD14HwrccyeoklgF4wAaaup04I8v3ioTnU,706
+qmenta_client-2.1.dev1517.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+qmenta_client-2.1.dev1517.dist-info/RECORD,,