Skip to content

update authorization header with refreshed token during retry #9

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

update authorization header with refreshed token during retry #9

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
6 changes: 2 additions & 4 deletions src/openai/lib/azure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ def _prepare_options(self, options: FinalRequestOptions) -> None:

azure_ad_token = self._get_azure_ad_token()
if azure_ad_token is not None:
if headers.get("Authorization") is None:
headers["Authorization"] = f"Bearer {azure_ad_token}"
headers["Authorization"] = f"Bearer {azure_ad_token}"
elif self.api_key is not API_KEY_SENTINEL:
if headers.get("api-key") is None:
headers["api-key"] = self.api_key
Expand Down Expand Up @@ -530,8 +529,7 @@ async def _prepare_options(self, options: FinalRequestOptions) -> None:

azure_ad_token = await self._get_azure_ad_token()
if azure_ad_token is not None:
if headers.get("Authorization") is None:
headers["Authorization"] = f"Bearer {azure_ad_token}"
headers["Authorization"] = f"Bearer {azure_ad_token}"
elif self.api_key is not API_KEY_SENTINEL:
if headers.get("api-key") is None:
headers["api-key"] = self.api_key
Expand Down
39 changes: 39 additions & 0 deletions tests/lib/test_azure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,42 @@ def test_client_copying_override_options(client: Client) -> None:
api_version="2022-05-01",
)
assert copied._custom_query == {"api-version": "2022-05-01"}


def test_client_token_provider_refresh_sync() -> None:
options = FinalRequestOptions.construct(
method="post",
url="/chat/completions",
json_data={"model": "my-deployment-model"},
headers={"Authorization": "Bearer expired"}
)

sync_client = AzureOpenAI(
api_version="2024-02-01",
azure_ad_token_provider=lambda: "valid",
azure_endpoint="https://example-resource.azure.openai.com",
)

sync_client._prepare_options(options)
token = options.headers["Authorization"]
assert token == "Bearer valid"


@pytest.mark.asyncio
async def test_client_token_provider_refresh_async() -> None:
options = FinalRequestOptions.construct(
method="post",
url="/chat/completions",
json_data={"model": "my-deployment-model"},
headers={"Authorization": "Bearer expired"}
)

async_client = AsyncAzureOpenAI(
api_version="2024-02-01",
azure_ad_token_provider=lambda: "valid",
azure_endpoint="https://example-resource.azure.openai.com",
)

await async_client._prepare_options(options)
token = options.headers["Authorization"]
assert token == "Bearer valid"