Merge branch 'master' into slugg

Author: Akshat453

.travis.yml

@@ -81,4 +81,4 @@ notifications:
   email:
     on_success: change
     on_failure: always
-  slack: cloudcv:gy3CGQGNXLwXOqVyzXGZfdea
+  slack: cloudcv:gy3CGQGNXLwXOqVyzXGZfdea

apps/challenges/admin.py

@@ -58,6 +58,7 @@ class ChallengeAdmin(ImportExportTimeStampedAdmin):
         "workers",
         "task_def_arn",
         "github_repository",
+        "github_branch",
     )
     list_filter = (
         ChallengeFilter,
@@ -75,6 +76,7 @@ class ChallengeAdmin(ImportExportTimeStampedAdmin):
         "creator__team_name",
         "slug",
         "github_repository",
+        "github_branch",
     )
     actions = [
         "start_selected_workers",

apps/challenges/migrations/0113_add_github_branch_field_and_unique_constraint.py

@@ -0,0 +1,45 @@
+# Generated by Django 2.2.20 on 2025-07-09 15:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("challenges", "0112_challenge_sqs_retention_period"),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            sql=(
+                "DO $$\n"
+                "BEGIN\n"
+                "    IF NOT EXISTS (\n"
+                "        SELECT 1 FROM information_schema.columns\n"
+                "        WHERE table_name='challenge'\n"
+                "        AND column_name='github_branch'\n"
+                "    ) THEN\n"
+                "        ALTER TABLE challenge ADD COLUMN github_branch "
+                "varchar(200) NULL DEFAULT '';\n"
+                "    END IF;\n"
+                "END$$;"
+            ),
+            reverse_sql=(
+                "ALTER TABLE challenge DROP COLUMN IF EXISTS github_branch;"
+            ),
+        ),
+        # Add a partial unique constraint
+        # Only applies when both fields are not empty
+        migrations.RunSQL(
+            (
+                "CREATE UNIQUE INDEX challenge_github_repo_branch_partial_idx "
+                "ON challenge (github_repository, github_branch) "
+                "WHERE github_repository != '' "
+                "AND github_branch != '';"
+            ),
+            reverse_sql=(
+                "DROP INDEX IF EXISTS "
+                "challenge_github_repo_branch_partial_idx;"
+            ),
+        ),
+    ]

apps/challenges/models.py

@@ -186,6 +186,10 @@ def __init__(self, *args, **kwargs):
     github_repository = models.CharField(
         max_length=1000, null=True, blank=True, default=""
     )
+    # The github branch name used to create/update the challenge
+    github_branch = models.CharField(
+        max_length=200, null=True, blank=True, default=""
+    )
     # The number of vCPU for a Fargate worker for the challenge. Default value
     # is 0.25 vCPU.
     worker_cpu_cores = models.IntegerField(null=True, blank=True, default=512)

apps/challenges/serializers.py

@@ -94,6 +94,7 @@ class Meta:
             "worker_instance_type",
             "sqs_retention_period",
             "github_repository",
+            "github_branch",
         )
 
 
@@ -264,6 +265,9 @@ def __init__(self, *args, **kwargs):
             github_repository = context.get("github_repository")
             if github_repository:
                 kwargs["data"]["github_repository"] = github_repository
+            github_branch = context.get("github_branch")
+            if github_branch:
+                kwargs["data"]["github_branch"] = github_branch
 
     class Meta:
         model = Challenge
@@ -302,6 +306,7 @@ class Meta:
             "max_docker_image_size",
             "cli_version",
             "github_repository",
+            "github_branch",
             "vpc_cidr",
             "subnet_1_cidr",
             "subnet_2_cidr",

apps/challenges/templates/challenges/subscription_plans_email.html

