mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
Merge pull request #51460 from BerriAI/litellm_backport_48529_lts_1_108_x
fix(azure): backport Azure OpenAI Decisions support to lts/1.108.x (#48529)
This commit is contained in:
commit
73a1c79f66
13 changed files with 819 additions and 14 deletions
|
|
@ -1739,6 +1739,9 @@ if TYPE_CHECKING:
|
|||
from .llms.openai.decisions.transformation import (
|
||||
OpenAIDecisionsConfig as OpenAIDecisionsConfig,
|
||||
)
|
||||
from .llms.azure.decisions.transformation import (
|
||||
AzureDecisionsConfig as AzureDecisionsConfig,
|
||||
)
|
||||
from .llms.azure_ai.decisions.transformation import (
|
||||
AzureAIDecisionsConfig as AzureAIDecisionsConfig,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ LLM_CONFIG_NAMES: Final = (
|
|||
"LayaDecisionsConfig",
|
||||
"BespokeDecisionsConfig",
|
||||
"OpenAIDecisionsConfig",
|
||||
"AzureDecisionsConfig",
|
||||
"AzureAIDecisionsConfig",
|
||||
"NvidiaNimRerankConfig",
|
||||
"NvidiaNimRankingConfig",
|
||||
|
|
@ -745,6 +746,7 @@ _LLM_CONFIGS_IMPORT_MAP: Final = {
|
|||
"LayaDecisionsConfig": (".llms.laya.decisions.transformation", "LayaDecisionsConfig"),
|
||||
"BespokeDecisionsConfig": (".llms.bespoke.decisions.transformation", "BespokeDecisionsConfig"),
|
||||
"OpenAIDecisionsConfig": (".llms.openai.decisions.transformation", "OpenAIDecisionsConfig"),
|
||||
"AzureDecisionsConfig": (".llms.azure.decisions.transformation", "AzureDecisionsConfig"),
|
||||
"AzureAIDecisionsConfig": (".llms.azure_ai.decisions.transformation", "AzureAIDecisionsConfig"),
|
||||
"NvidiaNimRerankConfig": (
|
||||
".llms.nvidia_nim.rerank.transformation",
|
||||
|
|
|
|||
|
|
@ -101,6 +101,10 @@ def _cached_azure_ad_token_refresh_provider(scope: str) -> Callable[[], str]:
|
|||
return get_azure_ad_token_provider(azure_scope=scope)
|
||||
|
||||
|
||||
def cached_azure_ad_token_refresh_provider(scope: str) -> Callable[[], str]:
|
||||
return _cached_azure_ad_token_refresh_provider(scope)
|
||||
|
||||
|
||||
def get_azure_ad_token_from_entra_id(
|
||||
tenant_id: str,
|
||||
client_id: str,
|
||||
|
|
@ -798,6 +802,10 @@ class BaseAzureLLM(BaseOpenAILLM):
|
|||
) -> dict[str, str]: # mutable-ok: mirrors override contract
|
||||
return cls._base_validate_azure_environment(headers, litellm_params)
|
||||
|
||||
@staticmethod
|
||||
def resolve_azure_api_base(api_base: str | None) -> str | None:
|
||||
return api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
|
||||
|
||||
@staticmethod
|
||||
def _get_base_azure_url(
|
||||
api_base: str | None,
|
||||
|
|
@ -815,7 +823,7 @@ class BaseAzureLLM(BaseOpenAILLM):
|
|||
default_api_version: The default API version to use if no api_version is provided. If 'latest', it will use `openai/v1/...` route.
|
||||
"""
|
||||
|
||||
api_base = api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
|
||||
api_base = BaseAzureLLM.resolve_azure_api_base(api_base)
|
||||
if api_base is None:
|
||||
raise ValueError(
|
||||
f"api_base is required for Azure AI Studio. Please set the api_base parameter. Passed `api_base={api_base}`"
|
||||
|
|
|
|||
77
litellm/llms/azure/decisions/transformation.py
Normal file
77
litellm/llms/azure/decisions/transformation.py
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
import asyncio
|
||||
from collections.abc import Mapping
|
||||
from typing import Final
|
||||
|
||||
from pydantic import ValidationError
|
||||
|
||||
import litellm
|
||||
from litellm.llms.azure.common_utils import (
|
||||
BaseAzureLLM,
|
||||
cached_azure_ad_token_refresh_provider,
|
||||
)
|
||||
from litellm.llms.openai.decisions.transformation import OpenAIDecisionsConfig
|
||||
from litellm.secret_managers.main import get_secret_str
|
||||
from litellm.types.router import GenericLiteLLMParams
|
||||
|
||||
|
||||
class AzureDecisionsConfig(OpenAIDecisionsConfig):
|
||||
"""Azure OpenAI Decisions, with the Azure deployment name in the request body."""
|
||||
|
||||
api_key_required = False
|
||||
|
||||
def resolve_api_base(self, api_base: str | None) -> str | None:
|
||||
return BaseAzureLLM.resolve_azure_api_base(api_base)
|
||||
|
||||
def resolve_api_key(self, api_key: str | None) -> str | None:
|
||||
return api_key
|
||||
|
||||
def resolve_credential(
|
||||
self, api_key: str | None, api_base: str, litellm_params: Mapping[str, object]
|
||||
) -> str | None:
|
||||
return api_key
|
||||
|
||||
def validate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
try:
|
||||
params: Final = GenericLiteLLMParams.model_validate({**litellm_params, "api_key": api_key})
|
||||
except ValidationError as error:
|
||||
raise litellm.BadRequestError(
|
||||
message="Invalid Azure Decisions credential parameters",
|
||||
model=model,
|
||||
llm_provider="azure",
|
||||
) from error
|
||||
clean_headers: Final = super().validate_environment(
|
||||
{name: value for name, value in headers.items() if name.lower() != "api-key"},
|
||||
model,
|
||||
None,
|
||||
litellm_params,
|
||||
)
|
||||
azure_headers: Final = BaseAzureLLM.base_validate_azure_environment(
|
||||
headers=dict(clean_headers), litellm_params=params
|
||||
)
|
||||
if "api-key" in azure_headers:
|
||||
return azure_headers
|
||||
if "Authorization" in azure_headers:
|
||||
return azure_headers
|
||||
scope: Final = (
|
||||
params.azure_scope or get_secret_str("AZURE_SCOPE") or "https://cognitiveservices.azure.com/.default"
|
||||
)
|
||||
azure_headers["Authorization"] = f"Bearer {cached_azure_ad_token_refresh_provider(scope)()}"
|
||||
return azure_headers
|
||||
|
||||
async def avalidate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
return await asyncio.to_thread(self.validate_environment, headers, model, api_key, litellm_params)
|
||||
|
||||
def get_complete_url(self, api_base: str, model: str) -> str:
|
||||
return BaseAzureLLM.get_base_azure_url(api_base, None, route="/openai/v1/decisions")
|
||||
|
|
@ -1,11 +1,21 @@
|
|||
import asyncio
|
||||
import re
|
||||
from collections.abc import Mapping
|
||||
from types import MappingProxyType
|
||||
from typing import Final
|
||||
|
||||
import httpx
|
||||
from pydantic import ValidationError
|
||||
|
||||
import litellm
|
||||
from litellm.llms.azure_ai.common_utils import (
|
||||
AZURE_ENTRA_LITELLM_PARAM_KEYS,
|
||||
get_azure_ai_auth_headers,
|
||||
)
|
||||
from litellm.llms.base_llm.decisions.transformation import BaseDecisionsConfig
|
||||
|
||||
_FOUNDRY_ROUTE_SUFFIX: Final = re.compile(r"(/api/projects/[^/]+)?(/openai/v1|/openai|/models|/v1)?$")
|
||||
_AZURE_AI_CREDENTIAL_PARAM_KEYS: Final = AZURE_ENTRA_LITELLM_PARAM_KEYS | frozenset({"azure_ad_token_provider"})
|
||||
|
||||
|
||||
class AzureAIDecisionsConfig(BaseDecisionsConfig):
|
||||
|
|
@ -14,10 +24,69 @@ class AzureAIDecisionsConfig(BaseDecisionsConfig):
|
|||
path = "/providers/microsoft/v1/systemone"
|
||||
api_key_env = ("AZURE_AI_API_KEY",)
|
||||
api_base_env = ("AZURE_AI_API_BASE",)
|
||||
api_key_required = False
|
||||
|
||||
def missing_api_base_message(self, custom_llm_provider: str) -> str:
|
||||
return "Missing AZURE_AI_API_BASE - set AZURE_AI_API_BASE or pass api_base, e.g. https://<resource>.services.ai.azure.com"
|
||||
|
||||
def validate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
credential_params: Final = MappingProxyType(
|
||||
{key: litellm_params[key] for key in _AZURE_AI_CREDENTIAL_PARAM_KEYS if key in litellm_params}
|
||||
)
|
||||
try:
|
||||
auth_headers: Final = get_azure_ai_auth_headers(api_key, credential_params)
|
||||
except ValidationError as error:
|
||||
field_names: Final = tuple(
|
||||
dict.fromkeys(
|
||||
".".join(str(field) for field in detail["loc"])
|
||||
for detail in error.errors(include_input=False, include_context=False, include_url=False)
|
||||
)
|
||||
)
|
||||
raise litellm.BadRequestError(
|
||||
message=f"Invalid Azure AI credential parameter(s): {', '.join(f'`{name}`' for name in field_names)}",
|
||||
model=model,
|
||||
llm_provider="azure_ai",
|
||||
) from error
|
||||
except ValueError as error:
|
||||
raise litellm.AuthenticationError(message=str(error), model=model, llm_provider="azure_ai") from error
|
||||
return {
|
||||
**super().validate_environment(
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
),
|
||||
**auth_headers,
|
||||
}
|
||||
|
||||
async def avalidate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
if api_key:
|
||||
return self.validate_environment(
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
return await asyncio.to_thread(
|
||||
self.validate_environment,
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
|
||||
def get_complete_url(self, api_base: str, model: str) -> str:
|
||||
url: Final = httpx.URL(api_base)
|
||||
resource_path: Final = _FOUNDRY_ROUTE_SUFFIX.sub("", url.path.rstrip("/"))
|
||||
|
|
|
|||
|
|
@ -510,13 +510,33 @@ class BaseDecisionsConfig(ABC):
|
|||
def request_model(self, model: str) -> str:
|
||||
return model
|
||||
|
||||
def validate_environment(self, headers: Mapping[str, str], model: str, api_key: str | None) -> dict[str, str]:
|
||||
def validate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
return {
|
||||
**{name: value for name, value in headers.items() if name.lower() not in _RESERVED_HEADERS},
|
||||
**({"Authorization": f"Bearer {api_key}"} if api_key is not None else {}),
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
async def avalidate_environment(
|
||||
self,
|
||||
headers: Mapping[str, str],
|
||||
model: str,
|
||||
api_key: str | None,
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> Mapping[str, str]:
|
||||
return self.validate_environment(
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
|
||||
def get_complete_url(self, api_base: str, model: str) -> str:
|
||||
return f"{api_base.rstrip('/').removesuffix('/v1')}{self.path}"
|
||||
|
||||
|
|
|
|||
|
|
@ -1527,8 +1527,65 @@ class BaseLLMHTTPHandler:
|
|||
api_base: str,
|
||||
api_key: str | None,
|
||||
headers: Mapping[str, str],
|
||||
) -> tuple[str, dict[str, str], dict[str, object]]:
|
||||
outbound_headers: Final = provider_config.validate_environment(headers=headers, model=model, api_key=api_key)
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> tuple[str, Mapping[str, str], Mapping[str, object]]:
|
||||
outbound_headers: Final = provider_config.validate_environment(
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
return self._prepare_decisions_request_with_headers(
|
||||
model=model,
|
||||
logging_obj=logging_obj,
|
||||
provider_config=provider_config,
|
||||
body=body,
|
||||
logged_body=logged_body,
|
||||
api_base=api_base,
|
||||
api_key=api_key,
|
||||
outbound_headers=outbound_headers,
|
||||
)
|
||||
|
||||
async def _aprepare_decisions_request(
|
||||
self,
|
||||
model: str,
|
||||
logging_obj: LiteLLMLoggingObj | None,
|
||||
provider_config: BaseDecisionsConfig,
|
||||
body: Mapping[str, object],
|
||||
logged_body: Mapping[str, object],
|
||||
api_base: str,
|
||||
api_key: str | None,
|
||||
headers: Mapping[str, str],
|
||||
litellm_params: Mapping[str, object],
|
||||
) -> tuple[str, Mapping[str, str], Mapping[str, object]]:
|
||||
outbound_headers: Final = await provider_config.avalidate_environment(
|
||||
headers=headers,
|
||||
model=model,
|
||||
api_key=api_key,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
return self._prepare_decisions_request_with_headers(
|
||||
model=model,
|
||||
logging_obj=logging_obj,
|
||||
provider_config=provider_config,
|
||||
body=body,
|
||||
logged_body=logged_body,
|
||||
api_base=api_base,
|
||||
api_key=api_key,
|
||||
outbound_headers=outbound_headers,
|
||||
)
|
||||
|
||||
def _prepare_decisions_request_with_headers(
|
||||
self,
|
||||
model: str,
|
||||
logging_obj: LiteLLMLoggingObj | None,
|
||||
provider_config: BaseDecisionsConfig,
|
||||
body: Mapping[str, object],
|
||||
logged_body: Mapping[str, object],
|
||||
api_base: str,
|
||||
api_key: str | None,
|
||||
outbound_headers: Mapping[str, str],
|
||||
) -> tuple[str, Mapping[str, str], Mapping[str, object]]:
|
||||
url: Final = provider_config.get_complete_url(api_base=api_base, model=model)
|
||||
data: Final = dict(body)
|
||||
if logging_obj is not None:
|
||||
|
|
@ -1565,6 +1622,7 @@ class BaseLLMHTTPHandler:
|
|||
api_base=api_base,
|
||||
api_key=api_key,
|
||||
headers=headers,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
signed_headers, signed_body = provider_config.sign_request(
|
||||
headers=outbound_headers,
|
||||
|
|
@ -1579,7 +1637,7 @@ class BaseLLMHTTPHandler:
|
|||
response: Final = sync_httpx_client.post(
|
||||
url,
|
||||
content=signed_body,
|
||||
json=data if signed_body is None else None,
|
||||
json=dict(data) if signed_body is None else None,
|
||||
headers=dict(signed_headers),
|
||||
timeout=timeout,
|
||||
logging_obj=logging_obj,
|
||||
|
|
@ -1606,7 +1664,7 @@ class BaseLLMHTTPHandler:
|
|||
litellm_params: Mapping[str, object],
|
||||
client: AsyncHTTPHandler | None = None,
|
||||
) -> DecisionsIRResponse:
|
||||
url, outbound_headers, data = self._prepare_decisions_request(
|
||||
url, outbound_headers, data = await self._aprepare_decisions_request(
|
||||
model=model,
|
||||
logging_obj=logging_obj,
|
||||
provider_config=provider_config,
|
||||
|
|
@ -1615,6 +1673,7 @@ class BaseLLMHTTPHandler:
|
|||
api_base=api_base,
|
||||
api_key=api_key,
|
||||
headers=headers,
|
||||
litellm_params=litellm_params,
|
||||
)
|
||||
sign: Final = partial(
|
||||
provider_config.sign_request,
|
||||
|
|
@ -1637,7 +1696,7 @@ class BaseLLMHTTPHandler:
|
|||
response: Final = await async_httpx_client.post(
|
||||
url,
|
||||
content=signed_body,
|
||||
json=data if signed_body is None else None,
|
||||
json=dict(data) if signed_body is None else None,
|
||||
headers=dict(signed_headers),
|
||||
timeout=timeout,
|
||||
logging_obj=logging_obj,
|
||||
|
|
|
|||
|
|
@ -9446,8 +9446,12 @@ class ProviderConfigManager:
|
|||
return litellm.LayaDecisionsConfig()
|
||||
if provider == LlmProviders.BESPOKE:
|
||||
return litellm.BespokeDecisionsConfig()
|
||||
if provider == LlmProviders.OPENAI:
|
||||
return litellm.OpenAIDecisionsConfig()
|
||||
if provider in (LlmProviders.OPENAI, LlmProviders.AZURE):
|
||||
configs: Final = {
|
||||
LlmProviders.OPENAI: litellm.OpenAIDecisionsConfig,
|
||||
LlmProviders.AZURE: litellm.AzureDecisionsConfig,
|
||||
}
|
||||
return configs[provider]()
|
||||
if provider == LlmProviders.AZURE_AI:
|
||||
return litellm.AzureAIDecisionsConfig()
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ import pytest
|
|||
import yaml
|
||||
from integration._support.client import Gateway, Scenario, eventually, object_value, string_value
|
||||
from integration._support.database import read_rows
|
||||
from integration._support.ports import allocate_port
|
||||
from integration._support.process import owned_proxy_process
|
||||
from integration._support.upstream import ScenarioHandle, delete_scenario, register_scenario
|
||||
from integration._support.ports import allocate_port
|
||||
from integration.cost_calculation.cost_tracking_case import JsonResponse
|
||||
from pydantic import JsonValue, TypeAdapter
|
||||
|
||||
|
|
@ -21,6 +21,13 @@ import litellm
|
|||
|
||||
_API_KEY: Final = "synthetic-decisions-key"
|
||||
_ENV_KEY: Final = "synthetic-decisions-env-key"
|
||||
_AZURE_AI_ENTRA_SCENARIO: Final = "providers"
|
||||
_AZURE_AI_ENTRA_TOKEN: Final = "synthetic-decisions-entra-token"
|
||||
_AZURE_AI_MISSING_CREDENTIALS_MESSAGE: Final = (
|
||||
"Missing Azure AI credentials - set an API key (`api_key` or AZURE_AI_API_KEY), or Entra ID / OAuth "
|
||||
"credentials (`tenant_id` + `client_id` + `client_secret`, `azure_ad_token`, an OIDC token, or a managed "
|
||||
"identity with `litellm.enable_azure_ad_token_refresh = True`)"
|
||||
)
|
||||
_PASS_THROUGH_MODEL: Final = "gpt-6-luna"
|
||||
_PASS_THROUGH_AUTHORIZATION: Final = "Bearer customer-held-upstream-key"
|
||||
_PASS_THROUGH_NEIGHBOUR: Final = "decisions-beside-a-pass-through"
|
||||
|
|
@ -100,9 +107,7 @@ _PROVIDERS: Final = (
|
|||
_Provider(
|
||||
"bespoke", "bespoke/nimble-latest", "/v1/systemone", "nimble-latest", None, False, "bespoke/nimble-latest"
|
||||
),
|
||||
_Provider(
|
||||
"hosted_vllm", "hosted_vllm/Qwen/Qwen3-0.6B", "/v1/systemone", "Qwen/Qwen3-0.6B", None, False, None
|
||||
),
|
||||
_Provider("hosted_vllm", "hosted_vllm/Qwen/Qwen3-0.6B", "/v1/systemone", "Qwen/Qwen3-0.6B", None, False, None),
|
||||
_Provider(
|
||||
"fireworks_ai",
|
||||
"fireworks_ai/accounts/fireworks/routers/rune",
|
||||
|
|
@ -235,6 +240,56 @@ def _assert_connection_error(response: httpx.Response) -> None:
|
|||
assert _GENERIC_API_ERROR not in response.text, response.text
|
||||
|
||||
|
||||
def test_azure_ai_entra_auth_reaches_the_scripted_upstream_for_both_decisions_routes(
|
||||
gateway: Gateway, scenario: Scenario
|
||||
) -> None:
|
||||
provider: Final = next(provider for provider in _PROVIDERS if provider.name == "azure_ai")
|
||||
handle: Final = register_scenario(
|
||||
_AZURE_AI_ENTRA_SCENARIO,
|
||||
JsonResponse(content_type="application/json", body=_answer_body(provider)),
|
||||
)
|
||||
scenario.cleanups.callback(delete_scenario, handle)
|
||||
model: Final = "azure_ai/decision-1-entra"
|
||||
body: Final = {"model": model, "state": _STATE, "questions": _QUESTIONS}
|
||||
decisions_body: Final = {
|
||||
"model": model,
|
||||
"input": "The export job hangs at 99%",
|
||||
"questions": [{"type": "predicate", "name": "defect", "instructions": "Is this a defect?"}],
|
||||
}
|
||||
|
||||
no_credentials_body: Final = {**body, "model": "azure_ai/decision-1-no-credentials"}
|
||||
systemone_auth_error: Final = gateway.request("POST", "/v1/systemone", no_credentials_body)
|
||||
assert systemone_auth_error.status_code == 401, systemone_auth_error.text
|
||||
assert _AZURE_AI_MISSING_CREDENTIALS_MESSAGE in string_value(
|
||||
object_value(object_value(systemone_auth_error.json())["error"])["message"]
|
||||
)
|
||||
no_credentials_decisions_body: Final = {
|
||||
**decisions_body,
|
||||
"model": "azure_ai/decision-1-no-credentials",
|
||||
}
|
||||
decisions_auth_error: Final = gateway.request("POST", "/v1/decisions", no_credentials_decisions_body)
|
||||
assert decisions_auth_error.status_code == 401, decisions_auth_error.text
|
||||
assert _AZURE_AI_MISSING_CREDENTIALS_MESSAGE in string_value(
|
||||
object_value(object_value(decisions_auth_error.json())["error"])["message"]
|
||||
)
|
||||
assert not _upstream_calls(gateway, handle)
|
||||
|
||||
systemone_response: Final = gateway.request("POST", "/v1/systemone", body)
|
||||
assert systemone_response.status_code == 200, systemone_response.text
|
||||
decisions_response: Final = gateway.request("POST", "/v1/decisions", decisions_body)
|
||||
assert decisions_response.status_code == 200, decisions_response.text
|
||||
|
||||
calls: Final = _upstream_calls(gateway, handle)
|
||||
assert tuple(string_value(call["authorization"]) for call in calls) == (
|
||||
f"Bearer {_AZURE_AI_ENTRA_TOKEN}",
|
||||
f"Bearer {_AZURE_AI_ENTRA_TOKEN}",
|
||||
)
|
||||
assert tuple(string_value(call["path"]) for call in calls) == (
|
||||
"/providers/microsoft/v1/systemone",
|
||||
"/providers/microsoft/v1/systemone",
|
||||
)
|
||||
|
||||
|
||||
def _pass_through_config(directory: Path, pass_through_target: str, native_api_base: str) -> Path:
|
||||
base: Final = _JSON_OBJECT.validate_python(yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()))
|
||||
config: Final = {
|
||||
|
|
|
|||
|
|
@ -625,6 +625,19 @@ model_list:
|
|||
api_key: synthetic-azure-ai-key
|
||||
model_info:
|
||||
base_model: azure_ai/Microsoft-Decision-1
|
||||
- model_name: azure_ai/decision-1-entra
|
||||
litellm_params:
|
||||
model: azure_ai/decision-1
|
||||
api_base: os.environ/INTEGRATION_UPSTREAM_URL
|
||||
azure_ad_token: synthetic-decisions-entra-token
|
||||
model_info:
|
||||
base_model: azure_ai/Microsoft-Decision-1
|
||||
- model_name: azure_ai/decision-1-no-credentials
|
||||
litellm_params:
|
||||
model: azure_ai/decision-1
|
||||
api_base: os.environ/INTEGRATION_UPSTREAM_URL
|
||||
model_info:
|
||||
base_model: azure_ai/Microsoft-Decision-1
|
||||
general_settings:
|
||||
master_key: os.environ/LITELLM_MASTER_KEY
|
||||
database_url: os.environ/DATABASE_URL
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ from litellm.constants import AWS_SIGNING_MAX_THREADS
|
|||
from litellm.cost_calculator import get_response_cost_from_hidden_params
|
||||
from litellm.integrations.custom_logger import CustomLogger
|
||||
from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
|
||||
from litellm.llms.azure_ai.common_utils import get_azure_ai_auth_headers
|
||||
from litellm.llms.bedrock.base_aws_llm import AWS_SIGNING_EXECUTOR
|
||||
from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
|
||||
from litellm.types.decisions import (
|
||||
|
|
@ -1439,7 +1440,12 @@ async def test_databricks_router_deployment_sends_its_own_key_to_its_own_base(
|
|||
|
||||
|
||||
_PROVIDERS_WHOSE_CHAT_MODELS_ALSO_DECIDE: Final = frozenset(
|
||||
{LlmProviders.OPENAI.value, LlmProviders.OPENROUTER.value, LlmProviders.HOSTED_VLLM.value}
|
||||
{
|
||||
LlmProviders.OPENAI.value,
|
||||
LlmProviders.AZURE.value,
|
||||
LlmProviders.OPENROUTER.value,
|
||||
LlmProviders.HOSTED_VLLM.value,
|
||||
}
|
||||
)
|
||||
_DEDICATED_DECIDER_PROVIDERS: Final[tuple[str, ...]] = tuple(
|
||||
sorted(
|
||||
|
|
@ -2681,6 +2687,269 @@ async def test_azure_ai_decision_requires_api_base_before_http(
|
|||
assert len(respx_mock.calls) == 0
|
||||
|
||||
|
||||
def _clear_azure_ai_auth_environment(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.delenv("AZURE_AI_API_KEY", raising=False)
|
||||
monkeypatch.delenv("AZURE_AD_TOKEN", raising=False)
|
||||
monkeypatch.delenv("AZURE_TENANT_ID", raising=False)
|
||||
monkeypatch.delenv("AZURE_CLIENT_ID", raising=False)
|
||||
monkeypatch.delenv("AZURE_CLIENT_SECRET", raising=False)
|
||||
monkeypatch.delenv("AZURE_USERNAME", raising=False)
|
||||
monkeypatch.delenv("AZURE_PASSWORD", raising=False)
|
||||
monkeypatch.delenv("AZURE_AI_API_BASE", raising=False)
|
||||
monkeypatch.setattr(litellm, "enable_azure_ad_token_refresh", False)
|
||||
|
||||
|
||||
def test_azure_ai_systemone_uses_entra_token_without_api_key(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.systemone(
|
||||
model="azure_ai/decision-1",
|
||||
state="review",
|
||||
questions={"is_defect": {"type": "noul", "instructions": "Is this a defect?"}},
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer entra-access-token"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_azure_ai_decisions_use_entra_token_without_api_key(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
await litellm.adecisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer entra-access-token"
|
||||
|
||||
|
||||
def test_azure_ai_systemone_environment_api_key_wins_over_deployment_entra(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
monkeypatch.setenv("AZURE_AI_API_KEY", "env-key")
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.systemone(
|
||||
model="azure_ai/decision-1",
|
||||
state="review",
|
||||
questions={"is_defect": {"type": "noul", "instructions": "Is this a defect?"}},
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer env-key"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_azure_ai_decisions_environment_api_key_wins_over_deployment_entra(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
monkeypatch.setenv("AZURE_AI_API_KEY", "env-key")
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
await litellm.adecisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer env-key"
|
||||
|
||||
|
||||
def test_azure_ai_decisions_uses_environment_api_key_without_entra_credentials(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
monkeypatch.setenv("AZURE_AI_API_KEY", "env-key")
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer env-key"
|
||||
|
||||
|
||||
def test_azure_ai_decisions_explicit_api_key_precedes_entra_and_environment(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
monkeypatch.setenv("AZURE_AI_API_KEY", "env-key")
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
api_key="call-key",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer call-key"
|
||||
|
||||
|
||||
def test_azure_ai_decisions_does_not_validate_noncredential_params_as_auth(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
azure_ad_token="entra-access-token",
|
||||
max_retries="three",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer entra-access-token"
|
||||
|
||||
|
||||
def test_azure_ai_decisions_malformed_credential_is_a_sanitized_bad_request(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
with pytest.raises(litellm.BadRequestError) as caught:
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
tenant_id="tenant-id",
|
||||
client_id="client-id",
|
||||
client_secret=123,
|
||||
)
|
||||
|
||||
assert caught.value.status_code == 400
|
||||
assert "`client_secret`" in str(caught.value)
|
||||
assert "123" not in str(caught.value)
|
||||
assert not route.called
|
||||
|
||||
|
||||
def test_azure_ai_decisions_prefer_api_key_when_both_are_set(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
api_key="foundry-key",
|
||||
azure_ad_token="entra-access-token",
|
||||
)
|
||||
|
||||
assert route.called
|
||||
assert route.calls[0].request.headers["authorization"] == "Bearer foundry-key"
|
||||
|
||||
|
||||
def test_azure_ai_decisions_without_credentials_raise_authentication_error(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
with pytest.raises(ValueError, match="Missing Azure AI credentials") as helper_error:
|
||||
get_azure_ai_auth_headers(None, {})
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
with pytest.raises(litellm.AuthenticationError) as caught:
|
||||
litellm.decisions(
|
||||
model="azure_ai/decision-1",
|
||||
input="review",
|
||||
questions=_PREDICATE_QUESTIONS,
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
)
|
||||
|
||||
assert caught.value.status_code == 401
|
||||
assert str(helper_error.value) in str(caught.value)
|
||||
assert not route.called
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_azure_ai_systemone_without_credentials_raises_authentication_error(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
_clear_azure_ai_auth_environment(monkeypatch)
|
||||
with pytest.raises(ValueError, match="Missing Azure AI credentials") as helper_error:
|
||||
get_azure_ai_auth_headers(None, {})
|
||||
route: Final = respx_mock.post("https://res.services.ai.azure.com/providers/microsoft/v1/systemone").respond(
|
||||
json={**_RESPONSE, "model": "microsoft-decision-1"}
|
||||
)
|
||||
|
||||
with pytest.raises(litellm.AuthenticationError) as caught:
|
||||
await litellm.asystemone(
|
||||
model="azure_ai/decision-1",
|
||||
state="review",
|
||||
questions={"is_defect": {"type": "noul", "instructions": "Is this a defect?"}},
|
||||
api_base="https://res.services.ai.azure.com",
|
||||
)
|
||||
|
||||
assert caught.value.status_code == 401
|
||||
assert str(helper_error.value) in str(caught.value)
|
||||
assert not route.called
|
||||
|
||||
|
||||
_CLEF_OMNI_UPSTREAM: Final = "https://example.com/ai/run/@cf/cloudflare/clef-omni"
|
||||
_CLEF_OMNI_RESPONSE: Final[Mapping[str, object]] = {
|
||||
"success": True,
|
||||
|
|
|
|||
0
tests/unit/llms/azure/decisions/__init__.py
Normal file
0
tests/unit/llms/azure/decisions/__init__.py
Normal file
226
tests/unit/llms/azure/decisions/test_transformation.py
Normal file
226
tests/unit/llms/azure/decisions/test_transformation.py
Normal file
|
|
@ -0,0 +1,226 @@
|
|||
import json
|
||||
import threading
|
||||
import time
|
||||
from collections.abc import Iterator, Mapping
|
||||
from typing import Final
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
import respx
|
||||
from azure.core.credentials import AccessToken
|
||||
|
||||
import litellm
|
||||
from litellm.llms.azure import common_utils
|
||||
from litellm.llms.azure.decisions.transformation import AzureDecisionsConfig
|
||||
from litellm.types.decisions import DecisionsResponse, OpenAIDecisionResponse
|
||||
|
||||
_BASE: Final = "https://resource.openai.azure.com"
|
||||
_URL: Final = f"{_BASE}/openai/v1/decisions"
|
||||
_RESPONSE: Final = {
|
||||
"model": "luna-deployment",
|
||||
"answers": [{"type": "predicate", "name": "defect", "probability": 0.9}],
|
||||
"usage": {"input_tokens": 10, "output_tokens": 1, "total_tokens": 11},
|
||||
}
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def clear_credentials(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
|
||||
for name in (
|
||||
"AZURE_API_KEY",
|
||||
"AZURE_OPENAI_API_KEY",
|
||||
"AZURE_API_BASE",
|
||||
"AZURE_AD_TOKEN",
|
||||
"AZURE_CLIENT_ID",
|
||||
"AZURE_TENANT_ID",
|
||||
"AZURE_CLIENT_SECRET",
|
||||
"AZURE_SCOPE",
|
||||
"AZURE_USERNAME",
|
||||
"AZURE_PASSWORD",
|
||||
):
|
||||
monkeypatch.delenv(name, raising=False)
|
||||
monkeypatch.setattr(litellm, "api_key", None)
|
||||
monkeypatch.setattr(litellm, "azure_key", None)
|
||||
monkeypatch.setattr(litellm, "api_base", None)
|
||||
monkeypatch.setattr(litellm, "enable_azure_ad_token_refresh", False)
|
||||
monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
|
||||
common_utils._cached_azure_ad_token_refresh_provider.cache_clear()
|
||||
yield
|
||||
common_utils._cached_azure_ad_token_refresh_provider.cache_clear()
|
||||
|
||||
|
||||
async def call_decisions(
|
||||
is_async: bool,
|
||||
systemone: bool,
|
||||
credentials: Mapping[str, object],
|
||||
api_base: str = _BASE,
|
||||
) -> DecisionsResponse | OpenAIDecisionResponse:
|
||||
params = {
|
||||
"model": "azure/luna-deployment",
|
||||
"api_base": api_base,
|
||||
**credentials,
|
||||
}
|
||||
if systemone:
|
||||
params["state"] = "The export job hangs."
|
||||
params["questions"] = {"defect": {"type": "noul", "instructions": "Is this a defect?"}}
|
||||
if is_async:
|
||||
return await litellm.asystemone(**params)
|
||||
return litellm.systemone(**params)
|
||||
params["input"] = "The export job hangs."
|
||||
params["questions"] = [{"type": "predicate", "name": "defect", "instructions": "Is this a defect?"}]
|
||||
if is_async:
|
||||
return await litellm.adecisions(**params)
|
||||
return litellm.decisions(**params)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("is_async", (False, True))
|
||||
@pytest.mark.parametrize("systemone", (False, True))
|
||||
@pytest.mark.parametrize("suffix", ("", "/", "/openai", "/openai/v1/"))
|
||||
async def test_azure_decisions_uses_entra_token_and_openai_wire_format(
|
||||
respx_mock: respx.MockRouter, is_async: bool, systemone: bool, suffix: str
|
||||
) -> None:
|
||||
route = respx_mock.post(_URL).respond(json=_RESPONSE)
|
||||
response = await call_decisions(is_async, systemone, {"azure_ad_token": "synthetic-entra"}, _BASE + suffix)
|
||||
request = route.calls.last.request
|
||||
assert request.headers["authorization"] == "Bearer synthetic-entra"
|
||||
assert "api-key" not in request.headers
|
||||
assert json.loads(request.content) == {
|
||||
"model": "luna-deployment",
|
||||
"input": "The export job hangs.",
|
||||
"questions": [{"type": "predicate", "name": "defect", "instructions": "Is this a defect?"}],
|
||||
}
|
||||
if systemone:
|
||||
assert response.model_dump()["answers"]["defect"]["noul"] == 0.9
|
||||
else:
|
||||
assert response.model_dump()["answers"][0]["probability"] == 0.9
|
||||
assert response._hidden_params["custom_llm_provider"] == "azure"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("is_async", (False, True))
|
||||
@pytest.mark.parametrize("systemone", (False, True))
|
||||
async def test_default_credential_refreshes_without_opt_in(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
respx_mock: respx.MockRouter,
|
||||
is_async: bool,
|
||||
systemone: bool,
|
||||
) -> None:
|
||||
credential = Mock(spec=["get_token"])
|
||||
credential.get_token.side_effect = [
|
||||
AccessToken("synthetic-first", int(time.time()) + 120),
|
||||
AccessToken("synthetic-refreshed", int(time.time()) + 3600),
|
||||
]
|
||||
factory = Mock(return_value=credential)
|
||||
monkeypatch.setattr("azure.identity.DefaultAzureCredential", factory)
|
||||
monkeypatch.setenv("OPENAI_API_KEY", "synthetic-unrelated-openai-key")
|
||||
route = respx_mock.post(_URL).respond(json=_RESPONSE)
|
||||
await call_decisions(is_async, systemone, {})
|
||||
await call_decisions(is_async, systemone, {})
|
||||
assert [call.request.headers["authorization"] for call in route.calls] == [
|
||||
"Bearer synthetic-first",
|
||||
"Bearer synthetic-refreshed",
|
||||
]
|
||||
factory.assert_called_once_with()
|
||||
assert credential.get_token.call_count == 2
|
||||
assert all(
|
||||
call.args == ("https://cognitiveservices.azure.com/.default",) for call in credential.get_token.call_args_list
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("kind", ("service-principal", "oidc", "provider"))
|
||||
async def test_azure_decisions_reuses_existing_azure_credential_resolution(
|
||||
monkeypatch: pytest.MonkeyPatch, respx_mock: respx.MockRouter, kind: str
|
||||
) -> None:
|
||||
provider = Mock(return_value="synthetic-entra")
|
||||
if kind == "service-principal":
|
||||
factory = Mock(return_value=provider)
|
||||
monkeypatch.setattr(common_utils, "get_azure_ad_token_from_entra_id", factory)
|
||||
credentials = {
|
||||
"tenant_id": "tenant",
|
||||
"client_id": "client",
|
||||
"client_secret": "synthetic-secret",
|
||||
}
|
||||
elif kind == "oidc":
|
||||
monkeypatch.setattr(common_utils, "get_azure_ad_token_from_oidc", provider)
|
||||
credentials = {
|
||||
"tenant_id": "tenant",
|
||||
"client_id": "client",
|
||||
"azure_ad_token": "oidc/azure/https://cognitiveservices.azure.com/.default",
|
||||
}
|
||||
else:
|
||||
credentials = {"azure_ad_token_provider": provider}
|
||||
route = respx_mock.post(_URL).respond(json=_RESPONSE)
|
||||
await call_decisions(True, False, credentials)
|
||||
assert route.calls.last.request.headers["authorization"] == "Bearer synthetic-entra"
|
||||
provider.assert_called_once()
|
||||
if kind == "service-principal":
|
||||
factory.assert_called_once_with(
|
||||
tenant_id="tenant",
|
||||
client_id="client",
|
||||
client_secret="synthetic-secret",
|
||||
scope="https://cognitiveservices.azure.com/.default",
|
||||
)
|
||||
if kind == "oidc":
|
||||
provider.assert_called_once_with(
|
||||
azure_ad_token=credentials["azure_ad_token"],
|
||||
azure_client_id="client",
|
||||
azure_tenant_id="tenant",
|
||||
scope="https://cognitiveservices.azure.com/.default",
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("key_source", ("api_key", "AZURE_API_KEY", "AZURE_OPENAI_API_KEY"))
|
||||
async def test_azure_api_key_takes_precedence_over_entra(
|
||||
monkeypatch: pytest.MonkeyPatch, respx_mock: respx.MockRouter, key_source: str
|
||||
) -> None:
|
||||
provider = Mock(side_effect=AssertionError("API key must bypass Entra"))
|
||||
credentials = {"azure_ad_token_provider": provider}
|
||||
if key_source == "api_key":
|
||||
credentials["api_key"] = "synthetic-key"
|
||||
else:
|
||||
monkeypatch.setenv(key_source, "synthetic-key")
|
||||
route = respx_mock.post(_URL).respond(json=_RESPONSE)
|
||||
await call_decisions(True, False, credentials)
|
||||
assert route.calls.last.request.headers["api-key"] == "synthetic-key"
|
||||
assert "authorization" not in route.calls.last.request.headers
|
||||
provider.assert_not_called()
|
||||
|
||||
|
||||
async def test_azure_credential_lookup_does_not_block_the_event_loop(
|
||||
respx_mock: respx.MockRouter,
|
||||
) -> None:
|
||||
event_loop_thread = threading.get_ident()
|
||||
|
||||
def provider() -> str:
|
||||
assert threading.get_ident() != event_loop_thread
|
||||
return "synthetic-entra"
|
||||
|
||||
respx_mock.post(_URL).respond(json=_RESPONSE)
|
||||
await call_decisions(True, False, {"azure_ad_token_provider": provider})
|
||||
|
||||
|
||||
def test_azure_decisions_requires_azure_endpoint(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
monkeypatch.setenv("OPENAI_API_BASE", "https://unrelated.example")
|
||||
with pytest.raises(litellm.BadRequestError, match="api_base is required"):
|
||||
litellm.decisions(
|
||||
model="azure/luna-deployment",
|
||||
input="Text",
|
||||
questions=[
|
||||
{
|
||||
"type": "predicate",
|
||||
"name": "defect",
|
||||
"instructions": "Is this a defect?",
|
||||
}
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
def test_azure_decisions_does_not_echo_invalid_credentials() -> None:
|
||||
with pytest.raises(litellm.BadRequestError) as error:
|
||||
AzureDecisionsConfig().validate_environment(
|
||||
{},
|
||||
"luna-deployment",
|
||||
None,
|
||||
{"azure_ad_token": {"secret": "sensitive-value"}},
|
||||
)
|
||||
assert "sensitive-value" not in str(error.value)
|
||||
Loading…
Add table
Reference in a new issue