Merge pull request #483 from microsoft/psl-pk-km-fdp

fix: fix unittestcases

Author: Avijit-Microsoft

src/tests/api/plugins/test_chat_with_data_plugin.py

@@ -25,14 +25,19 @@ def chat_plugin(mock_config):
 
 
 class TestChatWithDataPlugin:
-    @patch("plugins.chat_with_data_plugin.get_bearer_token_provider")
+    @patch("helpers.azure_openai_helper.Config")
+    @patch("helpers.azure_openai_helper.get_bearer_token_provider")
     @patch("helpers.azure_openai_helper.openai.AzureOpenAI")
     @pytest.mark.asyncio
-    async def test_greeting(self, mock_azure_openai, mock_token_provider, chat_plugin):
+    async def test_greeting(self, mock_azure_openai, mock_token_provider, mock_config, chat_plugin):
         # Setup mock token provider
         mock_token_provider.return_value = lambda: "fake_token"
 
         # Setup mock client and completion response
+        mock_config_instance = MagicMock()
+        mock_config_instance.azure_openai_endpoint = "https://test-openai.azure.com/"
+        mock_config_instance.azure_openai_api_version = "2024-02-15-preview"
+        mock_config.return_value = mock_config_instance
         mock_client = MagicMock()
         mock_completion = MagicMock()
         mock_completion.choices = [MagicMock()]
