fix: Update private networking dependency logic and adjust OpenAI parameters

Author: Pavan-Microsoft

infra/main.bicep

@@ -830,8 +830,6 @@ var openAiDeployments = concat(
     : []
 )
 
-// Keep private networking disabled for OpenAI when using integrated vectorization in Azure Cognitive Search, as indexer requires it.
-var enablePrivateNetworkingForOpenAI = enablePrivateNetworking && azureSearchUseIntegratedVectorization == false
 module openai 'modules/core/ai/cognitiveservices.bicep' = {
   name: azureOpenAIResourceName
   scope: resourceGroup()
@@ -886,7 +884,7 @@ module openai 'modules/core/ai/cognitiveservices.bicep' = {
         : []
     )
   }
-  dependsOn: enablePrivateNetworkingForOpenAI ? avmPrivateDnsZones : []
+  dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
 }
 
 module computerVision 'modules/core/ai/cognitiveservices.bicep' = if (useAdvancedImageProcessing) {

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "5060547412943026398"
+      "templateHash": "13005999981929939317"
     }
   },
   "parameters": {
@@ -697,7 +697,6 @@
       }
     ],
     "openAiDeployments": "[concat(variables('defaultOpenAiDeployments'), if(parameters('useAdvancedImageProcessing'), createArray(createObject('name', parameters('azureOpenAIVisionModel'), 'model', createObject('format', 'OpenAI', 'name', parameters('azureOpenAIVisionModelName'), 'version', parameters('azureOpenAIVisionModelVersion')), 'sku', createObject('name', 'GlobalStandard', 'capacity', parameters('azureOpenAIVisionModelCapacity')))), createArray()))]",
-    "enablePrivateNetworkingForOpenAI": "[and(parameters('enablePrivateNetworking'), equals(parameters('azureSearchUseIntegratedVectorization'), false()))]",
     "enablePrivateNetworkingSpeech": false,
     "webServerFarmResourceName": "[variables('hostingPlanName')]",
     "postgresDBFqdn": "[format('{0}.postgres.database.azure.com', variables('postgresResourceName'))]",
@@ -56366,9 +56365,9 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "managedIdentityModule",
         "network"
       ]

infra/main.parameters.json

@@ -123,7 +123,7 @@
       "value": "${AZURE_OPENAI_TOP_P=1}"
     },
     "azureOpenAIStopSequence": {
-      "value": "${AZURE_OPENAI_STOP_SEQUENCE}"
+      "value": "${AZURE_OPENAI_STOP_SEQUENCE=\n}"
     },
     "azureOpenAISystemMessage": {
       "value": "${AZURE_OPENAI_SYSTEM_MESSAGE=You are an AI assistant that helps people find information.}"