Merge pull request #455 from microsoft/PSL-18442

fix: parameterized for model version

Author: Roopan-Microsoft

infra/deploy_ai_foundry.bicep

@@ -4,6 +4,7 @@ param solutionLocation string
 param keyVaultName string
 param deploymentType string
 param gptModelName string
+param gptModelVersion string
 param azureOpenaiAPIVersion string
 param gptDeploymentCapacity int
 param embeddingModel string
@@ -42,7 +43,7 @@ var aiModelDeployments = [
       name: deploymentType
       capacity: gptDeploymentCapacity
     }
-    version: '2024-05-13'
+    version: gptModelVersion
     raiPolicyName: 'Microsoft.Default'
   }
   {

infra/main.bicep

@@ -25,14 +25,12 @@ param secondaryLocation string
 ])
 param deploymentType string = 'GlobalStandard'
 
-@minLength(1)
 @description('Name of the GPT model to deploy:')
-@allowed([
-  'gpt-4o'
-  'gpt-4'
-])
 param gptModelName string = 'gpt-4o'
 
+@description('Version of the GPT model to deploy:')
+param gptModelVersion string = '2024-05-13'
+
 param azureOpenaiAPIVersion string = '2024-05-01-preview'
 
 @minValue(10)
@@ -106,6 +104,7 @@ module aifoundry 'deploy_ai_foundry.bicep' = {
     keyVaultName: kvault.outputs.keyvaultName
     deploymentType: deploymentType
     gptModelName: gptModelName
+    gptModelVersion: gptModelVersion
     azureOpenaiAPIVersion: azureOpenaiAPIVersion
     gptDeploymentCapacity: gptDeploymentCapacity
     embeddingModel: embeddingModel

infra/main.bicepparam

@@ -5,6 +5,7 @@ param environmentName = readEnvironmentVariable('AZURE_ENV_NAME', 'env_name')
 param secondaryLocation = readEnvironmentVariable('AZURE_ENV_SECONDARY_LOCATION', 'eastus2')
 param deploymentType = readEnvironmentVariable('AZURE_ENV_MODEL_DEPLOYMENT_TYPE', 'GlobalStandard')
 param gptModelName = readEnvironmentVariable('AZURE_ENV_MODEL_NAME', 'gpt-4o')
+param gptModelVersion = readEnvironmentVariable('AZURE_ENV_MODEL_VERSION', '2024-05-13')
 param gptDeploymentCapacity = int(readEnvironmentVariable('AZURE_ENV_MODEL_CAPACITY', '30'))
 
 param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_ENV_EMBEDDING_MODEL_CAPACITY', '80'))

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.35.1.17967",
-      "templateHash": "6972576500861957783"
+      "templateHash": "3433053339326968482"
     }
   },
   "parameters": {
@@ -42,15 +42,17 @@
     "gptModelName": {
       "type": "string",
       "defaultValue": "gpt-4o",
-      "allowedValues": [
-        "gpt-4o",
-        "gpt-4"
-      ],
-      "minLength": 1,
       "metadata": {
         "description": "Name of the GPT model to deploy:"
       }
     },
+    "gptModelVersion": {
+      "type": "string",
+      "defaultValue": "2024-05-13",
+      "metadata": {
+        "description": "Version of the GPT model to deploy:"
+      }
+    },
     "azureOpenaiAPIVersion": {
       "type": "string",
       "defaultValue": "2024-05-01-preview"
@@ -571,6 +573,9 @@
           "gptModelName": {
             "value": "[parameters('gptModelName')]"
           },
+          "gptModelVersion": {
+            "value": "[parameters('gptModelVersion')]"
+          },
           "azureOpenaiAPIVersion": {
             "value": "[parameters('azureOpenaiAPIVersion')]"
           },
@@ -597,7 +602,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.35.1.17967",
-              "templateHash": "10562656740645209068"
+              "templateHash": "3118038315112495212"
             }
           },
           "parameters": {
@@ -616,6 +621,9 @@
             "gptModelName": {
               "type": "string"
             },
+            "gptModelVersion": {
+              "type": "string"
+            },
             "azureOpenaiAPIVersion": {
               "type": "string"
             },
@@ -890,7 +898,7 @@
                   "name": "[parameters('deploymentType')]",
                   "capacity": "[parameters('gptDeploymentCapacity')]"
                 },
-                "version": "2024-05-13",
+                "version": "[parameters('gptModelVersion')]",
                 "raiPolicyName": "Microsoft.Default"
               },
               {