ai-workspace-services/litellm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat(azure.py): Add Azure AD cred caching for OIDC flow."

Browse Source 
This reverts commit 73d9d0d7db.
This commit is contained in:
David Manouchehri 2024-06-11 15:51:59 +00:00
parent 73d9d0d7db
commit 7154c25903
No known key found for this signature in database
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
litellm/llms/azure.py
View File

@ -18,9 +18,6 @@ from .custom_httpx.azure_dall_e_2 import CustomHTTPTransport, AsyncCustomHTTPTra
from openai import AzureOpenAI, AsyncAzureOpenAI
import uuid
import os
from litellm.caching import DualCache
azure_ad_cache = DualCache()
class AzureOpenAIError(Exception):
@ -156,17 +153,6 @@ def get_azure_ad_token_from_oidc(azure_ad_token: str):
message="OIDC token could not be retrieved from secret manager.",
)
azure_ad_token_cache_key = json.dumps({
"azure_client_id": azure_client_id,
"azure_tenant_id": azure_tenant_id,
"azure_authority_host": azure_authority_host,
"oidc_token": oidc_token,
})
azure_ad_token_access_token = azure_ad_cache.get_cache(azure_ad_token_cache_key)
if azure_ad_token_access_token is not None:
return azure_ad_token_access_token
req_token = httpx.post(
f"{azure_authority_host}/{azure_tenant_id}/oauth2/v2.0/token",
data={
@ -184,23 +170,14 @@ def get_azure_ad_token_from_oidc(azure_ad_token: str):
message=req_token.text,
)
azure_ad_token_json = req_token.json()
azure_ad_token_access_token = azure_ad_token_json.get("access_token", None)
azure_ad_token_expires_in = azure_ad_token_json.get("expires_in", None)
possible_azure_ad_token = req_token.json().get("access_token", None)
if azure_ad_token_access_token is None:
if possible_azure_ad_token is None:
raise AzureOpenAIError(
status_code=422, message="Azure AD Token access_token not returned"
status_code=422, message="Azure AD Token not returned"
)
if azure_ad_token_expires_in is None:
raise AzureOpenAIError(
status_code=422, message="Azure AD Token expires_in not returned"
)
azure_ad_cache.set_cache(key=azure_ad_token_cache_key, value=azure_ad_token_access_token, ttl=azure_ad_token_expires_in)
return azure_ad_token_access_token
return possible_azure_ad_token
class AzureChatCompletion(BaseLLM):