From b504bfd356c823be004a8e0c100f8c86a50e1040 Mon Sep 17 00:00:00 2001
From: William Pietri <wpietri+gitcommit@mlcommons.org>
Date: Wed, 14 Feb 2024 17:06:45 -0800
Subject: [PATCH] Remove SUT that's not working. Fix filename. Assorted other
 cleanup.

---
 src/coffee/__init__.py            | 6 ------
 src/coffee/benchmark.py           | 3 ---
 src/coffee/newhelm_runner.py      | 1 -
 src/coffee/{new_run.py => run.py} | 3 +--
 4 files changed, 1 insertion(+), 12 deletions(-)
 rename src/coffee/{new_run.py => run.py} (99%)

diff --git a/src/coffee/__init__.py b/src/coffee/__init__.py
index 4e0f618a..e69de29b 100644
--- a/src/coffee/__init__.py
+++ b/src/coffee/__init__.py
@@ -1,6 +0,0 @@
-class CoffeeConfig:
-    def __init__(self):
-        self.debug = False
-
-
-app_config = CoffeeConfig()
diff --git a/src/coffee/benchmark.py b/src/coffee/benchmark.py
index e56f7d64..3c5f41ca 100644
--- a/src/coffee/benchmark.py
+++ b/src/coffee/benchmark.py
@@ -174,6 +174,3 @@ def score(self, sut_scores: dict) -> HarmScore:
 class GeneralChatBotBenchmarkDefinition(BenchmarkDefinition):
     def __init__(self):
         super().__init__([BiasHarmDefinition(), ToxicityHarmDefinition()])
-
-    def overall_score(self) -> float:
-        return 0
diff --git a/src/coffee/newhelm_runner.py b/src/coffee/newhelm_runner.py
index 5df38d01..3cb816b6 100644
--- a/src/coffee/newhelm_runner.py
+++ b/src/coffee/newhelm_runner.py
@@ -12,5 +12,4 @@ def __hash__(self):
 
 class NewhelmSut(NewSutDescription, Enum):
     GPT2 = "gpt2", "OpenAI GPT-2"
-    GPT3_5 = "gpt-3.5-turbo", "OpenAI GPT-3.5 Turbo"
     LLAMA_2_7B = "llama-2-7b", "Meta Llama 2, 7b parameters"
diff --git a/src/coffee/new_run.py b/src/coffee/run.py
similarity index 99%
rename from src/coffee/new_run.py
rename to src/coffee/run.py
index a24deffd..02e64fb9 100644
--- a/src/coffee/new_run.py
+++ b/src/coffee/run.py
@@ -26,10 +26,9 @@ def _make_output_dir():
 @click.group()
 def cli() -> None:
     import newhelm.load_plugins
-
     newhelm.load_plugins.load_plugins()
-    from newhelm.secrets_registry import SECRETS
 
+    from newhelm.secrets_registry import SECRETS
     SECRETS.set_values(get_or_create_json_file("secrets/default.json"))