Merge branch 'dev' into kings-docgen-dev

Author: Kingshuk-Microsoft

.github/ISSUE_TEMPLATE/subtask.md

@@ -0,0 +1,22 @@
+---
+name: Sub task
+about: A sub task
+title: ''
+labels: subtask
+assignees: ''
+
+---
+
+Required by <link to parent issue>
+
+# Description
+
+A clear and concise description of what this subtask is.
+
+# Tasks
+
+_To be filled in by the engineer picking up the subtask
+
+- [ ] Task 1
+- [ ] Task 2
+- [ ] ...

.github/workflows/deploy.yml

@@ -138,7 +138,7 @@ jobs:
           az deployment group create \
             --name ${{ env.SOLUTION_PREFIX }}-deployment \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
-            --template-file infra/main.json \
+            --template-file infra/main.bicep \
             --parameters \
                 solutionName="${{ env.SOLUTION_PREFIX }}" \
                 secondaryLocation="northcentralus" \
@@ -168,8 +168,8 @@ jobs:
           echo "KEY_VAULT_NAME=$KEY_VAULT_NAME" >> $GITHUB_ENV
           COSMOSDB_ACCOUNT_NAME=$(echo $BICEP_OUTPUT | jq -r '.cosmosdB_ACCOUNT_NAME.value')
           echo "COSMOSDB_ACCOUNT_NAME=$COSMOSDB_ACCOUNT_NAME" >> $GITHUB_ENV
-          AI_FOUNDRY_NAME=$(echo $BICEP_OUTPUT | jq -r '.aI_FOUNDRY_NAME.value')
-          echo "AI_FOUNDRY_NAME=$AI_FOUNDRY_NAME" >> $GITHUB_ENV
+          AI_FOUNDRY_RESOURCE_ID=$(echo $BICEP_OUTPUT | jq -r '.aI_FOUNDRY_RESOURCE_ID.value')
+          echo "AI_FOUNDRY_RESOURCE_ID=$AI_FOUNDRY_RESOURCE_ID" >> $GITHUB_ENV
           AI_SEARCH_SERVICE_NAME=$(echo $BICEP_OUTPUT | jq -r '.aI_SEARCH_SERVICE_NAME.value')
           echo "AI_SEARCH_SERVICE_NAME=$AI_SEARCH_SERVICE_NAME" >> $GITHUB_ENV
           echo "Deployment output: $BICEP_OUTPUT"
@@ -190,10 +190,9 @@ jobs:
           bash ./infra/scripts/run_create_index_scripts.sh \
             "${{ env.KEY_VAULT_NAME }}" \
             "${{ env.RESOURCE_GROUP_NAME }}" \
-            "${{ env.AI_FOUNDRY_NAME }}" \
-            "${{ env.RESOURCE_GROUP_NAME }}" \
             "${{ env.AI_SEARCH_SERVICE_NAME }}" \
-            "${{ secrets.AZURE_CLIENT_ID }}"
+            "${{ secrets.AZURE_CLIENT_ID }}" \
+            "${{ env.AI_FOUNDRY_RESOURCE_ID }}"
 
       - name: Logout from Azure
         if: always()

infra/deploy_ai_foundry.bicep

