fix: Cleanup multiple gpt41 deployments (#1964)

Author: Priyanka-Microsoft

code/backend/batch/utilities/helpers/env_helper.py

@@ -186,7 +186,7 @@ def __load_config(self, **kwargs) -> None:
                 "AZURE_OPENAI_MODEL_NAME", "gpt-4.1"
             )
 
-        self.AZURE_OPENAI_VISION_MODEL = os.getenv("AZURE_OPENAI_VISION_MODEL", "gpt-4")
+        self.AZURE_OPENAI_VISION_MODEL = os.getenv("AZURE_OPENAI_VISION_MODEL", "gpt-4.1")
         self.AZURE_OPENAI_TEMPERATURE = os.getenv("AZURE_OPENAI_TEMPERATURE", "0")
         self.AZURE_OPENAI_TOP_P = os.getenv("AZURE_OPENAI_TOP_P", "1.0")
         self.AZURE_OPENAI_MAX_TOKENS = os.getenv("AZURE_OPENAI_MAX_TOKENS", "1000")

code/tests/utilities/helpers/test_push_embedder.py

@@ -192,7 +192,7 @@ def test_embed_file_advanced_image_processing_uses_vision_model_for_captioning(
 ):
     # given
     env_helper_mock = MagicMock()
-    env_helper_mock.AZURE_OPENAI_VISION_MODEL = "gpt-4"
+    env_helper_mock.AZURE_OPENAI_VISION_MODEL = "gpt-4.1"
     push_embedder = PushEmbedder(MagicMock(), env_helper_mock)
     source_url = "http://localhost:8080/some-file-name.jpg"
 

docs/model_configuration.md

@@ -27,9 +27,9 @@ This document outlines the necessary steps and configurations required for setti
 - `AZURE_OPENAI_VISION_MODEL`: The Azure OpenAI Model Deployment Name
     - example: `my-gpt-4`
 - `AZURE_OPENAI_VISION_MODEL_NAME`: The Azure OpenAI Model Name
-    - example: `gpt-4`
+    - example: `gpt-4.1`
 - `AZURE_OPENAI_VISION_MODEL_VERSION`: The Azure OpenAI Model Version
-    - example: `turbo-2024-04-09`
+    - example: `2025-04-14`
 - `AZURE_OPENAI_VISION_MODEL_CAPACITY`: The Tokens per Minute Rate Limit (thousands)
     - example: `10`
 

infra/main.bicep

@@ -151,7 +151,7 @@ param useAdvancedImageProcessing bool = false
 param advancedImageProcessingMaxImages int = 1
 
 @description('Optional. Azure OpenAI Vision Model Deployment Name.')
-param azureOpenAIVisionModel string = 'gpt-4.1-vision'
+param azureOpenAIVisionModel string = 'gpt-4.1'
 
 @description('Optional. Azure OpenAI Vision Model Name.')
 param azureOpenAIVisionModelName string = 'gpt-4.1'
@@ -963,26 +963,6 @@ var defaultOpenAiDeployments = [
   }
 ]
 
-var openAiDeployments = concat(
-  defaultOpenAiDeployments,
-  useAdvancedImageProcessing
-    ? [
-        {
-          name: azureOpenAIVisionModel
-          model: {
-            format: 'OpenAI'
-            name: azureOpenAIVisionModelName
-            version: azureOpenAIVisionModelVersion
-          }
-          sku: {
-            name: 'GlobalStandard'
-            capacity: azureOpenAIVisionModelCapacity
-          }
-        }
-      ]
-    : []
-)
-
 module openai 'modules/core/ai/cognitiveservices.bicep' = {
   name: azureOpenAIResourceName
   scope: resourceGroup()
@@ -992,7 +972,7 @@ module openai 'modules/core/ai/cognitiveservices.bicep' = {
     tags: allTags
     kind: 'OpenAI'
     sku: azureOpenAISkuName
-    deployments: openAiDeployments
+    deployments: defaultOpenAiDeployments
     userAssignedResourceId: managedIdentityModule.outputs.resourceId
     restrictOutboundNetworkAccess: true
     allowedFqdnList: concat(

infra/main.parameters.json

@@ -127,11 +127,14 @@
       "value": "${ADVANCED_IMAGE_PROCESSING_MAX_IMAGES=1}"
     },
     "azureOpenAIVisionModel": {
-      "value": "${AZURE_OPENAI_VISION_MODEL=gpt-4.1-vision}"
+      "value": "${AZURE_OPENAI_VISION_MODEL=gpt-4.1}"
     },
     "azureOpenAIVisionModelName": {
       "value": "${AZURE_OPENAI_VISION_MODEL_NAME=gpt-4.1}"
     },
+    "azureOpenAIVisionModelVersion": {
+      "value": "${AZURE_OPENAI_VISION_MODEL_VERSION=2025-04-14}"
+    },
     "azureOpenAIVisionModelCapacity": {
       "value": "${AZURE_OPENAI_VISION_MODEL_CAPACITY=10}"
     },

infra/main.waf.parameters.json

@@ -127,13 +127,13 @@
       "value": "${ADVANCED_IMAGE_PROCESSING_MAX_IMAGES=1}"
     },
     "azureOpenAIVisionModel": {
-      "value": "${AZURE_OPENAI_VISION_MODEL=gpt-4}"
+      "value": "${AZURE_OPENAI_VISION_MODEL=gpt-4.1}"
     },
     "azureOpenAIVisionModelName": {
-      "value": "${AZURE_OPENAI_VISION_MODEL_NAME=gpt-4}"
+      "value": "${AZURE_OPENAI_VISION_MODEL_NAME=gpt-4.1}"
     },
     "azureOpenAIVisionModelVersion": {
-      "value": "${AZURE_OPENAI_VISION_MODEL_VERSION=turbo-2024-04-09}"
+      "value": "${AZURE_OPENAI_VISION_MODEL_VERSION=2025-04-14}"
     },
     "azureOpenAIVisionModelCapacity": {
       "value": "${AZURE_OPENAI_VISION_MODEL_CAPACITY=10}"