split leaderboard task into definition and runner-relevant things

Author: ngc92

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

@@ -15,7 +15,7 @@
 from discord.ext import commands, tasks
 from discord_utils import leaderboard_name_autocomplete, send_discord_message, with_error_handling
 from leaderboard_db import LeaderboardDoesNotExist, LeaderboardItem, SubmissionItem
-from task import LeaderboardTask, make_task
+from task import LeaderboardDefinition, make_task_definition
 from ui.misc import ConfirmationView, DeleteConfirmationModal, GPUSelectionView
 from utils import (
     KernelBotError,
@@ -169,7 +169,7 @@ async def leaderboard_create_local(
 
         directory = Path(env.PROBLEM_DEV_DIR) / directory
         assert directory.resolve().is_relative_to(Path.cwd() / env.PROBLEM_DEV_DIR)
-        task = make_task(directory)
+        definition = make_task_definition(directory)
 
         # clearly mark this leaderboard as development-only
         leaderboard_name = directory.name + "-dev"
@@ -203,7 +203,7 @@ async def leaderboard_create_local(
             interaction,
             leaderboard_name,
             datetime.now(timezone.utc) + timedelta(days=365),
-            task=task,
+            definition=definition,
             forum_id=forum_id,
             gpu=gpu.value if gpu else None,
         ):
@@ -238,7 +238,7 @@ async def leaderboard_create_impl(  # noqa: C901
         interaction: discord.Interaction,
         leaderboard_name: str,
         deadline: str,
-        task: LeaderboardTask,
+        definition: LeaderboardDefinition,
         gpus: Optional[str | list[str]],
     ):
         if len(leaderboard_name) > 95:
@@ -271,13 +271,13 @@ async def leaderboard_create_impl(  # noqa: C901
             forum_thread = await forum_channel.create_thread(
                 name=leaderboard_name,
                 content=self._leaderboard_opening_message(
-                    leaderboard_name, date_value, task.description
+                    leaderboard_name, date_value, definition.description
                 ),
                 auto_archive_duration=10080,  # 7 days
             )
 
             success = await self.create_leaderboard_in_db(
-                interaction, leaderboard_name, date_value, task, forum_thread.thread.id, gpus
+                interaction, leaderboard_name, date_value, definition, forum_thread.thread.id, gpus
             )
             if not success:
                 await forum_thread.delete()
@@ -323,7 +323,7 @@ async def create_leaderboard_in_db(
         interaction: discord.Interaction,
         leaderboard_name: str,
         date_value: datetime,
-        task: LeaderboardTask,
+        definition: LeaderboardDefinition,
         forum_id: int,
         gpu: Optional[str | list[str]] = None,
     ) -> bool:
@@ -350,14 +350,12 @@ async def create_leaderboard_in_db(
         with self.bot.leaderboard_db as db:
             try:
                 db.create_leaderboard(
-                    {
-                        "name": leaderboard_name,
-                        "deadline": date_value,
-                        "task": task,
-                        "gpu_types": selected_gpus,
-                        "creator_id": interaction.user.id,
-                        "forum_id": forum_id,
-                    }
+                    name=leaderboard_name,
+                    deadline=date_value,
+                    definition=definition,
+                    gpu_types=selected_gpus,
+                    creator_id=interaction.user.id,
+                    forum_id=forum_id,
                 )
             except KernelBotError as e:
                 await send_discord_message(
@@ -617,12 +615,13 @@ async def _create_update_plan(  # noqa: C901
             if name in leaderboards:
                 # check for differences
                 old = leaderboards[name]  # type: LeaderboardItem
-                new_task = make_task(source)
+                new_def = make_task_definition(source)
+                new_task = new_def.task
 
                 # from the database, we get datetime with timezone,
                 # so we need to convert here to enable comparison
                 new_dl = self._parse_deadline(problem["deadline"])
-                new_dl = new_dl.astimezone()
+                new_dl = new_dl.astimezone(timezone.utc)
                 if old["deadline"] != new_dl:
                     pass
                 elif old["gpu_types"] != problem["gpus"]:
@@ -729,15 +728,17 @@ async def update_competition(
                     interaction,
                     entry["name"],
                     entry["deadline"],
-                    make_task(root / entry["directory"]),
+                    make_task_definition(root / entry["directory"]),
                     entry["gpus"],
                 )
                 steps += "done\n"
 
             for entry in update_list:
                 with self.bot.leaderboard_db as db:
-                    task = make_task(root / entry["directory"])
-                    db.update_leaderboard(entry["name"], entry["deadline"], task)
+                    task = make_task_definition(root / entry["directory"])
+                    db.update_leaderboard(
+                        entry["name"], self._parse_deadline(entry["deadline"]), task
+                    )
                     new_lb: LeaderboardItem = db.get_leaderboard(entry["name"])
 
                 forum_id = new_lb["forum_id"]

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

@@ -266,14 +266,10 @@ async def lang_autocomplete(
     return [discord.app_commands.Choice(name=c, value=c) for c in candidates]
 
 
-def add_header_to_template(lang: str, lb: LeaderboardItem):
-    template_file = lb["task"].templates[lang]
-
+def add_header_to_template(lang: str, code: str, lb: LeaderboardItem):
     comment_char = {"CUDA": "//", "Python": "#", "Triton": "#", "HIP": "#"}[lang]
 
-    description_comment = [
-        f"{comment_char} > {line}" for line in lb["task"].description.splitlines()
-    ]
+    description_comment = [f"{comment_char} > {line}" for line in lb["description"].splitlines()]
     header = f"""
 {comment_char}!POPCORN leaderboard {lb["name"]}
 
@@ -287,7 +283,7 @@ def add_header_to_template(lang: str, lb: LeaderboardItem):
 {comment_char} Happy hacking!
 
 """[1:]
-    return header + template_file + "\n"
+    return header + code + "\n"
 
 
 class LeaderboardCog(commands.Cog):
@@ -566,12 +562,11 @@ async def get_task_template(
 
         try:
             with self.bot.leaderboard_db as db:
-                leaderboard_item = db.get_leaderboard(leaderboard_name)  # type: LeaderboardItem
+                templates = db.get_leaderboard_templates(leaderboard_name)
+                leaderboard_item = db.get_leaderboard(leaderboard_name)
 
-            if lang not in leaderboard_item["task"].templates:
-                langs = "\n".join(
-                    (f"* {lang} " for lang in leaderboard_item["task"].templates.keys())
-                )
+            if lang not in templates:
+                langs = "\n".join((f"* {lang} " for lang in templates.keys()))
                 await send_discord_message(
                     interaction,
                     f"Leaderboard `{leaderboard_name}` does not have a template for `{lang}`.\n"  # noqa: E501
@@ -580,7 +575,7 @@ async def get_task_template(
                 )
                 return
 
-            template = add_header_to_template(lang, leaderboard_item)
+            template = add_header_to_template(lang, templates[lang], leaderboard_item)
             ext = {"CUDA": "cu", "Python": "py", "Triton": "py", "HIP": "py"}
             file_name = f"{leaderboard_name}.{ext[lang]}"
             file = discord.File(fp=StringIO(template), filename=file_name)

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

@@ -16,7 +16,7 @@
 from discord_reporter import MultiProgressReporterDiscord
 from discord_utils import send_discord_message, with_error_handling
 from leaderboard_db import RunItem, SubmissionItem
-from task import make_task
+from task import make_task_definition
 from utils import setup_logging
 
 logger = setup_logging()
@@ -52,12 +52,12 @@ async def trigger_run(self, interaction: discord.Interaction, gpu: GPU, reporter
             sub_code = create_mock_attachment(
                 "submission.py", Path("examples/identity_py/submission.py").read_text()
             )
-            task = make_task("examples/identity_py")
+            task = make_task_definition("examples/identity_py")
         else:
             sub_code = create_mock_attachment(
                 "test.cu", Path("examples/identity_cuda/submission.cu").read_text()
             )
-            task = make_task("examples/identity_cuda")
+            task = make_task_definition("examples/identity_cuda")
 
         return await submit_leaderboard(
             interaction,
@@ -184,7 +184,7 @@ async def verify_task(
             await send_discord_message(interaction, f"Invalid path {directory.resolve()}")
             return
         try:
-            task = make_task(directory)
+            task = make_task_definition(directory)
         except Exception as E:
             logger.exception("Could not make task", exc_info=E)
             await send_discord_message(interaction, f"Invalid task {directory}")