Merge branch 'dev' of https://github.com/microsoft/Container-Migration-Solution-Accelerator into psl-ts-cleanup

Author: Tejasri-Microsoft

.github/workflows/test.yml

@@ -8,9 +8,11 @@ on:
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
+      - 'src/backend-api/uv.lock'
       - 'src/backend-api/pytest.ini'
       - 'src/processor/**/*.py'
       - 'src/processor/pyproject.toml'
+      - 'src/processor/uv.lock'
       - '.github/workflows/test.yml'
   pull_request:
     types:
@@ -24,9 +26,11 @@ on:
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
+      - 'src/backend-api/uv.lock'
       - 'src/backend-api/pytest.ini'
       - 'src/processor/**/*.py'
       - 'src/processor/pyproject.toml'
+      - 'src/processor/uv.lock'
       - '.github/workflows/test.yml'
 
 permissions:

infra/main.bicep

@@ -859,7 +859,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }

infra/main_custom.bicep

@@ -747,7 +747,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
       {
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
       }
     ]
   }
@@ -801,7 +801,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }

src/backend-api/src/tests/sas/storage/blob/test_async_helper_extra.py

@@ -81,13 +81,16 @@ def _wire_credential(svc_cls, *, account_key=None, account_name="myacct",
                      credential_cls_name="DefaultAzureCredential"):
     svc = _wire(svc_cls)
     svc.account_name = account_name
+    # Use a dedicated stub class per credential type so that ``type(cred).__name__``
+    # reflects the desired credential class without mutating the shared ``MagicMock``
+    # class metadata (which would leak across tests and make order-dependent failures).
     if credential_cls_name == "AccountKey":
-        cred = MagicMock()
+        cred_cls = type("StorageSharedKeyCredential", (), {})
+        cred = cred_cls()
         cred.account_key = account_key
-        type(cred).__name__ = "StorageSharedKeyCredential"
     else:
-        cred = MagicMock(spec=[])
-        type(cred).__name__ = credential_cls_name
+        cred_cls = type(credential_cls_name, (), {})
+        cred = cred_cls()
     svc.credential = cred
     return svc
 

src/backend-api/src/tests/sas/storage/blob/test_config.py

@@ -1,12 +1,9 @@
 """Tests for libs/sas/storage/blob/config.py."""
 
-import pytest
-
 from libs.sas.storage.blob import config as blob_config_module
 from libs.sas.storage.blob.config import (
     BlobHelperConfig,
     create_config,
-    default_config,
     get_config,
     set_config,
 )

src/backend-api/src/tests/sas/storage/blob/test_helper_extra.py

@@ -66,16 +66,21 @@ def test_delete_container_blobs_present_message_no_force(self, blob_service_mock
 
 def _wire_credential(blob_service_mock, *, account_key=None, account_name="myacct",
                      credential_cls_name="DefaultAzureCredential"):
-    """Make the helper's blob_service_client respond like an Azure SDK client."""
+    """Make the helper's blob_service_client respond like an Azure SDK client.
+
+    Uses a dedicated stub class per credential type so that ``type(cred).__name__``
+    reflects the desired credential class without mutating the shared ``MagicMock``
+    class metadata (which would leak across tests).
+    """
     h = _make_helper(blob_service_mock)
     h.blob_service_client.account_name = account_name
     if credential_cls_name == "AccountKey":
-        cred = MagicMock()
+        cred_cls = type("StorageSharedKeyCredential", (), {})
+        cred = cred_cls()
         cred.account_key = account_key
-        type(cred).__name__ = "StorageSharedKeyCredential"
     else:
-        cred = MagicMock(spec=[])
-        type(cred).__name__ = credential_cls_name
+        cred_cls = type(credential_cls_name, (), {})
+        cred = cred_cls()
     h.blob_service_client.credential = cred
     return h
 

src/backend-api/src/tests/sas/storage/test_shared_config.py

@@ -1,7 +1,5 @@
 """Tests for libs/sas/storage/shared_config.py."""
 
-import pytest
-
 from libs.sas.storage import shared_config as shared_config_module
 from libs.sas.storage.shared_config import (
     StorageConfig,

src/processor/src/tests/unit/libs/agent_framework/test_agent_speaking_capture.py

@@ -2,9 +2,8 @@
 # Licensed under the MIT License.
 
 import asyncio
-from datetime import datetime
 from types import SimpleNamespace
-from unittest.mock import AsyncMock, MagicMock
+from unittest.mock import AsyncMock
 
 from libs.agent_framework.agent_speaking_capture import AgentSpeakingCaptureMiddleware
 

src/processor/src/tests/unit/libs/agent_framework/test_cosmos_checkpoint_storage.py

@@ -2,11 +2,8 @@
 # Licensed under the MIT License.
 
 import asyncio
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock
 
-import pytest
-
-from libs.agent_framework import cosmos_checkpoint_storage as ccs
 from libs.agent_framework.cosmos_checkpoint_storage import (
     CosmosCheckpointStorage,
     CosmosWorkflowCheckpoint,

src/processor/src/tests/unit/libs/agent_framework/test_groupchat_orchestrator_internals.py

@@ -19,7 +19,6 @@
 
 from libs.agent_framework.groupchat_orchestrator import (
     AgentResponse,
-    AgentResponseStream,
     GroupChatOrchestrator,
     OrchestrationResult,
 )