Merge branch 'dev' into exp-changes

Author: Vamshi-Microsoft

.github/workflows/test.yml

@@ -6,6 +6,7 @@ on:
       - main
       - dev
       - demo
+      - psl-backend-unittest
   pull_request:
     types:
       - opened
@@ -18,49 +19,48 @@ on:
       - demo
 
 jobs:
-#   frontend_tests:
-#     runs-on: ubuntu-latest
-
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
-
-#       - name: Set up Node.js
-#         uses: actions/setup-node@v3
-#         with:
-#           node-version: '20'
-
-#       - name: Check if Frontend Test Files Exist
-#         id: check_frontend_tests
-#         run: |
-#           if [ -z "$(find App/frontend/src -type f -name '*.test.js' -o -name '*.test.ts' -o -name '*.test.tsx')" ]; then
-#             echo "No frontend test files found, skipping frontend tests."
-#             echo "skip_frontend_tests=true" >> $GITHUB_ENV
-#           else
-#             echo "Frontend test files found, running tests."
-#             echo "skip_frontend_tests=false" >> $GITHUB_ENV
-#           fi
-
-#       - name: Install Frontend Dependencies
-#         if: env.skip_frontend_tests == 'false'
-#         run: |
-#           cd App/frontend
-#           npm install
-
-#       - name: Run Frontend Tests with Coverage
-#         if: env.skip_frontend_tests == 'false'
-#         run: |
-#           cd App/frontend
-#           npm run test -- --coverage
-
-#       - name: Skip Frontend Tests
-#         if: env.skip_frontend_tests == 'true'
-#         run: |
-#           echo "Skipping frontend tests because no test files were found."
+  #   frontend_tests:
+  #     runs-on: ubuntu-latest
+
+  #     steps:
+  #       - name: Checkout code
+  #         uses: actions/checkout@v3
+
+  #       - name: Set up Node.js
+  #         uses: actions/setup-node@v3
+  #         with:
+  #           node-version: '20'
+
+  #       - name: Check if Frontend Test Files Exist
+  #         id: check_frontend_tests
+  #         run: |
+  #           if [ -z "$(find App/frontend/src -type f -name '*.test.js' -o -name '*.test.ts' -o -name '*.test.tsx')" ]; then
+  #             echo "No frontend test files found, skipping frontend tests."
+  #             echo "skip_frontend_tests=true" >> $GITHUB_ENV
+  #           else
+  #             echo "Frontend test files found, running tests."
+  #             echo "skip_frontend_tests=false" >> $GITHUB_ENV
+  #           fi
+
+  #       - name: Install Frontend Dependencies
+  #         if: env.skip_frontend_tests == 'false'
+  #         run: |
+  #           cd App/frontend
+  #           npm install
+
+  #       - name: Run Frontend Tests with Coverage
+  #         if: env.skip_frontend_tests == 'false'
+  #         run: |
+  #           cd App/frontend
+  #           npm run test -- --coverage
+
+  #       - name: Skip Frontend Tests
+  #         if: env.skip_frontend_tests == 'true'
+  #         run: |
+  #           echo "Skipping frontend tests because no test files were found."
 
   backend_tests:
     runs-on: ubuntu-latest
-    
 
     steps:
       - name: Checkout code
@@ -69,7 +69,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: "3.11"
 
       - name: Install Backend Dependencies
         run: |
@@ -81,7 +81,7 @@ jobs:
       - name: Check if Backend Test Files Exist
         id: check_backend_tests
         run: |
-          if [ -z "$(find src/api -type f -name 'test_*.py')" ]; then
+          if [ -z "$(find src/tests/api -type f -name 'test_*.py')" ]; then
             echo "No backend test files found, skipping backend tests."
             echo "skip_backend_tests=true" >> $GITHUB_ENV
           else
@@ -94,8 +94,6 @@ jobs:
         run: |
           pytest --cov=. --cov-report=term-missing --cov-report=xml
 
-
-
       - name: Skip Backend Tests
         if: env.skip_backend_tests == 'true'
         run: |

pytest.ini

@@ -0,0 +1,7 @@
+[pytest]
+markers =
+    unittest: Unit Tests (relatively fast)
+    functional: Functional Tests (tests that require a running server, with stubbed downstreams)
+    azure: marks tests as extended (run less frequently, relatively slow)
+pythonpath = ./src/api
+log_level=debug

src/api/requirements.txt

@@ -31,4 +31,9 @@ opentelemetry-sdk==1.31.1
 opentelemetry-api==1.31.1
 opentelemetry-semantic-conventions==0.52b1
 opentelemetry-instrumentation==0.52b1
