Merge branch 'openai:main' into feature/theory_of_mind

Author: inwaves

evals/cli/oaieval.py

@@ -7,8 +7,6 @@
 import sys
 from typing import Any, Mapping, Optional, Union, cast
 
-import openai
-
 import evals
 import evals.api
 import evals.base
@@ -268,9 +266,6 @@ def main() -> None:
         filename=args.log_to_file if args.log_to_file else None,
     )
     logging.getLogger("openai").setLevel(logging.WARN)
-
-    if hasattr(openai.error, "set_display_cause"):  # type: ignore
-        openai.error.set_display_cause()  # type: ignore
     run(args)
 
 

evals/elsuite/make_me_say/autoeval.py

@@ -2,7 +2,7 @@
 from typing import Callable, Optional, Union
 
 import backoff
-from openai.error import InvalidRequestError
+from openai import BadRequestError
 
 from evals.api import CompletionFn, CompletionResult
 from evals.elsuite.make_me_say.core import Game, Message, Player
@@ -17,7 +17,7 @@
 )
 
 
-@backoff.on_exception(backoff.constant, InvalidRequestError, max_tries=3)
+@backoff.on_exception(backoff.constant, BadRequestError, max_tries=3)
 def run(
     codeword: str,
     manipulator_completion_fn: CompletionFn,

evals/elsuite/make_me_say/utils.py

@@ -3,7 +3,6 @@
 
 import backoff
 import openai
-import openai.error
 import urllib3.exceptions
 
 from evals.api import CompletionResult
@@ -12,9 +11,12 @@
 @backoff.on_exception(
     backoff.expo,
     (
-        openai.error.RateLimitError,
-        openai.error.ServiceUnavailableError,
-        openai.error.TryAgain,
+        openai.APIError,
+        openai.APIStatusError,
+        openai.RateLimitError,
+        openai.APITimeoutError,
+        openai.APIConnectionError,
+        openai.InternalServerError,
         urllib3.exceptions.TimeoutError,
     ),
 )

evals/registry.py

@@ -99,7 +99,7 @@ def add_registry_paths(self, paths: Sequence[Union[str, Path]]) -> None:
     def api_model_ids(self) -> list[str]:
         try:
             return [m["id"] for m in openai.Model.list()["data"]]
-        except openai.error.OpenAIError as err:  # type: ignore
+        except openai.OpenAIError as err:  # type: ignore
             # Errors can happen when running eval with completion function that uses custom
             # API endpoints and authentication mechanisms.
             logger.warning(f"Could not fetch API model IDs from OpenAI API: {err}")

evals/utils/api_utils.py

@@ -14,11 +14,12 @@
 @backoff.on_exception(
     wait_gen=backoff.expo,
     exception=(
-        openai.error.ServiceUnavailableError,
-        openai.error.APIError,
-        openai.error.RateLimitError,
-        openai.error.APIConnectionError,
-        openai.error.Timeout,
+        openai.APIError,
+        openai.APIStatusError,
+        openai.RateLimitError,
+        openai.APITimeoutError,
+        openai.APIConnectionError,
+        openai.InternalServerError,
     ),
     max_value=60,
     factor=1.5,
@@ -31,7 +32,7 @@ def openai_completion_create_retrying(*args, **kwargs):
     result = openai.Completion.create(*args, **kwargs)
     if "error" in result:
         logging.warning(result)
-        raise openai.error.APIError(result["error"])
+        raise openai.APIError(result["error"])
     return result
 
 
@@ -52,11 +53,12 @@ def request_with_timeout(func, *args, timeout=EVALS_THREAD_TIMEOUT, **kwargs):
 @backoff.on_exception(
     wait_gen=backoff.expo,
     exception=(
-        openai.error.ServiceUnavailableError,
-        openai.error.APIError,
-        openai.error.RateLimitError,
-        openai.error.APIConnectionError,
-        openai.error.Timeout,
+        openai.APIError,
+        openai.APIStatusError,
+        openai.RateLimitError,
+        openai.APITimeoutError,
+        openai.APIConnectionError,
+        openai.InternalServerError,
     ),
     max_value=60,
     factor=1.5,
@@ -69,5 +71,5 @@ def openai_chat_completion_create_retrying(*args, **kwargs):
     result = request_with_timeout(openai.ChatCompletion.create, *args, **kwargs)
     if "error" in result:
         logging.warning(result)
-        raise openai.error.APIError(result["error"])
+        raise openai.APIError(result["error"])
     return result