Merge remote-tracking branch 'origin/dev-v4' into psl-logging-improvements

Author: Abdul-Microsoft

.github/workflows/test.yml

@@ -66,20 +66,29 @@ jobs:
 
       - name: Run tests with coverage
         if: env.skip_tests == 'false'
+        env:
+          PYTHONPATH: src:src/backend
         run: |
-          if python -m pytest src/tests/backend/test_app.py --cov=backend --cov-config=.coveragerc -q > /dev/null 2>&1 && \
-             python -m pytest src/tests/backend --cov=backend --cov-append --cov-report=term --cov-report=xml --cov-config=.coveragerc --ignore=src/tests/backend/test_app.py; then
-            echo "Tests completed, checking coverage."
-            if [ -f coverage.xml ]; then
-              COVERAGE=$(python -c "import xml.etree.ElementTree as ET; tree = ET.parse('coverage.xml'); root = tree.getroot(); print(float(root.attrib.get('line-rate', 0)) * 100)")
-              echo "Overall coverage: $COVERAGE%"
-              if (( $(echo "$COVERAGE < 80" | bc -l) )); then
-                echo "Coverage is below 80%, failing the job."
-                exit 1
-              fi
+          # Run test_app.py first (isolation required)
+          python -m pytest src/tests/backend/test_app.py --cov=src/backend --cov-config=.coveragerc -q
+          
+          # Run remaining backend tests with coverage append
+          python -m pytest src/tests/backend --cov=src/backend --cov-append --cov-report=term --cov-report=xml --cov-config=.coveragerc --ignore=src/tests/backend/test_app.py
+
+      - name: Check coverage threshold
+        if: env.skip_tests == 'false'
+        run: |
+          if [ -f coverage.xml ]; then
+            COVERAGE=$(python -c "import xml.etree.ElementTree as ET; tree = ET.parse('coverage.xml'); root = tree.getroot(); print(float(root.attrib.get('line-rate', 0)) * 100)")
+            echo "Overall coverage: $COVERAGE%"
+            if (( $(echo "$COVERAGE < 80" | bc -l) )); then
+              echo "::error::Coverage is below 80% threshold. Current: $COVERAGE%"
+              exit 1
             fi
+            echo "✅ Coverage threshold met: $COVERAGE% >= 80%"
           else
-            echo "No tests found, skipping coverage check."
+            echo "::error::coverage.xml not found"
+            exit 1
           fi
 
       - name: Skip coverage report if no tests

conftest.py

@@ -7,9 +7,18 @@
 
 import pytest
 
-# Add the agents path
-agents_path = Path(__file__).parent.parent.parent / "backend" / "v4" / "magentic_agents"
-sys.path.insert(0, str(agents_path))
+# Get the root directory of the project
+root_dir = Path(__file__).parent
+
+# Add src directory to path for 'backend', 'common', 'v4' etc. imports
+src_path = root_dir / "src"
+if str(src_path) not in sys.path:
+    sys.path.insert(0, str(src_path))
+
+# Add src/backend to path for relative imports within backend
+backend_path = root_dir / "src" / "backend"
+if str(backend_path) not in sys.path:
+    sys.path.insert(0, str(backend_path))
 
 @pytest.fixture
 def agent_env_vars():

src/tests/backend/auth/__init__.py

@@ -218,6 +218,9 @@ class TestCreateRAIAgent:
     def setup_method(self):
         """Setup for each test method."""
         self.mock_team = Mock(spec=TeamConfiguration)
+        # Setup model_copy to return a new mock that can be modified
+        self.mock_rai_team = Mock(spec=TeamConfiguration)
+        self.mock_team.model_copy = Mock(return_value=self.mock_rai_team)
         self.mock_memory_store = Mock(spec=DatabaseBase)
 
     @pytest.mark.asyncio
@@ -238,6 +241,9 @@ async def test_create_rai_agent_success(self, mock_registry, mock_foundry_class,
         # Execute
         result = await create_RAI_agent(self.mock_team, self.mock_memory_store)
 
+        # Verify team.model_copy() was called to create a copy
+        self.mock_team.model_copy.assert_called_once()
+        
         # Verify agent creation
         mock_foundry_class.assert_called_once()
         call_args = mock_foundry_class.call_args
@@ -251,13 +257,14 @@ async def test_create_rai_agent_success(self, mock_registry, mock_foundry_class,
         assert call_args[1]['project_endpoint'] == "https://test.project.azure.com/"
         assert call_args[1]['mcp_config'] is None
         assert call_args[1]['search_config'] is None
-        assert call_args[1]['team_config'] is self.mock_team
+        # The team_config passed should be the copy (rai_team), not the original
+        assert call_args[1]['team_config'] is self.mock_rai_team
         assert call_args[1]['memory_store'] is self.mock_memory_store
 
-        # Verify team configuration updates
-        assert self.mock_team.team_id == "rai_team"
-        assert self.mock_team.name == "RAI Team"
-        assert self.mock_team.description == "Team responsible for Responsible AI checks"
+        # Verify the copied team configuration was updated (not the original)
+        assert self.mock_rai_team.team_id == "rai_team"
+        assert self.mock_rai_team.name == "RAI Team"
+        assert self.mock_rai_team.description == "Team responsible for Responsible AI checks"
 
         # Verify agent initialization
         mock_agent.open.assert_called_once()