Add tests

app/grandchallenge/algorithms/models.py

@@ -502,6 +502,16 @@ def public_test_case(self):
         except AttributeError:
             return False
 
+    def form_field_label(self):
+        title = f"{self.title}"
+        if self.active_image:
+            title += f" (Active image: {self.active_image.pk})"
+        if self.active_model:
+            title += f" (Active model: {self.active_model.pk})"
+        else:
+            title += " (Active model: None)"
+        return title
+
 
 class AlgorithmUserObjectPermission(UserObjectPermissionBase):
     content_object = models.ForeignKey(Algorithm, on_delete=models.CASCADE)

app/grandchallenge/algorithms/tasks.py

@@ -226,8 +226,8 @@ def retry_with_delay():
 def create_algorithm_jobs(
     *,
     algorithm_image,
-    algorithm_model,
     civ_sets,
+    algorithm_model=None,
     extra_viewer_groups=None,
     extra_logs_viewer_groups=None,
     max_jobs=None,

app/grandchallenge/evaluation/forms.py

@@ -264,6 +264,11 @@ class Meta:
         )
 
 
+class AlgorithmChoiceField(ModelChoiceField):
+    def label_from_instance(self, obj):
+        return obj.form_field_label()
+
+
 submission_fields = (
     "creator",
     "phase",
@@ -294,7 +299,7 @@ class SubmissionForm(
         label="Predictions File",
         queryset=None,
     )
-    algorithm = ModelChoiceField(queryset=None)
+    algorithm = AlgorithmChoiceField(queryset=None)
 
     def __init__(self, *args, user, phase: Phase, **kwargs):  # noqa: C901
         super().__init__(*args, user=user, phase=phase, **kwargs)

app/grandchallenge/evaluation/templates/evaluation/evaluation_detail.html

@@ -74,7 +74,11 @@ <h2>Evaluation</h2>
             <dd>
                 <a href="{{ object.submission.algorithm_image.algorithm.get_absolute_url }}">
                     {{ object.submission.algorithm_image.algorithm.title }}
-                    (Version {{ object.submission.algorithm_image.pk }})
+                    (Image Version {{ object.submission.algorithm_image.pk }}
+                    {% if object.submission.algorithm_model %}
+                        Model version {{ object.submission.algorithm_model.pk }}
+                    {% endif %}
+                    )
                 </a>
             </dd>
         {% endif %}

app/tests/algorithms_tests/test_permissions.py

@@ -15,12 +15,10 @@
 from grandchallenge.evaluation.tasks import (
     create_algorithm_jobs_for_evaluation,
 )
-from grandchallenge.verifications.models import Verification
 from tests.algorithms_tests.factories import (
     AlgorithmFactory,
     AlgorithmImageFactory,
     AlgorithmJobFactory,
-    AlgorithmModelFactory,
 )
 from tests.algorithms_tests.utils import TwoAlgorithms
 from tests.archives_tests.factories import ArchiveFactory, ArchiveItemFactory
@@ -536,53 +534,3 @@ def test_job_permissions_for_debug_phase(
         )
         # No-one should be in the viewers group
         assert {*job.viewers.user_set.all()} == set()
-
-
-@pytest.mark.django_db
-def test_algorithm_model_view_permissions(client):
-    user, editor = UserFactory.create_batch(2)
-    alg = AlgorithmFactory()
-    alg.add_editor(editor)
-
-    am = AlgorithmModelFactory(algorithm=alg)
-
-    response = get_view_for_user(
-        viewname="algorithms:model-create",
-        client=client,
-        reverse_kwargs={"slug": alg.slug},
-        user=user,
-    )
-    assert response.status_code == 403
-
-    response = get_view_for_user(
-        viewname="algorithms:model-detail",
-        client=client,
-        reverse_kwargs={"slug": alg.slug, "pk": am.pk},
-        user=user,
-    )
-    assert response.status_code == 403
-
-    response = get_view_for_user(
-        viewname="algorithms:model-create",
-        client=client,
-        reverse_kwargs={"slug": alg.slug},
-        user=editor,
-    )
-    assert response.status_code == 403
-
-    Verification.objects.create(user=editor, is_verified=True)
-    response = get_view_for_user(
-        viewname="algorithms:model-create",
-        client=client,
-        reverse_kwargs={"slug": alg.slug},
-        user=editor,
-    )
-    assert response.status_code == 200
-
-    response = get_view_for_user(
-        viewname="algorithms:model-detail",
-        client=client,
-        reverse_kwargs={"slug": alg.slug, "pk": am.pk},
-        user=editor,
-    )
-    assert response.status_code == 200

app/tests/algorithms_tests/test_views.py

@@ -22,6 +22,7 @@
     AlgorithmFactory,
     AlgorithmImageFactory,
     AlgorithmJobFactory,
+    AlgorithmModelFactory,
     AlgorithmPermissionRequestFactory,
 )
 from tests.cases_tests import RESOURCE_PATH
