qmenta-client 1.1.dev1311__py3-none-any.whl → 1.1.dev1324__py3-none-any.whl

qmenta/client/Project.py

@@ -154,8 +154,8 @@ def wrap_search_criteria(search_criteria={}):
         'from pars_tags'
 
     file_metadata : Dict
-        Dictionary containing the file metadata of teh search criteria
-        exgtracted from 'pars_[dicom]_KEY'
+        Dictionary containing the file metadata of the search criteria
+        extracted from 'pars_[dicom]_KEY'
     """
 
     # The keys not included bellow apply to the whole session.
@@ -829,10 +829,12 @@ class Project:
         analysis = self.list_analysis(limit)
         return [{"name": a["name"], "id": a["out_container_id"]} for a in analysis]
 
-    def list_container_files(self, container_id):
+    def list_container_files(
+        self,
+        container_id,
+    ):
         """
         List the name of the files available inside a given container.
-
         Parameters
         ----------
         container_id : str or int
@@ -852,12 +854,73 @@ class Project:
         except errors.PlatformError as e:
             logging.getLogger(logger_name).error(e)
             return False
-
-        try:
-            return content["files"]
-        except KeyError:
+        if "files" not in content.keys():
             logging.getLogger(logger_name).error("Could not get files")
             return False
+        return content["files"]
+
+    def list_container_filter_files(
+        self,
+        container_id,
+        modality="",
+        metadata_info={},
+        tags=[]
+    ):
+        """
+        List the name of the files available inside a given container.
+        search condition example:
+        "metadata": {"SliceThickness":1},
+        }
+        Parameters
+        ----------
+        container_id : str or int
+            Container identifier.
+
+        modality: str
+            String containing the modality of the files being filtered
+
+        metadata_info: dict
+            Dictionary containing the file metadata of the files being filtered
+
+        tags: list[str]
+            List of strings containing the tags of the files being filtered
+
+        Returns
+        -------
+        selected_files: list[str]
+            List of file names (strings)
+        """
+        content_files = self.list_container_files(container_id)
+        content_meta = self.list_container_files_metadata(container_id)
+        selected_files = []
+        for index, file in enumerate(content_files):
+            metadata_file = content_meta[index]
+            tags_file = metadata_file.get("tags")
+            tags_bool = [tag in tags_file for tag in tags]
+            info_bool = []
+            if modality == "":
+                modality_bool = True
+            else:
+                modality_bool = modality == metadata_file["metadata"].get(
+                    "modality"
+                )
+            for key in metadata_info.keys():
+                meta_key = (
+                    (
+                        metadata_file.get("metadata") or {}
+                    ).get("info") or {}).get(
+                        key
+                    )
+                if meta_key is None:
+                    logging.getLogger(logger_name).warning(
+                        f"{key} is not in file_info from file {file}"
+                    )
+                info_bool.append(
+                    metadata_info[key] == meta_key
+                    )
+            if all(tags_bool) and all(info_bool) and modality_bool:
+                selected_files.append(file)
+        return selected_files
 
     def list_container_files_metadata(self, container_id):
         """

{qmenta_client-1.1.dev1311.dist-info → qmenta_client-1.1.dev1324.dist-info}/METADATA

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

{qmenta_client-1.1.dev1311.dist-info → qmenta_client-1.1.dev1324.dist-info}/RECORD

@@ -1,10 +1,10 @@
 qmenta/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 qmenta/client/Account.py,sha256=MEljEy9cmg2uP2FG1d3TZAgfj66EE2_3PQAZ9rvpCXY,9647
 qmenta/client/File.py,sha256=ZgvSqejIosUt4uoX7opUnPnp5XGEaJNMRwFC0mQVB8k,5344
-qmenta/client/Project.py,sha256=u2fGizvjr3uU9476m_tV0padhlKxqcSR7i2xp07jrps,68234
+qmenta/client/Project.py,sha256=9a6v7-H6BxU-2EykaWnFhW61GZijDB-XWsYzPdzWxz4,70398
 qmenta/client/Subject.py,sha256=lhxxVdQ6d-GNoQC8mrJwa4L1f44nJc4PcJtDspmKN7I,8756
 qmenta/client/__init__.py,sha256=AjTojBhZeW5nl0i605KS8S1Gl5tPNc1hdzD47BGNfoI,147
 qmenta/client/utils.py,sha256=5DK2T_HQprrCwLS0Ycm2CjseaYmAUKaJkJvYoW-Rqzc,2479
-qmenta_client-1.1.dev1311.dist-info/METADATA,sha256=7Zesw_sWgPMQYv9ByAllGzdmTCCQcQo4u-o4Q2EHyso,672
-qmenta_client-1.1.dev1311.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-qmenta_client-1.1.dev1311.dist-info/RECORD,,
+qmenta_client-1.1.dev1324.dist-info/METADATA,sha256=yDhr3jCEwhPFFSWqIdJUeaZtj10Y3GXyEbAq7fDj7UQ,672
+qmenta_client-1.1.dev1324.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+qmenta_client-1.1.dev1324.dist-info/RECORD,,