fix: Updated shell script to continue on git pull

Author: Prajwal-Microsoft

.devcontainer/setupEnv.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
 
-set -e  # Exit on error
 echo "Pull latest code for the current branch"
 git fetch
 git pull
 
+set -e  # Exit on error
+
 echo "Setting up ContentProcessor..."
 cd ./src/ContentProcessor
 uv sync --frozen
@@ -22,8 +23,8 @@ yarn install
 cd ../../
 
 echo "Setting up executable permission for shell scripts"
-chmod +x ./infra/scripts/docker-build.sh
-chmod +x ./src/ContentProcessorAPI/samples/upload_files.sh
-chmod +x ./src/ContentProcessorAPI/samples/schemas/register_schema.sh
+sudo chmod +x ./infra/scripts/docker-build.sh
+sudo chmod +x ./src/ContentProcessorAPI/samples/upload_files.sh
+sudo chmod +x ./src/ContentProcessorAPI/samples/schemas/register_schema.sh
 
 echo "Setup complete! 🎉"

infra/deploy_ai_foundry.bicep

@@ -245,225 +245,6 @@ resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-p
   }
 }
 
-// var phiModelRegions = ['East US', 'East US 2', 'North Central US', 'South Central US', 'Sweden Central', 'West US', 'West US 3', 'eastus','eastus2','northcentralus','southcentralus','swedencentral','westus','westus3']
-  
-// var isInPhiList = contains(phiModelRegions, location)
-
-// var serverlessModelName = 'Phi-4' //'Phi-3-medium-4k-instruct'
-// var phiserverlessName = '${solutionName}-${serverlessModelName}'
-// resource phiserverless 'Microsoft.MachineLearningServices/workspaces/serverlessEndpoints@2024-10-01' = if (isInPhiList) {
-//   parent: aiHubProject
-//   location: location
-//   name: phiserverlessName
-//   properties: {
-//     authMode: 'Key'
-//     contentSafety: {
-//       contentSafetyStatus: 'Enabled'
-//     }
-//     modelSettings: {
-//       modelId: 'azureml://registries/azureml/models/${serverlessModelName}'
-//     }
-//   }
-//   sku: {
-//     name: 'Consumption'
-//     tier: 'Free'
-//   }
-// }
-
-resource tenantIdEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'TENANT-ID'
-  properties: {
-    value: subscription().tenantId
-  }
-}
-
-// resource adlsAccountNameEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'ADLS-ACCOUNT-NAME'
-//   properties: {
-//     value: storageName
-//   }
-// }
-
-// resource adlsAccountContainerEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'ADLS-ACCOUNT-CONTAINER'
-//   properties: {
-//     value: 'data'
-//   }
-// }
-
-// resource adlsAccountKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'ADLS-ACCOUNT-KEY'
-//   properties: {
-//     value: storage.listKeys().keys[0].value
-//   }
-// }
-
-// resource azureOpenAIInferenceEndpoint 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-OPENAI-INFERENCE-ENDPOINT'
-//   properties: {
-//     value: phiserverless != null ? phiserverless.properties.inferenceEndpoint.uri : ''
-//     // value: phiserverless.properties.inferenceEndpoint.uri
-//   }
-// }
-
-// resource azureOpenAIInferenceKey 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-OPENAI-INFERENCE-KEY'
-//   properties: {
-//     value: phiserverless != null ? listKeys(phiserverless.id, '2024-10-01').primaryKey : ''
-//     // listKeys(phiserverless.id, '2024-10-01').primaryKey
-//   }
-// }
-
-resource azureOpenAIApiKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-KEY'
-  properties: {
-    value: aiServices.listKeys().key1 //aiServices_m.listKeys().key1
-  }
-}
-
-resource azureOpenAIDeploymentModel 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPEN-AI-DEPLOYMENT-MODEL'
-  properties: {
-    value: gptModelName
-  }
-}
-
-resource gptModelVersionEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-PREVIEW-API-VERSION'
-  properties: {
-    value: gptModelVersion  //'2024-02-15-preview'
-  }
-}
-
-resource azureOpenAIEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-ENDPOINT'
-  properties: {
-    value: aiServices.properties.endpoint //aiServices_m.properties.endpoint
-  }
-}
-
-resource azureAIProjectConnectionStringEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-AI-PROJECT-CONN-STRING'
-  properties: {
-    value: '${split(aiHubProject.properties.discoveryUrl, '/')[2]};${subscription().subscriptionId};${resourceGroup().name};${aiHubProject.name}'
-  }
-}
-
-resource azureOpenAICUEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-CU-ENDPOINT'
-  properties: {
-    value: aiServices_CU.properties.endpoint
-  }
-}
-
-resource azureOpenAICUApiKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-CU-KEY'
-  properties: {
-    value: aiServices_CU.listKeys().key1
-  }
-}
-
-resource azureOpenAICUApiVersionEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-OPENAI-CU-VERSION'
-  properties: {
-    value: '?api-version=2024-12-01-preview'
-  }
-}
-
-// resource azureSearchAdminKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-SEARCH-KEY'
-//   properties: {
-//     value: aiSearch.listAdminKeys().primaryKey
-//   }
-// }
-
-// resource azureSearchServiceEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-SEARCH-ENDPOINT'
-//   properties: {
-//     value: 'https://${aiSearch.name}.search.windows.net'
-//   }
-// }
-
-// resource azureSearchServiceEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-SEARCH-SERVICE'
-//   properties: {
-//     value: aiSearch.name
-//   }
-// }
-
-// resource azureSearchIndexEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-//   parent: keyVault
-//   name: 'AZURE-SEARCH-INDEX'
-//   properties: {
-//     value: 'transcripts_index'
-//   }
-// }
-
-resource cogServiceEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'COG-SERVICES-ENDPOINT'
-  properties: {
-    value: aiServices.properties.endpoint
-  }
-}
-
-resource cogServiceKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'COG-SERVICES-KEY'
-  properties: {
-    value: aiServices.listKeys().key1
-  }
-}
-
-resource cogServiceNameEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'COG-SERVICES-NAME'
-  properties: {
-    value: aiServicesName
-  }
-}
-
-resource azureSubscriptionIdEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-SUBSCRIPTION-ID'
-  properties: {
-    value: subscription().subscriptionId
-  }
-}
-
-resource resourceGroupNameEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-RESOURCE-GROUP'
-  properties: {
-    value: resourceGroup().name
-  }
-}
-
-resource azureLocatioEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
-  parent: keyVault
-  name: 'AZURE-LOCATION'
-  properties: {
-    value: solutionLocation
-  }
-}
-
 output aiServicesTarget string = aiServices.properties.endpoint //aiServices_m.properties.endpoint
 output aiServicesCUEndpoint string = aiServices_CU.properties.endpoint //aiServices_m.properties.endpoint
 output aiServicesName string = aiServicesName //aiServicesName_m