Merge branch 'main' into dev

Author: Vamshi-Microsoft

.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 \
                 environmentName="${{ env.SOLUTION_PREFIX }}" \
                 secondaryLocation="northcentralus" \

infra/deploy_ai_foundry.bicep

@@ -71,7 +71,7 @@ var aiModelDeployments = [
     name: embeddingModel
     model: embeddingModel
     sku: {
-      name: 'Standard'
+      name: 'GlobalStandard'
       capacity: embeddingDeploymentCapacity
     }
     version: '2'

infra/deploy_app_service.bicep

@@ -354,6 +354,7 @@ resource searchIndexDataReaderAssignment 'Microsoft.Authorization/roleAssignment
   properties: {
     roleDefinitionId: searchIndexDataReader.id
     principalId: Website.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 

infra/main.bicep

@@ -40,7 +40,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'
     ]
   }
 })

infra/main.json

@@ -59,7 +59,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."
@@ -976,7 +976,7 @@
                 "name": "[parameters('embeddingModel')]",
                 "model": "[parameters('embeddingModel')]",
                 "sku": {
-                  "name": "Standard",
+                  "name": "GlobalStandard",
                   "capacity": "[parameters('embeddingDeploymentCapacity')]"
                 },
                 "version": "2",
@@ -2361,7 +2361,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'))]"

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