Refactor: Rename ensure_workers_for_host_submission to ensure_workers_for_submission for clarity and broaden functionality. Update all references in the codebase to reflect this change, ensuring both host and participant submissions are handled appropriately. (#5059)

Author: RishabhJain2018

apps/challenges/aws_utils.py

@@ -513,24 +513,22 @@ def delete_challenge_cleanup_schedule(challenge):
         pass  # Schedule already deleted or never created
 
 
-def ensure_workers_for_host_submission(challenge):
+def ensure_workers_for_submission(challenge):
     """
     Ensures the worker stack (ECS service, auto-scaling, EventBridge cleanup)
-    exists for a challenge when a host makes a submission. If the stack has
-    never been created (challenge.workers is None), this triggers full stack
-    creation via start_workers.
+    exists for a challenge when a submission is made (host or participant).
+    If no active workers exist (workers is None or workers == 0), this triggers
+    stack creation/start via start_workers.
 
-    This allows challenge hosts to test their evaluation pipeline before
-    requesting admin approval.
-
-    Called from submission endpoints when the submitter is a challenge host.
+    This allows both challenge hosts (pre-approval testing) and participants
+    (approved challenges) to recover from missing/stopped workers.
 
     Parameters:
     challenge (<class 'challenges.models.Challenge'>): The challenge to ensure workers for.
     """
     if settings.DEBUG or settings.TEST:
         logger.info(
-            "Skipping ensure_workers_for_host_submission for challenge %s "
+            "Skipping ensure_workers_for_submission for challenge %s "
             "in development/test environment.",
             challenge.pk,
         )
@@ -544,12 +542,12 @@ def ensure_workers_for_host_submission(challenge):
     ):
         return
 
-    # Stack already exists; auto-scaling will handle scale-up
-    if challenge.workers is not None:
+    # Stack already has active workers
+    if challenge.workers not in (None, 0):
         return
 
     logger.info(
-        "Host submission detected for challenge %s with no workers. "
+        "Submission detected for challenge %s with no active workers. "
         "Creating worker stack.",
         challenge.pk,
     )

apps/jobs/admin.py

@@ -1,7 +1,7 @@
 import logging
 
 from base.admin import ImportExportTimeStampedAdmin
-from challenges.aws_utils import ensure_workers_for_host_submission
+from challenges.aws_utils import ensure_workers_for_submission
 from django.contrib import admin
 
 from .admin_filters import (
@@ -72,7 +72,7 @@ def submit_job_to_worker(self, request, queryset):
         for submission in queryset:
             challenge = submission.challenge_phase.challenge
             if challenge.pk not in challenges_checked:
-                ensure_workers_for_host_submission(challenge)
+                ensure_workers_for_submission(challenge)
                 challenges_checked.add(challenge.pk)
             message = handle_submission_rerun(submission, Submission.CANCELLED)
             publish_submission_message(message)

apps/jobs/views.py

@@ -13,7 +13,7 @@
     is_user_a_staff,
     paginated_queryset,
 )
