get_leaderboard either returns a leaderboard or throws

Author: ngc92

src/discord-cluster-manager/api/main.py

@@ -347,18 +347,6 @@ async def run_submission(  # noqa: C901
     try:
         with db_context as db:
             leaderboard_item = db.get_leaderboard(leaderboard_name)
-            if not leaderboard_item:
-                all_leaderboards = [lb["name"] for lb in db.get_leaderboards()]
-                if leaderboard_name not in all_leaderboards:
-                    raise HTTPException(
-                        status_code=404, detail=f"Leaderboard '{leaderboard_name}' not found."
-                    )
-                else:
-                    raise HTTPException(
-                        status_code=500,
-                        detail=f"Error retrieving details for leaderboard '{leaderboard_name}'.",
-                    )
-
             gpus = leaderboard_item.get("gpu_types", [])
             if gpu_type not in gpus:
                 supported_gpus = ", ".join(gpus) if gpus else "None"

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

@@ -14,7 +14,7 @@
 from discord import app_commands
 from discord.ext import commands, tasks
 from discord_utils import leaderboard_name_autocomplete, send_discord_message, with_error_handling
-from leaderboard_db import LeaderboardItem, SubmissionItem
+from leaderboard_db import LeaderboardDoesNotExist, LeaderboardItem, SubmissionItem
 from task import LeaderboardTask, make_task
 from ui.misc import ConfirmationView, DeleteConfirmationModal, GPUSelectionView
 from utils import (
@@ -176,7 +176,10 @@ async def leaderboard_create_local(
 
         # create-local overwrites existing leaderboard
         with self.bot.leaderboard_db as db:
-            old_lb = db.get_leaderboard(leaderboard_name)
+            try:
+                old_lb = db.get_leaderboard(leaderboard_name)
+            except LeaderboardDoesNotExist:
+                pass
             db.delete_leaderboard(leaderboard_name, force=True)
 
         # get existing forum thread or create new one
@@ -398,8 +401,7 @@ async def delete_leaderboard(
         forum_channel = self.bot.get_channel(self.bot.leaderboard_forum_id)
 
         with self.bot.leaderboard_db as db:
-            lb: LeaderboardItem = db.get_leaderboard(leaderboard_name)
-            forum_id = lb["forum_id"]
+            forum_id = db.get_leaderboard(leaderboard_name)["forum_id"]
         threads = [thread for thread in forum_channel.threads if thread.id == forum_id]
 
         if threads:

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

@@ -261,8 +261,6 @@ async def lang_autocomplete(
 
     with bot.leaderboard_db as db:
         leaderboard_item = db.get_leaderboard(lb)  # type: LeaderboardItem
-        if not leaderboard_item:
-            raise ValueError("Invalid leaderboard")
 
     candidates = leaderboard_item["task"].templates
     return [discord.app_commands.Choice(name=c, value=c) for c in candidates]
@@ -423,14 +421,6 @@ async def _get_submissions_helper(
             submissions = {}
             with self.bot.leaderboard_db as db:
                 leaderboard_id = db.get_leaderboard(leaderboard_name)["id"]
-                if not leaderboard_id:
-                    await send_discord_message(
-                        interaction,
-                        f'Leaderboard "{leaderboard_name}" not found.',
-                        ephemeral=True,
-                    )
-                    return
-
                 gpus = db.get_leaderboard_gpu_types(leaderboard_name)
 
                 if len(gpus) == 1:
@@ -551,13 +541,6 @@ async def get_leaderboard_task(self, interaction: discord.Interaction, leaderboa
 
         with self.bot.leaderboard_db as db:
             leaderboard_item = db.get_leaderboard(leaderboard_name)  # type: LeaderboardItem
-            if not leaderboard_item:
-                await send_discord_message(
-                    interaction,
-                    f"Leaderboard with name `{leaderboard_name}` not found.",
-                    ephemeral=True,
-                )
-                return
 
         code = leaderboard_item["task"].files
 
@@ -585,13 +568,6 @@ async def get_task_template(
         try:
             with self.bot.leaderboard_db as db:
                 leaderboard_item = db.get_leaderboard(leaderboard_name)  # type: LeaderboardItem
-                if not leaderboard_item:
-                    await send_discord_message(
-                        interaction,
-                        f"Leaderboard with name `{leaderboard_name}` not found.",
-                        ephemeral=True,
-                    )
-                    return
 
             if lang not in leaderboard_item["task"].templates:
                 langs = "\n".join(

src/discord-cluster-manager/leaderboard_db.py

@@ -389,7 +389,7 @@ def get_leaderboard_gpu_types(self, leaderboard_name: str) -> List[str] | None:
         else:
             return None
 
-    def get_leaderboard(self, leaderboard_name: str) -> "LeaderboardItem | None":
+    def get_leaderboard(self, leaderboard_name: str) -> "LeaderboardItem":
         self.cursor.execute(
             """
             SELECT id, name, deadline, task, creator_id, forum_id, secret_seed
@@ -414,7 +414,7 @@ def get_leaderboard(self, leaderboard_name: str) -> "LeaderboardItem | None":
                 gpu_types=self.get_leaderboard_gpu_types(res[1]),
             )
         else:
-            return None
+            raise LeaderboardDoesNotExist(leaderboard_name)
 
     def get_leaderboard_submissions(
         self,
@@ -938,3 +938,8 @@ class SubmissionItem(TypedDict):
     done: bool
     code: str
     runs: List[RunItem]
+
+
+class LeaderboardDoesNotExist(KernelBotError):
+    def __init__(self, name: str):
+        super().__init__(message=f"Leaderboard `{name}` does not exist.", code=404)

src/discord-cluster-manager/submission.py

@@ -52,7 +52,8 @@ def prepare_submission(
     req = handle_popcorn_directives(req)
     assert req.leaderboard is not None
 
-    leaderboard = lookup_leaderboard(req.leaderboard, backend.db)
+    with backend.db as db:
+        leaderboard = db.get_leaderboard(req.leaderboard)
     check_deadline(leaderboard)
 
     task_gpus = get_avail_gpus(req.leaderboard, backend.db)
@@ -77,14 +78,6 @@ def prepare_submission(
     )
 
 
-def lookup_leaderboard(leaderboard: str, lb_db: LeaderboardDB) -> LeaderboardItem:
-    with lb_db as db:
-        leaderboard_item = db.get_leaderboard(leaderboard)
-        if not leaderboard_item:
-            raise KernelBotError(f"Leaderboard `{leaderboard}` not found.")
-        return leaderboard_item
-
-
 def check_deadline(leaderboard: LeaderboardItem):
     now = datetime.now()
     deadline = leaderboard["deadline"]

src/discord-cluster-manager/utils.py

@@ -32,7 +32,7 @@ class KernelBotError(Exception):
 
     def __init__(self, message, code: int = 400):
         super().__init__(message)
-        self.http_code = 400
+        self.http_code = code
 
 
 def get_github_branch_name():