Skip to content

Commit f8ddbf2

Browse files
fix: Replacing DefaultAzureCredential with ManagedIdentityCredential
2 parents 96b4999 + ba80922 commit f8ddbf2

40 files changed

+155
-93
lines changed

docs/workshop/docs/workshop/Challenge-3-and-4/knowledge_mining_api.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"import pyodbc\n",
2929
"from dotenv import load_dotenv\n",
3030
"\n",
31-
"from azure.identity.aio import DefaultAzureCredential, get_bearer_token_provider\n",
31+
"from azure.identity.aio import ManagedIdentityCredential, get_bearer_token_provider\n",
3232
"from azure.ai.agents.models import TruncationObject\n",
3333
"\n",
3434
"from semantic_kernel.functions.kernel_function_decorator import kernel_function\n",
@@ -61,7 +61,7 @@
6161
" mid_id = os.getenv(\"SQLDB_USER_MID\")\n",
6262
"\n",
6363
" try:\n",
64-
" async with DefaultAzureCredential() as credential:\n",
64+
" async with ManagedIdentityCredential() as credential:\n",
6565
" token = await credential.get_token(\"https://database.windows.net/.default\")\n",
6666
" token_bytes = token.token.encode(\"utf-16-LE\")\n",
6767
" token_struct = struct.pack(\n",
@@ -128,7 +128,7 @@
128128
"\n",
129129
" try:\n",
130130
" token_provider = get_bearer_token_provider(\n",
131-
" DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
131+
" ManagedIdentityCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
132132
" )\n",
133133
" token = await token_provider()\n",
134134
" client = openai.AzureOpenAI(\n",
@@ -175,7 +175,7 @@
175175
" Only return the generated SQL query. Do not return anything else.'''\n",
176176
" \n",
177177
" token_provider = get_bearer_token_provider(\n",
178-
" DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
178+
" ManagedIdentityCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
179179
" )\n",
180180
" token = await token_provider()\n",
181181
" client = openai.AzureOpenAI(\n",
@@ -212,7 +212,7 @@
212212
" ):\n",
213213
" try:\n",
214214
" token_provider = get_bearer_token_provider(\n",
215-
" DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
215+
" ManagedIdentityCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
216216
" )\n",
217217
" token = await token_provider()\n",
218218
" client = openai.AzureOpenAI(\n",
@@ -313,7 +313,7 @@
313313
"async def main() -> None:\n",
314314
" ai_agent_settings = AzureAIAgentSettings()\n",
315315
" async with (\n",
316-
" DefaultAzureCredential() as creds,\n",
316+
" ManagedIdentityCredential() as creds,\n",
317317
" AzureAIAgent.create_client(credential=creds, endpoint=ai_agent_settings.endpoint) as client,\n",
318318
" ):\n",
319319
" AGENT_INSTRUCTIONS = '''You are a helpful assistant.\n",

docs/workshop/docs/workshop/Challenge-5/notebooks/video_chapter_generation.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
")\n",
118118
"from python.content_understanding_client import AzureContentUnderstandingClient\n",
119119
"\n",
120-
"from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
121-
"credential = DefaultAzureCredential()\n",
120+
"from azure.identity import ManagedIdentityCredential, get_bearer_token_provider\n",
121+
"credential = ManagedIdentityCredential()\n",
122122
"token_provider = get_bearer_token_provider(credential, AUTHENTICATION_URL)\n",
123123
"\n",
124124
"# The analyzer template is used to define the schema of the output\n",

docs/workshop/docs/workshop/Challenge-5/notebooks/video_tag_generation.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
")\n",
118118
"from python.content_understanding_client import AzureContentUnderstandingClient\n",
119119
"\n",
120-
"from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
121-
"credential = DefaultAzureCredential()\n",
120+
"from azure.identity import ManagedIdentityCredential, get_bearer_token_provider\n",
121+
"credential = ManagedIdentityCredential()\n",
122122
"token_provider = get_bearer_token_provider(credential, AUTHENTICATION_URL)\n",
123123
"\n",
124124
"# The analyzer template is used to define the schema of the output\n",

docs/workshop/docs/workshop/Challenge-5/python/utility.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from openai import AzureOpenAI
77
import tiktoken
8-
from azure.identity import DefaultAzureCredential, get_bearer_token_provider
8+
from azure.identity import ManagedIdentityCredential, get_bearer_token_provider
99
from tenacity import retry, wait_random_exponential, stop_after_attempt
1010
from pydantic import BaseModel, Field
1111

@@ -158,7 +158,7 @@ def __init__(
158158
if aoai_api_key is None or aoai_api_key == "":
159159
print("Using Entra ID/AAD to authenticate")
160160
token_provider = get_bearer_token_provider(
161-
DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
161+
ManagedIdentityCredential(), "https://cognitiveservices.azure.com/.default"
162162
)
163163

164164
self.client = AzureOpenAI(

docs/workshop/docs/workshop/Challenge-6/Content_safety_evaluation.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"metadata": {},
3737
"outputs": [],
3838
"source": [
39-
"from azure.identity import DefaultAzureCredential\n",
39+
"from azure.identity import ManagedIdentityCredential\n",
4040
"\n",
4141
"azure_ai_project = {\n",
4242
" \"subscription_id\": os.environ.get(\"AZURE_SUBSCRIPTION_ID\"),\n",
@@ -122,8 +122,8 @@
122122
"outputs": [],
123123
"source": [
124124
"from azure.ai.evaluation.simulator import AdversarialScenario\n",
125-
"from azure.identity import DefaultAzureCredential\n",
126-
"credential = DefaultAzureCredential()\n",
125+
"from azure.identity import ManagedIdentityCredential\n",
126+
"credential = ManagedIdentityCredential()\n",
127127
"\n",
128128
"scenario = AdversarialScenario.ADVERSARIAL_QA\n",
129129
"adversarial_simulator = AdversarialSimulator(azure_ai_project=azure_ai_project, credential=credential)\n",
@@ -150,7 +150,7 @@
150150
"from azure.ai.evaluation import ContentSafetyEvaluator\n",
151151
"import pandas as pd\n",
152152
"\n",
153-
"credential = DefaultAzureCredential()\n",
153+
"credential = ManagedIdentityCredential()\n",
154154
"# instantiate an evaluator with image and multi-modal support\n",
155155
"safety_evaluator = ContentSafetyEvaluator(credential=credential, azure_ai_project=azure_ai_project)\n",
156156
"\n",

documents/DeploymentGuide.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ When you start the deployment, most parameters will have **default values**, but
119119
| **Embedding Model** | Default: **text-embedding-ada-002**. | text-embedding-ada-002 |
120120
| **Embedding Model Capacity** | Set the capacity for **embedding models** (in thousands). | 80k |
121121
| **Image Tag** | Docker image tag to deploy. Common values: `latest`, `dev`, `hotfix`. | latest |
122-
| **Existing Log Analytics Workspace** | To reuse an existing Log Analytics Workspace ID. | *(empty)* |
123122
| **Use Local Build** | Boolean flag to determine if local container builds should be used. | false |
123+
| **Existing Log Analytics Workspace** | To reuse an existing Log Analytics Workspace ID. | *(empty)* |
124+
| **Existing Azure AI Foundry Project** | To reuse an existing Azure AI Foundry Project ID instead of creating a new one. | *(empty)* |
124125

125126

126127

@@ -144,6 +145,13 @@ Depending on your subscription quota and capacity, you can [adjust quota setting
144145

145146
Guide to get your [Existing Workspace ID](/documents/re-use-log-analytics.md)
146147

148+
</details>
149+
<details>
150+
151+
<summary><b>Reusing an Existing Azure AI Foundry Project</b></summary>
152+
153+
Guide to get your [Existing Project ID](/documents/re-use-foundry-project.md)
154+
147155
</details>
148156

149157
### Deploying with AZD
-53.1 KB
Loading
331 KB
Loading
94.9 KB
Loading
196 KB
Loading

0 commit comments

Comments
 (0)