FDP changes

Author: Pavan-Microsoft

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

@@ -31,7 +31,8 @@
     "from azure.identity.aio import DefaultAzureCredential\n",
     "from azure.ai.projects import AIProjectClient\n",
     "from semantic_kernel.agents import AzureAIAgent\n",
-    "from azure.ai.projects.models import TruncationObject"
+    "from azure.ai.projects.models import TruncationObject\n",
+    "from azure.identity import DefaultAzureCredential, get_bearer_token_provider"
    ]
   },
   {
@@ -221,9 +222,12 @@
     "            self,\n",
     "            question: Annotated[str, \"the question\"]\n",
     "    ):\n",
+    "        token_provider = get_bearer_token_provider(\n",
+    "            DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
+    "        )\n",
     "        client = openai.AzureOpenAI(\n",
     "            azure_endpoint=self.azure_openai_endpoint,\n",
-    "            api_key=self.azure_openai_api_key,\n",
+    "            azure_ad_token_provider=token_provider,\n",
     "            api_version=self.azure_openai_api_version\n",
     "        )\n",
     "\n",

infra/deploy_ai_foundry.bicep

@@ -413,7 +413,7 @@ resource azureOpenAIEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-
   parent: keyVault
   name: 'AZURE-OPENAI-ENDPOINT'
   properties: {
-    value: aiServices.properties.endpoint //aiServices_m.properties.endpoint
+    value: aiServices.properties.endpoints['OpenAI Language Model Instance API'] //aiServices_m.properties.endpoint
   }
 }
 
@@ -429,7 +429,7 @@ resource azureOpenAICUEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-0
   parent: keyVault
   name: 'AZURE-OPENAI-CU-ENDPOINT'
   properties: {
-    value: aiServices_CU.properties.endpoint
+    value: aiServices_CU.properties.endpoints['OpenAI Language Model Instance API']
   }
 }
 

infra/deploy_backend_docker.bicep

@@ -7,8 +7,6 @@ param solutionLocation string
 @secure()
 param appSettings object = {}
 param appServicePlanId string
-@secure()
-param azureAiProjectConnString string
 param userassignedIdentityId string
 param aiProjectName string
 param keyVaultName string
@@ -91,8 +89,7 @@ module appService 'deploy_app_service.bicep' = {
     userassignedIdentityId:userassignedIdentityId
     appSettings: union(
       appSettings,
-      {        
-        AZURE_AI_PROJECT_CONN_STRING:azureAiProjectConnString
+      {
         APPINSIGHTS_INSTRUMENTATIONKEY: reference(applicationInsightsId, '2015-05-01').InstrumentationKey
         REACT_APP_LAYOUT_CONFIG: reactAppLayoutConfig
       }
@@ -119,8 +116,13 @@ resource role 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2022-05-
   }
 }
 
+resource aiServices 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' existing = {
+  name: aiServicesName
+}
+
 resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-04-01-preview' existing = {
-  name: '${aiServicesName}/${aiProjectName}'
+  parent: aiServices
+  name: aiProjectName
 }
 
 resource aiDeveloper 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
@@ -153,6 +155,28 @@ resource keyVaultSecretsUserAssignment 'Microsoft.Authorization/roleAssignments@
   }
 }
 
+resource aiUser 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
+  name: '53ca6127-db72-4b80-b1b0-d745d6d5456d'
+}
+
+resource aiUserAccessProj 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
+  name: guid(appService.name, aiProject.id, aiUser.id)
+  scope: aiProject
+  properties: {
+    roleDefinitionId: aiUser.id
+    principalId: appService.outputs.identityPrincipalId
+  }
+}
+
+resource aiUserAccessFoundry 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
+  name: guid(appService.name, aiServices.id, aiUser.id)
+  scope: aiServices
+  properties: {
+    roleDefinitionId: aiUser.id
+    principalId: appService.outputs.identityPrincipalId
+  }
+}
+
 output appUrl string = appService.outputs.appUrl
 output reactAppLayoutConfig string = reactAppLayoutConfig
 output appInsightInstrumentationKey string = reference(applicationInsightsId, '2015-05-01').InstrumentationKey

infra/main.bicep

@@ -40,7 +40,7 @@ param gptModelName string = 'gpt-4o-mini'
 // @minLength(1)
 // @description('Version of the GPT model to deploy:')
 // param gptModelVersion string = '2024-02-15-preview' //'2024-08-06'
-var azureOpenAIApiVersion = '2024-02-15-preview'
+var azureOpenAIApiVersion = '2025-01-01-preview'
 
 @minValue(10)
 @description('Capacity of the GPT deployment:')
@@ -196,7 +196,6 @@ module backend_docker 'deploy_backend_docker.bicep' = {
     imageTag: imageTag
     appServicePlanId: hostingplan.outputs.name
     applicationInsightsId: aifoundry.outputs.applicationInsightsId
-    azureAiProjectConnString: keyVault.getSecret('AZURE-AI-PROJECT-CONN-STRING')
     userassignedIdentityId: managedIdentityModule.outputs.managedIdentityBackendAppOutput.id
     aiProjectName: aifoundry.outputs.aiProjectName
     keyVaultName: kvault.outputs.keyvaultName
@@ -207,6 +206,8 @@ module backend_docker 'deploy_backend_docker.bicep' = {
       AZURE_OPENAI_API_VERSION: azureOpenAIApiVersion
       AZURE_OPENAI_RESOURCE: aifoundry.outputs.aiServicesName
       AZURE_OPENAI_API_KEY: '@Microsoft.KeyVault(SecretUri=${kvault.outputs.keyvaultUri}secrets/AZURE-OPENAI-KEY/)'
+      AZURE_AI_AGENT_ENDPOINT: aifoundry.outputs.projectEndpoint
+      AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME: gptModelName
       USE_CHAT_HISTORY_ENABLED: 'True'
       AZURE_COSMOSDB_ACCOUNT: cosmosDBModule.outputs.cosmosAccountName
       AZURE_COSMOSDB_CONVERSATIONS_CONTAINER: cosmosDBModule.outputs.cosmosContainerName
@@ -279,6 +280,8 @@ output SQLDB_USERNAME string = sqlDBModule.outputs.sqlDbUser
 output USE_AI_PROJECT_CLIENT string = 'False'
 output USE_CHAT_HISTORY_ENABLED string = 'True'
 output DISPLAY_CHART_DEFAULT string = 'False'
+output AZURE_AI_AGENT_ENDPOINT string = aifoundry.outputs.projectEndpoint
+output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = gptModelName
 
 output API_APP_URL string = backend_docker.outputs.appUrl
 output WEB_APP_URL string = frontend_docker.outputs.appUrl