data_type

Author: antgonza

qiita_db/artifact.py

@@ -329,6 +329,16 @@ def create(
         qiita_db.artifact.Artifact
             A new instance of Artifact
 
+        Raises
+        ------
+        QiitaDBArtifactCreationError
+            If `filepaths` is not provided
+            If both `parents` and `prep_template` are provided
+            If none of `parents` and `prep_template` are provided
+            If `parents` is provided but `processing_parameters` is not
+            If both `prep_template` and `processing_parameters` is provided
+            If not all the artifacts in `parents` belong to the same study
+
         Notes
         -----
         The visibility of the artifact is set by default to `sandbox` if
@@ -344,29 +354,29 @@ def create(
             )
 
         # Check that the combination of parameters is correct
-        if bool(parents) and bool(prep_template):
-            raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: parents and prep_template provided"
-            )
-        elif bool(parents) and not bool(processing_parameters):
+        counts = (
+            int(bool(parents or processing_parameters))
+            + int(prep_template is not None)
+            + int(bool(analysis or data_type))
+        )
+        if counts != 1:
+            # More than one parameter has been provided
             raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: both parents and processing_parameters need to be provided"
+                "One and only one of parents, prep template or analysis must "
+                "be provided"
             )
-        elif bool(prep_template) and bool(processing_parameters):
+        elif bool(parents) != bool(processing_parameters):
+            # When provided, parents and processing parameters both should be
+            # provided (this is effectively doing an XOR)
             raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: both prep_template and processing_parameters provided"
+                "When provided, both parents and processing parameters should "
+                "be provided"
             )
         elif bool(analysis) and not bool(data_type):
+            # When provided, analysis and data_type both should be
+            # provided (this is effectively doing an XOR)
             raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: both analysis and data_type need to be provided"
-            )
-        elif bool(prep_template) and bool(data_type):
-            raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: both prep_template and data_type need to be provided"
-            )
-        elif not bool(prep_template) and not bool(parents) and not bool(analysis):
-            raise qdb.exceptions.QiitaDBArtifactCreationError(
-                "Not valid: no prep_template, parents or analysis provided"
+                "When provided, both analysis and data_type should be provided"
             )
 
         # There are three different ways of creating an Artifact, but all of

qiita_db/processing_job.py

@@ -1244,6 +1244,15 @@ def release(self):
                         parents = [
                             qdb.artifact.Artifact(aid) for aid in pvals["artifacts"]
                         ]
+                        # as this is going to be the first artifact of an analysis, we
+                        # need to provide the data type so we are going to make sure all
+                        # the parents data_types are the same and assing that one
+                        data_type = set([p.data_type for p in parents])
+                        if len(data_type) != 1:
+                            raise ValueError(
+                                f"Not valida parents data_types: {data_type}"
+                            )
+                        data_type = data_type.pop()
                 else:
                     analysis = None