Ruff everything (#54)

Author: msaroufim

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    
+    - name: Install dependencies
+      run: |
+        pip install ruff
+    
+    - name: Run Ruff check
+      run: |
+        ruff check .

.ruff.toml

@@ -0,0 +1,11 @@
+line-length = 110 # ideally I want this to be less than 100 but don't wanna test and change the sql stuff
+target-version = "py310"
+lint.select = [
+    "E",   # pycodestyle errors
+    "F",   # pyflakes
+    "I",   # isort
+    "B",   # flake8-bugbear
+    "C",   # mccabe
+    "W",   # pycodestyle warnings
+]
+lint.ignore = []

scripts/flush_db.py

@@ -1,18 +1,20 @@
 #!/usr/bin/env python3
 
+import os
+
 import psycopg2
-from psycopg2 import Error
 from dotenv import load_dotenv
-import os
+from psycopg2 import Error
+
 
 def flush_database():
     # Load environment variables
     load_dotenv()
-    
+
     DATABASE_URL = os.getenv('DATABASE_URL')
-    
+
     if DATABASE_URL is None:
-        print(f"❌ Missing DATABASE_URL environment variable")
+        print("❌ Missing DATABASE_URL environment variable")
         return
 
     try:
@@ -47,4 +49,4 @@ def flush_database():
             print("🔌 Database connection closed")
 
 if __name__ == "__main__":
-    flush_database() 
+    flush_database()

scripts/github-only-bot.py

@@ -44,4 +44,4 @@ async def run_pytorch_script_on_modal():
 if __name__ == "__main__":
     with modal_app.run():
         result = run_pytorch_script_on_modal.remote()
-        print(result)
+        print(result)

scripts/modal-test.py

@@ -1,27 +1,28 @@
-import discord
-from discord import app_commands
-from discord.ext import commands
 import argparse
-from utils import setup_logging
-from cogs.misc_cog import BotManagerCog
 from datetime import datetime
+
+import discord
+from cogs.github_cog import GitHubCog
+from cogs.leaderboard_cog import LeaderboardCog
+from cogs.misc_cog import BotManagerCog
+from cogs.modal_cog import ModalCog
+from cogs.verify_run_cog import VerifyRunCog
 from consts import (
-    init_environment,
-    DISCORD_TOKEN,
-    DISCORD_DEBUG_TOKEN,
     DISCORD_CLUSTER_STAGING_ID,
     DISCORD_DEBUG_CLUSTER_STAGING_ID,
-    POSTGRES_USER,
-    POSTGRES_PASSWORD,
+    DISCORD_DEBUG_TOKEN,
+    DISCORD_TOKEN,
+    POSTGRES_DATABASE,
     POSTGRES_HOST,
+    POSTGRES_PASSWORD,
     POSTGRES_PORT,
-    POSTGRES_DATABASE,
+    POSTGRES_USER,
+    init_environment,
 )
-from cogs.modal_cog import ModalCog
-from cogs.github_cog import GitHubCog
-from cogs.leaderboard_cog import LeaderboardCog
+from discord import app_commands
+from discord.ext import commands
 from leaderboard_db import LeaderboardDB
-from cogs.verify_run_cog import VerifyRunCog
+from utils import setup_logging
 
 logger = setup_logging()
 

src/discord-cluster-manager/bot.py

@@ -1,15 +1,16 @@
+import asyncio
+import os
+import zipfile
+from datetime import datetime, timedelta, timezone
+
 import discord
+import requests
+from consts import GITHUB_REPO, GITHUB_TOKEN, GPUType
 from discord import app_commands
 from discord.ext import commands
-from datetime import datetime, timezone, timedelta
-import asyncio
-import requests
-import zipfile
-import os
 from github import Github
-from utils import setup_logging, get_github_branch_name
-from consts import GPUType, GITHUB_TOKEN, GITHUB_REPO
-from leaderboard_eval import py_eval, cu_eval
+from leaderboard_eval import cu_eval, py_eval
+from utils import get_github_branch_name, setup_logging
 
 logger = setup_logging()
 
@@ -100,12 +101,13 @@ async def run_github(
                     "Failed to trigger GitHub Action. Please check the configuration."
                 )
 
+            return thread
+
         except Exception as e:
             logger.error(f"Error processing request: {str(e)}", exc_info=True)
-            await thread.send(f"Error processing request: {str(e)}")
-
-        finally:
-            return thread
+            if thread:
+                await thread.send(f"Error processing request: {str(e)}")
+            raise
 
     async def trigger_github_action(
         self,
@@ -175,7 +177,8 @@ async def check_workflow_status(self, run_id, thread):
                 if elapsed_time > timeout:
                     try:
                         run.cancel()
-                        # Wait briefly to ensure cancellation is processed and Verify the run was actually cancelled
+                        # Wait briefly to ensure cancellation is processed
+                        # And Verify the run was actually cancelled
                         await asyncio.sleep(5)
                         run = repo.get_workflow_run(run_id)
                         if run.status != "completed":

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

@@ -1,14 +1,12 @@
-import discord
-from discord import app_commands
-from discord.ext import commands
+import random
 from datetime import datetime
 
-from typing import TYPE_CHECKING
+import discord
 from consts import GitHubGPU, ModalGPU
+from discord import app_commands
+from discord.ext import commands
 from utils import extract_score, get_user_from_id
 
-import random
-
 
 class LeaderboardSubmitCog(app_commands.Group):
     def __init__(
@@ -67,8 +65,6 @@ async def submit_modal(
                 await interaction.response.send_message("❌ Required cogs not found!")
                 return
 
-            modal_command = modal_cog.run_modal
-
             # Compute eval or submission score, call runner here.
             score = random.random()
 
@@ -83,7 +79,10 @@ async def submit_modal(
                 })
 
             await interaction.response.send_message(
-                f"Ran on Modal. Leaderboard '{leaderboard_name}'. Submission title: {script.filename}. Submission user: {interaction.user.id}. Runtime: {score} ms",
+                f"Ran on Modal. Leaderboard '{leaderboard_name}'.\n"
+                + f"Submission title: {script.filename}.\n"
+                + f"Submission user: {interaction.user.id}.\n"
+                + f"Runtime: {score} ms",
                 ephemeral=True,
             )
         except ValueError:
@@ -270,7 +269,9 @@ async def leaderboard_create(
                 })
 
             await interaction.response.send_message(
-                f"Leaderboard '{leaderboard_name}'. Reference code: {reference_code}. Submission deadline: {date_value}",
+                f"Leaderboard '{leaderboard_name}' created.\n"
+                + f"Reference code: {reference_code}.\n"
+                + f"Submission deadline: {date_value}",
                 ephemeral=True,
             )
         except ValueError:

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

@@ -1,9 +1,9 @@
 import discord
+import psycopg2
+from consts import DATABASE_URL
 from discord import app_commands
 from discord.ext import commands
-import psycopg2
 from utils import setup_logging
-from consts import DATABASE_URL
 
 logger = setup_logging()