@@ -102,7 +102,7 @@ var aiModelDeployments = [
     name: embeddingModel
     model: embeddingModel
     sku: {
-      name: 'Standard'
+      name: 'GlobalStandard'
       capacity: embeddingDeploymentCapacity
     }
     version: '2'
@@ -511,6 +511,10 @@ output aiFoundryName string = !empty(existingAIFoundryName) ? existingAIFoundryN
 
 @description('Contains Name of AI Foundry RG.')
 output aiFoundryRgName string = !empty(existingAIServiceResourceGroup) ? existingAIServiceResourceGroup : resourceGroup().name
+=======
+output aiFoundryId string = !empty(azureExistingAIProjectResourceId)
+  ? existingAiFoundry.id
+  : aiFoundry.id
 
 @description('Contains Application Insights ID.')
 output applicationInsightsId string = applicationInsights.id

infra/deploy_app_service.bicep

@@ -379,6 +379,7 @@ resource searchIndexDataReaderAssignment 'Microsoft.Authorization/roleAssignment
   properties: {
     roleDefinitionId: searchIndexDataReader.id
     principalId: Website.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -438,3 +439,16 @@ module assignAiUserRoleToAiProject 'deploy_foundry_role_assignment.bicep' = {
 
 @description('Contains the URL of WebApp.')
 output webAppUrl string = 'https://${websiteName}.azurewebsites.net'
+output webAppUrl string = 'https://${WebsiteName}.azurewebsites.net'
+output azureOpenAISystemMessage string = azureOpenAISystemMessage
+output azureOpenAiGenerateSectionContentPrompt string = azureOpenAiGenerateSectionContentPrompt
+output azureOpenAiTemplateSystemMessage string = azureOpenAiTemplateSystemMessage
+output azureOpenAiTitlePrompt string = azureOpenAiTitlePrompt
+output azureOpenAIModel string = AzureOpenAIModel
+output azureOpenAIResource string = azureOpenaiResource
+output AzureSearchIndex string = AzureSearchIndex
+output aiSearchService string = aiSearchService
+output AZURE_COSMOSDB_ENABLE_FEEDBACK string = AZURE_COSMOSDB_ENABLE_FEEDBACK
+output AzureSearchQueryType string = AzureSearchQueryType
+output AzureSearchVectorFields string = AzureSearchVectorFields
+

infra/main.bicep

@@ -16,17 +16,11 @@ param AZURE_LOCATION string = ''
 // ========== AI Deployments Location ========== //
 @allowed([
   'australiaeast'
-  'canadaeast'
-  'centraluseuap'
   'eastus'
   'eastus2'
   'francecentral'
   'japaneast'
   'koreacentral'
-  'norwayeast'
-  'polandcentral'
-  'southeastasia'
-  'southindia'
   'swedencentral'
   'switzerlandnorth'
   'uaenorth'
@@ -40,7 +34,7 @@ param AZURE_LOCATION string = ''
     type: 'location'
     usageName: [
       'OpenAI.GlobalStandard.gpt4.1,150'
-      'OpenAI.Standard.text-embedding-ada-002,80'
+      'OpenAI.GlobalStandard.text-embedding-ada-002,80'
     ]
   }
 })
@@ -262,7 +256,26 @@ output AI_FOUNDRY_NAME string = aifoundry.outputs.aiFoundryName
 output AI_FOUNDRY_RG_NAME string = aifoundry.outputs.aiFoundryRgName
 
 @description('Contains AI Search Service Name')
+output AI_FOUNDRY_RESOURCE_ID string = aifoundry.outputs.aiFoundryId
 output AI_SEARCH_SERVICE_NAME string = aifoundry.outputs.aiSearchService
 
 @description('Contains Azure Search Connection Name')
 output AZURE_SEARCH_CONNECTION_NAME string = aifoundry.outputs.aiSearchConnectionName
+output AZURE_OPENAI_TITLE_PROMPT string = appserviceModule.outputs.azureOpenAiTitlePrompt
+output AZURE_OPENAI_GENERATE_SECTION_CONTENT_PROMPT string = appserviceModule.outputs.azureOpenAiGenerateSectionContentPrompt
+output AZURE_OPENAI_TEMPLATE_SYSTEM_MESSAGE string = appserviceModule.outputs.azureOpenAiTemplateSystemMessage
+output AZURE_OPENAI_SYSTEM_MESSAGE string = appserviceModule.outputs.azureOpenAISystemMessage
+output AZURE_OPENAI_MODEL string = appserviceModule.outputs.azureOpenAIModel
+output AZURE_OPENAI_RESOURCE string = appserviceModule.outputs.azureOpenAIResource
+output AZURE_SEARCH_SERVICE string = appserviceModule.outputs.aiSearchService
+output AZURE_SEARCH_INDEX string = appserviceModule.outputs.AzureSearchIndex
+output AZURE_COSMOSDB_ACCOUNT string = cosmosDBModule.outputs.cosmosAccountName
+output AZURE_COSMOSDB_DATABASE string = cosmosDBModule.outputs.cosmosDatabaseName
+output AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = cosmosDBModule.outputs.cosmosContainerName
+output AZURE_COSMOSDB_ENABLE_FEEDBACK string = appserviceModule.outputs.AZURE_COSMOSDB_ENABLE_FEEDBACK
+output AZURE_SEARCH_QUERY_TYPE string = appserviceModule.outputs.AzureSearchQueryType
+output AZURE_SEARCH_VECTOR_COLUMNS string = appserviceModule.outputs.AzureSearchVectorFields
+output AZURE_AI_AGENT_ENDPOINT string = aifoundry.outputs.aiFoundryProjectEndpoint
+output AZURE_AI_AGENT_API_VERSION string = azureAiAgentApiVersion
+output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = appserviceModule.outputs.azureOpenAIModel
+output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = aifoundry.outputs.applicationInsightsConnectionString

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.36.177.2456",
-      "templateHash": "5067006710993312117"
+      "templateHash": "1702044992104018188"
     }
   },
   "parameters": {
@@ -36,17 +36,11 @@
       "type": "string",
       "allowedValues": [
         "australiaeast",
-        "canadaeast",
-        "centraluseuap",
         "eastus",
         "eastus2",
         "francecentral",
         "japaneast",
         "koreacentral",
-        "norwayeast",
-        "polandcentral",
-        "southeastasia",
-        "southindia",
         "swedencentral",
         "switzerlandnorth",
         "uaenorth",
@@ -59,7 +53,7 @@
           "type": "location",
           "usageName": [
             "OpenAI.GlobalStandard.gpt4.1,150",
-            "OpenAI.Standard.text-embedding-ada-002,80"
+            "OpenAI.GlobalStandard.text-embedding-ada-002,80"
           ]
         },
         "description": "Location for AI deployments. This should be a valid Azure region where OpenAI services are available."
@@ -665,7 +659,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.177.2456",
-              "templateHash": "5405168643980957312"
+              "templateHash": "4676644507101240486"
             }
           },
           "parameters": {
@@ -976,7 +970,7 @@
                 "name": "[parameters('embeddingModel')]",
                 "model": "[parameters('embeddingModel')]",
                 "sku": {
-                  "name": "Standard",
+                  "name": "GlobalStandard",
                   "capacity": "[parameters('embeddingDeploymentCapacity')]"
                 },
                 "version": "2",
@@ -1565,9 +1559,9 @@
               "type": "string",
               "value": "[if(not(empty(variables('existingAIFoundryName'))), variables('existingAIFoundryName'), variables('aiFoundryName'))]"
             },
