Merge pull request #275 from microsoft/more-bicep-changes

fix: A bug fix - More bicep changes

Author: Roopan-Microsoft

.env.sample

@@ -21,6 +21,7 @@ AZURE_OPENAI_TEMPLATE_SYSTEM_MESSAGE="Generate a template for a document given a
 AZURE_OPENAI_GENERATE_SECTION_CONTENT_PROMPT="Help the user generate content for a section in a document. The user has provided a section title and a brief description of the section. The user would like you to provide an initial draft for the content in the section. Must be less than 2000 characters. Only include the section content, not the title. Do not use markdown syntax. Whenever possible, use ingested documents to help generate the section content."
 AZURE_OPENAI_TITLE_PROMPT="Summarize the conversation so far into a 4-word or less title. Do not use any quotation marks or punctuation. Respond with a json object in the format {{\"title\": string}}. Do not include any other commentary or description."
 AZURE_OPENAI_PREVIEW_API_VERSION=2024-05-01-preview
+AZURE_OPENAI_API_VERSION=2024-05-01-preview
 AZURE_OPENAI_STREAM=True
 AZURE_OPENAI_ENDPOINT=
 AZURE_OPENAI_EMBEDDING_NAME=

README_azd.md

@@ -112,6 +112,7 @@ resource aiServices 'Microsoft.CognitiveServices/accounts@2021-10-01' = {
   }
   kind: 'AIServices'
   properties: {
+    customSubDomainName: aiServicesName
     apiProperties: {
       statisticsEnabled: false
     }

infra/deploy_ai_foundry.bicep

@@ -101,15 +101,15 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
           value: azureOpenAIApiVersion
         }
         {
-          name: 'AZURE_OPENAI_DEPLOYMENT_NAME'
+          name: 'AZURE_OPENAI_MODEL'
           value: AzureOpenAIModel
         }
         {
           name: 'AZURE_OPENAI_ENDPOINT'
           value: AzureOpenAIEndpoint
         }
         {
-          name: 'AZURE_OPENAI_API_KEY'
+          name: 'AZURE_OPENAI_KEY'
           value: AzureOpenAIKey
         }
         {

infra/deploy_app_service.bicep

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "8931514270414510226"
+      "templateHash": "3126173092886008904"
     }
   },
   "parameters": {
@@ -380,7 +380,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.33.93.31351",
-              "templateHash": "6139170564292952532"
+              "templateHash": "14703493169474623961"
             }
           },
           "parameters": {
@@ -563,6 +563,7 @@
               },
               "kind": "AIServices",
               "properties": {
+                "customSubDomainName": "[variables('aiServicesName')]",
                 "apiProperties": {
                   "statisticsEnabled": false
                 }
@@ -1181,7 +1182,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.33.93.31351",
-              "templateHash": "13134513664140996267"
+              "templateHash": "10772344907596853045"
             }
           },
           "parameters": {
@@ -1361,15 +1362,15 @@
                       "value": "[parameters('azureOpenAIApiVersion')]"
                     },
                     {
-                      "name": "AZURE_OPENAI_DEPLOYMENT_NAME",
+                      "name": "AZURE_OPENAI_MODEL",
                       "value": "[parameters('AzureOpenAIModel')]"
                     },
                     {
                       "name": "AZURE_OPENAI_ENDPOINT",
                       "value": "[parameters('AzureOpenAIEndpoint')]"
                     },
                     {
-                      "name": "AZURE_OPENAI_API_KEY",
+                      "name": "AZURE_OPENAI_KEY",
                       "value": "[parameters('AzureOpenAIKey')]"
                     },
                     {