existence validation inside get_leaderboard_gpu_types

Author: ngc92

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

@@ -437,11 +437,6 @@ async def get_gpus(leaderboard_name: str, db_context=Depends(get_db)) -> list[st
     await simple_rate_limit()
     try:
         with db_context as db:
-            # Validate leaderboard exists first
-            leaderboard_names = [x["name"] for x in db.get_leaderboards()]
-            if leaderboard_name not in leaderboard_names:
-                raise HTTPException(status_code=400, detail="Invalid leaderboard name")
-
             return db.get_leaderboard_gpu_types(leaderboard_name)
 
     except Exception as e:

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

@@ -420,7 +420,6 @@ async def _get_submissions_helper(
         try:
             submissions = {}
             with self.bot.leaderboard_db as db:
-                leaderboard_id = db.get_leaderboard(leaderboard_name)["id"]
                 gpus = db.get_leaderboard_gpu_types(leaderboard_name)
 
                 if len(gpus) == 1:

src/discord-cluster-manager/leaderboard_db.py

@@ -371,18 +371,26 @@ def get_leaderboards(self) -> list["LeaderboardItem"]:
     def get_leaderboard_gpu_types(self, leaderboard_name: str) -> List[str]:
         self.cursor.execute(
             """
-            SELECT *
-            FROM leaderboard.gpu_type
-            WHERE leaderboard_id = (
-                SELECT id
-                FROM leaderboard.leaderboard
-                WHERE name = %s
-            )
+            SELECT id
+            FROM leaderboard.leaderboard
+            WHERE name = %s
             """,
             (leaderboard_name,),
         )
+        lb_id = self.cursor.fetchone()
+        if lb_id is None:
+            raise LeaderboardDoesNotExist(leaderboard_name)
+
+        self.cursor.execute(
+            """
+            SELECT gpu_type
+            FROM leaderboard.gpu_type
+            WHERE leaderboard_id = %s
+            """,
+            (lb_id[0],),
+        )
 
-        return [x[1] for x in self.cursor.fetchall()]
+        return [x[0] for x in self.cursor.fetchall()]
 
     def get_leaderboard(self, leaderboard_name: str) -> "LeaderboardItem":
         self.cursor.execute(

src/discord-cluster-manager/submission.py

@@ -112,7 +112,8 @@ def handle_popcorn_directives(req: SubmissionRequest) -> SubmissionRequest:
     if info["leaderboard"] is not None:
         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"Leaderboard name `{req.leaderboard}` specified in the command"
+                f" doesn't match the one "
                 f"in the submission script header `{info['leaderboard']}`."
             )
         else: