Merge pull request #650 from microsoft/psl-v4envvariablechanges

fix: added the RAI model variable and removed the other variable

Author: Roopan-Microsoft

infra/main.bicep

@@ -1231,6 +1231,10 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
           }
           {
             name: 'AZURE_OPENAI_DEPLOYMENT_NAME'
+            value: aiFoundryAiServicesModelDeployment.name
+          }
+          {
+            name: 'AZURE_OPENAI_RAI_DEPLOYMENT_NAME'
             value: aiFoundryAiServices4_1ModelDeployment.name
           }
           {
@@ -1329,10 +1333,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
             name: 'AZURE_STORAGE_BLOB_URL'
             value: avmStorageAccount.outputs.serviceEndpoints.blob
           }
-          {
-            name: 'AZURE_AI_MODEL_DEPLOYMENT_NAME'
-            value: aiFoundryAiServicesModelDeployment.name
-          }
           {
             name: 'AZURE_AI_PROJECT_ENDPOINT'
             value: aiFoundryAiProjectEndpoint
@@ -1786,13 +1786,13 @@ output COSMOSDB_CONTAINER string = cosmosDbDatabaseMemoryContainerName
 output AZURE_OPENAI_ENDPOINT string = 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/'
 output AZURE_OPENAI_MODEL_NAME string = aiFoundryAiServicesModelDeployment.name
 output AZURE_OPENAI_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
+output AZURE_OPENAI_RAI_DEPLOYMENT_NAME string = aiFoundryAiServices4_1ModelDeployment.name
 output AZURE_OPENAI_API_VERSION string = azureopenaiVersion
 // output APPLICATIONINSIGHTS_INSTRUMENTATION_KEY string = applicationInsights.outputs.instrumentationKey
 // output AZURE_AI_PROJECT_ENDPOINT string = aiFoundryAiServices.outputs.aiProjectInfo.apiEndpoint
 output AZURE_AI_SUBSCRIPTION_ID string = subscription().subscriptionId
 output AZURE_AI_RESOURCE_GROUP string = resourceGroup().name
 output AZURE_AI_PROJECT_NAME string = aiFoundryAiProjectName
-output AZURE_AI_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
 // output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsights.outputs.connectionString
 output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name
 // output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiProjectEndpoint

src/backend/.env.sample

@@ -12,9 +12,9 @@ AZURE_AI_PROJECT_ENDPOINT=
 AZURE_AI_SUBSCRIPTION_ID=
 AZURE_AI_RESOURCE_GROUP=
 AZURE_AI_PROJECT_NAME=
-AZURE_AI_MODEL_DEPLOYMENT_NAME=gpt-4o
 APPLICATIONINSIGHTS_CONNECTION_STRING=
 AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME=gpt-4o
+AZURE_OPENAI_RAI_DEPLOYMENT_NAME=
 AZURE_COGNITIVE_SERVICES="https://cognitiveservices.azure.com/.default"
 AZURE_AI_AGENT_ENDPOINT=
 # AZURE_BING_CONNECTION_NAME=

src/backend/common/config/app_config.py

@@ -33,9 +33,6 @@ def __init__(self):
             "APPLICATIONINSIGHTS_CONNECTION_STRING"
         )
         self.APP_ENV = self._get_required("APP_ENV", "prod")
-        # self.AZURE_AI_MODEL_DEPLOYMENT_NAME = self._get_required(
-        #     "AZURE_AI_MODEL_DEPLOYMENT_NAME", "gpt-4o"
-        # )
 
         self.AZURE_COGNITIVE_SERVICES = self._get_optional(
             "AZURE_COGNITIVE_SERVICES", "https://cognitiveservices.azure.com/.default"
@@ -49,6 +46,10 @@ def __init__(self):
         self.AZURE_OPENAI_DEPLOYMENT_NAME = self._get_required(
             "AZURE_OPENAI_DEPLOYMENT_NAME", "gpt-4o"
         )
+
+        self.AZURE_OPENAI_RAI_DEPLOYMENT_NAME = self._get_required(
+            "AZURE_OPENAI_RAI_DEPLOYMENT_NAME", "gpt-4.1"
+        )
         self.AZURE_OPENAI_API_VERSION = self._get_required(
             "AZURE_OPENAI_API_VERSION", "2024-11-20"
         )

src/backend/common/utils/utils_af.py

@@ -61,7 +61,7 @@ async def create_RAI_agent(
         "Respond with 'TRUE' if the input violates any rules and should be blocked, otherwise respond with 'FALSE'."
     )
 
-    model_deployment_name = config.AZURE_OPENAI_DEPLOYMENT_NAME
+    model_deployment_name = config.AZURE_OPENAI_RAI_DEPLOYMENT_NAME
     team.team_id = "rai_team"  # Use a fixed team ID for RAI agent
     team.name = "RAI Team"
     team.description = "Team responsible for Responsible AI checks"