-            "aiFoundryRgName": {
+            "aiFoundryId": {
               "type": "string",
-              "value": "[if(not(empty(variables('existingAIServiceResourceGroup'))), variables('existingAIServiceResourceGroup'), resourceGroup().name)]"
+              "value": "[if(not(empty(parameters('azureExistingAIProjectResourceId'))), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingAIServiceSubscription'), variables('existingAIServiceResourceGroup')), 'Microsoft.CognitiveServices/accounts', variables('existingAIFoundryName')), resourceId('Microsoft.CognitiveServices/accounts', variables('aiFoundryName')))]"
             },
             "applicationInsightsId": {
               "type": "string",
@@ -1868,7 +1862,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.177.2456",
-              "templateHash": "7711665754275271950"
+              "templateHash": "5423105461678227247"
             }
           },
           "parameters": {
@@ -2361,7 +2355,8 @@
               "name": "[guid(parameters('WebsiteName'), parameters('aiSearchName'), resourceId('Microsoft.Authorization/roleDefinitions', '1407120a-92aa-4202-b7e9-c0e197c71c8f'))]",
               "properties": {
                 "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '1407120a-92aa-4202-b7e9-c0e197c71c8f')]",
-                "principalId": "[reference(resourceId('Microsoft.Web/sites', parameters('WebsiteName')), '2020-06-01', 'full').identity.principalId]"
+                "principalId": "[reference(resourceId('Microsoft.Web/sites', parameters('WebsiteName')), '2020-06-01', 'full').identity.principalId]",
+                "principalType": "ServicePrincipal"
               },
               "dependsOn": [
                 "[resourceId('Microsoft.Web/sites', parameters('WebsiteName'))]"
@@ -2726,13 +2721,9 @@
       "type": "string",
       "value": "[resourceGroup().name]"
     },
-    "AI_FOUNDRY_NAME": {
-      "type": "string",
-      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryName.value]"
-    },
-    "AI_FOUNDRY_RG_NAME": {
+    "AI_FOUNDRY_RESOURCE_ID": {
       "type": "string",
-      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryRgName.value]"
+      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryId.value]"
     },
     "AI_SEARCH_SERVICE_NAME": {
       "type": "string",

infra/scripts/process_sample_data.sh

@@ -6,10 +6,9 @@ fileSystem="$2"
 keyvaultName="$3"
 cosmosDbAccountName="$4"
 resourceGroupName="$5"
-aiFoundryName="$6"
-aiFoundryRgName="$7"
-aiSearchName="$8"
-managedIdentityClientId="$9"
+aiSearchName="$6"
+managedIdentityClientId="$7"
+aif_resource_id="${8}"
 
 # get parameters from azd env, if not provided
 if [ -z "$resourceGroupName" ]; then
@@ -32,23 +31,19 @@ if [ -z "$keyvaultName" ]; then
     keyvaultName=$(azd env get-value KEY_VAULT_NAME)
 fi
 
-if [ -z "$aiFoundryName" ]; then
-    aiFoundryName=$(azd env get-value AI_FOUNDRY_NAME)
-fi
-
-if [ -z "$aiFoundryRgName" ]; then
-    aiFoundryRgName=$(azd env get-value AI_FOUNDRY_RG_NAME)
-fi
-
 if [ -z "$aiSearchName" ]; then
     aiSearchName=$(azd env get-value AI_SEARCH_SERVICE_NAME)
 fi
 
+if [ -z "$aif_resource_id" ]; then
+    aif_resource_id=$(azd env get-value AI_FOUNDRY_RESOURCE_ID)
+fi
+
 azSubscriptionId=$(azd env get-value AZURE_SUBSCRIPTION_ID)
 
 # Check if all required arguments are provided
-if [ -z "$storageAccount" ] || [ -z "$fileSystem" ] || [ -z "$keyvaultName" ] || [ -z "$cosmosDbAccountName" ] || [ -z "$resourceGroupName" ] || [ -z "$aiFoundryName" ] || [ -z "$aiFoundryRgName" ] || [ -z "$aiSearchName" ]; then
-    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiFoundryName> <aiFoundryRgName> <aiSearchName>"
+if [ -z "$storageAccount" ] || [ -z "$fileSystem" ] || [ -z "$keyvaultName" ] || [ -z "$cosmosDbAccountName" ] || [ -z "$resourceGroupName" ] || [ -z "$aif_resource_id" ] || [ -z "$aiSearchName" ]; then
+    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiSearchName> <managedIdentityClientId> <aif_resource_id>"
     exit 1
 fi
 
@@ -130,7 +125,7 @@ echo "copy_kb_files.sh completed successfully."
 
 # Call run_create_index_scripts.sh
 echo "Running run_create_index_scripts.sh"
-bash infra/scripts/run_create_index_scripts.sh "$keyvaultName" "$resourceGroupName" "$aiFoundryName" "$aiFoundryRgName" "$aiSearchName" "$managedIdentityClientId"
+bash infra/scripts/run_create_index_scripts.sh "$keyvaultName" "$resourceGroupName" "$aiSearchName" "$managedIdentityClientId" "$aif_resource_id"
 if [ $? -ne 0 ]; then
     echo "Error: run_create_index_scripts.sh failed."
     exit 1

infra/scripts/run_create_index_scripts.sh

@@ -4,10 +4,9 @@
 # baseUrl="$1"
 keyvaultName="$1"
 resourceGroupName="$2"
-aiFoundryName="$3"
-aiFoundryRgName="$4"
-aiSearchName="$5"
-managedIdentityClientId="$6"
+aiSearchName="$3"
+managedIdentityClientId="$4"
+aif_resource_id="$5"
 # requirementFile="infra/scripts/index_scripts/requirements.txt"
 # requirementFileUrl=${baseUrl}"infra/scripts/index_scripts/requirements.txt"
 
@@ -66,8 +65,7 @@ fi
 
 ### Assign Azure AI User role to the signed in user ###
 
-    echo "Getting Azure AI resource id"
-    aif_resource_id=$(az cognitiveservices account show --name $aiFoundryName --resource-group $aiFoundryRgName --query id --output tsv)
+    echo "Using provided Azure AI resource id: $aif_resource_id"
 
     # Check if the user has the Azure AI User role
     echo "Checking if user has the Azure AI User role"

scripts/checkquota.sh

@@ -35,7 +35,7 @@ declare -A MIN_CAPACITY=(
 
     ["OpenAI.GlobalStandard.gpt4.1"]=$GPT_MIN_CAPACITY
 
-    ["OpenAI.Standard.text-embedding-ada-002"]=$TEXT_EMBEDDING_MIN_CAPACITY
+    ["OpenAI.GlobalStandard.text-embedding-ada-002"]=$TEXT_EMBEDDING_MIN_CAPACITY
 )
 
 VALID_REGION=""

scripts/quota_check_params.sh

@@ -165,11 +165,7 @@ for REGION in "${REGIONS[@]}"; do
         FOUND=false
         INSUFFICIENT_QUOTA=false
 
-        if [ "$MODEL_NAME" = "text-embedding-ada-002" ]; then
-            MODEL_TYPES=("openai.standard.$MODEL_NAME")
-        else
-            MODEL_TYPES=("openai.standard.$MODEL_NAME" "openai.globalstandard.$MODEL_NAME")
-        fi
+        MODEL_TYPES=("openai.standard.$MODEL_NAME" "openai.globalstandard.$MODEL_NAME")
 
         for MODEL_TYPE in "${MODEL_TYPES[@]}"; do
             FOUND=false