Check for number of images in ds update task (#2537)

Author: MikeOver1

app/grandchallenge/reader_studies/tasks.py

@@ -2,7 +2,8 @@
 from django.conf import settings
 from django.db import transaction
 
-from grandchallenge.cases.models import Image
+from grandchallenge.algorithms.exceptions import ImageImportError
+from grandchallenge.cases.models import Image, RawImageUploadSession
 from grandchallenge.components.models import (
     ComponentInterface,
     ComponentInterfaceValue,
@@ -49,12 +50,23 @@ def add_scores_for_display_set(*, instance_pk, ds_pk):
             add_score(instance, ground_truth.answer)
 
 
-@shared_task(**settings.CELERY_TASK_DECORATOR_KWARGS["acks-late-micro-short"])
+@shared_task(
+    **settings.CELERY_TASK_DECORATOR_KWARGS["acks-late-micro-short"],
+    throws=(ImageImportError,),
+)
 def add_image_to_display_set(
     *, upload_session_pk, display_set_pk, interface_pk
 ):
     display_set = DisplaySet.objects.get(pk=display_set_pk)
-    image = Image.objects.get(origin_id=upload_session_pk)
+    upload_session = RawImageUploadSession.objects.get(pk=upload_session_pk)
+    try:
+        image = Image.objects.get(origin_id=upload_session_pk)
+    except (Image.DoesNotExist, Image.MultipleObjectsReturned):
+        error_message = "Image imports should result in a single image"
+        upload_session.status = RawImageUploadSession.FAILURE
+        upload_session.error_message = error_message
+        upload_session.save()
+        raise ImageImportError(error_message)
     interface = ComponentInterface.objects.get(pk=interface_pk)
     with transaction.atomic():
         display_set.values.remove(

app/tests/reader_studies_tests/test_tasks.py

@@ -1,11 +1,22 @@
 import pytest
 
-from grandchallenge.components.models import ComponentInterface
+from grandchallenge.algorithms.exceptions import ImageImportError
+from grandchallenge.cases.models import RawImageUploadSession
+from grandchallenge.components.models import (
+    ComponentInterface,
+    ComponentInterfaceValue,
+)
 from grandchallenge.reader_studies.tasks import (
+    add_image_to_display_set,
     create_display_sets_for_upload_session,
 )
+from tests.cases_tests.factories import RawImageUploadSessionFactory
+from tests.components_tests.factories import ComponentInterfaceFactory
 from tests.factories import ImageFactory
-from tests.reader_studies_tests.factories import ReaderStudyFactory
+from tests.reader_studies_tests.factories import (
+    DisplaySetFactory,
+    ReaderStudyFactory,
+)
 
 
 @pytest.mark.django_db
@@ -33,3 +44,48 @@ def test_create_display_sets_for_upload_session():
 
     assert rs.display_sets.count() == 1
     assert rs.display_sets.first().values.first().image == image
+
+
+@pytest.mark.django_db
+def test_add_image_to_display_set(settings):
+    settings.task_eager_propagates = (True,)
+    settings.task_always_eager = (True,)
+
+    ds = DisplaySetFactory()
+    us = RawImageUploadSessionFactory()
+    ci = ComponentInterfaceFactory()
+
+    error_message = "Image imports should result in a single image"
+
+    with pytest.raises(ImageImportError):
+        add_image_to_display_set(
+            upload_session_pk=us.pk,
+            display_set_pk=ds.pk,
+            interface_pk=ci.pk,
+        )
+    assert ComponentInterfaceValue.objects.filter(interface=ci).count() == 0
+    us.refresh_from_db()
+    assert us.status == RawImageUploadSession.FAILURE
+    assert us.error_message == error_message
+
+    im1, im2 = ImageFactory.create_batch(2, origin=us)
+
+    with pytest.raises(ImageImportError):
+        add_image_to_display_set(
+            upload_session_pk=us.pk,
+            display_set_pk=ds.pk,
+            interface_pk=ci.pk,
+        )
+    assert ComponentInterfaceValue.objects.filter(interface=ci).count() == 0
+    us.refresh_from_db()
+    assert us.status == RawImageUploadSession.FAILURE
+    assert us.error_message == error_message
+
+    im2.delete()
+
+    add_image_to_display_set(
+        upload_session_pk=us.pk,
+        display_set_pk=ds.pk,
+        interface_pk=ci.pk,
+    )
+    assert ComponentInterfaceValue.objects.filter(interface=ci).count() == 1