A programming framework for agentic AI
fix!: Move azure auth provider to separate module (#4912)
Jack Gerrits310564908b9a
diff --git a/python/packages/autogen-ext/pyproject.toml b/python/packages/autogen-ext/pyproject.tomlindex 156d3ff79..a4e7d0d9f 100644--- a/python/packages/autogen-ext/pyproject.toml+++ b/python/packages/autogen-ext/pyproject.toml@@ -25,7 +25,7 @@ m1 = "autogen_ext.teams.magentic_one_cli:main"langchain = ["langchain_core~= 0.3.3"]azure = ["azure-core", "azure-identity"]docker = ["docker~=7.0"]-openai = ["openai>=1.52.2", "aiofiles", "azure-core", "azure-identity"]+openai = ["openai>=1.52.2", "aiofiles"]file-surfer = ["autogen-agentchat==0.4.0.dev13","markitdown>=0.0.1a2",diff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/_azure_token_provider.py b/python/packages/autogen-ext/src/autogen_ext/auth/azure/__init__.pysimilarity index 99%rename from python/packages/autogen-ext/src/autogen_ext/models/openai/_azure_token_provider.pyrename to python/packages/autogen-ext/src/autogen_ext/auth/azure/__init__.pyindex 2201c9217..607a3e01c 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/_azure_token_provider.py+++ b/python/packages/autogen-ext/src/autogen_ext/auth/azure/__init__.py@@ -1,11 +1,12 @@from typing import Listfrom autogen_core import Component-from azure.core.credentials import TokenProvider-from azure.identity import DefaultAzureCredential, get_bearer_token_providerfrom pydantic import BaseModelfrom typing_extensions import Self+from azure.core.credentials import TokenProvider+from azure.identity import DefaultAzureCredential, get_bearer_token_provider+class TokenProviderConfig(BaseModel):provider_kind: strdiff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/__init__.py b/python/packages/autogen-ext/src/autogen_ext/models/openai/__init__.pyindex 47586d16c..bad5690e3 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/__init__.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/openai/__init__.py@@ -1,4 +1,3 @@-from ._azure_token_provider import AzureTokenProviderfrom ._openai_client import (AzureOpenAIChatCompletionClient,OpenAIChatCompletionClient,@@ -10,5 +9,4 @@ __all__ = ["AzureOpenAIChatCompletionClient","OpenAIClientConfiguration","OpenAIChatCompletionClient",- "AzureTokenProvider",]diff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.pyindex 5c55dbffc..3fb8710b6 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py@@ -69,8 +69,6 @@ from openai.types.shared_params import FunctionDefinition, FunctionParametersfrom pydantic import BaseModelfrom typing_extensions import Self, Unpack-from autogen_ext.models.openai._azure_token_provider import AzureTokenProvider-from . import _model_infofrom .config import (AzureOpenAIClientConfiguration,@@ -1076,8 +1074,9 @@ class AzureOpenAIChatCompletionClient(self._client = _azure_openai_client_from_config(state["_raw_config"])def _to_config(self) -> AzureOpenAIClientConfigurationConfigModel:- copied_config = self._raw_config.copy()+ from ...auth.azure import AzureTokenProvider+ copied_config = self._raw_config.copy()if "azure_ad_token_provider" in copied_config:if not isinstance(copied_config["azure_ad_token_provider"], AzureTokenProvider):raise ValueError("azure_ad_token_provider must be a AzureTokenProvider to be component serialized")@@ -1090,6 +1089,8 @@ class AzureOpenAIChatCompletionClient(@classmethoddef _from_config(cls, config: AzureOpenAIClientConfigurationConfigModel) -> Self:+ from ...auth.azure import AzureTokenProvider+copied_config = config.model_copy().model_dump(exclude_none=True)if "azure_ad_token_provider" in copied_config:copied_config["azure_ad_token_provider"] = AzureTokenProvider.load_component(diff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/config/__init__.py b/python/packages/autogen-ext/src/autogen_ext/models/openai/config/__init__.pyindex b98158504..482af3a6f 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/config/__init__.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/openai/config/__init__.py@@ -5,8 +5,6 @@ from autogen_core.models import ModelCapabilities, ModelInfo # type: ignorefrom pydantic import BaseModelfrom typing_extensions import Required, TypedDict-from .._azure_token_provider import AzureTokenProvider-class ResponseFormat(TypedDict):type: Literal["text", "json_object"]@@ -51,7 +49,7 @@ class AzureOpenAIClientConfiguration(BaseOpenAIClientConfiguration, total=False)azure_deployment: strapi_version: Required[str]azure_ad_token: str- azure_ad_token_provider: AsyncAzureADTokenProvider | AzureTokenProvider+ azure_ad_token_provider: AsyncAzureADTokenProvider # Or AzureTokenProvider__all__ = [diff --git a/python/packages/component-schema-gen/src/component_schema_gen/__main__.py b/python/packages/component-schema-gen/src/component_schema_gen/__main__.pyindex a61e7f386..bf0a21f1f 100644--- a/python/packages/component-schema-gen/src/component_schema_gen/__main__.py+++ b/python/packages/component-schema-gen/src/component_schema_gen/__main__.py@@ -8,7 +8,8 @@ from autogen_core._component_config import (ComponentConfigImpl,_type_to_provider_str, # type: ignore)-from autogen_ext.models.openai import AzureOpenAIChatCompletionClient, AzureTokenProvider, OpenAIChatCompletionClient+from autogen_ext.auth.azure import AzureTokenProvider+from autogen_ext.models.openai import AzureOpenAIChatCompletionClient, OpenAIChatCompletionClientfrom pydantic import BaseModelall_defs: Dict[str, Any] = {}diff --git a/python/uv.lock b/python/uv.lockindex 5df896271..1e4c1c576 100644--- a/python/uv.lock+++ b/python/uv.lock@@ -497,8 +497,6 @@ magentic-one = []openai = [{ name = "aiofiles" },- { name = "azure-core" },- { name = "azure-identity" },{ name = "openai" },]video-surfer = [@@ -529,9 +527,7 @@ requires-dist = [{ name = "autogen-agentchat", marker = "extra == 'web-surfer'", editable = "packages/autogen-agentchat" },{ name = "autogen-core", editable = "packages/autogen-core" },{ name = "azure-core", marker = "extra == 'azure'" },- { name = "azure-core", marker = "extra == 'openai'" },{ name = "azure-identity", marker = "extra == 'azure'" },- { name = "azure-identity", marker = "extra == 'openai'" },{ name = "docker", marker = "extra == 'docker'", specifier = "~=7.0" },{ name = "ffmpeg-python", marker = "extra == 'video-surfer'" },{ name = "grpcio", marker = "extra == 'grpc'", specifier = "~=1.62.0" },