adds gpu_type column to submission table (#79)

* adds gpu_type column to submission table

* changes to make ruff happy

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

@@ -75,6 +75,7 @@ async def submit_modal(
                         "code": submission_content,
                         "user_id": interaction.user.id,
                         "submission_score": score,
+                        "gpu_type": gpu_type.name,
                     }
                 )
 
@@ -179,6 +180,8 @@ async def submit_github(
                         "code": submission_content,
                         "user_id": interaction.user.id,
                         "submission_score": score,
+                         # TODO: Change this to multiple GPUs (see above)
+                        "gpu_type": "nvidia",
                     }
                 )
 
@@ -420,6 +423,7 @@ async def get_leaderboard_submissions(
         self,
         interaction: discord.Interaction,
         leaderboard_name: str,
+        # TODO add GPU type
     ):
         try:
             with self.bot.leaderboard_db as db:

src/discord-cluster-manager/leaderboard_db.py

@@ -132,10 +132,11 @@ def create_submission(self, submission: SubmissionItem):
             self.cursor.execute(
                 """
                 INSERT INTO leaderboard.submission (leaderboard_id, name,
-                    user_id, code, submission_time, score)
+                    user_id, code, submission_time, score, gpu_type, stdout,
+                    profiler_output)
                 VALUES (
                     (SELECT id FROM leaderboard.leaderboard WHERE name = %s),
-                    %s, %s, %s, %s, %s)
+                    %s, %s, %s, %s, %s, %s, %s, %s)
                 """,
                 (
                     submission["leaderboard_name"],
@@ -144,6 +145,9 @@ def create_submission(self, submission: SubmissionItem):
                     submission["code"],
                     submission["submission_time"],
                     submission["submission_score"],
+                    submission["gpu_type"],
+                    submission.get("stdout", None),
+                    submission.get("profiler_output", None),
                 ),
             )
             self.connection.commit()
@@ -193,6 +197,7 @@ def get_leaderboard(self, leaderboard_name: str) -> int | None:
         else:
             return None
 
+    # TODO: add GPU type
     def get_leaderboard_submissions(self, leaderboard_name: str) -> list[SubmissionItem]:
         self.cursor.execute(
             """

src/discord-cluster-manager/migrations/20241226_01_ZQSOK-add_gpu_type_to_submission.py

@@ -0,0 +1,21 @@
+"""
+This migration adds a score column to runinfo, and drops the score column in
+submission.
+"""
+
+from yoyo import step
+
+__depends__ = {'20241224_01_Pg4FX-delete-cascade'}
+
+steps = [
+    step("DROP TABLE leaderboard.runinfo"),
+
+    step("""
+         ALTER TABLE leaderboard.submission
+         ADD COLUMN gpu_type TEXT NOT NULL DEFAULT 'nvidia'
+         """),
+
+    step("ALTER TABLE leaderboard.submission ADD COLUMN stdout TEXT"),
+
+    step("ALTER TABLE leaderboard.submission ADD COLUMN profiler_output TEXT"),
+]

src/discord-cluster-manager/utils.py

@@ -2,7 +2,7 @@
 import logging
 import re
 import subprocess
-from typing import Any, List, TypedDict
+from typing import Any, List, NotRequired, TypedDict
 
 import discord
 
@@ -143,9 +143,6 @@ class SubmissionItem(TypedDict):
     leaderboard_name: str
     code: str
     user_id: int
-
-
-class ProfilingItem(TypedDict):
-    submission_name: str
-    ncu_output: str
-    stdout: str
+    gpu_type: str
+    stdout: NotRequired[str]
+    profiler_output: NotRequired[str]