Contruct CIVData with dicom on serializers

Author: koopmant

app/grandchallenge/algorithms/serializers.py

@@ -22,6 +22,7 @@
     Job,
     annotate_input_output_counts,
 )
+from grandchallenge.cases.widgets import DICOMUploadWithName
 from grandchallenge.components.backends.exceptions import (
     CIVNotEditableException,
 )
@@ -310,35 +311,30 @@ def validate_inputs_and_return_matching_interface(self, *, inputs):
     @staticmethod
     def reformat_inputs(*, serialized_civs):
         """Takes serialized CIV data and returns list of CIVData objects."""
-        possible_keys = [
-            "image",
-            "value",
-            "file",
-            "user_upload",
-            "upload_session",
-        ]
 
         data = []
         for civ in serialized_civs:
-            found_keys = [
-                key for key in possible_keys if civ.get(key) is not None
-            ]
-
-            if not found_keys:
-                raise serializers.ValidationError(
-                    f"You must provide at least one of {possible_keys}"
-                )
-
-            if len(found_keys) > 1:
-                raise serializers.ValidationError(
-                    f"You can only provide one of {possible_keys} for each interface."
-                )
-
+            interface = civ["interface"]
+            upload_session = civ.get("upload_session")
+            user_upload = civ.get("user_upload")
+            image = civ.get("image")
+            value = civ.get("value")
+            user_uploads = civ.get("user_uploads")
+            image_name = civ.get("image_name")
+            dicom_upload_with_name = (
+                DICOMUploadWithName(name=image_name, user_uploads=user_uploads)
+                if user_uploads and image_name
+                else None
+            )
             try:
                 data.append(
                     CIVData(
-                        interface_slug=civ["interface"].slug,
-                        value=civ[found_keys[0]],
+                        interface_slug=interface.slug,
+                        value=upload_session
+                        or user_upload
+                        or image
+                        or value
+                        or dicom_upload_with_name,
                     )
                 )
             except ValidationError as e:

app/grandchallenge/components/serializers.py

@@ -6,6 +6,7 @@
 from rest_framework.relations import SlugRelatedField
 
 from grandchallenge.cases.models import Image, RawImageUploadSession
+from grandchallenge.cases.widgets import DICOMUploadWithName
 from grandchallenge.components.backends.exceptions import (
     CINotAllowedException,
     CIVNotEditableException,
@@ -279,14 +280,25 @@ def update(self, instance, validated_data):
 
         for value in values:
             interface = value["interface"]
-            upload_session = value.get("upload_session", None)
-            user_upload = value.get("user_upload", None)
-            image = value.get("image", None)
-            value = value.get("value", None)
+            upload_session = value.get("upload_session")
+            user_upload = value.get("user_upload")
+            image = value.get("image")
+            value = value.get("value")
+            user_uploads = value.get("user_uploads")
+            image_name = value.get("image_name")
+            dicom_upload_with_name = (
+                DICOMUploadWithName(name=image_name, user_uploads=user_uploads)
+                if user_uploads and image_name
+                else None
+            )
             civ_data_objects.append(
                 CIVData(
                     interface_slug=interface.slug,
-                    value=upload_session or user_upload or image or value,
+                    value=upload_session
+                    or user_upload
+                    or image
+                    or value
+                    or dicom_upload_with_name,
                 )
             )
         try: