Skip to content

add thin client for azure #15

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 2 commits into
base: v1
Choose a base branch
from
Draft

add thin client for azure #15

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
2ce434f
add thin client for azure
kristapratico Oct 9, 2023
8cb6c2a
format
kristapratico Oct 9, 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
7 changes: 7 additions & 0 deletions src/openai/azure/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from ._client import AzureOpenAIClient, AsyncAzureOpenAIClient


__all__ = [
"AzureOpenAIClient",
"AsyncAzureOpenAIClient",
]
47 changes: 47 additions & 0 deletions src/openai/azure/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import httpx
from typing import Any, Optional, Dict

from openai import Client, AsyncClient
from ._credential import TokenAuth


class AzureOpenAIClient(Client):

def __init__(self, *args: Any, base_url: str, credential: Optional["TokenCredential"] = None, api_version: str = '2023-09-01-preview', **kwargs: Any):
default_query = kwargs.get('default_query', {})
default_query.setdefault('api-version', api_version)
kwargs['default_query'] = default_query
self.credential = credential
if credential:
kwargs['api_key'] = 'Placeholder: AAD'
super().__init__(*args, base_url=base_url, **kwargs)

@property
def auth_headers(self) -> Dict[str, str]:
return {"api-key": self.api_key}

@property
def custom_auth(self) -> Optional[httpx.Auth]:
if self.credential:
return TokenAuth(self.credential)


class AsyncAzureOpenAIClient(AsyncClient):

def __init__(self, *args: Any, credential: Optional["TokenCredential"] = None, api_version: str = '2023-09-01-preview', **kwargs: Any):
default_query = kwargs.get('default_query', {})
default_query.setdefault('api-version', api_version)
kwargs['default_query'] = default_query
self.credential = credential
if credential:
kwargs['api_key'] = 'Placeholder: AAD'
super().__init__(*args, **kwargs)

@property
def auth_headers(self) -> Dict[str, str]:
return {"api-key": self.api_key}

@property
def custom_auth(self) -> httpx.Auth | None:
if self.credential:
return TokenAuth(self.credential)
32 changes: 32 additions & 0 deletions src/openai/azure/_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import time
import asyncio
import httpx
from typing import Any, Generator, AsyncGenerator


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