@@ -60,30 +65,39 @@ async def test_greeting(self, mock_azure_openai, mock_token_provider, chat_plugi
         assert args["messages"][1]["content"] == "Hello"
 
     @pytest.mark.asyncio
+    @patch("plugins.chat_with_data_plugin.Config")
     @patch("plugins.chat_with_data_plugin.AIProjectClient")
     @patch("plugins.chat_with_data_plugin.DefaultAzureCredential")
-    async def test_greeting_with_ai_project_client(self, mock_azure_credential, mock_ai_project_client, chat_plugin):
+    async def test_greeting_with_ai_project_client(self, mock_azure_credential, mock_ai_project_client, mock_config, chat_plugin):
         # Setup AIProjectClient
         chat_plugin.use_ai_project_client = True
 
         # Setup mock
-        mock_project = MagicMock()
-        mock_ai_project_client.from_connection_string.return_value = mock_project
-        mock_client = MagicMock()
-        mock_project.inference.get_chat_completions_client.return_value = mock_client
+        mock_config_instance = MagicMock()
+        mock_config_instance.ai_project_endpoint = "https://test-openai.azure.com/"
+        mock_config.return_value = mock_config_instance
+        mock_credential_instance = MagicMock()
+        mock_azure_credential.return_value = mock_credential_instance
+        mock_project_instance = MagicMock()
+        mock_ai_project_client.return_value = mock_project_instance
+        mock_chat_client = MagicMock()
+        mock_project_instance.inference.get_chat_completions_client.return_value = mock_chat_client
         mock_completion = MagicMock()
         mock_completion.choices = [MagicMock()]
         mock_completion.choices[0].message.content = "Hello from AI Project Client"
-        mock_client.complete.return_value = mock_completion
+        mock_chat_client.complete.return_value = mock_completion
 
         # Call the method
         result = await chat_plugin.greeting("Hello")
 
         # Assertions
         assert result == "Hello from AI Project Client"
-        mock_ai_project_client.from_connection_string.assert_called_once()
-        mock_client.complete.assert_called_once()
-        args = mock_client.complete.call_args[1]
+        mock_ai_project_client.assert_called_once_with(
+            endpoint=chat_plugin.ai_project_endpoint,
+            credential=mock_credential_instance
+        )
+        mock_chat_client.complete.assert_called_once()
+        args = mock_chat_client.complete.call_args[1]
         assert args["model"] == "gpt-4"
         assert args["temperature"] == 0
         assert len(args["messages"]) == 2
@@ -106,12 +120,17 @@ async def test_greeting_exception(self, mock_azure_openai, chat_plugin):
         assert result == "Details could not be retrieved. Please try again later."
 
     @pytest.mark.asyncio
-    @patch("plugins.chat_with_data_plugin.get_bearer_token_provider")
+    @patch("helpers.azure_openai_helper.Config")
+    @patch("helpers.azure_openai_helper.get_bearer_token_provider")
     @patch("plugins.chat_with_data_plugin.execute_sql_query")
     @patch("helpers.azure_openai_helper.openai.AzureOpenAI")
-    async def test_get_SQL_Response(self, mock_azure_openai, mock_execute_sql, mock_token_provider, chat_plugin):
+    async def test_get_SQL_Response(self, mock_azure_openai, mock_execute_sql, mock_token_provider, mock_config, chat_plugin):
 
         # Setup mocks
+        mock_config_instance = MagicMock()
+        mock_config_instance.azure_openai_endpoint = "https://test-openai.azure.com/"
+        mock_config_instance.azure_openai_api_version = "2024-02-15-preview"
+        mock_config.return_value = mock_config_instance
         mock_token_provider.return_value = lambda: "fake_token"
         mock_client = MagicMock()
         mock_azure_openai.return_value = mock_client
@@ -136,18 +155,24 @@ async def test_get_SQL_Response(self, mock_azure_openai, mock_execute_sql, mock_
         mock_execute_sql.assert_called_once_with("SELECT * FROM km_processed_data")
 
     @pytest.mark.asyncio
+    @patch("plugins.chat_with_data_plugin.Config")
     @patch("plugins.chat_with_data_plugin.execute_sql_query")
     @patch("plugins.chat_with_data_plugin.AIProjectClient")
     @patch("plugins.chat_with_data_plugin.DefaultAzureCredential")
-    async def test_get_SQL_Response_with_ai_project_client(self, mock_azure_credential, mock_ai_project_client, mock_execute_sql, chat_plugin):
+    async def test_get_SQL_Response_with_ai_project_client(self, mock_azure_credential, mock_ai_project_client, mock_execute_sql, mock_config, chat_plugin):
         # Setup AIProjectClient
         chat_plugin.use_ai_project_client = True
 
         # Setup mocks
-        mock_project = MagicMock()
-        mock_ai_project_client.from_connection_string.return_value = mock_project
+        mock_config_instance = MagicMock()
+        mock_config_instance.ai_project_endpoint = "https://test-openai.azure.com/"
+        mock_config.return_value = mock_config_instance
+        mock_credential_instance = MagicMock()
+        mock_azure_credential.return_value = mock_credential_instance
+        mock_project_instance = MagicMock()
+        mock_ai_project_client.return_value = mock_project_instance
         mock_client = MagicMock()
-        mock_project.inference.get_chat_completions_client.return_value = mock_client
+        mock_project_instance.inference.get_chat_completions_client.return_value = mock_client
         mock_completion = MagicMock()
         mock_completion.choices = [MagicMock()]
         mock_completion.choices[0].message.content = "```sql\nSELECT * FROM km_processed_data\n```"
@@ -160,8 +185,10 @@ async def test_get_SQL_Response_with_ai_project_client(self, mock_azure_credenti
 
         # Assertions
         assert result == "Query results data with AI Project Client"
-        mock_ai_project_client.from_connection_string.assert_called_once()
-        mock_client.complete.assert_called_once()
+        mock_ai_project_client.assert_called_once_with(
+            endpoint=chat_plugin.ai_project_endpoint,
+            credential=mock_credential_instance
+        )
         mock_execute_sql.assert_called_once_with("\nSELECT * FROM km_processed_data\n")
 
     @pytest.mark.asyncio
@@ -181,13 +208,18 @@ async def test_get_SQL_Response_exception(self, mock_azure_openai, mock_execute_
         mock_execute_sql.assert_not_called()
 
     @pytest.mark.asyncio
-    @patch("plugins.chat_with_data_plugin.get_bearer_token_provider")
+    @patch("helpers.azure_openai_helper.Config")
+    @patch("helpers.azure_openai_helper.get_bearer_token_provider")
     @patch("helpers.azure_openai_helper.openai.AzureOpenAI")
-    async def test_get_answers_from_calltranscripts(self, mock_azure_openai, mock_token_provider, chat_plugin):
+    async def test_get_answers_from_calltranscripts(self, mock_azure_openai, mock_token_provider, mock_config, chat_plugin):
         # Setup mock
         mock_token_provider.return_value = lambda: "fake_token"
         mock_client = MagicMock()
         mock_azure_openai.return_value = mock_client
+        mock_config_instance = MagicMock()
+        mock_config_instance.azure_openai_endpoint = "https://test-openai.azure.com/"
+        mock_config_instance.azure_openai_api_version = "2024-02-15-preview"
+        mock_config.return_value = mock_config_instance
         mock_completion = MagicMock()
         mock_completion.choices = [MagicMock()]
         mock_completion.choices[0].message = MagicMock()

src/tests/api/services/test_chat_service.py

@@ -9,7 +9,7 @@
 
 
 # ---- Patch imports before importing the service under test ----
-@patch("common.config.config.Config")
+@patch("helpers.azure_openai_helper.Config")
 @patch("semantic_kernel.agents.AzureAIAgentThread")
 @patch("azure.ai.agents.models.TruncationObject")
 @patch("semantic_kernel.exceptions.agent_exceptions.AgentException")
@@ -167,8 +167,6 @@ def test_init(self, mock_config_class, mock_request):
 
         service = ChatService(mock_request)
 
-        assert service.azure_openai_endpoint == "https://test.openai.azure.com"
-        assert service.azure_openai_api_version == "2024-02-15-preview"
         assert service.azure_openai_deployment_name == "gpt-4o-mini"
         assert service.agent == mock_request.app.state.agent
         assert ChatService.thread_cache is not None

src/tests/api/services/test_history_service.py

@@ -28,7 +28,7 @@ def history_service(mock_config_instance):
         # Create patches for other dependencies used by HistoryService
         with patch("services.history_service.CosmosConversationClient"):
             with patch("services.history_service.AsyncAzureOpenAI"):
-                with patch("services.history_service.get_bearer_token_provider"):
+                with patch("helpers.azure_openai_helper.get_bearer_token_provider"):
                     with patch("services.history_service.complete_chat_request"):
                         service = HistoryService()
                         return service
@@ -105,7 +105,7 @@ def test_init_openai_client_no_deployment_name(self, history_service):
 
     def test_init_openai_client_no_api_key(self, history_service):
         """Test OpenAI client initialization with no API key"""
-        with patch("services.history_service.get_bearer_token_provider", return_value="token_provider"):
+        with patch("helpers.azure_openai_helper.get_bearer_token_provider", return_value="token_provider"):
             with patch("services.history_service.AsyncAzureOpenAI", return_value="openai_client"):
                 client = history_service.init_openai_client()
                 assert client == "openai_client"