Merge branch 'main' into 4721-draft-request-reminders-not-send-often-enough

Author: chrisvanrun

app/grandchallenge/algorithms/models.py

@@ -1762,7 +1762,7 @@ class InvocationStatusChoices(TextChoices):
     CANCELLED = "CANCELLED", _("Cancelled")
 
 
-class Invocation(UUIDModel):
+class Invocation(CIVForObjectMixin, UUIDModel):
     StatusChoices = InvocationStatusChoices
 
     endpoint = models.ForeignKey(Endpoint, on_delete=models.PROTECT)
@@ -1861,6 +1861,13 @@ def orchestrator_kwargs(self):
     def orchestrator(self):
         return EndpointOrchestrator(**self.orchestrator_kwargs)
 
+    @property
+    def is_editable(self):
+        if self.status == InvocationStatusChoices.VALIDATING_INPUTS:
+            return True
+        else:
+            return False
+
     @cached_property
     def inputs_complete(self):
         # check if all inputs are present and if they all have a value
@@ -1894,3 +1901,31 @@ def update_status(
             self.invoke_duration = invoke_duration
 
         self.save()
+
+    def add_civ(self, *, civ):
+        super().add_civ(civ=civ)
+        return self.inputs.add(civ)
+
+    def remove_civ(self, *, civ):
+        super().remove_civ(civ=civ)
+        return self.inputs.remove(civ)
+
+    def get_civ_for_interface(self, interface):
+        return self.inputs.get(interface=interface)
+
+    def process_civ_data_objects_and_execute_linked_task(
+        self, *, civ_data_objects, user, linked_task=None
+    ):
+        from grandchallenge.algorithms.tasks import (
+            execute_invocation_for_inputs,
+        )
+
+        linked_task = execute_invocation_for_inputs.signature(
+            kwargs={"invocation_pk": str(self.pk)}, immutable=True
+        )
+
+        return super().process_civ_data_objects_and_execute_linked_task(
+            civ_data_objects=civ_data_objects,
+            user=user,
+            linked_task=linked_task,
+        )

app/grandchallenge/algorithms/serializers.py

@@ -21,6 +21,7 @@
     AlgorithmModel,
     Endpoint,
     Invocation,
+    InvocationStatusChoices,
     Job,
     annotate_input_output_counts,
 )
@@ -358,6 +359,7 @@ class InvocationPostSerializer(serializers.ModelSerializer):
         view_name="api:algorithms-endpoint-detail",
         required=True,
     )
+    status = CharField(source="get_status_display", read_only=True)
 
     class Meta:
         model = Invocation
@@ -381,7 +383,7 @@ def __init__(self, *args, **kwargs):
             )
 
     def validate(self, data):
-        endpoint = data.pop("endpoint")
+        endpoint = data["endpoint"]
         inputs = data.pop("inputs")
         data["algorithm_interface"] = (
             validate_inputs_and_return_matching_interface(
@@ -394,3 +396,32 @@ def validate(self, data):
         )
 
         return data
+
+    def create(self, validated_data):
+        civ_data_objects = validated_data.pop("civ_data_objects", [])
+
+        invocation = Invocation.objects.create(
+            **validated_data,
+            time_limit=settings.ALGORITHM_ENDPOINTS_MAXIMUM_INVOCATION_DURATION,
+            status=InvocationStatusChoices.VALIDATING_INPUTS,
+        )
+
+        try:
+            invocation.process_civ_data_objects_and_execute_linked_task(
+                civ_data_objects=civ_data_objects,
+                user=self.context["request"].user,
+            )
+        except CIVNotEditableException as e:
+            invocation.refresh_from_db()
+            if invocation.status == invocation.StatusChoices.CANCELLED:
+                # this can happen for jobs with multiple inputs
+                # if one of them fails validation
+                pass
+            else:
+                error_handler = invocation.get_error_handler()
+                error_handler.handle_error(
+                    error_message=SystemErrorMessages.UNEXPECTED_ERROR,
+                )
+                logger.error(e, exc_info=True)
+
+        return invocation

app/grandchallenge/algorithms/tasks.py

@@ -12,6 +12,7 @@
 from grandchallenge.algorithms.exceptions import TooManyJobsScheduled
 from grandchallenge.components.schemas import GPUTypeChoices
 from grandchallenge.components.tasks import (
+    provision_invocation_input_data,
     remove_container_image_from_registry,
 )
 from grandchallenge.core.celery import (
@@ -325,3 +326,31 @@ def deactivate_old_algorithm_images():
                 }
             ).apply_async
         )
