clarify badgeneratorexception, and use it if wrong class is requested

leondz · Sep 23, 2024 · 35a339f · 35a339f
1 parent 28ab0a7
commit 35a339f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/garak/exception.py b/garak/exception.py
@@ -23,7 +23,7 @@ class PluginConfigurationError(GarakException):
 
 
 class BadGeneratorException(PluginConfigurationError):
-    """Generator config/description is not usable"""
+    """Generator invocation requested is not usable"""
 
 
 class RateLimitHit(Exception):

diff --git a/garak/generators/openai.py b/garak/generators/openai.py
@@ -299,7 +299,7 @@ def _load_client(self):
         if self.__class__.__name__ == "OpenAIGenerator" and self.name.startswith("o1-"):
             msg = "o1 models should use openai.ReasoningGenerator"
             logging.error(msg)
-            raise ValueError("🛑 " + msg)
+            raise garak.exception.BadGeneratorException("🛑 " + msg)
 
     def _clear_client(self):
         self.generator = None