qmenta-client 0.11.dev1158__py3-none-any.whl → 0.11.dev1173__py3-none-any.whl

qmenta/client/Account.py

@@ -4,6 +4,7 @@ import logging
 from urllib3.exceptions import HTTPError
 
 from qmenta.core import platform
+from qmenta.core import errors
 
 from .Project import Project
 from .utils import load_json
@@ -67,7 +68,7 @@ class Account:
             auth = platform.Auth.login(
                 self.username, self.password, base_url=self.baseurl
             )
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logger.error('Failed to log in: {}'.format(e))
             self.auth = None
             raise
@@ -81,14 +82,14 @@ class Account:
 
         Raises
         ------
-        qmenta.core.platform.PlatformError
+        qmenta.core.errors.PlatformError
             When the logout was not successful
         """
 
         logger = logging.getLogger(logger_name)
         try:
             platform.parse_response(platform.post(self.auth, 'logout'))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logger.error('Logout was unsuccessful: {}'.format(e))
             raise
 
@@ -137,7 +138,7 @@ class Account:
             data = platform.parse_response(platform.post(
                 self.auth, 'projectset_manager/get_projectset_list'
             ))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logger.error('Failed to get project list: {}'.format(e))
             raise
 
@@ -189,7 +190,7 @@ class Account:
                     "users": "|".join(users)
                 }
             ))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logger.error(e)
             return False
 

qmenta/client/Project.py

@@ -10,6 +10,7 @@ import logging
 from enum import Enum
 
 from qmenta.core import platform
+from qmenta.core import errors
 
 from .Subject import Subject
 
@@ -138,7 +139,7 @@ class Project:
                 'projectset_manager/activate_project',
                 data={"project_id": int(project_id)}
             ))
-        except platform.PlatformError:
+        except errors.PlatformError:
             logger.error('Unable to activate the project.')
             return False
 
@@ -236,7 +237,7 @@ class Project:
             data = platform.parse_response(platform.post(
                 self._account.auth, 'patient_manager/module_config'
             ))
-        except platform.PlatformError:
+        except errors.PlatformError:
             logger.error("Could not retrieve metadata parameters.")
             return None
         return data['fields']
@@ -280,7 +281,7 @@ class Project:
                 'patient_manager/save_metadata_changes',
                 data=post_data
             ))
-        except platform.PlatformError:
+        except errors.PlatformError:
             answer = {}
 
         if title not in answer:
@@ -432,7 +433,7 @@ class Project:
                 self._account.auth, 'file_manager/get_container_files',
                 data={'container_id': container_id}
             ))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logging.getLogger(logger_name).error(e)
             return False
 
@@ -462,7 +463,7 @@ class Project:
                 self._account.auth, 'file_manager/get_container_files',
                 data={"container_id": container_id}
             ))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logging.getLogger(logger_name).error(e)
             return False
 
@@ -577,6 +578,7 @@ class Project:
         zip_name : str
             Name of the zip where the downloaded files are stored.
         """
