move db helper typedefs into db file

Author: ngc92

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

@@ -10,8 +10,8 @@
 from consts import SubmissionMode
 from fastapi import Depends, FastAPI, Header, HTTPException, UploadFile
 from fastapi.responses import StreamingResponse
+from leaderboard_db import LeaderboardRankedEntry
 from submission import SubmissionRequest
-from utils import LeaderboardRankedEntry
 
 from .utils import _handle_discord_oauth, _handle_github_oauth, _run_submission
 

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

@@ -13,12 +13,11 @@
 from consts import GitHubGPU, ModalGPU
 from discord import app_commands
 from discord.ext import commands, tasks
+from leaderboard_db import LeaderboardItem, SubmissionItem
 from task import LeaderboardTask, make_task
 from ui.misc import ConfirmationView, DeleteConfirmationModal, GPUSelectionView
 from utils import (
     KernelBotError,
-    LeaderboardItem,
-    SubmissionItem,
     leaderboard_name_autocomplete,
     send_discord_message,
     setup_logging,

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

@@ -10,15 +10,17 @@
 )
 from discord import app_commands
 from discord.ext import commands
+from leaderboard_db import (
+    LeaderboardItem,
+    LeaderboardRankedEntry,
+    RunItem,
+    SubmissionItem,
+)
 from report import MultiProgressReporter
 from submission import SubmissionRequest, prepare_submission
 from ui.misc import GPUSelectionView
 from ui.table import create_table
 from utils import (
-    LeaderboardItem,
-    LeaderboardRankedEntry,
-    RunItem,
-    SubmissionItem,
     format_time,
     get_user_from_id,
     leaderboard_name_autocomplete,

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

@@ -14,9 +14,10 @@
 from discord import app_commands
 from discord.app_commands import Choice
 from discord.ext import commands
+from leaderboard_db import RunItem, SubmissionItem
 from report import MultiProgressReporter
 from task import make_task
-from utils import RunItem, SubmissionItem, send_discord_message, setup_logging, with_error_handling
+from utils import send_discord_message, setup_logging, with_error_handling
 
 logger = setup_logging()
 

src/discord-cluster-manager/leaderboard_db.py

@@ -2,18 +2,14 @@
 import datetime
 import json
 import logging
-from typing import List, Optional
+from typing import List, NotRequired, Optional, TypedDict
 
 import psycopg2
 from run_eval import CompileResult, RunResult, SystemInfo
 from task import LeaderboardTask
 from utils import (
     KernelBotError,
-    LeaderboardItem,
-    LeaderboardRankedEntry,
     LRUCache,
-    RunItem,
-    SubmissionItem,
     setup_logging,
 )
 
@@ -79,7 +75,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         if self.refcount == 0:
             self.disconnect()
 
-    def create_leaderboard(self, leaderboard: LeaderboardItem) -> int:
+    def create_leaderboard(self, leaderboard: "LeaderboardItem") -> int:
         try:
             self.cursor.execute(
                 """
@@ -342,7 +338,7 @@ def get_leaderboard_names(self) -> list[str]:
         self.cursor.execute("SELECT name FROM leaderboard.leaderboard")
         return [x[0] for x in self.cursor.fetchall()]
 
-    def get_leaderboards(self) -> list[LeaderboardItem]:
+    def get_leaderboards(self) -> list["LeaderboardItem"]:
         self.cursor.execute(
             """
             SELECT id, name, deadline, task, creator_id
@@ -393,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 | None":
         self.cursor.execute(
             """
             SELECT id, name, deadline, task, creator_id, forum_id, secret_seed
@@ -427,7 +423,7 @@ def get_leaderboard_submissions(
         user_id: Optional[str] = None,
         limit: int = None,
         offset: int = 0,
-    ) -> list[LeaderboardRankedEntry]:
+    ) -> list["LeaderboardRankedEntry"]:
         # separate cases, for personal we want all submissions, for general we want best per user
         if user_id:
             # Query all if user_id (means called from show-personal)
@@ -642,7 +638,7 @@ def delete_submission(self, submission_id: int):
             logger.exception("Could not delete submission %s.", submission_id, exc_info=e)
             raise KernelBotError(f"Could not delete submission {submission_id}!") from e
 
-    def get_submission_by_id(self, submission_id: int) -> Optional[SubmissionItem]:
+    def get_submission_by_id(self, submission_id: int) -> Optional["SubmissionItem"]:
         query = """
                 SELECT s.leaderboard_id, lb.name, s.file_name, s.user_id,
                        s.submission_time, s.done, c.code
@@ -893,3 +889,52 @@ def validate_cli_id(self, cli_id: str) -> Optional[dict[str, str]]:
             self.connection.rollback()
             logger.exception("Error validating CLI ID %s", cli_id, exc_info=e)
             raise KernelBotError("Error validating CLI ID") from e
+
+
+class LeaderboardItem(TypedDict):
+    id: int
+    name: str
+    creator_id: int
+    deadline: datetime.datetime
+    task: "LeaderboardTask"
+    gpu_types: List[str]
+    forum_id: int
+    secret_seed: NotRequired[int]
+
+
+class LeaderboardRankedEntry(TypedDict):
+    submission_id: int
+    rank: int
+    submission_name: str
+    submission_time: datetime.datetime
+    submission_score: float
+    leaderboard_name: str
+    user_id: int
+    user_name: str
+    gpu_type: str
+
+
+class RunItem(TypedDict):
+    start_time: datetime.datetime
+    end_time: datetime.datetime
+    mode: str
+    secret: bool
+    runner: str
+    score: Optional[float]
+    passed: bool
+    compilation: dict
+    meta: dict
+    result: dict
+    system: dict
+
+
+class SubmissionItem(TypedDict):
+    submission_id: int
+    leaderboard_id: int
+    leaderboard_name: str
+    file_name: str
+    user_id: int
+    submission_time: datetime.datetime
+    done: bool
+    code: str
+    runs: List[RunItem]

src/discord-cluster-manager/submission.py

@@ -4,9 +4,9 @@
 from typing import Optional, Union
 
 from better_profanity import profanity
-from leaderboard_db import LeaderboardDB
+from leaderboard_db import LeaderboardDB, LeaderboardItem
 from task import LeaderboardTask
-from utils import KernelBotError, LeaderboardItem
+from utils import KernelBotError
 
 
 @dataclasses.dataclass

src/discord-cluster-manager/utils.py

@@ -1,8 +1,7 @@
-import datetime
 import functools
 import logging
 import subprocess
-from typing import TYPE_CHECKING, Any, List, NotRequired, Optional, TypedDict
+from typing import TYPE_CHECKING, Any, Optional
 
 import discord
 from consts import Language, SubmissionMode
@@ -179,55 +178,6 @@ def invalidate(self):
         self._q.clear()
 
 
-class LeaderboardItem(TypedDict):
-    id: int
-    name: str
-    creator_id: int
-    deadline: datetime.datetime
-    task: "LeaderboardTask"
-    gpu_types: List[str]
-    forum_id: int
-    secret_seed: NotRequired[int]
-
-
-class LeaderboardRankedEntry(TypedDict):
-    submission_id: int
-    rank: int
-    submission_name: str
-    submission_time: datetime.datetime
-    submission_score: float
-    leaderboard_name: str
-    user_id: int
-    user_name: str
-    gpu_type: str
-
-
-class RunItem(TypedDict):
-    start_time: datetime.datetime
-    end_time: datetime.datetime
-    mode: str
-    secret: bool
-    runner: str
-    score: Optional[float]
-    passed: bool
-    compilation: dict
-    meta: dict
-    result: dict
-    system: dict
-
-
-class SubmissionItem(TypedDict):
-    submission_id: int
-    leaderboard_id: int
-    leaderboard_name: str
-    file_name: str
-    user_id: int
-    submission_time: datetime.datetime
-    done: bool
-    code: str
-    runs: List[RunItem]
-
-
 def build_task_config(
     task: "LeaderboardTask" = None,
     submission_content: str = None,