feat: use Foundry built into AI Services

Author: Adrian Wright

voice_agent/app/infra/core/ai/ai-services.bicep

@@ -22,21 +22,12 @@ param cognitiveServicesAccountName string = foundryHubName
 @description('Name of the GPT-4o model deployment')
 param gpt4oDeploymentName string = 'gpt-4o'
 
-@description('GPT-4o model name')
-param gpt4oModelName string = 'gpt-4o'
-
-@description('GPT-4o model version')
-param gpt4oModelVersion string = '2024-05-13'
-
 @description('Capacity for the GPT-4o model deployment')
 param gpt4oCapacity int = 1
 
 @description('Name of the embedding model deployment')
 param embeddingModelDeploymentName string = 'text-embedding-ada-002'
 
-@description('Embedding model version')
-param embeddingModelVersion string = '2'
-
 @description('Name of the GPT-4o mini deployment')
 param gpt4oMiniModelDeploymentName string = 'gpt-4o-mini'
 
@@ -64,9 +55,6 @@ param aiFoundryProjectName string = '${foundryHubName}-project'
 @description('Display name for the AI Foundry Project')
 param aiFoundryProjectDisplayName string = 'Voice Agent Multi Modal Workshop'
 
-@description('API version for Azure OpenAI API')
-param apiVersion string = '2023-05-15'
-
 @description('Abbreviations to use for resource naming')
 param abbrs object
 
@@ -108,139 +96,43 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2019-04-01' = {
   tags: tags
 }
 
-resource aiHub 'Microsoft.MachineLearningServices/workspaces@2024-07-01-preview' = {
-  name: foundryHubName
+// Add Cognitive Services account of kind AIServices
+resource cognitiveServicesAccount 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = {
+  name: cognitiveServicesAccountName
   location: location
-  kind: 'hub'
+  tags: tags
+  kind: 'AIServices'
+  sku: {
+    name: accountSku
+  }
   identity: {
     type: 'SystemAssigned'
   }
   properties: {
-    description: 'Azure AI Foundry Hub'
-    friendlyName: 'AI Foundry Hub'
+    allowProjectManagement: true
     publicNetworkAccess: 'Enabled'
-    storageAccount: storageAccount.id
-    containerRegistry: containerRegistry.outputs.resourceId
-    applicationInsights: applicationInsightsResourceId
-    keyVault: keyVault.outputs.resourceId
   }
-  tags: tags
 }
 
 // Create the AI Foundry Project
-resource aiProject 'Microsoft.MachineLearningServices/workspaces@2024-07-01-preview' = {
+resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-04-01-preview' = {
+  parent: cognitiveServicesAccount
   name: aiFoundryProjectName
   location: location
-  kind: 'project'
   identity: {
     type: 'SystemAssigned'
   }
   properties: {
-    description: 'AI Foundry Project for Video RAG'
-    friendlyName: aiFoundryProjectDisplayName
-    hubResourceId: aiHub.id
-    publicNetworkAccess: 'Enabled'
+    description: aiFoundryProjectDisplayName
   }
   tags: tags
 }
 
-// Connect the Azure OpenAI endpoint to the AI Foundry Project
-resource aiServiceConnection 'Microsoft.MachineLearningServices/workspaces/connections@2023-08-01-preview' = {
-  parent: aiProject
-  name: '${foundryHubName}-ai-connection'
-  properties: {
-    category: 'AzureOpenAI'
-    target: cognitiveServicesAccount.properties.endpoint
-    authType: 'ApiKey'
-    isSharedToAll: true
-    credentials: {
-      key: cognitiveServicesAccount.listKeys().key1
-    }
-    metadata: {
-      resourceName: cognitiveServicesAccount.name
-      ApiType: 'Azure'
-      ApiVersion: apiVersion
-    }
-  }
-}
-
-// Add Cognitive Services account of kind AIServices
-resource cognitiveServicesAccount 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
-  name: cognitiveServicesAccountName
-  location: location
-  tags: tags
-  kind: 'AIServices'
-  sku: {
-    name: accountSku
-  }
-  properties: {
-    customSubDomainName: cognitiveServicesAccountName
-    networkAcls: {
-      defaultAction: 'Allow'
-    }
-    publicNetworkAccess: 'Enabled'
-  }
-}
-
 var contentUnderstandingEndpoint = 'https://${cognitiveServicesAccountName}.services.ai.azure.com/'
 
-// User-assigned managed identity for the deployment script
-resource deploymentScriptIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
-  name: 'id-deploymentscript-${resourceToken}'
-  location: location
-  tags: tags
-}
-
-// Create role assignment for the deployment script identity to manage Cognitive Services
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-  name: guid(resourceGroup().id, deploymentScriptIdentity.id, 'Contributor')
-  scope: cognitiveServicesAccount
-  properties: {
-    principalId: deploymentScriptIdentity.properties.principalId
-    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') // Contributor role
-    principalType: 'ServicePrincipal'
-  }
-}
-
 // Generate a unique token for resource naming
 var resourceToken = uniqueString(subscription().id, resourceGroup().id, cognitiveServicesAccountName)
 