+        logger = logging.getLogger(logger_name)
 
         files_in_container = self.list_container_files(container_id)
         files_not_in_container = filter(lambda f: f not in files_in_container,
@@ -586,11 +588,21 @@ class Project:
         if files_not_in_container:
             msg = "The following files are missing in container {}: {}".format(
                 container_id, ", ".join(files_not_in_container))
-            logging.getLogger(logger_name).error(msg)
+            logger.error(msg)
             return False
 
-        return self.download_file(container_id, ";".join(filenames),
-                                  zip_name, overwrite)
+        params = {"container_id": container_id, "files": ";".join(filenames)}
+        with platform.post(self._account.auth, 'file_manager/download_file',
+                           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()
+
+        logger.info("Files from container {} saved to {}".format(
+            container_id, zip_name))
+        return True
 
     def get_subject_id(self, subject_name, cache=False):
         """
@@ -664,7 +676,7 @@ class Project:
                 self._account.auth, 'patient_manager/upsert_patient',
                 data={"secret_name": subject.name}
             ))
-        except platform.PlatformError:
+        except errors.PlatformError:
             logger.error(
                 "Subject {} could not be created.".format(subject.name))
             return False
@@ -726,7 +738,7 @@ class Project:
                     "patient_id": str(int(session['_id'])), "delete_files": 1
                 }
             ))
-        except platform.PlatformError:
+        except errors.PlatformError:
             logger.error("Session '{}/{}' could not be deleted.".format(
                 subject_name, session['ssid']
             ))
@@ -981,7 +993,7 @@ class Project:
 
         try:
             platform.parse_response(response)
-        except platform.PlatformError as error:
+        except errors.PlatformError as error:
             logger.error(error)
             return False
 
@@ -1090,7 +1102,7 @@ class Project:
                 'file_manager/copy_container_to_another_project',
                 data=data
             ))
-        except platform.PlatformError as e:
+        except errors.PlatformError as e:
             logging.getLogger(logger_name).error(
                 'Couldn not copy container: {}'.format(e)
             )
@@ -1201,7 +1213,7 @@ class Project:
                 endpoint='analysis_manager/delete_analysis',
                 data={'project_id': analysis_id}
             ))
-        except platform.PlatformError as error:
+        except errors.PlatformError as error:
             logger.error('Could not delete analysis: {}'.format(error))
             return False
 

{qmenta_client-0.11.dev1158.dist-info → qmenta_client-0.11.dev1173.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qmenta-client
-Version: 0.11.dev1158
+Version: 0.11.dev1173
 Summary: Python client lib to interact with the QMENTA platform.
 Home-page: https://www.qmenta.com/
 Author: QMENTA
@@ -14,4 +14,4 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: future (>=0.18.2,<0.19.0)
-Requires-Dist: qmenta-core (>=1.0,<1.1)
+Requires-Dist: qmenta-core (>=3.0.1,<3.1.0)

qmenta_client-0.11.dev1173.dist-info/RECORD

@@ -0,0 +1,9 @@
+qmenta/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
+qmenta/client/Account.py,sha256=J4NI9YxlhAvNkAQjdEegiQRrzZsOkGgXbaPG4qX_GI0,9511
+qmenta/client/Project.py,sha256=3Jm_1BRXirqe-LKqugmbw6c519TMspnulwLZJjB13f4,43788
+qmenta/client/Subject.py,sha256=azcLeYKO8KTLq-dn0CNvhD9XN1tGjAXZS3lFZcFHDuc,8713
+qmenta/client/__init__.py,sha256=AjTojBhZeW5nl0i605KS8S1Gl5tPNc1hdzD47BGNfoI,147
+qmenta/client/utils.py,sha256=er8BT64WBbNYj4FysI1Mx3ZqHkOGCZPIMGcZeFDysrA,487
+qmenta_client-0.11.dev1173.dist-info/METADATA,sha256=jr7LNIsUO83K2nbvXTKW_NwvFKlaJIp1WepGyIDCJVQ,658
+qmenta_client-0.11.dev1173.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+qmenta_client-0.11.dev1173.dist-info/RECORD,,

qmenta_client-0.11.dev1158.dist-info/RECORD

@@ -1,9 +0,0 @@
-qmenta/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
-qmenta/client/Account.py,sha256=LhUqPcB_GNGNffPJeZ6QyfLlEmbVHts1JHxITLAwE1M,9490
-qmenta/client/Project.py,sha256=XvxFwPFPQZnqmQ6bbL_wvue9LmQ3iImxCuxWf-XOzHQ,43363
-qmenta/client/Subject.py,sha256=azcLeYKO8KTLq-dn0CNvhD9XN1tGjAXZS3lFZcFHDuc,8713
-qmenta/client/__init__.py,sha256=AjTojBhZeW5nl0i605KS8S1Gl5tPNc1hdzD47BGNfoI,147
-qmenta/client/utils.py,sha256=er8BT64WBbNYj4FysI1Mx3ZqHkOGCZPIMGcZeFDysrA,487
-qmenta_client-0.11.dev1158.dist-info/METADATA,sha256=7buIS8z0zp7b5Vx4KCx7aPlQ142G0MNH0oLpdEoes8M,654
-qmenta_client-0.11.dev1158.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-qmenta_client-0.11.dev1158.dist-info/RECORD,,