-azure-monitor-opentelemetry==1.6.8
+azure-monitor-opentelemetry==1.6.8
+
+# Development tools
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-asyncio==0.26.0

src/api/services/history_service.py

@@ -206,6 +206,7 @@ async def update_conversation(self, user_id: str, request_json: dict):
                 input_message=messages[-1],
             )
         else:
+            await cosmos_conversation_client.cosmosdb_client.close()
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 detail="No assistant message found")

src/tests/__init__.py

@@ -0,0 +1,119 @@
+import pytest
+import asyncio
+from unittest.mock import AsyncMock, patch, MagicMock
+
+from agents.agent_factory import AgentFactory
+
+
+@pytest.fixture(autouse=True)
+def reset_agent_factory():
+    AgentFactory._instance = None
+    yield
+    AgentFactory._instance = None
+
+
+@pytest.fixture
+def config_mock():
+    return MagicMock(
+        azure_ai_project_conn_string="fake_conn_str",
+        azure_openai_deployment_model="gpt-4"
+    )
+
+
+@pytest.mark.asyncio
+@patch("agents.agent_factory.ChatWithDataPlugin", autospec=True)
+@patch("agents.agent_factory.AzureAIAgent", autospec=True)
+@patch("agents.agent_factory.DefaultAzureCredential", autospec=True)
+async def test_get_instance_creates_new_agent(
+    mock_credential,
+    mock_azure_agent,
+    mock_plugin,
+    config_mock
+):
+    mock_client = AsyncMock()
+    mock_agent_definition = MagicMock()
+    mock_client.agents.create_agent.return_value = mock_agent_definition
+    mock_azure_agent.create_client.return_value = mock_client
+
+    agent_instance = MagicMock()
+    mock_azure_agent.return_value = agent_instance
+
+    result = await AgentFactory.get_instance(config_mock)
+
+    assert result == agent_instance
+    mock_azure_agent.create_client.assert_called_once_with(
+        credential=mock_credential.return_value,
+        conn_str="fake_conn_str"
+    )
+    mock_client.agents.create_agent.assert_awaited_once()
+    mock_azure_agent.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_get_instance_returns_existing_instance(config_mock):
+    AgentFactory._instance = MagicMock()
+    result = await AgentFactory.get_instance(config_mock)
+    assert result == AgentFactory._instance
+
+
+@pytest.mark.asyncio
+@patch("agents.agent_factory.AzureAIAgentThread", autospec=True)
+@patch("agents.agent_factory.AzureAIAgent", autospec=True)
+@patch("agents.agent_factory.ChatService", autospec=True)
+async def test_delete_instance_deletes_agent_and_threads(
+    mock_chat_service,
+    mock_azure_agent,
+    mock_agent_thread
+):
+    # Setup instance
+    mock_client = AsyncMock()
+    mock_agent = MagicMock()
+    mock_agent.id = "test-id"
+    mock_agent.client = mock_client
+    AgentFactory._instance = mock_agent
+
+    # Setup thread cache
+    mock_chat_service.thread_cache = {
+        "conv1": "thread1",
+        "conv2": "thread2"
+    }
+
+    mock_thread_instance = AsyncMock()
+    mock_agent_thread.side_effect = lambda client, thread_id: mock_thread_instance
+
+    await AgentFactory.delete_instance()
+
+    mock_agent_thread.assert_any_call(client=mock_client, thread_id="thread1")
+    mock_agent_thread.assert_any_call(client=mock_client, thread_id="thread2")
+    assert mock_thread_instance.delete.await_count == 2
+    mock_client.agents.delete_agent.assert_awaited_once_with("test-id")
+    assert AgentFactory._instance is None
+
+
+@pytest.mark.asyncio
+@patch("agents.agent_factory.AzureAIAgent", autospec=True)
+@patch("agents.agent_factory.ChatService", autospec=True)
+async def test_delete_instance_handles_missing_thread_cache(
+    mock_chat_service,
+    mock_azure_agent
+):
+    mock_client = AsyncMock()
+    mock_agent = MagicMock()
+    mock_agent.id = "some-id"
+    mock_agent.client = mock_client
+    AgentFactory._instance = mock_agent
+
+    del mock_chat_service.thread_cache  # simulate attribute not existing
+
+    await AgentFactory.delete_instance()
+
+    mock_client.agents.delete_agent.assert_awaited_once_with("some-id")
+    assert AgentFactory._instance is None
+
+
+@pytest.mark.asyncio
+@patch("agents.agent_factory.AzureAIAgent", autospec=True)
+async def test_delete_instance_does_nothing_if_none(mock_azure_agent):
+    AgentFactory._instance = None
+    await AgentFactory.delete_instance()
+