-
-// resource chatModelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2025-04-01-preview' = {
-//   parent: cognitiveServicesAccount
-//   name: gpt4oDeploymentName
-//   sku: {
-//     capacity: gpt4oCapacity
-//     name: openAiSkuName
-//   }
-//   properties: {
-//     model: {
-//       format: openAiModelFormat
-//       name: gpt4oModelName
-//       version: gpt4oModelVersion
-//     }
-//   }
-// }
-
-// resource embeddingModelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2025-04-01-preview' = {
-//   parent: cognitiveServicesAccount
-//   name: embeddingModelDeploymentName
-//   sku: {
-//     capacity: gpt4oCapacity
-//     name: openAiSkuName
-//   }
-//   properties: {
-//     model: {
-//       format: openAiModelFormat
-//       name: embeddingModelDeploymentName
-//       version: embeddingModelVersion
-//     }
-//   }
-//   dependsOn: [
-//     chatModelDeployment
-//   ]
-// }
-
 resource gpt4oMiniModelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2025-04-01-preview' = {
   parent: cognitiveServicesAccount
   name: gpt4oMiniModelDeploymentName
@@ -295,12 +187,4 @@ output embeddingModelDeploymentName string = embeddingModelDeploymentName
 output gpt4oMiniModelDeploymentName string = gpt4oMiniModelDeploymentName
 output gpt4oMiniModelVersion string = gpt4oMiniModelVersion
 output realtimeModelDeploymentName string = realtimeModelDeploymentName
-output aiProjectName string = aiProject.name
-output aiProjectId string = aiProject.id
-output aiProjectPrincipalId string = aiProject.identity.principalId
-output aiServiceConnectionName string = aiServiceConnection.name
-output aiServiceConnectionId string = aiServiceConnection.id
-output resourceId string = aiHub.id
-output name string = aiHub.name
-output principalId string = aiHub.identity.principalId
 output containerRegistryName string = containerRegistry.outputs.name

voice_agent/app/infra/main.bicep

@@ -198,8 +198,6 @@ module aiServices './core/ai/ai-services.bicep' = {
     applicationInsightsResourceId: monitoring.outputs.applicationInsightsId
     cognitiveServicesAccountName: '${abbrs.cognitiveServicesAccounts}${resourceToken}'
     gpt4oDeploymentName: 'gpt-4o'
-    gpt4oModelName: 'gpt-4o'
-    gpt4oModelVersion: '2024-05-13'
     realtimeModelDeploymentName: 'gpt-4o-realtime-preview'
     embeddingModelDeploymentName: 'text-embedding-ada-002'
     gpt4oMiniModelDeploymentName: 'gpt-4o-mini'
@@ -376,7 +374,7 @@ module storageContribRoleApi 'core/security/role.bicep' = {
 }
 
 module dataScientistRole 'core/security/subscription-role.bicep' = {
-  name: 'data-scientist-role'
+  name: 'data-scientist-role-${resourceToken}'
   params: {
     principalId: backendApp.outputs.SERVICE_BACKEND_PRINCIPAL_ID
     roleDefinitionId: 'f6c7c914-8db3-469d-8ca1-694a8f32e121' // Azure ML Data Scientist
@@ -391,12 +389,6 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerApps.outputs.registry
 output AZURE_CONTAINER_REGISTRY_NAME string = containerApps.outputs.registryName
 output AZURE_CONTAINER_REGISTRY_RESOURCE_GROUP string = containerApps.outputs.registryName
 output AZURE_LOCATION string = location
-output AZURE_FOUNDRY_HUB_NAME string = aiServices.outputs.name
-output AZURE_FOUNDRY_HUB_ID string = aiServices.outputs.resourceId
-output AZURE_FOUNDRY_PROJECT_NAME string = aiServices.outputs.aiProjectName
-output AZURE_FOUNDRY_PROJECT_ID string = aiServices.outputs.aiProjectId
-output AZURE_AI_SERVICE_CONNECTION_NAME string = aiServices.outputs.aiServiceConnectionName
-output AZURE_AI_SERVICE_CONNECTION_ID string = aiServices.outputs.aiServiceConnectionId
 output AZURE_COGNITIVE_SERVICES_NAME string = aiServices.outputs.cognitiveServicesAccountName
 output AZURE_COGNITIVE_SERVICES_ID string = aiServices.outputs.cognitiveServicesAccountId
 output AZURE_COGNITIVE_SERVICES_ENDPOINT string = aiServices.outputs.cognitiveServicesEndpoint