Create add_dicom_image_set_to_object

Author: koopmant

app/grandchallenge/components/tasks.py

@@ -31,7 +31,12 @@
 from django.utils.timezone import now
 from panimg.models import SimpleITKImage
 
-from grandchallenge.cases.models import Image, ImageFile, RawImageUploadSession
+from grandchallenge.cases.models import (
+    DICOMImageSet,
+    Image,
+    ImageFile,
+    RawImageUploadSession,
+)
 from grandchallenge.components.backends.exceptions import (
     CIVNotEditableException,
     ComponentException,
@@ -1240,6 +1245,7 @@ def get_object(*, app_label, model_name, object_pk):
             )
     except (ArchiveItem.DoesNotExist, DisplaySet.DoesNotExist):
         logger.info(f"Nothing to do: {model_name} no longer exists.")
+        return None
 
 
 def add_civ_to_object(
@@ -1264,6 +1270,54 @@ def add_civ_to_object(
             return
 
 
+def add_image_to_object(
+    *,
+    image,
+    obj,
+    interface,
+    error_handler,
+    user,
+):
+    from grandchallenge.components.models import ComponentInterfaceValue
+
+    current_value = obj.get_current_value_for_interface(
+        interface=interface, user=user
+    )
+
+    civ, created = ComponentInterfaceValue.objects.get_first_or_create(
+        interface=interface, image=image
+    )
+
+    if created:
+        try:
+            civ.full_clean()
+        except ValidationError as e:
+            error_handler.handle_error(
+                interface=interface,
+                error_message=format_validation_error_message(error=e),
+                user=user,
+            )
+            logger.info(f"Validation failed: {e}")
+            return
+        except Exception as e:
+            error_handler.handle_error(
+                interface=interface,
+                error_message="An unexpected error occurred",
+                user=user,
+            )
+            logger.error(e, exc_info=True)
+            return
+
+    add_civ_to_object(
+        civ=civ,
+        obj=obj,
+        current_value=current_value,
+        error_handler=error_handler,
+        interface=interface,
+        user=user,
+    )
+
+
 @acks_late_micro_short_task(
     retry_on=(LockNotAcquiredException,), delayed_retry=False
 )
@@ -1277,10 +1331,7 @@ def add_panimg_image_to_object(
     upload_session_pk,
     linked_task=None,
 ):
-    from grandchallenge.components.models import (
-        ComponentInterface,
-        ComponentInterfaceValue,
-    )
+    from grandchallenge.components.models import ComponentInterface
 
     obj = get_object(
         app_label=app_label, model_name=model_name, object_pk=object_pk
@@ -1308,41 +1359,63 @@ def add_panimg_image_to_object(
         logger.info("Upload session should only have one image")
         return
 
-    current_value = obj.get_current_value_for_interface(
-        interface=interface, user=upload_session.creator
+    add_image_to_object(
+        image=image,
+        obj=obj,
+        interface=interface,
+        error_handler=error_handler,
+        user=upload_session.creator,
     )
 
-    civ, created = ComponentInterfaceValue.objects.get_first_or_create(
-        interface=interface, image=image
+    if linked_task is not None:
+        logger.info("Scheduling linked task")
+        on_commit(signature(linked_task).apply_async)
+    else:
+        logger.info("No linked task, task complete")
+
+
+@acks_late_micro_short_task(
+    retry_on=(LockNotAcquiredException,), delayed_retry=False
+)
+@transaction.atomic
+def add_dicom_image_set_to_object(
+    *,
+    app_label,
+    model_name,
+    object_pk,
+    interface_pk,
+    dicom_image_set_pk,
+    linked_task=None,
+):
+    from grandchallenge.components.models import ComponentInterface
+
+    obj = get_object(
+        app_label=app_label, model_name=model_name, object_pk=object_pk
     )
+    if not obj:
+        return
 
-    if created:
-        try:
-            civ.full_clean()
-        except ValidationError as e:
-            error_handler.handle_error(
-                interface=interface,
-                error_message=format_validation_error_message(error=e),
-                user=upload_session.creator,
-            )
-            logger.info(f"Validation failed: {e}")
-            return
-        except Exception as e:
-            error_handler.handle_error(
-                interface=interface,
-                error_message="An unexpected error occurred",
-                user=upload_session.creator,
-            )
-            logger.error(e, exc_info=True)
-            return
+    interface = ComponentInterface.objects.get(pk=interface_pk)
+    dicom_image_set = DICOMImageSet.objects.get(pk=dicom_image_set_pk)
+    error_handler = obj.get_error_handler()
 
-    add_civ_to_object(
-        civ=civ,
+    try:
+        image = Image.objects.get(dicom_image_set_pk=dicom_image_set_pk)
+    except Image.DoesNotExist:
+        error_handler.handle_error(
+            interface=interface,
+            error_message="Image does not exist",
+            user=dicom_image_set.dicom_image_set_upload.creator,
+        )
+        logger.info("Image for dicom image set does not exist")
+        return
+
+    add_image_to_object(
+        image=image,
         obj=obj,
-        current_value=current_value,
-        error_handler=error_handler,
         interface=interface,
-        user=upload_session.creator,
+        error_handler=error_handler,
+        user=dicom_image_set.dicom_image_set_upload.creator,
     )
 
     if linked_task is not None: