Skip to content

Commit ba80922

Browse files
MANAGED_IDENTITY_CLIENT_ID to client_id
1 parent 121cf6c commit ba80922

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

infra/scripts/index_scripts/01_create_search_index.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
# === Configuration ===
2020
KEY_VAULT_NAME = 'kv_to-be-replaced'
21+
MANAGED_IDENTITY_CLIENT_ID = 'mici_to-be-replaced'
2122
INDEX_NAME = "call_transcripts_index"
2223

2324

@@ -32,7 +33,7 @@ def get_secrets_from_kv(secret_name: str) -> str:
3233
Returns:
3334
str: The secret value.
3435
"""
35-
kv_credential = ManagedIdentityCredential()
36+
kv_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
3637
secret_client = SecretClient(
3738
vault_url=f"https://{KEY_VAULT_NAME}.vault.azure.net/",
3839
credential=kv_credential
@@ -48,7 +49,7 @@ def create_search_index():
4849
- Semantic search using prioritized fields
4950
"""
5051
# Shared credential
51-
credential = ManagedIdentityCredential()
52+
credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
5253

5354
# Retrieve secrets from Key Vault
5455
search_endpoint = get_secrets_from_kv("AZURE-SEARCH-ENDPOINT")
@@ -120,4 +121,4 @@ def create_search_index():
120121
print(f"Search index '{result.name}' created or updated successfully.")
121122

122123

123-
create_search_index()
124+
create_search_index()

infra/scripts/index_scripts/02_create_cu_template_audio.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
# === Configuration ===
1111
KEY_VAULT_NAME = 'kv_to-be-replaced'
12+
MANAGED_IDENTITY_CLIENT_ID = 'mici_to-be-replaced'
1213
AZURE_AI_API_VERSION = "2024-12-01-preview"
1314
ANALYZER_ID = "ckm-audio"
1415
ANALYZER_TEMPLATE_FILE = 'ckm-analyzer_config_audio.json'
@@ -26,7 +27,7 @@ def get_secrets_from_kv(secret_name: str, vault_name: str) -> str:
2627
Returns:
2728
str: The value of the secret.
2829
"""
29-
kv_credential = ManagedIdentityCredential()
30+
kv_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
3031
secret_client = SecretClient(
3132
vault_url=f"https://{vault_name}.vault.azure.net/",
3233
credential=kv_credential
@@ -38,7 +39,7 @@ def get_secrets_from_kv(secret_name: str, vault_name: str) -> str:
3839
# Fetch endpoint from Key Vault
3940
endpoint = get_secrets_from_kv("AZURE-OPENAI-CU-ENDPOINT", KEY_VAULT_NAME)
4041

41-
credential = ManagedIdentityCredential()
42+
credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
4243
# Initialize Content Understanding Client
4344
token_provider = get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
4445
client = AzureContentUnderstandingClient(
@@ -49,4 +50,4 @@ def get_secrets_from_kv(secret_name: str, vault_name: str) -> str:
4950

5051
# Create Analyzer
5152
response = client.begin_create_analyzer(ANALYZER_ID, analyzer_template_path=ANALYZER_TEMPLATE_FILE)
52-
result = client.poll_result(response)
53+
result = client.poll_result(response)

infra/scripts/index_scripts/02_create_cu_template_text.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
# === Configuration ===
1111
KEY_VAULT_NAME = 'kv_to-be-replaced'
12+
MANAGED_IDENTITY_CLIENT_ID = 'mici_to-be-replaced'
1213
AZURE_AI_API_VERSION = "2024-12-01-preview"
1314
ANALYZER_ID = "ckm-json"
1415
ANALYZER_TEMPLATE_FILE = 'ckm-analyzer_config_text.json'
@@ -19,7 +20,7 @@ def get_secret(secret_name: str, vault_name: str) -> str:
1920
"""
2021
Retrieve a secret value from Azure Key Vault.
2122
"""
22-
kv_credential = ManagedIdentityCredential()
23+
kv_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
2324
secret_client = SecretClient(vault_url=f"https://{vault_name}.vault.azure.net/", credential=kv_credential)
2425
return secret_client.get_secret(secret_name).value
2526

@@ -29,7 +30,7 @@ def get_secret(secret_name: str, vault_name: str) -> str:
2930
# Get endpoint from Key Vault
3031
endpoint = get_secret("AZURE-OPENAI-CU-ENDPOINT", KEY_VAULT_NAME)
3132

32-
credential = ManagedIdentityCredential()
33+
credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
3334
# Initialize Content Understanding Client
3435
token_provider = get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
3536
client = AzureContentUnderstandingClient(
@@ -40,4 +41,4 @@ def get_secret(secret_name: str, vault_name: str) -> str:
4041

4142
# Create Analyzer
4243
response = client.begin_create_analyzer(ANALYZER_ID, analyzer_template_path=ANALYZER_TEMPLATE_FILE)
43-
result = client.poll_result(response)
44+
result = client.poll_result(response)

infra/scripts/index_scripts/03_cu_process_data_text.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515

1616
# Constants and configuration
1717
KEY_VAULT_NAME = 'kv_to-be-replaced'
18+
MANAGED_IDENTITY_CLIENT_ID = 'mici_to-be-replaced'
1819
FILE_SYSTEM_CLIENT_NAME = "data"
1920
DIRECTORY = 'call_transcripts'
2021
AUDIO_DIRECTORY = 'audiodata'
2122
INDEX_NAME = "call_transcripts_index"
2223

2324
def get_secrets_from_kv(kv_name, secret_name):
24-
kv_credential = ()
25+
kv_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
2526
secret_client = SecretClient(vault_url=f"https://{kv_name}.vault.azure.net/", credential=kv_credential)
2627
return secret_client.get_secret(secret_name).value
2728

@@ -39,15 +40,15 @@ def get_secrets_from_kv(kv_name, secret_name):
3940

4041
# Azure DataLake setup
4142
account_url = f"https://{account_name}.dfs.core.windows.net"
42-
credential = ManagedIdentityCredential()
43+
credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
4344
service_client = DataLakeServiceClient(account_url, credential=credential, api_version='2023-01-03')
4445
file_system_client = service_client.get_file_system_client(FILE_SYSTEM_CLIENT_NAME)
4546
directory_name = DIRECTORY
4647
paths = list(file_system_client.get_paths(path=directory_name))
4748
print("Azure DataLake setup complete.")
4849

4950
# Azure Search setup
50-
search_credential = ManagedIdentityCredential()
51+
search_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
5152
search_client = SearchClient(search_endpoint, INDEX_NAME, search_credential)
5253
index_client = SearchIndexClient(endpoint=search_endpoint, credential=search_credential)
5354
print("Azure Search setup complete.")
@@ -64,7 +65,7 @@ def get_secrets_from_kv(kv_name, secret_name):
6465

6566

6667
# Content Understanding client
67-
cu_credential = ManagedIdentityCredential()
68+
cu_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
6869
cu_token_provider = get_bearer_token_provider(cu_credential, "https://cognitiveservices.azure.com/.default")
6970
cu_client = AzureContentUnderstandingClient(
7071
endpoint=azure_ai_endpoint,
@@ -78,7 +79,7 @@ def get_secrets_from_kv(kv_name, secret_name):
7879
def get_embeddings(text: str, openai_api_base, openai_api_version):
7980
model_id = "text-embedding-ada-002"
8081
token_provider = get_bearer_token_provider(
81-
ManagedIdentityCredential(),
82+
ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID),
8283
"https://cognitiveservices.azure.com/.default"
8384
)
8485
client = AzureOpenAI(
@@ -289,7 +290,7 @@ def call_gpt4(topics_str1, client):
289290
return json.loads(res.replace("```json", '').replace("```", ''))
290291

291292
token_provider = get_bearer_token_provider(
292-
ManagedIdentityCredential(),
293+
ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID),
293294
"https://cognitiveservices.azure.com/.default"
294295
)
295296
openai_client = AzureOpenAI(

infra/scripts/index_scripts/04_cu_process_data_new_data.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929

3030
# Constants and configuration
3131
KEY_VAULT_NAME = 'kv_to-be-replaced'
32+
MANAGED_IDENTITY_CLIENT_ID = 'mici_to-be-replaced'
3233
FILE_SYSTEM_CLIENT_NAME = "data"
3334
DIRECTORY = 'custom_transcripts'
3435
AUDIO_DIRECTORY = 'custom_audiodata'
3536
INDEX_NAME = "call_transcripts_index"
3637

3738
def get_secrets_from_kv(kv_name, secret_name):
38-
kv_credential = ManagedIdentityCredential()
39+
kv_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
3940
secret_client = SecretClient(vault_url=f"https://{kv_name}.vault.azure.net/", credential=kv_credential)
4041
return secret_client.get_secret(secret_name).value
4142

@@ -54,15 +55,15 @@ def get_secrets_from_kv(kv_name, secret_name):
5455

5556
# Azure DataLake setup
5657
account_url = f"https://{account_name}.dfs.core.windows.net"
57-
credential = ManagedIdentityCredential()
58+
credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
5859
service_client = DataLakeServiceClient(account_url, credential=credential, api_version='2023-01-03')
5960
file_system_client = service_client.get_file_system_client(FILE_SYSTEM_CLIENT_NAME)
6061
directory_name = DIRECTORY
6162
paths = list(file_system_client.get_paths(path=directory_name))
6263
print("Azure DataLake setup complete.")
6364

6465
# Azure Search setup
65-
search_credential = ManagedIdentityCredential()
66+
search_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
6667
search_client = SearchClient(search_endpoint, INDEX_NAME, search_credential)
6768
index_client = SearchIndexClient(endpoint=search_endpoint, credential=search_credential)
6869
print("Azure Search setup complete.")
@@ -155,7 +156,7 @@ def create_search_index():
155156
print("SQL Server connection established.")
156157

157158
# Content Understanding client
158-
cu_credential = ManagedIdentityCredential()
159+
cu_credential = ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID)
159160
cu_token_provider = get_bearer_token_provider(cu_credential, "https://cognitiveservices.azure.com/.default")
160161
cu_client = AzureContentUnderstandingClient(
161162
endpoint=azure_ai_endpoint,
@@ -168,7 +169,7 @@ def create_search_index():
168169
def get_embeddings(text: str, openai_api_base, openai_api_version):
169170
model_id = "text-embedding-ada-002"
170171
token_provider = get_bearer_token_provider(
171-
ManagedIdentityCredential(),
172+
ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID),
172173
"https://cognitiveservices.azure.com/.default"
173174
)
174175
client = AzureOpenAI(
@@ -403,7 +404,7 @@ def call_gpt4(topics_str1, client):
403404
return json.loads(res.replace("```json", '').replace("```", ''))
404405

405406
token_provider = get_bearer_token_provider(
406-
ManagedIdentityCredential(),
407+
ManagedIdentityCredential(client_id=MANAGED_IDENTITY_CLIENT_ID),
407408
"https://cognitiveservices.azure.com/.default"
408409
)
409410
openai_client = AzureOpenAI(

0 commit comments

Comments
 (0)