2025 jan update

.github/workflows/azure-dev-validate.yml

@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - master
+      - oct-update
   pull_request:
     branches:
       - main
-      - master
+      - oct-update
 
 jobs:
   build:
@@ -19,9 +19,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build Bicep for linting
-        uses: azure/CLI@v1
+        uses: azure/cli@v2
         with:
-          inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
+           azcliversion: 2.64.0
+           inlineScript: |
+              tdnf install -y icu
+              tdnf install -y jq
+              az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
 
       - name: Run Microsoft Security DevOps Analysis
         uses: microsoft/security-devops-action@preview

.github/workflows/open-ai-app.yml

@@ -4,9 +4,9 @@ name: Build & deploy Next.js app to Azure Web App
 on:
   # Automatically trigger it when detected changes in repo
   push:
-    branches: [main]
+    branches:
+      - main
 
-  # Allow manual workflow trigger
   workflow_dispatch:
 
 jobs:
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: Production
+      name: 'Development'
 
     steps:
       - name: 🍏 Set up Node.js version
@@ -77,24 +77,26 @@ jobs:
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
 
-      # Set the build during deployment setting to false. This setting was added in the templates to all azd to work, but breaks deployment via webapps-deploy
       - name: Azure CLI script
         uses: azure/CLI@v1
         with:
-          inlineScript: |
-            rg=$(az webapp list --query "[?name=='${{ secrets.AZURE_APP_SERVICE_NAME }}'].resourceGroup" --output tsv)
-            echo Setting SCM_DO_BUILD_DURING_DEPLOYMENT=false on app service ${{ secrets.AZURE_APP_SERVICE_NAME }}
-            az webapp config appsettings set -n ${{ secrets.AZURE_APP_SERVICE_NAME }} -g $rg --settings SCM_DO_BUILD_DURING_DEPLOYMENT=false -o none
-            echo Setting --startup-file=\"node server.js\" on app service ${{ secrets.AZURE_APP_SERVICE_NAME }}
-            az webapp config set --startup-file="node server.js" -n ${{ secrets.AZURE_APP_SERVICE_NAME }} -g $rg -o none
-            sleep 10
+            inlineScript: |
+              rg=$(az webapp list --query "[?name=='${{ secrets.AZURE_APP_SERVICE_NAME }}'].resourceGroup" --output tsv)
+                  echo Setting SCM_DO_BUILD_DURING_DEPLOYMENT=true on app service ${{ secrets.AZURE_APP_SERVICE_NAME }} slot dev
+                  az webapp config appsettings set -n ${{ secrets.AZURE_APP_SERVICE_NAME }} -g $rg --settings SCM_DO_BUILD_DURING_DEPLOYMENT=false -o none --slot dev
+                  echo Setting --startup-file="node server.js" on app service ${{ secrets.AZURE_APP_SERVICE_NAME }} slot dev
+                  az webapp config set --startup-file="node server.js" -n ${{ secrets.AZURE_APP_SERVICE_NAME }} -g $rg -o none --slot dev
+              sleep 10
+
 
       - name: 🚀 Deploy to Azure Web App
         id: deploy-to-webapp
         uses: azure/webapps-deploy@v2
         with:
           app-name: ${{ secrets.AZURE_APP_SERVICE_NAME }}
+          slot-name: 'dev'
+          publish-profile: ${{ secrets.AZURE_APP_SERVICE_PUBLISH_PROFILE_DEV }}
           package: ${{ github.workspace }}/Nextjs-site.zip
-
+  
       - name: 🧹 Cleanup
         run: rm ${{ github.workspace }}/Nextjs-site.zip

infra/main.bicep

@@ -9,9 +9,9 @@ param name string
 @description('Primary location for all resources')
 param location string
 
-// azure open ai -- only regions supporting gpt-35-turbo v1106
+// azure open ai -- regions currently support gpt-4o global-standard
 @description('Location for the OpenAI resource group')
-@allowed(['australiaeast', 'canadaeast', 'francecentral', 'southindia', 'uksouth', 'swedencentral', 'westus'])
+@allowed(['australiaeast', 'brazilsouth', 'canadaeast', 'eastus', 'eastus2', 'francecentral', 'germanywestcentral', 'japaneast', 'koreacentral', 'northcentralus', 'norwayeast', 'polandcentral', 'spaincentral', 'southafricanorth', 'southcentralus', 'southindia', 'swedencentral', 'switzerlandnorth', 'uksouth', 'westeurope', 'westus', 'westus3'])
 @metadata({
   azd: {
     type: 'location'
@@ -20,37 +20,26 @@ param location string
 param openAILocation string
 
 param openAISku string = 'S0'
-param openAIApiVersion string = '2023-12-01-preview'
+param openAIApiVersion string ='2024-08-01-preview'
 
-param chatGptDeploymentCapacity int = 120
-param chatGptDeploymentName string = 'chat-gpt-35-turbo'
-param chatGptModelName string = 'gpt-35-turbo'
-param chatGptModelVersion string = '1106'
+param chatGptDeploymentCapacity int = 30
+param chatGptDeploymentName string = 'gpt-4o'
+param chatGptModelName string = 'gpt-4o'
+param chatGptModelVersion string = '2024-05-13'
 param embeddingDeploymentName string = 'embedding'
 param embeddingDeploymentCapacity int = 120
 param embeddingModelName string = 'text-embedding-ada-002'
 
-// DALL-E v3 only supported in Sweden Central for now
+// DALL-E v3 only supported in limited regions for now
 @description('Location for the OpenAI DALL-E 3 instance resource group')
-@allowed(['swedencentral'])
+@allowed(['swedencentral', 'eastus', 'australiaeast'])
 param dalleLocation string
 
 param dalleDeploymentCapacity int = 1
 param dalleDeploymentName string = 'dall-e-3'
 param dalleModelName string = 'dall-e-3'
 param dalleApiVersion string = '2023-12-01-preview'
 
-// DALL-E v3 only supported in Sweden Central for now
-@description('Location for the GPT vision instance resource')
-@allowed(['swedencentral','westus',])
-param gptvisionLocation string
-
-param gptvisionDeploymentCapacity int = 1
-param gptvisionDeploymentName string = 'gpt-4-vision'
-param gptvisionModelName string = 'gpt-4'
-param gptvisionApiVersion string = '2023-12-01-preview'
-param gptvisionModelVersion string = 'vision-preview'
-
 param formRecognizerSkuName string = 'S0'
 param searchServiceIndexName string = 'azure-chat'
 param searchServiceSkuName string = 'standard'
@@ -93,12 +82,6 @@ module resources 'resources.bicep' = {
     dalleDeploymentName: dalleDeploymentName
     dalleModelName: dalleModelName
     dalleApiVersion: dalleApiVersion
-    gptvisionLocation: gptvisionLocation
-    gptvisionApiVersion: gptvisionApiVersion
-    gptvisionDeploymentCapacity: gptvisionDeploymentCapacity
-    gptvisionDeploymentName: gptvisionDeploymentName
-    gptvisionModelName: gptvisionModelName
-    gptvisionModelVersion: gptvisionModelVersion
     formRecognizerSkuName: formRecognizerSkuName
     searchServiceIndexName: searchServiceIndexName
     searchServiceSkuName: searchServiceSkuName

infra/resources.bicep

@@ -4,28 +4,21 @@ param resourceToken string
 param openai_api_version string
 
 param openAiLocation string
-param openAiSkuName string = 'S0'
-param chatGptDeploymentCapacity int = 30
-param chatGptDeploymentName string = 'chat-gpt-35-turbo'
-param chatGptModelName string = 'chat-gpt-35-turbo'
-param chatGptModelVersion string = '1106'
-param embeddingDeploymentName string = 'text-embedding-ada-002'
-param embeddingDeploymentCapacity int = 10
-param embeddingModelName string = 'text-embedding-ada-002'
+param openAiSkuName string 
+param chatGptDeploymentCapacity int 
+param chatGptDeploymentName string
+param chatGptModelName string 
+param chatGptModelVersion string
+param embeddingDeploymentName string 
+param embeddingDeploymentCapacity int
+param embeddingModelName string 
 
 param dalleLocation string
 param dalleDeploymentCapacity int
 param dalleDeploymentName string
 param dalleModelName string
 param dalleApiVersion string
 
-param gptvisionLocation string
-param gptvisionDeploymentCapacity int = 30
-param gptvisionDeploymentName string = 'gpt-4-vision'
-param gptvisionModelName string = 'gpt-4'
-param gptvisionApiVersion string = '2023-12-01-preview'
-param gptvisionModelVersion string = 'vision-preview'
-
 param speechServiceSkuName string = 'S0'
 
 param formRecognizerSkuName string = 'S0'
@@ -45,16 +38,16 @@ param tags object = {}
 
 var openai_name = toLower('${name}-aillm-${resourceToken}')
 var openai_dalle_name = toLower('${name}-aidalle-${resourceToken}')
-var openai_gpt_vision_name = toLower('${name}-aivision-${resourceToken}')
 
 var form_recognizer_name = toLower('${name}-form-${resourceToken}')
 var speech_service_name = toLower('${name}-speech-${resourceToken}')
 var cosmos_name = toLower('${name}-cosmos-${resourceToken}')
 var search_name = toLower('${name}search${resourceToken}')
 var webapp_name = toLower('${name}-webapp-${resourceToken}')
 var appservice_name = toLower('${name}-app-${resourceToken}')
-// storage name must be less than 24 chars, alphanumeric only - token is 13
-var storage_prefix = take(name, 8)
+// storage name must be < 24 chars, alphanumeric only. 'sto' is 3 and resourceToken is 13
+var clean_name = replace(replace(name, '-', ''), '_', '')
+var storage_prefix = take(clean_name, 8)
 var storage_name = toLower('${storage_prefix}sto${resourceToken}')
 // keyvault name must be less than 24 chars - token is 13
 var kv_prefix = take(name, 7)
@@ -79,7 +72,7 @@ var llmDeployments = [
       version: chatGptModelVersion
     }
     sku: {
-      name: 'Standard'
+      name: 'GlobalStandard'
       capacity: chatGptDeploymentCapacity
     }
   }
@@ -133,22 +126,6 @@ resource webApp 'Microsoft.Web/sites@2020-06-01' = {
           name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
           value: 'true'
         }
-        {
-          name: 'AZURE_OPENAI_VISION_API_KEY'
-          value: '@Microsoft.KeyVault(VaultName=${kv.name};SecretName=${kv::AZURE_OPENAI_VISION_API_KEY.name})'
-        }
-        {
-          name: 'AZURE_OPENAI_VISION_API_INSTANCE_NAME'
-          value: openai_gpt_vision_name
-        }
-        {
-          name: 'AZURE_OPENAI_VISION_API_DEPLOYMENT_NAME'
-          value: gptvisionDeploymentName
-        }
-        {
-          name: 'AZURE_OPENAI_VISION_API_VERSION'
-          value: gptvisionApiVersion
-        }
         {
           name: 'AZURE_OPENAI_API_KEY'
           value: '@Microsoft.KeyVault(VaultName=${kv.name};SecretName=${kv::AZURE_OPENAI_API_KEY.name})'
@@ -298,14 +275,6 @@ resource kv 'Microsoft.KeyVault/vaults@2021-06-01-preview' = {
     enabledForTemplateDeployment: false
   }
 
-  resource AZURE_OPENAI_VISION_API_KEY 'secrets' = {
-    name: 'AZURE-OPENAI-VISION-API-KEY'
-    properties: {
-      contentType: 'text/plain'
-      value: azureopenaivision.listKeys().key1
-    }
-  }
-
   resource AZURE_OPENAI_API_KEY 'secrets' = {
     name: 'AZURE-OPENAI-API-KEY'
     properties: {
@@ -478,14 +447,15 @@ resource llmdeployment 'Microsoft.CognitiveServices/accounts/deployments@2023-05
   name: deployment.name
   properties: {
     model: deployment.model
-    raiPolicyName: contains(deployment, 'raiPolicyName') ? deployment.raiPolicyName : null
   }
-  sku: contains(deployment, 'sku') ? deployment.sku : {
+  sku: deployment.sku != null ? deployment.sku : {
     name: 'Standard'
     capacity: deployment.capacity
   }
 }]
 
+
+
 resource azureopenaidalle 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
   name: openai_dalle_name
   location: dalleLocation
@@ -516,35 +486,6 @@ resource azureopenaidalle 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
 
 
 
-resource azureopenaivision 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
-  name: openai_gpt_vision_name
-  location: gptvisionLocation
-  tags: tags
-  kind: 'OpenAI'
-  properties: {
-    customSubDomainName: openai_gpt_vision_name
-    publicNetworkAccess: 'Enabled'
-  }
-  sku: {
-    name: openAiSkuName
-  }
-
-  resource dalleDeployment 'deployments' = {
-    name: gptvisionDeploymentName
-    properties: {
-      model: {
-        format: 'OpenAI'
-        name: gptvisionModelName
-        version:gptvisionModelVersion
-      }
-    }
-    sku: {
-      name: 'Standard'
-      capacity: gptvisionDeploymentCapacity
-    }
-  }
-}
-
 resource speechService 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
   name: speech_service_name
   location: location