simplified the submission flow for discord

Author: ngc92

src/discord-cluster-manager/cogs/leaderboard_cog.py

@@ -61,52 +61,6 @@ async def select_gpu_view(
         await view.wait()
         return view
 
-    async def on_submit_hook(  # noqa: C901
-        self,
-        interaction: discord.Interaction,
-        leaderboard_name: Optional[str],
-        script: discord.Attachment,
-        mode: SubmissionMode,
-        cmd_gpus: Optional[List[str]],
-    ) -> int:
-        """
-        Called as the main body of a submission to route to the correct runner.
-        """
-        # Read the template file
-        submission_content = await script.read()
-
-        try:
-            submission_content = submission_content.decode()
-        except UnicodeError:
-            await send_discord_message(
-                interaction, "Could not decode your file. Is it UTF-8?", ephemeral=True
-            )
-            return -1
-
-        if not interaction.response.is_done():
-            await interaction.response.defer(ephemeral=True)
-
-        req = SubmissionRequest(
-            code=submission_content,
-            file_name=script.filename,
-            user_id=interaction.user.id,
-            user_name=interaction.user.global_name or interaction.user.name,
-            gpus=cmd_gpus,
-            leaderboard=leaderboard_name,
-        )
-        req = prepare_submission(req, self.bot.leaderboard_db)
-
-        if req.gpus is None:
-            view = await self.select_gpu_view(interaction, leaderboard_name, req.task_gpus)
-            req.gpus = view.selected_gpus
-
-        reporter = MultiProgressReporterDiscord(interaction)
-        sub_id, results = await self.bot.backend.submit_full(req, mode, reporter)
-
-        if mode == SubmissionMode.LEADERBOARD:
-            await self.post_submit_hook(interaction, sub_id)
-        return sub_id
-
     def generate_run_verdict(self, run: RunItem, sub_data: SubmissionItem):
         medals = {1: "🥇 First", 2: "🥈 Second", 3: "🥉 Third"}
 
@@ -176,18 +130,42 @@ async def submit(
         mode: SubmissionMode,
         gpu: Optional[str],
     ):
-        if not self.bot.backend.accepts_jobs:
+        if gpu is not None:
+            gpu = [gpu.strip() for gpu in gpu.split(",")]
+
+        submission_content = await script.read()
+
+        try:
+            submission_content = submission_content.decode()
+        except UnicodeError:
             await send_discord_message(
-                interaction,
-                "The bot is currently not accepting any new submissions, please try again later.",
-                ephemeral=True,
+                interaction, "Could not decode your file. Is it UTF-8?", ephemeral=True
             )
-            return
+            return -1
 
-        if gpu is not None:
-            gpu = [gpu.strip() for gpu in gpu.split(",")]
+        if not interaction.response.is_done():
+            await interaction.response.defer(ephemeral=True)
 
-        return await self.on_submit_hook(interaction, leaderboard_name, script, mode, gpu)
+        req = SubmissionRequest(
+            code=submission_content,
+            file_name=script.filename,
+            user_id=interaction.user.id,
+            user_name=interaction.user.global_name or interaction.user.name,
+            gpus=gpu,
+            leaderboard=leaderboard_name,
+        )
+        req = prepare_submission(req, self.bot.backend)
+
+        if req.gpus is None:
+            view = await self.select_gpu_view(interaction, leaderboard_name, req.task_gpus)
+            req.gpus = view.selected_gpus
+
+        reporter = MultiProgressReporterDiscord(interaction)
+        sub_id, results = await self.bot.backend.submit_full(req, mode, reporter)
+
+        if mode == SubmissionMode.LEADERBOARD:
+            await self.post_submit_hook(interaction, sub_id)
+        return sub_id
 
     @app_commands.command(name="test", description="Start a testing/debugging run")
     @app_commands.describe(

src/discord-cluster-manager/submission.py

@@ -1,5 +1,6 @@
 import copy
 import dataclasses
+import typing
 from datetime import datetime
 from typing import Optional, Union
 
@@ -8,6 +9,9 @@
 from task import LeaderboardTask
 from utils import KernelBotError
 
+if typing.TYPE_CHECKING:
+    from backend import KernelBackend
+
 
 @dataclasses.dataclass
 class SubmissionRequest:
@@ -27,7 +31,14 @@ class ProcessedSubmissionRequest(SubmissionRequest):
     task_gpus: list
 
 
-def prepare_submission(req: SubmissionRequest, lb_db: LeaderboardDB) -> ProcessedSubmissionRequest:
+def prepare_submission(
+    req: SubmissionRequest, backend: "KernelBackend"
+) -> ProcessedSubmissionRequest:
+    if not backend.accepts_jobs:
+        raise KernelBotError(
+            "The bot is currently not accepting any new submissions, please try again later."
+        )
+
     if profanity.contains_profanity(req.file_name):
         raise KernelBotError("Please provide a non rude filename")
 
@@ -41,10 +52,10 @@ def prepare_submission(req: SubmissionRequest, lb_db: LeaderboardDB) -> Processe
     req = handle_popcorn_directives(req)
     assert req.leaderboard is not None
 
-    leaderboard = lookup_leaderboard(req.leaderboard, lb_db)
+    leaderboard = lookup_leaderboard(req.leaderboard, backend.db)
     check_deadline(leaderboard)
 
-    task_gpus = get_avail_gpus(req.leaderboard, lb_db)
+    task_gpus = get_avail_gpus(req.leaderboard, backend.db)
 
     if req.gpus is not None:
         for g in req.gpus:
@@ -70,7 +81,7 @@ def lookup_leaderboard(leaderboard: str, lb_db: LeaderboardDB) -> LeaderboardIte
     with lb_db as db:
         leaderboard_item = db.get_leaderboard(leaderboard)
         if not leaderboard_item:
-            raise KernelBotError(f"Leaderboard {leaderboard} not found.")
+            raise KernelBotError(f"Leaderboard `{leaderboard}` not found.")
         return leaderboard_item
 
 
@@ -106,15 +117,11 @@ def handle_popcorn_directives(req: SubmissionRequest) -> SubmissionRequest:
         req.gpus = info["gpus"]
 
     if info["leaderboard"] is not None:
-        if req.leaderboard is not None:
-            pass
-            # TODO how do we handle this?
-            # await send_discord_message(
-            #     interaction,
-            #     "Leaderboard name specified in the command doesn't match the one "
-            #     f"in the submission script header. Submitting to `{leaderboard_name}`",
-            #     ephemeral=True,
-            # )
+        if req.leaderboard is not None and req.leaderboard != info["leaderboard"]:
+            raise KernelBotError(
+                f"Leaderboard name `{req.leaderboard}` specified in the command doesn't match the one "
+                f"in the submission script header `{info['leaderboard']}`."
+            )
         else:
             req.leaderboard = info["leaderboard"]