@@ -326,6 +327,7 @@ def test_algorithm_jobs_list_view(client):
 class TestObjectPermissionRequiredViews:
     def test_permission_required_views(self, client):
         ai = AlgorithmImageFactory(is_manifest_valid=True, is_in_registry=True)
+        am = AlgorithmModelFactory()
         u = UserFactory()
         j = AlgorithmJobFactory(algorithm_image=ai, status=Job.SUCCESS)
         p = AlgorithmPermissionRequestFactory(algorithm=ai.algorithm)
@@ -442,6 +444,20 @@ def test_permission_required_views(self, client):
                 ai.algorithm,
                 None,
             ),
+            (
+                "model-create",
+                {"slug": am.algorithm.slug},
+                "change_algorithm",
+                am.algorithm,
+                None,
+            ),
+            (
+                "model-detail",
+                {"slug": am.algorithm.slug, "pk": am.pk},
+                "view_algorithmmodel",
+                am,
+                None,
+            ),
         ]:
 
             def _get_view():
@@ -1242,3 +1258,45 @@ def test_evaluations_are_filtered(client):
     )
 
     assert [*response.context["best_evaluation_per_phase"]] == [e, e2]
+
+
+@pytest.mark.django_db
+def test_job_create_denied_for_same_input_model_and_image(client):
+    creator = UserFactory()
+    VerificationFactory(user=creator, is_verified=True)
+    alg = AlgorithmFactory()
+    alg.add_editor(user=creator)
+    ci = ComponentInterfaceFactory(
+        kind=InterfaceKind.InterfaceKindChoices.IMAGE
+    )
+    alg.inputs.set([ci])
+    ai = AlgorithmImageFactory(
+        algorithm=alg,
+        is_manifest_valid=True,
+        is_in_registry=True,
+        is_desired_version=True,
+    )
+    am = AlgorithmModelFactory(algorithm=alg, is_desired_version=True)
+    im = ImageFactory()
+    assign_perm("view_image", creator, im)
+    civ = ComponentInterfaceValueFactory(interface=ci, image=im)
+    j = AlgorithmJobFactory(algorithm_image=ai, algorithm_model=am)
+    j.inputs.set([civ])
+    response = get_view_for_user(
+        viewname="algorithms:job-create",
+        client=client,
+        method=client.post,
+        reverse_kwargs={
+            "slug": alg.slug,
+        },
+        user=creator,
+        data={
+            ci.slug: im.pk,
+            f"WidgetChoice-{ci.slug}": WidgetChoices.IMAGE_SEARCH.name,
+        },
+    )
+    assert not response.context["form"].is_valid()
+    assert (
+        "A result for these inputs with the current image and model already exists."
+        in str(response.context["form"].errors)
+    )

app/tests/components_tests/test_amazon_sagemaker_training_backend.py

@@ -160,6 +160,7 @@ def test_execute(settings):
     executor = AmazonSageMakerTrainingExecutor(
         job_id=f"algorithms-job-{pk}",
         exec_image_repo_tag="",
+        algorithm_model=None,
         memory_limit=4,
         time_limit=60,
         requires_gpu=False,
@@ -196,6 +197,7 @@ def test_execute(settings):
                     "PYTHONUNBUFFERED": "1",
                     "no_proxy": "amazonaws.com",
                     "GRAND_CHALLENGE_COMPONENT_WRITABLE_DIRECTORIES": "/opt/ml/output/data:/opt/ml/model:/opt/ml/checkpoints:/tmp",
+                    "GRAND_CHALLENGE_COMPONENT_POST_CLEAN_DIRECTORIES": "/opt/ml/output/data:/opt/ml/model",
                 },
                 "VpcConfig": {
                     "SecurityGroupIds": [