Add CIVForObjectMixin.create_civ_for_dicom_image

Author: koopmant

app/grandchallenge/cases/migrations/0021_dicomimagesetupload_task_on_success.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.25 on 2025-10-09 18:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cases", "0020_remove_dicomimageset_image_frame_ids_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dicomimagesetupload",
+            name="task_on_success",
+            field=models.JSONField(
+                default=None,
+                editable=False,
+                help_text="Serialized task that is run on job success",
+                null=True,
+            ),
+        ),
+    ]

app/grandchallenge/cases/models.py

@@ -11,6 +11,7 @@
 from actstream.actions import follow
 from actstream.models import Follow
 from botocore.exceptions import ClientError
+from celery import signature
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, SuspiciousFileOperation
@@ -1063,6 +1064,12 @@ class DICOMImageSetUpload(UUIDModel):
     name = models.CharField(
         max_length=255, help_text="The name for the resulting Image instance"
     )
+    task_on_success = models.JSONField(
+        default=None,
+        null=True,
+        editable=False,
+        help_text="Serialized task that is run on job success",
+    )
 
     class Meta:
         verbose_name = "DICOM image set upload"
@@ -1287,6 +1294,7 @@ def handle_event(self, *, event):
         else:
             self.status = self.DICOMImageSetUploadStatusChoices.COMPLETED
             self.save()
+            self.execute_task_on_success()
         finally:
             self.delete_input_files()
 
@@ -1374,3 +1382,7 @@ def convert_image_set_to_internal(self, *, image_set_id):
         image = Image(dicom_image_set=dicom_image_set, name=self.name)
         image.full_clean()
         image.save()
+
+    def execute_task_on_success(self):
+        if self.task_on_success:
+            on_commit(signature(self.task_on_success).apply_async)

app/grandchallenge/components/models.py

@@ -36,7 +36,12 @@
 from django_extensions.db.fields import AutoSlugField
 from panimg.models import MAXIMUM_SEGMENTS_LENGTH
 
-from grandchallenge.cases.models import Image, ImageFile, RawImageUploadSession
+from grandchallenge.cases.models import (
+    DICOMImageSetUpload,
+    Image,
+    ImageFile,
+    RawImageUploadSession,
+)
 from grandchallenge.charts.specs import components_line
 from grandchallenge.components.backends.exceptions import (
     CINotAllowedException,
@@ -2241,8 +2246,8 @@ def file_civ(self):
         return self._file_civ
 
     @property
-    def image_name(self):
-        return self._image_name
+    def dicom_upload_with_name(self):
+        return self._dicom_upload_with_name
 
     def __init__(self, *, interface_slug, value):
         self._interface_slug = interface_slug
@@ -2253,7 +2258,7 @@ def __init__(self, *, interface_slug, value):
         self._user_upload = None
         self._user_upload_queryset = None
         self._file_civ = None
-        self._image_name = None
+        self._dicom_upload_with_name = None
 
         ci = ComponentInterface.objects.get(slug=interface_slug)
 
@@ -2288,8 +2293,7 @@ def _init_dicom_civ_data(self):
         from grandchallenge.cases.widgets import DICOMUploadWithName
 
         if isinstance(self._initial_value, DICOMUploadWithName):
-            self._user_upload_queryset = self._initial_value.user_uploads
-            self._image_name = self._initial_value.name
+            self._dicom_upload_with_name = self._initial_value
         else:
             ValidationError(
                 f"Unknown data type {type(self._initial_value)} for interface {self._interface_slug}"
@@ -2441,15 +2445,25 @@ def create_civ(self, *, civ_data, user=None, linked_task=None):
                 linked_task=linked_task,
             )
         elif ci.super_kind == ci.SuperKind.IMAGE:
-            return self.create_civ_for_image(
-                ci=ci,
-                current_civ=current_civ,
-                user=user,
-                image=civ_data.image,
-                upload_session=civ_data.upload_session,
-                user_upload_queryset=civ_data.user_upload_queryset,
-                linked_task=linked_task,
-            )
+            if ci.is_dicom_image_kind:
+                return self.create_civ_for_dicom_image(
+                    ci=ci,
+                    current_civ=current_civ,
+                    user=user,
+                    image=civ_data.image,
+                    dicom_upload_with_name=civ_data.dicom_upload_with_name,
+                    linked_task=linked_task,
+                )
+            else:
+                return self.create_civ_for_image(
+                    ci=ci,
+                    current_civ=current_civ,
+                    user=user,
+                    image=civ_data.image,
+                    upload_session=civ_data.upload_session,
+                    user_upload_queryset=civ_data.user_upload_queryset,
+                    linked_task=linked_task,
+                )
         elif ci.super_kind == ci.SuperKind.FILE:
             return self.create_civ_for_file(
                 ci=ci,
@@ -2567,6 +2581,77 @@ def create_civ_for_image(  # noqa: C901
                 ),
             )
 
+    def create_civ_for_dicom_image(
+        self,
+        ci,
+        current_civ,
+        user=None,
+        image=None,
+        dicom_upload_with_name=None,
+        linked_task=None,
+    ):
+        current_image = current_civ.image if current_civ else None
+
+        if image and current_image != image:
+            civ, created = ComponentInterfaceValue.objects.get_first_or_create(
+                interface=ci, image=image
+            )
+
+            if created:
+                try:
+                    civ.full_clean()
+                except ValidationError as e:
+                    civ.delete()
+                    error_handler = self.get_error_handler()
+                    error_handler.handle_error(
+                        interface=ci,
+                        error_message=format_validation_error_message(error=e),
+                        user=user,
+                    )
+                    return
+
+            self.remove_civ(civ=current_civ)
+            self.add_civ(civ=civ)
+
+            if linked_task is not None:
+                on_commit(signature(linked_task).apply_async)
+
+        elif dicom_upload_with_name:
+            from grandchallenge.cases.tasks import (
+                import_dicom_to_health_imaging,
+            )
+            from grandchallenge.components.tasks import (
+                add_dicom_image_set_to_object,
+            )
+
+            if not user:
+                raise RuntimeError(
+                    f"You need to provide a user along with the user upload "
+                    f"queryset for interface {ci}"
+                )
+            upload = DICOMImageSetUpload(
+                creator=user, name=dicom_upload_with_name.name
+            )
+            upload.task_on_success = add_dicom_image_set_to_object.signature(
+                kwargs={
+                    "app_label": self._meta.app_label,
+                    "model_name": self._meta.model_name,
+                    "object_pk": self.pk,
+                    "interface_pk": str(ci.pk),
+                    "dicom_image_set_upload_pk": upload.pk,
+                    "linked_task": linked_task,
+                },
+            )
+            upload.full_clean()
+            upload.save()
+            upload.user_uploads.set(dicom_upload_with_name.user_uploads)
+
+            on_commit(
+                import_dicom_to_health_imaging.signature(
+                    kwargs={"dicom_imageset_upload_pk": upload.pk}
+                ).apply_async
+            )
+
     def create_civ_for_file(
         self,
         *,