Skip to content

fix: treat empty-string ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN as absent #1890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
okxint wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −4
Open

fix: treat empty-string ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN as absent #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/anthropic/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ def __init__(
or profile is not None
)
if not has_explicit_credential:
api_key = os.environ.get("ANTHROPIC_API_KEY")
auth_token = os.environ.get("ANTHROPIC_AUTH_TOKEN")
api_key = os.environ.get("ANTHROPIC_API_KEY") or None
auth_token = os.environ.get("ANTHROPIC_AUTH_TOKEN") or None
self.api_key = api_key
self.auth_token = auth_token
# --- end credentials support ---
Expand Down Expand Up @@ -628,8 +628,8 @@ def __init__(
or profile is not None
)
if not has_explicit_credential:
api_key = os.environ.get("ANTHROPIC_API_KEY")
auth_token = os.environ.get("ANTHROPIC_AUTH_TOKEN")
api_key = os.environ.get("ANTHROPIC_API_KEY") or None
auth_token = os.environ.get("ANTHROPIC_AUTH_TOKEN") or None
self.api_key = api_key
self.auth_token = auth_token
# --- end credentials support ---
Expand Down
22 changes: 22 additions & 0 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,17 @@ def test_validate_headers(self) -> None:
request2 = client2._build_request(FinalRequestOptions(method="get", url="/foo", headers={"X-Api-Key": Omit()}))
assert request2.headers.get("X-Api-Key") is None

def test_empty_string_env_credentials_treated_as_absent(self) -> None:
# An empty-string env var must not be used as a credential — it would
# produce a malformed "Authorization: Bearer " header rejected by h11.
with mock.patch("anthropic._client.default_credentials", return_value=None):
with update_env(ANTHROPIC_API_KEY="", ANTHROPIC_AUTH_TOKEN=""):
client = Anthropic(base_url=base_url, _strict_response_validation=True)

assert client.api_key is None
assert client.auth_token is None
assert client.auth_headers == {}

def test_default_query_option(self) -> None:
client = Anthropic(
base_url=base_url, api_key=api_key, _strict_response_validation=True, default_query={"query_param": "bar"}
Expand Down Expand Up @@ -1546,6 +1557,17 @@ def test_validate_headers(self) -> None:
request2 = client2._build_request(FinalRequestOptions(method="get", url="/foo", headers={"X-Api-Key": Omit()}))
assert request2.headers.get("X-Api-Key") is None

def test_empty_string_env_credentials_treated_as_absent(self) -> None:
# An empty-string env var must not be used as a credential — it would
# produce a malformed "Authorization: Bearer " header rejected by h11.
with mock.patch("anthropic._client.default_credentials", return_value=None):
with update_env(ANTHROPIC_API_KEY="", ANTHROPIC_AUTH_TOKEN=""):
client = AsyncAnthropic(base_url=base_url, _strict_response_validation=True)

assert client.api_key is None
assert client.auth_token is None
assert client.auth_headers == {}

async def test_default_query_option(self) -> None:
client = AsyncAnthropic(
base_url=base_url, api_key=api_key, _strict_response_validation=True, default_query={"query_param": "bar"}
Expand Down