+
+
+@acks_late_micro_short_task(retry_on=(LockNotAcquiredException,))
+@transaction.atomic
+def execute_invocation_for_inputs(*, invocation_pk):
+    from grandchallenge.algorithms.models import Invocation
+
+    with check_lock_acquired():
+        invocation = Invocation.objects.select_for_update(nowait=True).get(
+            pk=invocation_pk
+        )
+
+    if not invocation.inputs_complete:
+        # Nothing to do
+        return
+
+    if invocation.status != Invocation.StatusChoices.VALIDATING_INPUTS:
+        # this task can be called multiple times with complete inputs,
+        # and might have been queued for execution already, so ignore
+        return
+
+    invocation.update_status(status=Invocation.StatusChoices.QUEUED)
+
+    on_commit(
+        provision_invocation_input_data.signature(
+            kwargs=invocation.task_kwargs
+        ).apply_async
+    )

app/grandchallenge/components/models.py

@@ -73,6 +73,7 @@
     DICOMImageSetUploadErrorHandler,
     EvaluationCIVErrorHandler,
     FallbackCIVValidationErrorHandler,
+    InvocationCIVErrorHandler,
     JobCIVErrorHandler,
     RawImageUploadSessionErrorHandler,
     UserUploadCIVErrorHandler,
@@ -2841,7 +2842,7 @@ def get_current_value_for_interface(self, *, interface, user):
 
     def get_error_handler(self, *, linked_object=None):
         # local imports to prevent circular dependency
-        from grandchallenge.algorithms.models import Job
+        from grandchallenge.algorithms.models import Invocation, Job
         from grandchallenge.archives.models import ArchiveItem
         from grandchallenge.evaluation.models import Evaluation
         from grandchallenge.reader_studies.models import DisplaySet
@@ -2860,6 +2861,8 @@ def get_error_handler(self, *, linked_object=None):
             return JobCIVErrorHandler(job=self)
         elif isinstance(self, Evaluation):
             return EvaluationCIVErrorHandler(job=self)
+        elif isinstance(self, Invocation):
+            return InvocationCIVErrorHandler(invocation=self)
         elif linked_object and isinstance(linked_object, UserUpload):
             return UserUploadCIVErrorHandler(
                 user_upload=linked_object,

app/grandchallenge/core/error_handlers.py

@@ -86,6 +86,41 @@ def handle_error(self, *, error_message, interface=None, user=None):
         )
 
 