-from challenges.aws_utils import ensure_workers_for_host_submission
+from challenges.aws_utils import ensure_workers_for_submission
 from challenges.models import (
     Challenge,
     ChallengeEvaluationCluster,
@@ -261,9 +261,11 @@ def challenge_submission(request, challenge_id, challenge_phase_id):
                     return Response(
                         response_data, status=status.HTTP_403_FORBIDDEN
                     )
+            # Ensure worker stack exists for participant submissions
+            ensure_workers_for_submission(challenge)
         else:
             # Ensure the worker stack exists for host submissions
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
 
         participant_team_id = get_participant_team_id_of_user_for_a_challenge(
             request.user, challenge_id
@@ -2881,9 +2883,11 @@ def get_submission_file_presigned_url(request, challenge_phase_pk):
                 return Response(
                     response_data, status=status.HTTP_403_FORBIDDEN
                 )
+        # Ensure worker stack exists for participant submissions
+        ensure_workers_for_submission(challenge)
     else:
         # Ensure the worker stack exists for host submissions
-        ensure_workers_for_host_submission(challenge)
+        ensure_workers_for_submission(challenge)
 
     participant_team_id = get_participant_team_id_of_user_for_a_challenge(
         request.user, challenge.pk
@@ -3177,9 +3181,11 @@ def send_submission_message(request, challenge_phase_pk, submission_pk):
                 return Response(
                     response_data, status=status.HTTP_403_FORBIDDEN
                 )
+        # Ensure worker stack exists for participant submissions
+        ensure_workers_for_submission(challenge)
     else:
         # Ensure the worker stack exists for host submissions
-        ensure_workers_for_host_submission(challenge)
+        ensure_workers_for_submission(challenge)
 
     participant_team_id = get_participant_team_id_of_user_for_a_challenge(
         request.user, challenge.pk

tests/unit/challenges/test_aws_utils.py

@@ -19,7 +19,7 @@
     delete_service_by_challenge_pk,
     delete_workers,
     describe_ec2_instance,
-    ensure_workers_for_host_submission,
+    ensure_workers_for_submission,
     get_capacity_provider_strategy,
     get_code_upload_setup_meta_for_challenge,
     get_logs_from_cloudwatch,
@@ -4798,7 +4798,7 @@ def test_end_date_change_skipped_on_create(self):
             mock_start.assert_not_called()
 
 
-class TestEnsureWorkersForHostSubmission(TestCase):
+class TestEnsureWorkersForSubmission(TestCase):
     @patch("challenges.aws_utils.settings")
     def test_returns_early_in_debug_mode(self, mock_settings):
         """Should return early without calling start_workers in DEBUG mode."""
@@ -4807,7 +4807,7 @@ def test_returns_early_in_debug_mode(self, mock_settings):
         challenge.pk = 1
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
@@ -4819,7 +4819,7 @@ def test_returns_early_in_test_mode(self, mock_settings):
         challenge.pk = 1
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
@@ -4834,7 +4834,7 @@ def test_returns_early_for_docker_based_challenge(self, mock_settings):
         challenge.remote_evaluation = False
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
@@ -4849,7 +4849,7 @@ def test_returns_early_for_ec2_challenge(self, mock_settings):
         challenge.remote_evaluation = False
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
@@ -4866,7 +4866,7 @@ def test_returns_early_for_remote_evaluation_challenge(
         challenge.remote_evaluation = True
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
@@ -4882,13 +4882,12 @@ def test_returns_early_when_workers_already_exist(self, mock_settings):
         challenge.workers = 1  # Workers already exist
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
+            ensure_workers_for_submission(challenge)
             mock_start.assert_not_called()
 
     @patch("challenges.aws_utils.settings")
-    def test_returns_early_when_workers_stopped(self, mock_settings):
-        """Should be a no-op when workers are stopped (0) since
-        auto-scaling will handle scale-up."""
+    def test_starts_workers_when_workers_stopped(self, mock_settings):
+        """Should start workers when workers are stopped (0)."""
         mock_settings.DEBUG = False
         mock_settings.TEST = False
         challenge = MagicMock()
@@ -4899,8 +4898,9 @@ def test_returns_early_when_workers_stopped(self, mock_settings):
         challenge.workers = 0  # Workers exist but stopped
 
         with patch("challenges.aws_utils.start_workers") as mock_start:
-            ensure_workers_for_host_submission(challenge)
-            mock_start.assert_not_called()
+            mock_start.return_value = {"count": 1, "failures": []}
+            ensure_workers_for_submission(challenge)
+            mock_start.assert_called_once_with([challenge])
 
     @patch("challenges.aws_utils.start_workers")
     @patch("challenges.aws_utils.settings")
@@ -4919,7 +4919,7 @@ def test_creates_workers_when_none_exist(
 
         mock_start_workers.return_value = {"count": 1, "failures": []}
 
-        ensure_workers_for_host_submission(challenge)
+        ensure_workers_for_submission(challenge)
 
         mock_start_workers.assert_called_once_with([challenge])
 
@@ -4946,7 +4946,7 @@ def test_logs_error_when_worker_creation_fails(
         }
 
         # Should not raise, just log the error
-        ensure_workers_for_host_submission(challenge)
+        ensure_workers_for_submission(challenge)
 
         mock_start_workers.assert_called_once_with([challenge])
 

tests/unit/jobs/test_admin.py

@@ -194,11 +194,11 @@ def test_get_challenge_name_and_id(self):
 
     @patch("jobs.admin.publish_submission_message")
     @patch("jobs.admin.handle_submission_rerun")
-    @patch("jobs.admin.ensure_workers_for_host_submission")
+    @patch("jobs.admin.ensure_workers_for_submission")
     def test_submit_job_calls_ensure_workers(
         self, mock_ensure_workers, mock_rerun, mock_publish
     ):
-        """ensure_workers_for_host_submission should be called for
+        """ensure_workers_for_submission should be called for
         each unique challenge when re-running submissions."""
         mock_rerun.return_value = {"challenge_pk": self.challenge.pk}
         queryset = Submission.objects.filter(pk=self.submission.pk)
@@ -211,11 +211,11 @@ def test_submit_job_calls_ensure_workers(
 
     @patch("jobs.admin.publish_submission_message")
     @patch("jobs.admin.handle_submission_rerun")
-    @patch("jobs.admin.ensure_workers_for_host_submission")
+    @patch("jobs.admin.ensure_workers_for_submission")
     def test_submit_job_calls_ensure_workers_once_per_challenge(
         self, mock_ensure_workers, mock_rerun, mock_publish
     ):
-        """ensure_workers_for_host_submission should only be called once
+        """ensure_workers_for_submission should only be called once
         per challenge even when re-running multiple submissions."""
         second_submission = Submission.objects.create(
             participant_team=self.participant_team,
@@ -242,11 +242,11 @@ def test_submit_job_calls_ensure_workers_once_per_challenge(
 
     @patch("jobs.admin.publish_submission_message")
     @patch("jobs.admin.handle_submission_rerun")
-    @patch("jobs.admin.ensure_workers_for_host_submission")
+    @patch("jobs.admin.ensure_workers_for_submission")
     def test_submit_job_calls_ensure_workers_per_distinct_challenge(
         self, mock_ensure_workers, mock_rerun, mock_publish
     ):
-        """ensure_workers_for_host_submission should be called once per
+        """ensure_workers_for_submission should be called once per
         distinct challenge when submissions span multiple challenges."""
         second_challenge = Challenge.objects.create(
             title="Second Challenge",

tests/unit/jobs/test_views.py

@@ -563,6 +563,29 @@ def test_challenge_submission_for_successful_submission(self):
         )
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
+    @mock.patch("jobs.views.ensure_workers_for_submission")
+    def test_challenge_submission_calls_ensure_workers_for_participant(
+        self, mock_ensure_workers
+    ):
+        self.url = reverse_lazy(
+            "jobs:challenge_submission",
+            kwargs={
+                "challenge_id": self.challenge.pk,
+                "challenge_phase_id": self.challenge_phase.pk,
+            },
+        )
+
+        self.challenge.participant_teams.add(self.participant_team)
+        self.challenge.save()
+
+        response = self.client.post(
+            self.url,
+            {"status": "submitting", "input_file": self.input_file},
+            format="multipart",
+        )
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        mock_ensure_workers.assert_called_once_with(self.challenge)
+
     def test_challenge_submission_when_maximum_limit_exceeded(self):
         self.url = reverse_lazy(
             "jobs:challenge_submission",
@@ -2677,7 +2700,7 @@ class PresignedURLSubmissionTest(BaseAPITestClass):
     def setUp(self):
         super(PresignedURLSubmissionTest, self).setUp()
 
-    @mock.patch("jobs.views.ensure_workers_for_host_submission")
+    @mock.patch("jobs.views.ensure_workers_for_submission")
     @mock.patch("challenges.utils.get_aws_credentials_for_challenge")
     def test_get_submission_presigned_url(
         self, mock_get_aws_creds, mock_ensure_workers
@@ -2722,7 +2745,7 @@ def test_get_submission_presigned_url(
         )
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
-    @mock.patch("jobs.views.ensure_workers_for_host_submission")
+    @mock.patch("jobs.views.ensure_workers_for_submission")
     @mock.patch("challenges.utils.get_aws_credentials_for_challenge")
     def test_finish_submission_file_upload(
         self, mock_get_aws_creds, mock_ensure_workers