Skip to content

custom auth #12

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

Merged
merged 2 commits into from
Oct 6, 2023
Merged

custom auth #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a26725f
try custom auth
kristapratico Oct 6, 2023
2797847
async fix + cache token
kristapratico Oct 6, 2023
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: 5 additions & 3 deletions src/openai/azure/_async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from openai._streaming import AsyncStream

# Azure specific types
from ._credential import TokenCredential
from ._credential import TokenCredential, TokenAuth
from ._azuremodels import ChatExtensionConfiguration

TIMEOUT_SECS = 600
Expand Down Expand Up @@ -374,10 +374,12 @@ def __init__(self, *args: Any, credential: Optional["TokenCredential"] = None, a

@property
def auth_headers(self) -> Dict[str, str]:
if self.credential:
return { 'Authorization': f'Bearer {self.credential.get_token()}'}
return {"api-key": self.api_key}

@property
def custom_auth(self) -> httpx.Auth | None:
if self.credential:
return TokenAuth(self.credential)

def _check_polling_response(self, response: httpx.Response, predicate: Callable[[httpx.Response], bool]) -> bool:
if not predicate(response):
Expand Down
33 changes: 33 additions & 0 deletions src/openai/azure/_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
from typing import AsyncGenerator, Generator, Any
import time
import asyncio
import httpx


class TokenCredential:
"""Placeholder/example token credential class

Expand All @@ -11,3 +17,30 @@ def __init__(self):
def get_token(self):
return self._credential.get_token('https://cognitiveservices.azure.com/.default').token


class TokenAuth(httpx.Auth):
def __init__(self, credential: "TokenCredential") -> None:
self._credential = credential
self._async_lock = asyncio.Lock()
self.cached_token = None

def sync_get_token(self) -> str:
if not self.cached_token or self.cached_token.expires_on - time.time() < 300:
return self._credential.get_token("https://cognitiveservices.azure.com/.default").token
return self.cached_token.token

def sync_auth_flow(self, request: httpx.Request) -> Generator[httpx.Request, Any, Any]:
token = self.sync_get_token()
request.headers["Authorization"] = f"Bearer {token}"
yield request

async def async_get_token(self) -> str:
async with self._async_lock:
if not self.cached_token or self.cached_token.expires_on - time.time() < 300:
return (await self._credential.get_token("https://cognitiveservices.azure.com/.default")).token
return self.cached_token.token

async def async_auth_flow(self, request: httpx.Request) -> AsyncGenerator[httpx.Request, Any]:
token = await self.async_get_token()
request.headers["Authorization"] = f"Bearer {token}"
yield request
9 changes: 6 additions & 3 deletions src/openai/azure/_sync_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from openai.types.chat.completion_create_params import FunctionCall, Function

# Azure specific types
from ._credential import TokenCredential
from ._credential import TokenCredential, TokenAuth
from ._azuremodels import ChatExtensionConfiguration

TIMEOUT_SECS = 600
Expand Down Expand Up @@ -376,10 +376,13 @@ def __init__(self, *args: Any, base_url: str, credential: Optional["TokenCredent

@property
def auth_headers(self) -> Dict[str, str]:
if self.credential:
return { 'Authorization': f'Bearer {self.credential.get_token()}'}
return {"api-key": self.api_key}

@property
def custom_auth(self) -> httpx.Auth | None:
if self.credential:
return TokenAuth(self.credential)

# NOTE: We override the internal method because `@overrid`ing `@overload`ed methods and keeping typing happy is a pain. Most typing tools are lacking...
def _request(self, *, options: FinalRequestOptions, **kwargs: Any) -> Any:
if options.url == "/images/generations":
Expand Down