mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
cc0cfaaac8
* Python: fix OpenAI Azure routing and provider samples Prefer OpenAI when OPENAI_API_KEY is present unless Azure is explicitly requested. Clarify constructor docs, keep deprecated Azure wrappers compatible with stricter settings validation, and refresh the provider samples and tests to use the current client patterns. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix bandit * Python: align OpenAI embedding Azure routing Extend the shared OpenAI-vs-Azure routing and credential behavior to the embedding client, add Azure embedding regression coverage, and refresh the embedding samples to use the generic client path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: fix embedding client pyright check Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: thin OpenAI embedding wrapper Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: document embedding overload routing Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: fix callable OpenAI key routing Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: fix Azure credential routing tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: address OpenAI review feedback Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: narrow Azure routing markers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: refine OpenAI model fallback order Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: narrow Azure deployment docs Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: remove embedding routing wording Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: run embedding Azure integration tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * changed variable name * Python: expand OpenAI package README Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * clarified readme * Python: fix Azure OpenAI integration setup Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Python: correct Azure integration env mapping Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * updated code to fix int tests * test updates * test fix * fix test setup * updates to tests and setup * remove openai assistants int tests * improvements in int tests * fix env var * fix env vars * fix azure responses test * trigger actions --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
from azure.core.credentials import TokenCredential
|
|
from azure.core.credentials_async import AsyncTokenCredential
|
|
|
|
from agent_framework_openai._shared import AZURE_OPENAI_TOKEN_SCOPE, _resolve_azure_credential_to_token_provider
|
|
|
|
|
|
class _AsyncTokenCredentialStub(AsyncTokenCredential):
|
|
async def get_token(self, *scopes: str, **kwargs: object):
|
|
raise NotImplementedError
|
|
|
|
|
|
class _TokenCredentialStub(TokenCredential):
|
|
def get_token(self, *scopes: str, **kwargs: object):
|
|
raise NotImplementedError
|
|
|
|
|
|
def test_resolve_azure_async_credential_wraps_provider() -> None:
|
|
credential = _AsyncTokenCredentialStub()
|
|
token_provider = MagicMock()
|
|
|
|
with patch("azure.identity.aio.get_bearer_token_provider", return_value=token_provider) as mock_provider:
|
|
resolved = _resolve_azure_credential_to_token_provider(credential)
|
|
|
|
assert resolved is token_provider
|
|
mock_provider.assert_called_once_with(credential, AZURE_OPENAI_TOKEN_SCOPE)
|
|
|
|
|
|
def test_resolve_azure_sync_credential_wraps_provider() -> None:
|
|
credential = _TokenCredentialStub()
|
|
token_provider = MagicMock()
|
|
|
|
with patch("azure.identity.get_bearer_token_provider", return_value=token_provider) as mock_provider:
|
|
resolved = _resolve_azure_credential_to_token_provider(credential)
|
|
|
|
assert resolved is token_provider
|
|
mock_provider.assert_called_once_with(credential, AZURE_OPENAI_TOKEN_SCOPE)
|
|
|
|
|
|
def test_resolve_azure_callable_token_provider_passthrough() -> None:
|
|
token_provider = MagicMock()
|
|
|
|
assert _resolve_azure_credential_to_token_provider(token_provider) is token_provider
|
|
|
|
|
|
def test_resolve_azure_invalid_credential_raises() -> None:
|
|
with pytest.raises(ValueError, match="credential"):
|
|
_resolve_azure_credential_to_token_provider(object()) # type: ignore[arg-type]
|