@@ -0,0 +1,91 @@
+{% extends "base.html" %}
+{% block title %}Subscription Plan Details{% endblock %}
+
+{% block content %}
+<div class="container mx-auto p-6">
+  <h1 class="text-3xl font-bold mb-4">Subscription Plan Details for Your Challenge on EvalAI</h1>
+  <p class="mb-4">Hi {{ host_name }},</p>
+  <p class="mb-6">Thank you for your interest in hosting your challenge on EvalAI. We're excited to support your work.</p>
+
+  <p class="mb-4">We offer <strong>4 plans</strong> based on the compute needs of challenge hosts. Each plan is a monthly subscription (managed via Stripe) with no long-term commitment—you can cancel anytime once your challenge concludes. Stripe accepts all major payment methods and provides monthly receipts.</p>
+  <p class="mb-6">Each plan includes one always-on worker to handle submissions (except for the Remote Evaluation Plan, which relies on your own infrastructure). If you expect higher submission volume—especially near deadlines—we can scale easily by adding additional workers. These extra workers will be billed separately according to your selected plan.</p>
+
+  <h2 class="text-2xl font-semibold mt-8 mb-4">Available Plans</h2>
+  <div class="overflow-x-auto">
+    <table class="table-auto w-full border-collapse">
+      <thead>
+        <tr class="bg-gray-200">
+          <th class="px-4 py-2 border">Feature</th>
+          <th class="px-4 py-2 border">Essentials<br><span class="text-sm">$125/mo</span></th>
+          <th class="px-4 py-2 border">Core<br><span class="text-sm">$250/mo</span></th>
+          <th class="px-4 py-2 border">Advanced<br><span class="text-sm">$850/mo</span></th>
+          <th class="px-4 py-2 border">Remote Evaluation<br><span class="text-sm">$100/mo</span></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Compute Tier</td>
+          <td class="px-4 py-2 border">0.5 vCPU, 1–4 GB RAM</td>
+          <td class="px-4 py-2 border">1 vCPU, 2–4 GB RAM</td>
+          <td class="px-4 py-2 border">1 vCPU, 4–16 GB RAM</td>
+          <td class="px-4 py-2 border">Bring your own compute</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Task Runtime</td>
+          <td class="px-4 py-2 border">24/7 for 30 days</td>
+          <td class="px-4 py-2 border">24/7 for 30 days</td>
+          <td class="px-4 py-2 border">24/7 for 30 days</td>
+          <td class="px-4 py-2 border">N/A</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Ephemeral Storage</td>
+          <td class="px-4 py-2 border">20 GB (expandable)</td>
+          <td class="px-4 py-2 border">20 GB (expandable)</td>
+          <td class="px-4 py-2 border">20 GB (expandable)</td>
+          <td class="px-4 py-2 border">N/A</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Concurrent Evaluations</td>
+          <td class="px-4 py-2 border">1 container</td>
+          <td class="px-4 py-2 border">1 container</td>
+          <td class="px-4 py-2 border">1 container</td>
+          <td class="px-4 py-2 border">N/A</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Custom Dependencies</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">N/A</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">Submissions + Leaderboard Hosting</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+        </tr>
+        <tr class="hover:bg-gray-50">
+          <td class="px-4 py-2 border font-medium">EvalAI Hosts the Evaluation</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">✔️</td>
+          <td class="px-4 py-2 border">❌</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <h2 class="text-2xl font-semibold mt-8 mb-4">Plan Subscription Links</h2>
+  <ul class="list-disc list-inside space-y-2">
+    <li><a href="https://buy.stripe.com/9B600i8Zt2PI8gA8srcEw01" class="text-blue-600 underline">Essentials Plan</a></li>
+    <li><a href="https://buy.stripe.com/9B65kCcbF4XQdAUbEDcEw03" class="text-blue-600 underline">Core Plan</a></li>
+    <li><a href="https://buy.stripe.com/28E28q1x1gGy40kcIHcEw06" class="text-blue-600 underline">Advanced Plan</a></li>
+    <li><a href="https://buy.stripe.com/eVqfZg7Vp75Y8gA6kjcEw07" class="text-blue-600 underline">Remote Evaluation Plan</a></li>
+  </ul>
+
+  <p class="mt-6">If you're unsure about which plan is the best fit for your challenge, we recommend starting with the <strong>Essentials plan</strong> and upgrading as needed.</p>
+  <p class="mt-4">Please feel free to reach out if you have any questions or would like to discuss further.</p>
+  <p class="mt-6">Looking forward to supporting your challenge!<br>EvalAI Team</p>
+</div>
+{% endblock %}

apps/challenges/utils.py

@@ -14,7 +14,10 @@
 from botocore.exceptions import ClientError
 from django.conf import settings
 from django.core.files.base import ContentFile
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
 from moto import mock_ecr, mock_sts
+from participants.models import ParticipantTeam
 
 from .models import (
     Challenge,
@@ -24,7 +27,6 @@
     ChallengeSponsor,
     DatasetSplit,
     Leaderboard,
-    ParticipantTeam,
 )
 from .serializers import ChallengePrizeSerializer, ChallengeSponsorSerializer
 
@@ -459,6 +461,106 @@ def send_emails(emails, template_id, template_data):
         )
 
 