+class InvocationCIVErrorHandler(ErrorHandler):
+    """
+    Error handler for CIV validation errors on invocation creation.
+    Handle_error() updates an algorithm endpoint invocation.
+    """
+
+    def __init__(self, *args, invocation, **kwargs):
+        from grandchallenge.algorithms.models import Invocation
+
+        if not invocation or not isinstance(invocation, Invocation):
+            raise RuntimeError(
+                "You need to provide an Invocation instance to this error handler."
+            )
+
+        super().__init__(*args, **kwargs)
+        self._invocation = invocation
+
+    def handle_error(self, *, error_message, interface=None, user=None):
+        if interface:
+            detailed_error_message = copy.deepcopy(
+                self._invocation.detailed_error_message
+            )
+            detailed_error_message[interface.title] = error_message
+            self._invocation.update_status(
+                status=self._invocation.StatusChoices.CANCELLED,
+                error_message="One or more of the inputs failed validation.",
+                detailed_error_message=detailed_error_message,
+            )
+        else:
+            self._invocation.update_status(
+                status=self._invocation.StatusChoices.CANCELLED,
+                error_message=error_message,
+            )
+
+
 class RawImageUploadSessionErrorHandler(ErrorHandler):
     """
     Error handler for image imports and image validation.

app/grandchallenge/evaluation/admin.py

@@ -34,6 +34,8 @@
     SubmissionGroupObjectPermission,
     SubmissionUserObjectPermission,
 )
+from grandchallenge.evaluation.utils import SubmissionKindChoices
+from grandchallenge.subdomains.utils import reverse
 
 
 class PhaseAdminForm(ModelForm):
@@ -100,13 +102,50 @@ class PhaseAdmin(admin.ModelAdmin):
     readonly_fields = (
         "give_algorithm_editors_job_view_permissions",
         "algorithm_interfaces",
+        "algorithm_interface_configuration_link",
+        "download_starter_kit_link",
     )
     form = PhaseAdminForm
 
     @admin.display(boolean=True)
     def open_for_submissions(self, instance):
         return instance.open_for_submissions
 
+    @staticmethod
+    def algorithm_interface_configuration_link(obj):
+        if obj.submission_kind != SubmissionKindChoices.ALGORITHM:
+            return "-"
+        else:
+            return format_html(
+                '<a href="{link}">{link}</a>',
+                link=reverse(
+                    "evaluation:interface-list",
+                    kwargs={
+                        "challenge_short_name": obj.challenge.short_name,
+                        "slug": obj.slug,
+                    },
+                ),
+            )
+
+    @staticmethod
+    def download_starter_kit_link(obj):
+        if (
+            obj.submission_kind != SubmissionKindChoices.ALGORITHM
+            or not obj.algorithm_interfaces.exists()
+        ):
+            return "-"
+        else:
+            return format_html(
+                '<a href="{link}">{link}</a>',
+                link=reverse(
+                    "evaluation:phase-starter-kit-download",
+                    kwargs={
+                        "challenge_short_name": obj.challenge.short_name,
+                        "slug": obj.slug,
+                    },
+                ),
+            )
+
 
 @admin.action(
     description="Reevaluate selected submissions",

app/grandchallenge/evaluation/views/__init__.py

@@ -1576,16 +1576,12 @@ def get_permission_object(self):
         return self.phase
 
 
-class PhaseStarterKitDownload(
-    CachedPhaseMixin,
-    ObjectPermissionRequiredMixin,
-    View,
-):
-    permission_required = "evaluation.change_phase"
-    raise_exception = True
-
-    def get_permission_object(self):
-        return self.phase
+class PhaseStarterKitDownload(UserPassesTestMixin, CachedPhaseMixin, View):
+    def test_func(self):
+        return (
+            self.request.user.has_perm("evaluation.change_phase", self.phase)
+            or self.request.user.is_staff
+        )
 
     def get(self, *_, **__):
         phase = self.phase

app/grandchallenge/invoices/migrations/0015_invoice_follow_up_on_required_for_initialized_post_paid.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.14 on 2026-05-22 11:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("challenges", "0071_alter_challengerequest_status_and_more"),
+        ("invoices", "0014_invoice_compute_costs_utilized_euros_millicents"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="invoice",
+            constraint=models.CheckConstraint(
+                condition=models.Q(
+                    models.Q(("payment_type", "POSTPAID"), _negated=True),
+                    models.Q(("payment_status", "INITIALIZED"), _negated=True),
+                    ("follow_up_on__isnull", False),
+                    _connector="OR",
+                ),
+                name="follow_up_on_required_for_initialized_post_paid",
+                violation_error_message="Follow-up date is required for initialized post-paid invoices.",
+            ),
+        ),
+    ]

app/grandchallenge/invoices/models.py

@@ -296,6 +296,13 @@ class Meta:
                 | Q(follow_up_on__lte=Now() + timedelta(days=365)),
                 violation_error_message="Follow-up date cannot be more than a year into the future.",
             ),
+            models.CheckConstraint(
+                name="follow_up_on_required_for_initialized_post_paid",
+                condition=~Q(payment_type=PaymentTypeChoices.POSTPAID)
+                | ~Q(payment_status=PaymentStatusChoices.INITIALIZED)
+                | Q(follow_up_on__isnull=False),
+                violation_error_message="Follow-up date is required for initialized post-paid invoices.",
+            ),
         ]
 
     def delete(self, *args, **kwargs):