A programming framework for agentic AI
Updated the azure client to support AAD auth. (#2879)
afourneyf904b4fa1750
diff --git a/autogen/logger/sqlite_logger.py b/autogen/logger/sqlite_logger.pyindex 42db83d84..48d33082f 100644--- a/autogen/logger/sqlite_logger.py+++ b/autogen/logger/sqlite_logger.py@@ -236,7 +236,16 @@ class SqliteLogger(BaseLogger):args = to_dict(init_args,- exclude=("self", "__class__", "api_key", "organization", "base_url", "azure_endpoint"),+ exclude=(+ "self",+ "__class__",+ "api_key",+ "organization",+ "base_url",+ "azure_endpoint",+ "azure_ad_token",+ "azure_ad_token_provider",+ ),no_recursive=(Agent,),)@@ -301,7 +310,17 @@ class SqliteLogger(BaseLogger):returnargs = to_dict(- init_args, exclude=("self", "__class__", "api_key", "organization", "base_url", "azure_endpoint")+ init_args,+ exclude=(+ "self",+ "__class__",+ "api_key",+ "organization",+ "base_url",+ "azure_endpoint",+ "azure_ad_token",+ "azure_ad_token_provider",+ ),)query = """@@ -323,7 +342,17 @@ class SqliteLogger(BaseLogger):returnargs = to_dict(- init_args, exclude=("self", "__class__", "api_key", "organization", "base_url", "azure_endpoint")+ init_args,+ exclude=(+ "self",+ "__class__",+ "api_key",+ "organization",+ "base_url",+ "azure_endpoint",+ "azure_ad_token",+ "azure_ad_token_provider",+ ),)query = """diff --git a/autogen/oai/client.py b/autogen/oai/client.pyindex 982d1c0d5..3aaf01736 100644--- a/autogen/oai/client.py+++ b/autogen/oai/client.py@@ -407,6 +407,14 @@ class OpenAIWrapper:openai_config["azure_deployment"] = openai_config["azure_deployment"].replace(".", "")openai_config["azure_endpoint"] = openai_config.get("azure_endpoint", openai_config.pop("base_url", None))+ # Create a default Azure token provider if requested+ if openai_config.get("azure_ad_token_provider") == "DEFAULT":+ import azure.identity++ openai_config["azure_ad_token_provider"] = azure.identity.get_bearer_token_provider(+ azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"+ )+def _register_default_client(self, config: Dict[str, Any], openai_config: Dict[str, Any]) -> None:"""Create a client with the given config to override openai_config,after removing extra kwargs.diff --git a/autogen/oai/openai_utils.py b/autogen/oai/openai_utils.pyindex 1ed347f62..a676e9643 100644--- a/autogen/oai/openai_utils.py+++ b/autogen/oai/openai_utils.py@@ -13,7 +13,7 @@ from openai import OpenAIfrom openai.types.beta.assistant import Assistantfrom packaging.version import parse-NON_CACHE_KEY = ["api_key", "base_url", "api_type", "api_version"]+NON_CACHE_KEY = ["api_key", "base_url", "api_type", "api_version", "azure_ad_token", "azure_ad_token_provider"]DEFAULT_AZURE_API_VERSION = "2024-02-15-preview"OAI_PRICE1K = {# https://openai.com/api/pricing/