Merge branch 'main' into dependabot/uv/python-multipart-0.0.22

Author: pontemonti

libraries/microsoft-agents-a365-tooling-extensions-agentframework/microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py

@@ -225,6 +225,8 @@ async def send_chat_history_messages(
 
         Args:
             chat_messages: Sequence of Agent Framework ChatMessage objects to send.
+                           Can be empty - the request will still be sent to register
+                           the user message from turn_context.activity.text.
             turn_context: TurnContext from the Agents SDK containing conversation info.
             tool_options: Optional configuration for the request. Defaults to
                           AgentFramework-specific options if not provided.
@@ -235,6 +237,12 @@ async def send_chat_history_messages(
         Raises:
             ValueError: If chat_messages or turn_context is None.
 
+        Note:
+            Even if chat_messages is empty or all messages are filtered during
+            conversion, the request will still be sent to the MCP platform. This
+            ensures the user message from turn_context.activity.text is registered
+            correctly for real-time threat protection.
+
         Example:
             >>> service = McpToolRegistrationService()
             >>> messages = [ChatMessage(role=Role.USER, text="Hello")]
@@ -249,11 +257,6 @@ async def send_chat_history_messages(
         if turn_context is None:
             raise ValueError("turn_context cannot be None")
 
-        # Handle empty messages - return success with warning
-        if len(chat_messages) == 0:
-            self._logger.warning("Empty message list provided to send_chat_history_messages")
-            return OperationResult.success()
-
         self._logger.info(f"Send chat history initiated with {len(chat_messages)} messages")
 
         # Use default options if not provided
@@ -263,10 +266,13 @@ async def send_chat_history_messages(
         # Convert messages to ChatHistoryMessage format
         history_messages = self._convert_chat_messages_to_history(chat_messages)
 
-        # Check if all messages were filtered out during conversion
+        # Call core service even with empty history_messages to register
+        # the user message from turn_context.activity.text in the MCP platform.
         if len(history_messages) == 0:
-            self._logger.warning("All messages were filtered out during conversion (empty content)")
-            return OperationResult.success()
+            self._logger.info(
+                "Empty history messages (either no input or all filtered), "
+                "still sending to register user message"
+            )
 
         # Delegate to core service
         result = await self._mcp_server_configuration_service.send_chat_history(

libraries/microsoft-agents-a365-tooling-extensions-openai/microsoft_agents_a365/tooling/extensions/openai/mcp_tool_registration_service.py

@@ -347,7 +347,8 @@ async def send_chat_history_messages(
                           and activity.text.
             messages: List of OpenAI TResponseInputItem messages to send. Supports
                       UserMessage, AssistantMessage, SystemMessage, and other OpenAI
-                      message types.
+                      message types. Can be empty - the request will still be sent to
+                      register the user message from turn_context.activity.text.
             options: Optional ToolOptions for customization. If not provided,
                      uses default options with orchestrator_name="OpenAI".
 
@@ -359,6 +360,12 @@ async def send_chat_history_messages(
         Raises:
             ValueError: If turn_context is None or messages is None.
 
+        Note:
+            Even if messages is empty or all messages are filtered during conversion,
+            the request will still be sent to the MCP platform. This ensures the user
+            message from turn_context.activity.text is registered correctly for
+            real-time threat protection.
+
         Example:
             >>> from microsoft_agents_a365.tooling.extensions.openai import (
             ...     McpToolRegistrationService
@@ -382,11 +389,6 @@ async def send_chat_history_messages(
         if messages is None:
             raise ValueError("messages cannot be None")
 
-        # Handle empty list as no-op
-        if len(messages) == 0:
-            self._logger.info("Empty message list provided, returning success")
-            return OperationResult.success()
-
         self._logger.info(f"Sending {len(messages)} OpenAI messages as chat history")
 
         # Set default options
@@ -399,9 +401,13 @@ async def send_chat_history_messages(
             # Convert OpenAI messages to ChatHistoryMessage format
             chat_history_messages = self._convert_openai_messages_to_chat_history(messages)
 
+            # Call core service even with empty chat_history_messages to register
+            # the user message from turn_context.activity.text in the MCP platform.
             if len(chat_history_messages) == 0:
-                self._logger.warning("No messages could be converted to chat history format")
-                return OperationResult.success()
+                self._logger.info(
+                    "Empty chat history messages (either no input or all filtered), "
+                    "still sending to register user message"
+                )
 
             self._logger.debug(
                 f"Converted {len(chat_history_messages)} messages to ChatHistoryMessage format"

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -569,7 +569,8 @@ async def send_chat_history(
                           Must have a valid activity with conversation.id, activity.id, and
                           activity.text.
             chat_history_messages: List of ChatHistoryMessage objects representing the chat
-                                   history. Must be non-empty.
+                                   history. May be empty - an empty list will still send a
+                                   request to the MCP platform with empty chat history.
             options: Optional ToolOptions instance containing optional parameters.
 
         Returns:
@@ -578,10 +579,15 @@ async def send_chat_history(
                              On failure, returns OperationResult.failed() with error details.
 
         Raises:
-            ValueError: If turn_context is None, chat_history_messages is None or empty,
+            ValueError: If turn_context is None, chat_history_messages is None,
                         turn_context.activity is None, or any of the required fields
                         (conversation.id, activity.id, activity.text) are missing or empty.
 
+        Note:
+            Even if chat_history_messages is empty, the request will still be sent to
+            the MCP platform. This ensures the user message from turn_context.activity.text
+            is registered correctly for real-time threat protection.
+
         Example:
             >>> from datetime import datetime, timezone
             >>> from microsoft_agents_a365.tooling.models import ChatHistoryMessage
@@ -602,10 +608,8 @@ async def send_chat_history(
         if chat_history_messages is None:
             raise ValueError("chat_history_messages cannot be None")
 
-        # Handle empty messages - return success with warning (consistent with extension behavior)
-        if len(chat_history_messages) == 0:
-            self._logger.warning("Empty message list provided to send_chat_history")
-            return OperationResult.success()
+        # Note: Empty chat_history_messages is allowed - we still send the request to MCP platform
+        # The platform needs to receive the request even with empty chat history
 
         # Extract required information from turn context
         if not turn_context.activity:

tests/tooling/extensions/agentframework/services/test_send_chat_history.py

@@ -120,17 +120,20 @@ async def test_send_chat_history_from_store_validates_turn_context_none(
 
     @pytest.mark.asyncio
     @pytest.mark.unit
-    async def test_send_chat_history_messages_empty_messages_returns_success(
+    async def test_send_chat_history_messages_empty_messages_calls_core_service(
         self, service, mock_turn_context
     ):
-        """Test that empty message list returns success with warning log."""
+        """Test that empty message list still calls core service to register user message."""
         # Act
         result = await service.send_chat_history_messages([], mock_turn_context)
 
         # Assert
         assert result.succeeded is True
-        # Core service should not be called for empty messages
-        service._mcp_server_configuration_service.send_chat_history.assert_not_called()
+        # Core service SHOULD be called even for empty messages to register the user message
+        service._mcp_server_configuration_service.send_chat_history.assert_called_once()
+        # Verify empty list was passed
+        call_args = service._mcp_server_configuration_service.send_chat_history.call_args
+        assert call_args.kwargs["chat_history_messages"] == []
 
     @pytest.mark.asyncio
     @pytest.mark.unit
@@ -492,10 +495,10 @@ async def test_send_chat_history_messages_skips_messages_with_none_role(
 
     @pytest.mark.asyncio
     @pytest.mark.unit
-    async def test_send_chat_history_messages_all_filtered_returns_success(
+    async def test_send_chat_history_messages_all_filtered_still_calls_core(
         self, service, mock_turn_context, mock_role
     ):
-        """Test that all messages filtered out returns success without calling core (CRM-006)."""
+        """Test that all messages filtered out still calls core service to register user message."""
         # Arrange - all messages have empty content
         msg1 = Mock()
         msg1.message_id = "msg-1"
@@ -517,8 +520,11 @@ async def test_send_chat_history_messages_all_filtered_returns_success(
 
         # Assert
         assert result.succeeded is True
-        # Core service should not be called when all messages are filtered out
-        service._mcp_server_configuration_service.send_chat_history.assert_not_called()
+        # Core service SHOULD be called even when all messages are filtered out to register user message
+        service._mcp_server_configuration_service.send_chat_history.assert_called_once()
+        # Verify empty list was passed (all messages filtered)
+        call_args = service._mcp_server_configuration_service.send_chat_history.call_args
+        assert call_args.kwargs["chat_history_messages"] == []
 
     @pytest.mark.asyncio
     @pytest.mark.unit

tests/tooling/extensions/openai/test_send_chat_history.py

@@ -45,14 +45,26 @@ async def test_send_chat_history_messages_validates_messages_none(
     # UV-03
     @pytest.mark.asyncio
     @pytest.mark.unit
-    async def test_send_chat_history_messages_empty_list_returns_success(
+    async def test_send_chat_history_messages_empty_list_calls_core_service(
         self, service, mock_turn_context
     ):
-        """Test that empty message list returns success (no-op)."""
-        result = await service.send_chat_history_messages(mock_turn_context, [])
+        """Test that empty message list still calls core service to register user message."""
+        with patch.object(
+            service.config_service,
+            "send_chat_history",
+            new_callable=AsyncMock,
+        ) as mock_send:
+            mock_send.return_value = OperationResult.success()
 
-        assert result.succeeded is True
-        assert len(result.errors) == 0
+            result = await service.send_chat_history_messages(mock_turn_context, [])
+
+            assert result.succeeded is True
+            assert len(result.errors) == 0
+            # Core service SHOULD be called even for empty messages to register the user message
+            mock_send.assert_called_once()
+            # Verify empty list was passed
+            call_args = mock_send.call_args
+            assert call_args.kwargs["chat_history_messages"] == []
 
     # UV-04
     @pytest.mark.asyncio

tests/tooling/services/test_send_chat_history.py

@@ -3,6 +3,7 @@
 
 """Unit tests for send_chat_history method in McpToolServerConfigurationService."""
 
+import json
 from datetime import UTC, datetime
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
@@ -146,14 +147,37 @@ async def test_send_chat_history_validates_chat_history_messages(
             await service.send_chat_history(mock_turn_context, None)
 
     @pytest.mark.asyncio
-    async def test_send_chat_history_empty_list_returns_success(self, service, mock_turn_context):
-        """Test that send_chat_history returns success for empty list (CRM-008)."""
-        # Act
-        result = await service.send_chat_history(mock_turn_context, [])
-
-        # Assert - empty list should return success, not raise exception
-        assert result.succeeded is True
-        assert len(result.errors) == 0
+    async def test_send_chat_history_empty_list_sends_request(self, service, mock_turn_context):
+        """Test that send_chat_history sends request to MCP platform even with empty list."""
+        # Arrange
+        mock_response = AsyncMock()
+        mock_response.status = 200
+        mock_response.text = AsyncMock(return_value="OK")
+
+        # Mock aiohttp.ClientSession
+        with patch("aiohttp.ClientSession") as mock_session:
+            mock_session_instance = MagicMock()
+            mock_post = AsyncMock()
+            mock_post.__aenter__.return_value = mock_response
+            mock_session_instance.post.return_value = mock_post
+            mock_session.return_value.__aenter__.return_value = mock_session_instance
+
+            # Act
+            result = await service.send_chat_history(mock_turn_context, [])
+
+            # Assert - empty list should still make HTTP request and return success
+            assert result.succeeded is True
+            assert len(result.errors) == 0
+
+            # Verify HTTP request was actually made
+            assert mock_session_instance.post.called
+            call_args = mock_session_instance.post.call_args
+            assert "real-time-threat-protection/chat-message" in call_args[0][0]
+
+            # Verify the payload contains an empty chat history
+            data = call_args[1]["data"]
+            payload = json.loads(data)
+            assert payload["chatHistory"] == []
 
     @pytest.mark.asyncio
     async def test_send_chat_history_validates_activity(self, service, chat_history_messages):