Remove global OpenAI client initialization #1539
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Importing Evals libraries from python for use as a library rather than a CLI tool fails if the OPENAI_API_KEY is not specified. Normally this wouldn't be a problem, if we were evaluating an OpenAI model, however there are cases where we may not be evaluating an OpenAI model. In those cases we may not set the OPENAI_API_KEY in advance. In addition, this PR makes changes to some unit tests either to pass, or skip those tests when the necessary API keys are not in the environment.
michaelAlvarino
requested review from
andrew-openai,
etr2460 and
katyhshi
as code owners
etr2460
reviewed
Jul 31, 2024
| @@ -72,4 +69,4 @@ def model_output_empty_tags(message: str) -> bool: | |||
|
|
|||
|
|
|||
| def openai_chatcompletion_create(*args, **kwargs): | |||
| return client.chat.completions.create(*args, **kwargs) | |||
| return OpenAI(api_key=os.environ.get("OPENAI_API_KEY")).chat.completions.create(*args, **kwargs) | |||
There was a problem hiding this comment.
instead of creating the client fresh on every call of this function, can we pass it in from the caller? Ideally it would be instantiated in an __init__ in a class like the changes you made in other files
| @@ -263,14 +263,6 @@ def record_final_report(self, final_report: Any): | |||
| logging.info(f"Final report: {final_report}. Not writing anywhere.") | |||
|
|
|||
|
|
|||
| def _green(str): | |||
There was a problem hiding this comment.
i assume we don't want these deletions in this file?
| @@ -103,14 +103,18 @@ def is_chat_model(model_name: str) -> bool: | |||
| class Registry: | |||
| def __init__(self, registry_paths: Sequence[Union[str, Path]] = DEFAULT_PATHS): | |||
| self._registry_paths = [Path(p) if isinstance(p, str) else p for p in registry_paths] | |||
| try: | |||
| self.client = OpenAI() | |||
There was a problem hiding this comment.
do we need OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))?
| @@ -172,6 +170,7 @@ def get_embeddings( | |||
| A list of Embedding namedtuples where each Embedding | |||
| represents the input string and its corresponding vector. | |||
| """ | |||
| client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY")) | |||
There was a problem hiding this comment.
let's move this to an __init__ like in the GPTValidator?
| @@ -2,7 +2,7 @@ | |||
|
|
|||
| import anthropic | |||
| from anthropic import Anthropic | |||
| from anthropic.types import ContentBlock, MessageParam, Usage | |||
| from anthropic.types import TextBlock, MessageParam, Usage | |||
There was a problem hiding this comment.
this seems unrelated to this PR, maybe let's pull it into a different one?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes OpenAI initialization calls that happen at import time so developers who want to use Evals as a library rather than a CLI tool, without the OPENAI_API_KEY environment variable specified, can do so.