Merge branch 'dev-v4' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into psl-latestversinov2

Author: Dhruvkumar-Microsoft

infra/main.bicep

@@ -373,7 +373,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = if (en
     flowType: 'Bluefield'
     // WAF aligned configuration for Monitoring
     workspaceResourceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
-    diagnosticSettings: enableMonitoring ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] : null
   }
 }
 

infra/main.json

@@ -5,11 +5,11 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.40.2.10011",
-      "templateHash": "17476534152468179054"
+      "version": "0.41.2.15936",
+      "templateHash": "7834026170340721066"
     },
     "name": "Multi-Agent Custom Automation Engine",
-    "description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
+    "description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\r\n\r\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\r\n"
   },
   "parameters": {
     "solutionName": {
@@ -3703,8 +3703,7 @@
           "flowType": {
             "value": "Bluefield"
           },
-          "workspaceResourceId": "[if(parameters('enableMonitoring'), if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value)), createObject('value', ''))]",
-          "diagnosticSettings": "[if(parameters('enableMonitoring'), createObject('value', createArray(createObject('workspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)))), createObject('value', null()))]"
+          "workspaceResourceId": "[if(parameters('enableMonitoring'), if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value)), createObject('value', ''))]"
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -4921,8 +4920,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.40.2.10011",
-              "templateHash": "16969845928384020185"
+              "version": "0.41.2.15936",
+              "templateHash": "8667922205584012198"
             }
           },
           "definitions": {
@@ -22453,8 +22452,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.40.2.10011",
-              "templateHash": "8742987061721021759"
+              "version": "0.41.2.15936",
+              "templateHash": "8365054813170845685"
             }
           },
           "definitions": {
@@ -25440,8 +25439,8 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "logAnalyticsWorkspace",
         "userAssignedIdentity",
@@ -25481,8 +25480,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.40.2.10011",
-              "templateHash": "7507285802464480889"
+              "version": "0.41.2.15936",
+              "templateHash": "5789718034225488560"
             }
           },
           "parameters": {
@@ -34461,8 +34460,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.40.2.10011",
-              "templateHash": "8640881069237947782"
+              "version": "0.41.2.15936",
+              "templateHash": "14525082674956141939"
             }
           },
           "definitions": {
@@ -35474,8 +35473,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.40.2.10011",
-                      "templateHash": "10706743168754451638"
+                      "version": "0.41.2.15936",
+                      "templateHash": "1185169597469996118"
                     },
                     "name": "Site App Settings",
                     "description": "This module deploys a Site App Setting."
@@ -44644,8 +44643,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.40.2.10011",
-              "templateHash": "15348022841521786626"
+              "version": "0.41.2.15936",
+              "templateHash": "8488390916703184584"
             }
           },
           "parameters": {

infra/main_custom.bicep

@@ -372,7 +372,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = if (en
     flowType: 'Bluefield'
     // WAF aligned configuration for Monitoring
     workspaceResourceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
-    diagnosticSettings: enableMonitoring ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] : null
   }
 }
 

src/tests/backend/test_app.py

@@ -13,8 +13,7 @@
 import pytest
 import sys
 import os
-from unittest.mock import Mock, AsyncMock, patch, MagicMock
-from types import ModuleType
+from unittest.mock import Mock, AsyncMock, patch, NonCallableMock
 
 # Environment variables are set by conftest.py, but ensure they're available
 os.environ.setdefault("APPLICATIONINSIGHTS_CONNECTION_STRING", "InstrumentationKey=test-key-12345")
@@ -36,7 +35,8 @@
 os.environ.setdefault("AZURE_OPENAI_RAI_DEPLOYMENT_NAME", "test-rai-deployment")
 
 # Check if v4 has been mocked by another test file (prevents import errors)
-_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], (Mock, MagicMock))
+# Use NonCallableMock to catch all mock subclasses (Mock, MagicMock, etc.)
+_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], NonCallableMock)
 if _v4_is_mocked:
     # Skip this module - v4 has been mocked by another test file
     pytest.skip(

src/tests/backend/v4/orchestration/helper/test_plan_to_mplan_converter.py

@@ -11,13 +11,14 @@
 
 import unittest
 import sys
-from unittest.mock import Mock, MagicMock
+from unittest.mock import NonCallableMock
 
 import pytest
 
 # Check if v4 has been mocked by another test file (prevents import errors)
-_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], (Mock, MagicMock))
-_v4_models_is_mocked = 'v4.models' in sys.modules and isinstance(sys.modules['v4.models'], (Mock, MagicMock))
+# Use NonCallableMock to catch all mock subclasses (Mock, MagicMock, etc.)
+_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], NonCallableMock)
+_v4_models_is_mocked = 'v4.models' in sys.modules and isinstance(sys.modules['v4.models'], NonCallableMock)
 if _v4_is_mocked or _v4_models_is_mocked:
     pytest.skip(
         "Skipping test_plan_to_mplan_converter.py: v4 module has been mocked by another test file. "

src/tests/backend/v4/orchestration/test_orchestration_manager.py

@@ -917,30 +917,30 @@ def test_extract_response_text_object_with_text_attr(self):
     def test_extract_response_text_object_with_empty_text(self):
         """Test extracting text from object with empty text attribute."""
         # Use spec to ensure only specified attributes exist
-        obj = Mock(spec=['text'])
+        obj = Mock(spec_set=['text'])
         obj.text = ""
         result = self.manager._extract_response_text(obj)
         self.assertEqual(result, "")
 
     def test_extract_response_text_agent_executor_response_with_agent_response(self):
         """Test extracting text from AgentExecutorResponse with agent_response.text."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec_set=['text'])
         agent_resp.text = "Agent executor response"
 
-        executor_resp = Mock(spec=['agent_response'])
+        executor_resp = Mock(spec_set=['agent_response'])
         executor_resp.agent_response = agent_resp
 
         result = self.manager._extract_response_text(executor_resp)
         self.assertEqual(result, "Agent executor response")
 
     def test_extract_response_text_agent_executor_response_fallback_to_conversation(self):
         """Test extracting text from AgentExecutorResponse falling back to full_conversation."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec_set=['text'])
         agent_resp.text = None
 
         last_msg = MockChatMessage("Last conversation message")
 
-        executor_resp = Mock(spec=['agent_response', 'full_conversation'])
+        executor_resp = Mock(spec_set=['agent_response', 'full_conversation'])
         executor_resp.agent_response = agent_resp
         executor_resp.full_conversation = [MockChatMessage("First"), last_msg]
 
@@ -949,10 +949,10 @@ def test_extract_response_text_agent_executor_response_fallback_to_conversation(
 
     def test_extract_response_text_agent_executor_response_empty_conversation(self):
         """Test extracting text from AgentExecutorResponse with empty conversation."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec_set=['text'])
         agent_resp.text = None
 
-        executor_resp = Mock(spec=['agent_response', 'full_conversation'])
+        executor_resp = Mock(spec_set=['agent_response', 'full_conversation'])
         executor_resp.agent_response = agent_resp
         executor_resp.full_conversation = []
 
@@ -1091,7 +1091,7 @@ async def test_workflow_output_with_object_with_text(self):
         mock_workflow = Mock()
 
         # Create object with text attribute
-        obj_with_text = Mock(spec=['text'])
+        obj_with_text = Mock(spec_set=['text'])
         obj_with_text.text = "Object response"
         output_event = MockWorkflowOutputEvent(obj_with_text)