updated default values for gpt model deployment and updated openai api version parameter name

Author: Harsh-Microsoft

infra/main.bicep

@@ -25,17 +25,17 @@ param secondaryLocation string
   'Standard'
   'GlobalStandard'
 ])
-param deploymentType string = 'GlobalStandard'
+param deploymentType string = 'Standard'
 
 @minLength(1)
 @description('Name of the GPT model to deploy:')
 @allowed([
   'gpt-4o'
   'gpt-4'
 ])
-param gptModelName string = 'gpt-4o'
+param gptModelName string = 'gpt-4'
 
-param gptModelVersion string = '2024-05-01-preview'
+param azureOpenAIAPIVersion string = '2024-05-01-preview'
 
 @minValue(10)
 @description('Capacity of the GPT deployment:')
@@ -62,7 +62,7 @@ var solutionPrefix = 'dg${padLeft(take(uniqueId, 12), 12, '0')}'
 var resourceGroupLocation = resourceGroup().location
 
 var solutionLocation = resourceGroupLocation
-var baseUrl = 'https://raw.githubusercontent.com/microsoft/Generic-Build-your-own-copilot-Solution-Accelerator/dcgn_template/'
+var baseUrl = 'https://raw.githubusercontent.com/microsoft/Generic-Build-your-own-copilot-Solution-Accelerator/dev/'
 
 var ApplicationInsightsName = 'appins-${solutionPrefix}'
 var WorkspaceName = 'worksp-${solutionPrefix}'
@@ -97,7 +97,7 @@ module aifoundry 'deploy_ai_foundry.bicep' = {
     keyVaultName: kvault.outputs.keyvaultName
     deploymentType: deploymentType
     gptModelName: gptModelName
-    gptModelVersion: gptModelVersion
+    gptModelVersion: azureOpenAIAPIVersion
     gptDeploymentCapacity: gptDeploymentCapacity
     embeddingModel: embeddingModel
     embeddingDeploymentCapacity: embeddingDeploymentCapacity
@@ -377,7 +377,7 @@ module appserviceModule 'deploy_app_service.bicep' = {
     AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
     AzureOpenAIModel: gptModelName //'gpt-4o-mini'
     AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')
-    azureOpenAIApiVersion: gptModelVersion //'2024-02-15-preview'
+    azureOpenAIApiVersion: azureOpenAIAPIVersion //'2024-02-15-preview'
     AZURE_OPENAI_RESOURCE:aifoundry.outputs.aiServicesName
     USE_CHAT_HISTORY_ENABLED:'True'
     AZURE_COSMOSDB_ACCOUNT: cosmosDBModule.outputs.cosmosAccountName

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "5902602471296768197"
+      "templateHash": "17507866036733972920"
     }
   },
   "parameters": {
@@ -29,7 +29,7 @@
     },
     "deploymentType": {
       "type": "string",
-      "defaultValue": "GlobalStandard",
+      "defaultValue": "Standard",
       "allowedValues": [
         "Standard",
         "GlobalStandard"
@@ -41,7 +41,7 @@
     },
     "gptModelName": {
       "type": "string",
-      "defaultValue": "gpt-4o",
+      "defaultValue": "gpt-4",
       "allowedValues": [
         "gpt-4o",
         "gpt-4"
@@ -51,7 +51,7 @@
         "description": "Name of the GPT model to deploy:"
       }
     },
-    "gptModelVersion": {
+    "azureOpenAIAPIVersion": {
       "type": "string",
       "defaultValue": "2024-05-01-preview"
     },
@@ -92,7 +92,7 @@
     "solutionPrefix": "[format('dg{0}', padLeft(take(variables('uniqueId'), 12), 12, '0'))]",
     "resourceGroupLocation": "[resourceGroup().location]",
     "solutionLocation": "[variables('resourceGroupLocation')]",
-    "baseUrl": "https://raw.githubusercontent.com/microsoft/Generic-Build-your-own-copilot-Solution-Accelerator/dcgn_template/",
+    "baseUrl": "https://raw.githubusercontent.com/microsoft/Generic-Build-your-own-copilot-Solution-Accelerator/dev/",
     "ApplicationInsightsName": "[format('appins-{0}', variables('solutionPrefix'))]",
     "WorkspaceName": "[format('worksp-{0}', variables('solutionPrefix'))]"
   },
@@ -363,7 +363,7 @@
             "value": "[parameters('gptModelName')]"
           },
           "gptModelVersion": {
-            "value": "[parameters('gptModelVersion')]"
+            "value": "[parameters('azureOpenAIAPIVersion')]"
           },
           "gptDeploymentCapacity": {
             "value": "[parameters('gptDeploymentCapacity')]"
@@ -1185,7 +1185,7 @@
             }
           },
           "azureOpenAIApiVersion": {
-            "value": "[parameters('gptModelVersion')]"
+            "value": "[parameters('azureOpenAIAPIVersion')]"
           },
           "AZURE_OPENAI_RESOURCE": {
             "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesName.value]"