Fix up missed tests and consistency tweaks

Author: johanste

src/openai/__init__.py

@@ -333,7 +333,7 @@ def _load_client() -> OpenAI:  # type: ignore[reportUnusedFunction]
             _client = _AzureModuleClient(  # type: ignore
                 api_version=api_version,
                 azure_endpoint=azure_endpoint,
-                api_key=bearer_token_provider or api_key,
+                api_key=api_key,
                 azure_ad_token=azure_ad_token,
                 azure_ad_token_provider=azure_ad_token_provider,
                 organization=organization,
@@ -347,7 +347,7 @@ def _load_client() -> OpenAI:  # type: ignore[reportUnusedFunction]
             return _client
 
         _client = _ModuleClient(
-            api_key=api_key or bearer_token_provider,
+            api_key=api_key,
             organization=organization,
             project=project,
             webhook_secret=webhook_secret,

src/openai/_client.py

@@ -136,10 +136,11 @@ def __init__(
                 "The api_key client option must be set either by passing api_key to the client or by setting the OPENAI_API_KEY environment variable"
             )
         if callable(api_key):
-            self.bearer_token_provider = api_key
             self.api_key = ""
+            self.bearer_token_provider = api_key
         else:
             self.api_key = api_key or ""
+            self.bearer_token_provider = None
 
         if organization is None:
             organization = os.environ.get("OPENAI_ORG_ID")
@@ -296,7 +297,10 @@ def qs(self) -> Querystring:
         return Querystring(array_format="brackets")
 
     def refresh_auth_headers(self) -> None:
-        secret = self.bearer_token_provider() if self.bearer_token_provider else self.api_key
+        if self.bearer_token_provider:
+            secret = self.bearer_token_provider()
+        else:
+            secret = self.api_key
         if not secret:
             # if the api key is an empty string, encoding the header will fail
             # so we set it to an empty dict
@@ -367,7 +371,7 @@ def copy(
 
         http_client = http_client or self._client
         return self.__class__(
-            api_key=api_key or self.api_key or self.bearer_token_provider,
+            api_key=api_key or self.bearer_token_provider or self.api_key,
             organization=organization or self.organization,
             project=project or self.project,
             webhook_secret=webhook_secret or self.webhook_secret,
@@ -478,11 +482,11 @@ def __init__(
                 "The api_key client option must be set either by passing api_key to the client or by setting the OPENAI_API_KEY environment variable"
             )
         if callable(api_key):
-            self.bearer_token_provider = api_key
             self.api_key = ""
+            self.bearer_token_provider = api_key
         else:
-            self.bearer_token_provider = None
             self.api_key = api_key or ""
+            self.bearer_token_provider = None
 
         if organization is None:
             organization = os.environ.get("OPENAI_ORG_ID")
@@ -713,7 +717,7 @@ def copy(
 
         http_client = http_client or self._client
         return self.__class__(
-            api_key=api_key or self.api_key or self.bearer_token_provider,
+            api_key=api_key or self.bearer_token_provider or self.api_key,
             organization=organization or self.organization,
             project=project or self.project,
             webhook_secret=webhook_secret or self.webhook_secret,

tests/test_module_client.py

@@ -15,7 +15,6 @@
 def reset_state() -> None:
     openai._reset_client()
     openai.api_key = None or "My API Key"
-    openai.bearer_token_provider = None
     openai.organization = None
     openai.project = None
     openai.webhook_secret = None