Merge pull request #350 from microsoft/dev

chore: Dev to main

Author: Roopan-Microsoft

.github/workflows/job-deploy-windows.yml

@@ -52,7 +52,7 @@ jobs:
       WEBAPP_URL: ${{ steps.get_output_windows.outputs.WEBAPP_URL }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Validate Workflow Input Parameters
         shell: bash

.github/workflows/job-deploy.yml

@@ -270,7 +270,7 @@ jobs:
           echo "Final EXP status: $EXP_ENABLED"
           
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Login to Azure
         shell: bash

.github/workflows/job-docker-build.yml

@@ -30,7 +30,7 @@ jobs:
       IMAGE_TAG: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate Unique Docker Image Tag
         id: generate_docker_tag

.github/workflows/test-automation-v2.yml

@@ -36,7 +36,7 @@ jobs:
       TEST_REPORT_URL: ${{ steps.upload_report.outputs.artifact-url }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -136,7 +136,7 @@ jobs:
 
       - name: Upload test report
         id: upload_report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: test-report

infra/main.bicep

@@ -118,6 +118,8 @@ param azureExistingAIProjectResourceId string = ''
 @description('Optional. Use this parameter to use an existing Log Analytics workspace resource ID. Defaults to empty string.')
 param existingLogAnalyticsWorkspaceId string = ''
 
+var existingTags = resourceGroup().tags ?? {}
+
 var allTags = union(
   {
     'azd-env-name': solutionName
@@ -157,13 +159,15 @@ param createdBy string = contains(deployer(), 'userPrincipalName')? split(deploy
 resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   name: 'default'
   properties: {
-    tags: {
-      ...resourceGroup().tags
-      ...allTags
-      TemplateName: 'Code Modernization'
-      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
-      CreatedBy: createdBy
-    }
+    tags: union(
+      existingTags,
+      allTags,
+      {
+        TemplateName: 'Code Modernization'
+        Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
+        CreatedBy: createdBy
+      }
+    )
   }
 }
 

infra/main.json

@@ -120,6 +120,8 @@ param azureExistingAIProjectResourceId string = ''
 @description('Optional. Use this parameter to use an existing Log Analytics workspace resource ID. Defaults to empty string.')
 param existingLogAnalyticsWorkspaceId string = ''
 
+var existingTags = resourceGroup().tags ?? {}
+
 var allTags = union(
   {
     'azd-env-name': solutionName
@@ -154,18 +156,21 @@ var modelDeployment = {
 @description('Optional. Tag, Created by user name. Defaults to user principal name or object ID.')
 param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId
 
+var resourceGroupTagsValue = union(
+  existingTags,
+  allTags,
+  {
+    TemplateName: 'Code Modernization'
+    Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
+    CreatedBy: createdBy
+  }
+)
 
 // ========== Resource Group Tag ========== //
 resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   name: 'default'
   properties: {
-    tags: {
-      ...resourceGroup().tags
-      ...allTags
-      TemplateName: 'Code Modernization'
-      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
-      CreatedBy: createdBy
-    }
+    tags: resourceGroupTagsValue
   }
 }
 

infra/main_custom.bicep

@@ -14,7 +14,8 @@
 from api.status_updates import app_connection_manager, close_connection
 
 # Third-party
-from azure.monitor.opentelemetry import configure_azure_monitor
+# Azure Monitor OpenTelemetry integration is currently causing issues with OpenAI calls in process_batch_async, needs further investigation, commenting out for now
+# from azure.monitor.opentelemetry import configure_azure_monitor
 
 from common.logger.app_logger import AppLogger
 from common.services.batch_service import BatchService
@@ -43,7 +44,8 @@
 instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
 if instrumentation_key:
     # Configure Application Insights if the Instrumentation Key is found
-    configure_azure_monitor(connection_string=instrumentation_key)
+    # commenting below line as configure_azure_monitor is causing issues with OpenAI calls in process_batch_async, needs further investigation
+    # configure_azure_monitor(connection_string=instrumentation_key)
     logging.info(
         "Application Insights configured with the provided Instrumentation Key"
     )

src/backend/api/api_routes.py

@@ -35,7 +35,7 @@ structlog
 typing-extensions
 python-jose[cryptography]
 passlib[bcrypt]
-semantic-kernel[azure]==1.39.0
+semantic-kernel[azure]==1.39.2
 sqlparse
 sqlglot
 unittest2
@@ -49,5 +49,5 @@ opentelemetry-sdk==1.39.0
 opentelemetry-api==1.39.0
 opentelemetry-semantic-conventions==0.60b0
 opentelemetry-instrumentation==0.60b0
-azure-monitor-opentelemetry==1.8.3
+azure-monitor-opentelemetry==1.8.6
 azure-ai-projects==1.0.0