From 910be84ffabf0e336fc74c6338d793258ba00dee Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Sat, 23 Aug 2025 16:09:20 -0700 Subject: [PATCH] Update [ghstack-poisoned] --- src/kernelbot/api/api_utils.py | 13 ++++++------- src/libkernelbot/backend.py | 2 -- src/libkernelbot/leaderboard_db.py | 10 ++++++++-- .../20250822_01_UtXzl-website-submission.py | 3 ++- unit-tests/test_leaderboard_db.py | 6 +++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/kernelbot/api/api_utils.py b/src/kernelbot/api/api_utils.py index ab52b5a5..57b764bb 100644 --- a/src/kernelbot/api/api_utils.py +++ b/src/kernelbot/api/api_utils.py @@ -1,13 +1,13 @@ import asyncio -from dataclasses import asdict import datetime -from re import sub +import json import time -from typing import Any, Optional, Tuple +from dataclasses import asdict +from typing import Any, Optional + import requests -from fastapi import HTTPException, UploadFile -from fastapi import BackgroundTasks -import json +from fastapi import BackgroundTasks, HTTPException, UploadFile + from kernelbot.env import env from libkernelbot.backend import KernelBackend from libkernelbot.consts import SubmissionMode @@ -19,7 +19,6 @@ Text, ) from libkernelbot.submission import SubmissionRequest, prepare_submission -from src.kernelbot.api.main import simple_rate_limit from src.libkernelbot.leaderboard_db import LeaderboardDB diff --git a/src/libkernelbot/backend.py b/src/libkernelbot/backend.py index 2441a366..4cee7b8d 100644 --- a/src/libkernelbot/backend.py +++ b/src/libkernelbot/backend.py @@ -1,8 +1,6 @@ import asyncio import copy from datetime import datetime -from os import stat -from re import sub from types import SimpleNamespace from typing import Optional diff --git a/src/libkernelbot/leaderboard_db.py b/src/libkernelbot/leaderboard_db.py index 8b7b17bc..0d3f69a7 100644 --- a/src/libkernelbot/leaderboard_db.py +++ b/src/libkernelbot/leaderboard_db.py @@ -1,11 +1,17 @@ import dataclasses import datetime import json -from typing import Any, Dict, List, Optional +from typing import Dict, List, Optional import psycopg2 -from libkernelbot.db_types import IdentityType, LeaderboardItem, LeaderboardRankedEntry, RunItem, SubmissionItem +from libkernelbot.db_types import ( + IdentityType, + LeaderboardItem, + LeaderboardRankedEntry, + RunItem, + SubmissionItem, +) from libkernelbot.run_eval import CompileResult, RunResult, SystemInfo from libkernelbot.task import LeaderboardDefinition, LeaderboardTask from libkernelbot.utils import ( diff --git a/src/migrations/20250822_01_UtXzl-website-submission.py b/src/migrations/20250822_01_UtXzl-website-submission.py index ab1d3b29..03bd9192 100644 --- a/src/migrations/20250822_01_UtXzl-website-submission.py +++ b/src/migrations/20250822_01_UtXzl-website-submission.py @@ -8,6 +8,7 @@ steps = [ step( - "ALTER TABLE leaderboard.user_info ADD COLUMN IF NOT EXISTS web_auth_id VARCHAR(255) DEFAULT NULL;" + "ALTER TABLE leaderboard.user_info " + "ADD COLUMN IF NOT EXISTS web_auth_id VARCHAR(255) DEFAULT NULL;" ) ] diff --git a/unit-tests/test_leaderboard_db.py b/unit-tests/test_leaderboard_db.py index 3c419557..1f1cf6a7 100644 --- a/unit-tests/test_leaderboard_db.py +++ b/unit-tests/test_leaderboard_db.py @@ -5,11 +5,11 @@ import time import pytest -from libkernelbot.db_types import IdentityType from test_report import sample_compile_result, sample_run_result, sample_system_info from test_task import task_directory from libkernelbot import leaderboard_db +from libkernelbot.db_types import IdentityType from libkernelbot.utils import KernelBotError DATABASE_URL = "postgresql://postgres:postgres@localhost:5433/clusterdev" @@ -439,7 +439,7 @@ def test_validate_identity_web_auth_happy_path(database, submit_leaderboard): INSERT INTO leaderboard.user_info (id, user_name, web_auth_id) VALUES (%s, %s, %s) """, - (f"1234", f"sara_jojo","2345" ), + ("1234", "sara_jojo","2345" ), ) user_info = db.validate_identity("2345",IdentityType.WEB) assert user_info["user_id"] =="1234" @@ -453,7 +453,7 @@ def test_validate_identity_web_auth_missing(database, submit_leaderboard): INSERT INTO leaderboard.user_info (id, user_name) VALUES (%s, %s) """, - (f"1234", f"sara_jojo"), + ("1234", "sara_jojo"), ) res = db.validate_identity("2345",IdentityType.WEB) assert res is None