Clean upload session object created in task (#4363)

Also change `error_message` text field to allow blank but not null.

Author: koopmant

app/grandchallenge/cases/migrations/0022_auto_20251021_1014.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.25 on 2025-10-21 10:14
+
+from django.db import migrations
+
+
+def replace_error_message_none_values(apps, _schema_editor):
+    RawImageUploadSession = apps.get_model(  # noqa: N806
+        "cases", "RawImageUploadSession"
+    )
+
+    RawImageUploadSession.objects.filter(error_message__isnull=True).update(
+        error_message=""
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cases", "0021_dicomimagesetupload_task_on_success"),
+    ]
+
+    operations = [
+        migrations.RunPython(replace_error_message_none_values, elidable=True),
+    ]

app/grandchallenge/cases/migrations/0023_alter_rawimageuploadsession_error_message.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.25 on 2025-10-17 17:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cases", "0022_auto_20251021_1014"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="rawimageuploadsession",
+            name="error_message",
+            field=models.TextField(blank=True, default=""),
+            preserve_default=False,
+        ),
+    ]

app/grandchallenge/cases/models.py

@@ -131,13 +131,13 @@ class RawImageUploadSession(UUIDModel):
         blank=True, null=True, default=None, editable=False
     )
 
-    error_message = models.TextField(blank=False, null=True, default=None)
+    error_message = models.TextField(blank=True)
 
     def __str__(self):
         return (
             f"Upload Session <{str(self.pk).split('-')[0]}>, "
             f"({self.get_status_display()}) "
-            f"{self.error_message or ''}"
+            f"{self.error_message}"
         )
 
     def save(self, *args, **kwargs):
@@ -170,6 +170,8 @@ def default_error_message(self):
             return (
                 f"{n_errors} file{pluralize(n_errors)} could not be imported"
             )
+        else:
+            return ""
 
     def get_error_handler(self, *, linked_object=None):
         return RawImageUploadSessionErrorHandler(
@@ -201,7 +203,7 @@ def update_status(
         self.error_message = notification_description
         self.save()
 
-        if self.error_message and self.creator:
+        if notification_description and self.creator:
             Notification.send(
                 kind=NotificationTypeChoices.IMAGE_IMPORT_STATUS,
                 description=notification_description,

app/grandchallenge/components/models.py

@@ -2560,9 +2560,18 @@ def _create_civ_for_image(  # noqa: C901
                         f"You need to provide a user along with the user upload "
                         f"queryset for interface {ci}"
                     )
-                upload_session = RawImageUploadSession.objects.create(
-                    creator=user
-                )
+                upload_session = RawImageUploadSession(creator=user)
+                try:
+                    upload_session.full_clean()
+                except ValidationError as e:
+                    error_handler = self.get_error_handler()
+                    error_handler.handle_error(
+                        interface=ci,
+                        error_message=format_validation_error_message(error=e),
+                        user=user,
+                    )
+                    return
+                upload_session.save()
                 upload_session.user_uploads.set(user_upload_queryset)
 
             upload_session.process_images(
@@ -2606,7 +2615,16 @@ def _create_civ_for_image(  # noqa: C901
                 },
                 immutable=True,
             )
-            upload.full_clean()
+            try:
+                upload.full_clean()
+            except ValidationError as e:
+                error_handler = self.get_error_handler()
+                error_handler.handle_error(
+                    interface=ci,
+                    error_message=format_validation_error_message(error=e),
+                    user=user,
+                )
+                return
             upload.save()
             upload.user_uploads.set(dicom_upload_with_name.user_uploads)
 

app/tests/cases_tests/test_background_tasks.py

@@ -91,7 +91,7 @@ def test_staged_mhd_upload_with_additional_headers(
 
     session.refresh_from_db()
     assert session.status == session.SUCCESS
-    assert session.error_message is None
+    assert not session.error_message
 
     images = Image.objects.filter(origin=session).all()
     assert len(images) == 1
@@ -189,7 +189,7 @@ def test_mhd_file_annotation_creation(
 
     session.refresh_from_db()
     assert session.status == session.SUCCESS
-    assert session.error_message is None
+    assert not session.error_message
 
     images = Image.objects.filter(origin=session).all()
     assert len(images) == 1

app/tests/components_tests/test_models.py

@@ -1595,7 +1595,7 @@ def test_displacement_field_validation(
     session.refresh_from_db()
 
     assert session.status == session.SUCCESS
-    assert session.error_message is None
+    assert not session.error_message
 
     image = Image.objects.filter(origin=session).get()
 

app/tests/reader_studies_tests/test_api.py

@@ -1270,7 +1270,7 @@ def test_ground_truth(client):
 @pytest.mark.parametrize(
     "overlay_segments,error",
     (
-        ([], None),
+        ([], ""),
         (
             [{"name": "s1", "visible": True, "voxel_value": 0}],
             (
@@ -1283,7 +1283,7 @@ def test_ground_truth(client):
                 {"name": "s1", "visible": True, "voxel_value": 0},
                 {"name": "s2", "visible": True, "voxel_value": 1},
             ],
-            None,
+            "",
         ),
     ),
 )