lint/small refactor

Author: ngc92

src/kernelbot/cogs/admin_cog.py

@@ -20,10 +20,9 @@
 )
 from kernelbot.env import env
 from kernelbot.ui.misc import ConfirmationView, DeleteConfirmationModal, GPUSelectionView
-from libkernelbot.consts import GitHubGPU, ModalGPU, SubmissionMode, get_gpu_by_name
+from libkernelbot.consts import GitHubGPU, ModalGPU, get_gpu_by_name
 from libkernelbot.leaderboard_db import LeaderboardDoesNotExist, LeaderboardItem, SubmissionItem
-from libkernelbot.submission import compute_score
-from libkernelbot.task import LeaderboardDefinition, make_task_definition
+from libkernelbot.task import LeaderboardDefinition, LeaderboardTask, make_task_definition
 from libkernelbot.utils import (
     KernelBotError,
     setup_logging,
@@ -401,7 +400,7 @@ async def _submit_milestones(
             leaderboard_item = db.get_leaderboard(leaderboard_name)
             milestones = db.get_leaderboard_milestones(leaderboard_item["id"])
 
-        task: "LeaderboardTask" = leaderboard_item["task"]
+        task: LeaderboardTask = leaderboard_item["task"]
 
         # ok, submit all that are missing
         submit_tasks = []
@@ -410,50 +409,6 @@ async def _submit_milestones(
         reporters = MultiProgressReporterDiscord(interaction)
         await reporters.show(f"Milestone runs for {leaderboard_name}")
 
-        async def submit_milestone(milestone, gpu, reporter):
-            result = await backend.submit_leaderboard(
-                -1,
-                milestone["code"],
-                "milestone.py",
-                gpu,
-                reporter,
-                task,
-                SubmissionMode.LEADERBOARD,
-                None,
-            )
-
-            # we do not allow milestone runs to fail
-            if not result.success:
-                logger.error(f"Milestone run failed: {result}")
-                raise KernelBotError(f"Milestone run failed: {result.error}")
-
-            for key, value in result.runs.items():
-                if not value.run.success or not value.run.passed:
-                    logger.error(f"Milestone run {key} failed: {value}")
-                    raise KernelBotError(f"Milestone run {key} failed.")
-
-            with backend.db as db:
-                for key, value in result.runs.items():
-                    # Only store LB runs in the database;
-                    # we still want to run test/benchmark to validate
-                    # that the code actually passes, but for all other
-                    # purposes we only need the leaderboard run
-                    if key != SubmissionMode.LEADERBOARD.value:
-                        continue
-
-                    db.create_submission_run(
-                        milestone=milestone["id"],
-                        start=value.start,
-                        end=value.end,
-                        mode=key,
-                        runner=gpu.name,
-                        score=compute_score(result, task, -1),
-                        secret=False,
-                        compilation=value.compilation,
-                        result=value.run,
-                        system=result.system,
-                    )
-
         if gpus is None:
             gpus = leaderboard_item["gpu_types"]
 
@@ -479,8 +434,9 @@ async def submit_milestone(milestone, gpu, reporter):
                     continue
 
                 submit_tasks.append(
-                    submit_milestone(
+                    backend.submit_milestone_run(
                         milestone,
+                        task,
                         get_gpu_by_name(gpu),
                         reporters.add_run(f"Milestone {milestone['name']} on {gpu}"),
                     )

src/libkernelbot/backend.py

@@ -299,7 +299,8 @@ async def get_milestone_result(
 
         if len(runs) == 0:
             return [
-                f"⚠️ No runs available for milestone `{milestone_name}`. Maybe they haven't been triggered yet?"
+                f"⚠️ No runs available for milestone `{milestone_name}`. "
+                f"Maybe they haven't been triggered yet?"
             ]
         if gpu is not None:
             runs = [r for r in runs if r["runner"] == gpu]
@@ -313,3 +314,47 @@ async def get_milestone_result(
             messages.append(f"{milestone_name} on {run['runner']}\n```{log}```\n")
 
         return messages
+
+    async def submit_milestone_run(self, milestone, task, gpu, reporter):
+        result = await self.submit_leaderboard(
+            -1,
+            milestone["code"],
+            "milestone.py",
+            gpu,
+            reporter,
+            task,
+            SubmissionMode.LEADERBOARD,
+            None,
+        )
+
+        # we do not allow milestone runs to fail
+        if not result.success:
+            logger.error(f"Milestone run failed: {result}")
+            raise KernelBotError(f"Milestone run failed: {result.error}")
+
+        for key, value in result.runs.items():
+            if not value.run.success or not value.run.passed:
+                logger.error(f"Milestone run {key} failed: {value}")
+                raise KernelBotError(f"Milestone run {key} failed.")
+
+        with self.db as db:
+            for key, value in result.runs.items():
+                # Only store LB runs in the database;
+                # we still want to run test/benchmark to validate
+                # that the code actually passes, but for all other
+                # purposes we only need the leaderboard run
+                if key != SubmissionMode.LEADERBOARD.value:
+                    continue
+
+                db.create_submission_run(
+                    milestone=milestone["id"],
+                    start=value.start,
+                    end=value.end,
+                    mode=key,
+                    runner=gpu.name,
+                    score=compute_score(result, task, -1),
+                    secret=False,
+                    compilation=value.compilation,
+                    result=value.run,
+                    system=result.system,
+                )

src/libkernelbot/leaderboard_db.py

@@ -478,8 +478,8 @@ def create_submission_run(
             }
             self.cursor.execute(
                 """
-                INSERT INTO leaderboard.runs (submission_id, milestone_id, start_time, end_time, mode,
-                secret, runner, score, passed, compilation, meta, result, system_info
+                INSERT INTO leaderboard.runs (submission_id, milestone_id, start_time, end_time,
+                mode, secret, runner, score, passed, compilation, meta, result, system_info
                 )
                 VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
                 """,

src/migrations/20250725_01_hwite-add-milestone-table.py

@@ -11,7 +11,8 @@
         """
          CREATE TABLE IF NOT EXISTS leaderboard.milestones (
              id SERIAL PRIMARY KEY,
-             leaderboard_id INTEGER NOT NULL REFERENCES leaderboard.leaderboard(id) ON DELETE CASCADE,
+             leaderboard_id INTEGER NOT NULL REFERENCES leaderboard.leaderboard(id)
+                ON DELETE CASCADE,
              name TEXT NOT NULL,
              code TEXT NOT NULL,
              description TEXT,