+def send_subscription_plans_email(challenge):
+    """
+    Sends email with subscription plan details to challenge hosts when they request approval
+    Arguments:
+        challenge {Class Object} -- Challenge model object
+    """
+    try:
+        # Get challenge host emails
+        challenge_host_emails = (
+            challenge.creator.get_all_challenge_host_email()
+        )
+
+        if not challenge_host_emails:
+            logger.warning(
+                "No challenge host emails found for challenge {}".format(
+                    challenge.pk
+                )
+            )
+            return
+
+        # Prepare template context
+        challenge_url = "{}/web/challenges/challenge-page/{}".format(
+            getattr(settings, "EVALAI_API_SERVER", "http://localhost:8000"),
+            challenge.pk,
+        )
+        challenge_manage_url = (
+            "{}/web/challenges/challenge-page/{}/manage".format(
+                getattr(
+                    settings, "EVALAI_API_SERVER", "http://localhost:8000"
+                ),
+                challenge.pk,
+            )
+        )
+
+        context = {
+            "challenge_name": challenge.title,
+            "challenge_url": challenge_url,
+            "challenge_manage_url": challenge_manage_url,
+            "challenge_id": challenge.pk,
+            "host_team_name": challenge.creator.team_name,
+            "support_email": getattr(
+                settings, "CLOUDCV_TEAM_EMAIL", "[email protected]"
+            ),
+        }
+
+        # Add challenge image if available
+        if challenge.image:
+            context["challenge_image_url"] = challenge.image.url
+
+        # Render the HTML template
+        html_content = render_to_string(
+            "challenges/subscription_plans_email.html", context
+        )
+
+        # Create the email subject
+        subject = f"EvalAI Subscription Plans - Challenge: {challenge.title}"
+
+        # Send emails to all challenge hosts
+        emails_sent = 0
+        for email in challenge_host_emails:
+            try:
+                # Send subscription plans email to challenge host
+                email_message = EmailMultiAlternatives(
+                    subject=subject,
+                    body="Please view this email in HTML format.",  # Plain text fallback
+                    from_email=getattr(
+                        settings, "CLOUDCV_TEAM_EMAIL", "[email protected]"
+                    ),
+                    to=[email],
+                )
+                email_message.attach_alternative(html_content, "text/html")
+                email_message.send()
+
+                emails_sent += 1
+                logger.info(
+                    "Subscription plans email sent to {} for challenge {}".format(
+                        email, challenge.pk
+                    )
+                )
+            except Exception as e:
+                logger.error(
+                    "Failed to send subscription plans email to {} for challenge {}: {}".format(
+                        email, challenge.pk, str(e)
+                    )
+                )
+
+        logger.info(
+            "Sent subscription plans email to {}/{} hosts for challenge {}".format(
+                emails_sent, len(challenge_host_emails), challenge.pk
+            )
+        )
+
+    except Exception as e:
+        logger.error(
+            "Error sending subscription plans email for challenge {}: {}".format(
+                challenge.pk, str(e)
+            )
+        )
+
+
 def parse_submission_meta_attributes(submission):
     """
     Extracts submission attributes into Dict

apps/challenges/views.py

@@ -156,6 +156,7 @@
     get_file_content,
     get_missing_keys_from_dict,
     send_emails,
+    send_subscription_plans_email,
 )
 
 logger = logging.getLogger(__name__)
@@ -3900,7 +3901,7 @@ def create_or_update_github_challenge(request, challenge_host_team_pk):
         return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
 
     challenge_queryset = Challenge.objects.filter(
-        github_repository=request.data["GITHUB_REPOSITORY"]
+        github_repository=request.data["GITHUB_REPOSITORY"],
     )
 
     if challenge_queryset:
@@ -4827,6 +4828,14 @@ def request_challenge_approval_by_pk(request, challenge_pk):
     and send approval request for the challenge
     """
     challenge = get_challenge_model(challenge_pk)
+
+    # Check if the user is a host of this challenge
+    if not is_user_a_host_of_challenge(request.user, challenge_pk):
+        response_data = {
+            "error": "Sorry, you are not authorized to request approval for this challenge!"
+        }
+        return Response(response_data, status=status.HTTP_403_FORBIDDEN)
+
     challenge_phases = ChallengePhase.objects.filter(challenge=challenge)
     unfinished_phases = []
 
@@ -4847,6 +4856,22 @@ def request_challenge_approval_by_pk(request, challenge_pk):
             {"error": error_message}, status=status.HTTP_406_NOT_ACCEPTABLE
         )
 
+    # Send subscription plans email to challenge hosts
+    try:
+        send_subscription_plans_email(challenge)
+        logger.info(
+            "Subscription plans email sent successfully for challenge {}".format(
+                challenge_pk
+            )
+        )
+    except Exception as e:
+        logger.error(
+            "Failed to send subscription plans email for challenge {}: {}".format(
+                challenge_pk, str(e)
+            )
+        )
+        # Continue with the approval process even if email fails
+
     if not settings.DEBUG:
         try:
             evalai_api_server = settings.EVALAI_API_SERVER
@@ -4888,7 +4913,7 @@ def request_challenge_approval_by_pk(request, challenge_pk):
         if webhook_response:
             if webhook_response.content.decode("utf-8") == "ok":
                 response_data = {
-                    "message": "Approval request sent!",
+                    "message": "Approval request sent! You should also receive an email with subscription plan details.",
                 }
                 return Response(response_data, status=status.HTTP_200_OK)
             else:

docker/dev/celery/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.21
+FROM python:3.9.21-bullseye
 
 ENV PYTHONUNBUFFERED 1
 

docker/dev/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.21
+FROM python:3.9.21-bullseye
 
 ENV PYTHONUNBUFFERED 1
 ENV PIP_NO_CACHE_DIR=off