Refactor: moved some vars from envs to app_config

app.py

@@ -3,22 +3,20 @@ import gradio as gr
 from apscheduler.schedulers.background import BackgroundScheduler
 from huggingface_hub import snapshot_download
 
+from app_configs import AVAILABLE_MODELS, DEFAULT_SELECTIONS, THEME
 from components.quizbowl.bonus import BonusInterface
 from components.quizbowl.tossup import TossupInterface
 from display.custom_css import css_pipeline, css_tossup
 
 # Constants
-from src.envs import (
+from envs import (
     API,
-    AVAILABLE_MODELS,
-    DEFAULT_SELECTIONS,
     EVAL_REQUESTS_PATH,
     EVAL_RESULTS_PATH,
     PLAYGROUND_DATASET_NAMES,
     QUEUE_REPO,
     REPO_ID,
     RESULTS_REPO,
-    THEME,
     TOKEN,
 )
 from workflows import factory

src/app_configs.py

@@ -0,0 +1,52 @@
+THEME = "gstaff/xkcd"
+
+UNSELECTED_VAR_NAME = "Select Variable..."
+UNSELECTED_MODEL_NAME = "Select Model..."
+AVAILABLE_MODELS = {
+    "OpenAI/gpt-4o": {
+        "model": "gpt-4o-2024-11-20",
+    },
+    "OpenAI/gpt-4o-mini": {
+        "model": "gpt-4o-mini-2024-07-18",
+    },
+    "OpenAI/gpt-3.5-turbo": {
+        "model": "gpt-3.5-turbo-0125",
+    },
+    "Anthropic/claude-3-7-sonnet": {
+        "model": "claude-3-7-sonnet-20250219",
+    },
+    "Anthropic/claude-3-5-sonnet": {
+        "model": "claude-3-5-sonnet-20241022",
+    },
+    "Anthropic/claude-3-5-haiku": {
+        "model": "claude-3-5-haiku-20241022",
+    },
+    "Cohere/command-r": {
+        "model": "command-r-08-2024",
+    },
+    "Cohere/command-r-plus": {
+        "model": "command-r-plus-08-2024",
+    },
+    "Cohere/command-r7b": {
+        "model": "command-r7b-12-2024",
+    },
+}
+
+DEFAULT_SELECTIONS = {
+    "tossup": {
+        "simple_workflow": False,
+        "model": "OpenAI/gpt-4o-mini",
+        "temperature": 0.2,
+        "buzz_threshold": 0.85,
+        "early_stop": True,
+    },
+    "bonus": {
+        "simple_workflow": False,
+        "model": "OpenAI/gpt-4o-mini",
+        "temperature": 0.2,
+        "buzz_threshold": 0.85,
+        "early_stop": True,
+    },
+}
+
+DAILY_SUBMISSION_LIMIT_PER_USER = 5

src/envs.py

@@ -32,55 +32,5 @@ EVAL_RESULTS_PATH = os.path.join(CACHE_PATH, "eval-results")
 EVAL_REQUESTS_PATH_BACKEND = os.path.join(CACHE_PATH, "eval-queue-bk")
 EVAL_RESULTS_PATH_BACKEND = os.path.join(CACHE_PATH, "eval-results-bk")
 
-THEME = "gstaff/xkcd"
-UNSELECTED_VAR_NAME = "Select Variable..."
-UNSELECTED_MODEL_NAME = "Select Model..."
-AVAILABLE_MODELS = {
-    "OpenAI/gpt-4o": {
-        "model": "gpt-4o-2024-11-20",
-    },
-    "OpenAI/gpt-4o-mini": {
-        "model": "gpt-4o-mini-2024-07-18",
-    },
-    "OpenAI/gpt-3.5-turbo": {
-        "model": "gpt-3.5-turbo-0125",
-    },
-    "Anthropic/claude-3-7-sonnet": {
-        "model": "claude-3-7-sonnet-20250219",
-    },
-    "Anthropic/claude-3-5-sonnet": {
-        "model": "claude-3-5-sonnet-20241022",
-    },
-    "Anthropic/claude-3-5-haiku": {
-        "model": "claude-3-5-haiku-20241022",
-    },
-    "Cohere/command-r": {
-        "model": "command-r-08-2024",
-    },
-    "Cohere/command-r-plus": {
-        "model": "command-r-plus-08-2024",
-    },
-    "Cohere/command-r7b": {
-        "model": "command-r7b-12-2024",
-    },
-}
-
-DEFAULT_SELECTIONS = {
-    "tossup": {
-        "simple_workflow": False,
-        "model": "OpenAI/gpt-4o-mini",
-        "temperature": 0.2,
-        "buzz_threshold": 0.85,
-        "early_stop": True,
-    },
-    "bonus": {
-        "simple_workflow": False,
-        "model": "OpenAI/gpt-4o-mini",
-        "temperature": 0.2,
-        "buzz_threshold": 0.85,
-        "early_stop": True,
-    },
-}
 
-DAILY_SUBMISSION_LIMIT_PER_USER = 5
 API = HfApi(token=TOKEN)

src/llms.py

@@ -15,7 +15,7 @@ from pydantic import BaseModel, Field
 from rich import print as rprint
 
 import utils
-from envs import AVAILABLE_MODELS
+from app_configs import AVAILABLE_MODELS
 
 
 class LLMOutput(BaseModel):

src/submission/submit.py

@@ -1,19 +1,45 @@
 import json
+import logging
 import os
 import traceback
 from datetime import datetime, timedelta, timezone
-from typing import Optional
 
 import gradio as gr
-import yaml
 
-from src.display.formatting import styled_error, styled_message
-from src.envs import API, DAILY_SUBMISSION_LIMIT_PER_USER, EVAL_REQUESTS_PATH, QUEUE_REPO
-from src.submission.structs import CompetitionType, Submission, SubmissionStatus
+from app_configs import DAILY_SUBMISSION_LIMIT_PER_USER
+from display.formatting import styled_error, styled_message
+from envs import API, EVAL_REQUESTS_PATH, QUEUE_REPO
+from submission.structs import CompetitionType, Submission, SubmissionStatus
 from workflows.structs import Workflow
 
 
+def get_user_submissions(username: str, competition_type: str, pattern: str = None) -> list[Submission]:
+    """Get all submissions for a user."""
+    out_dir = f"{EVAL_REQUESTS_PATH}/{username}"
+    submissions = []
+    if not os.path.exists(out_dir):
+        return submissions
+    for file in os.listdir(out_dir):
+        if not file.startswith(f"{competition_type}_"):
+            continue
+        if pattern is not None and pattern not in file:
+            continue
+        with open(os.path.join(out_dir, file), "r") as f:
+            submission = Submission.from_dict(json.load(f))
+            submissions.append(submission)
+    return submissions
+
+
+def get_user_submission_names(competition_type: str, profile: gr.OAuthProfile | None) -> list[str]:
+    """Get all submission model names for a user."""
+    if profile is None:
+        return []
+    submissions = get_user_submissions(profile.username, competition_type)
+    return [s.model_name for s in submissions]
+
+
 def get_user_submissions_today(username: str, competition_type: str) -> list[Submission]:
+    """Get all submissions for a user for a given competition type."""
     today = datetime.now(timezone.utc).strftime("%Y%m%d")
     if username is None:
         raise gr.Error("Authentication required. Please log in to view your submissions.")
@@ -103,7 +129,7 @@ def submit_model(
 
     username = profile.username
 
-    if len(get_user_submissions_today(username)) >= DAILY_SUBMISSION_LIMIT_PER_USER:
+    if len(get_user_submissions_today(username, competition_type)) >= DAILY_SUBMISSION_LIMIT_PER_USER:
         time_str = get_time_until_next_submission()
         return styled_error(
             f"Daily submission limit of {DAILY_SUBMISSION_LIMIT_PER_USER} reached. Please try again in \n {time_str}."
@@ -144,6 +170,17 @@ def submit_model(
         return styled_error(f"Error submitting model: {str(e)}")
 
 
+def load_submission(model_name: str, competition_type: CompetitionType, profile: gr.OAuthProfile | None) -> Submission:
+    if profile is None:
+        logging.error("Authentication required. Please log in to view your submissions.")
+        return styled_error("Authentication required. Please log in to view your submissions.")
+    username = profile.username
+    submissions = get_user_submissions(username, competition_type, model_name)
+    if len(submissions) == 0:
+        return styled_error(f"Submission {model_name} not found.")
+    return submissions[0]
+
+
 if __name__ == "__main__":
     # Example usage
     from workflows.factory import create_quizbowl_simple_step_initial_setup
@@ -168,3 +205,5 @@ if __name__ == "__main__":
         competition_type="tossup",
     )
     print(result)
+
+# %%

src/utils.py

@@ -1,6 +1,6 @@
 # Description: Utility functions for the model_step component.
 
-from envs import AVAILABLE_MODELS, UNSELECTED_MODEL_NAME
+from app_configs import AVAILABLE_MODELS, UNSELECTED_MODEL_NAME
 
 
 def guess_model_provider(model_name: str):