Improved validation of response data in select ConversationsOperations methods (#317)

* Improved validation of received response data

* Addressing PR comments

* Revising tests and implementing suggested edits

Author: rodrigobr-msft

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/connector/client/connector_client.py

@@ -216,21 +216,29 @@ async def reply_to_activity(
                 by_alias=True, exclude_unset=True, exclude_none=True, mode="json"
             ),
         ) as response:
-            result = await response.json() if response.content_length else {}
+
+            response_text = await response.text("utf-8")
 
             if response.status >= 300:
                 logger.error(
                     "Error replying to activity: %s",
-                    result or response.status,
+                    response_text or response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
 
+            if not response_text:
+                resource_response = ResourceResponse()
+            else:
+                resource_response = ResourceResponse.model_validate_json(response_text)
+
             logger.info(
-                "Reply to conversation/activity: %s, %s", result.get("id"), activity_id
+                "Reply to conversation/activity: %s, %s",
+                resource_response.id,
+                activity_id,
             )
 
-        return ResourceResponse.model_validate(result)
+            return resource_response
 
     async def send_to_conversation(
         self, conversation_id: str, body: Activity
@@ -269,8 +277,10 @@ async def send_to_conversation(
                 )
                 response.raise_for_status()
 
-            data = await response.json()
-            return ResourceResponse.model_validate(data)
+            response_text = await response.text("utf-8")
+            if not response_text:
+                return ResourceResponse()
+            return ResourceResponse.model_validate_json(response_text)
 
     async def update_activity(
         self, conversation_id: str, activity_id: str, body: Activity

tests/hosting_core/connector/__init__.py

@@ -0,0 +1,136 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""Tests for ConversationsOperations using aiohttp TestServer."""
+
+import json
+
+import pytest
+from aiohttp import web, ClientSession
+from aiohttp.test_utils import TestServer
+
+from microsoft_agents.activity import Activity, ResourceResponse
+from microsoft_agents.hosting.core.connector.client.connector_client import (
+    ConversationsOperations,
+)
+
+
+def _create_app(routes):
+    """Create an aiohttp app with the given route table."""
+    app = web.Application()
+    app.router.add_routes(routes)
+    return app
+
+
+class TestSendToConversation:
+    """Tests for ConversationsOperations.send_to_conversation."""
+
+    @pytest.fixture
+    def activity(self):
+        return Activity(type="message", text="Hello, world!")
+
+    @pytest.mark.asyncio
+    async def test_send_to_conversation_success_with_content(self, activity):
+        """Should return ResourceResponse validated from response text."""
+
+        async def handler(request):
+            return web.json_response({"id": "activity-id-123"})
+
+        routes = [web.post("/v3/conversations/{conversation_id}/activities", handler)]
+        app = _create_app(routes)
+
+        server = TestServer(app)
+        await server.start_server()
+        try:
+            async with ClientSession(base_url=server.make_url("/")) as session:
+                ops = ConversationsOperations(session)
+                result = await ops.send_to_conversation("conv-1", activity)
+
+            assert isinstance(result, ResourceResponse)
+            assert result.id == "activity-id-123"
+        finally:
+            await server.close()
+
+    @pytest.mark.asyncio
+    async def test_send_to_conversation_success_no_content(self, activity):
+        """Should return empty ResourceResponse when no content."""
+
+        async def handler(request):
+            return web.Response(status=200, text="")
+
+        routes = [web.post("/v3/conversations/{conversation_id}/activities", handler)]
+        app = _create_app(routes)
+
+        server = TestServer(app)
+        await server.start_server()
+        try:
+            async with ClientSession(base_url=server.make_url("/")) as session:
+                ops = ConversationsOperations(session)
+                result = await ops.send_to_conversation("conv-1", activity)
+
+            assert isinstance(result, ResourceResponse)
+            assert result.id is None
+        finally:
+            await server.close()
+
+
+class TestReplyToActivity:
+    """Tests for ConversationsOperations.reply_to_activity."""
+
+    @pytest.fixture
+    def activity(self):
+        return Activity(type="message", text="Hello, world!")
+
+    @pytest.mark.asyncio
+    async def test_reply_to_activity_success_with_content(self, activity):
+        """Should return ResourceResponse parsed from JSON response text."""
+
+        async def handler(request):
+            return web.json_response({"id": "reply-id-456"})
+
+        routes = [
+            web.post(
+                "/v3/conversations/{conversation_id}/activities/{activity_id}",
+                handler,
+            )
+        ]
+        app = _create_app(routes)
+
+        server = TestServer(app)
+        await server.start_server()
+        try:
+            async with ClientSession(base_url=server.make_url("/")) as session:
+                ops = ConversationsOperations(session)
+                result = await ops.reply_to_activity("conv-1", "act-1", activity)
+
+            assert isinstance(result, ResourceResponse)
+            assert result.id == "reply-id-456"
+        finally:
+            await server.close()
+
+    @pytest.mark.asyncio
+    async def test_reply_to_activity_success_no_content(self, activity):
+        """Should return empty ResourceResponse when no content is returned."""
+
+        async def handler(request):
+            return web.Response(status=200, text="")
+
+        routes = [
+            web.post(
+                "/v3/conversations/{conversation_id}/activities/{activity_id}",
+                handler,
+            )
+        ]
+        app = _create_app(routes)
+
+        server = TestServer(app)
+        await server.start_server()
+        try:
+            async with ClientSession(base_url=server.make_url("/")) as session:
+                ops = ConversationsOperations(session)
+                result = await ops.reply_to_activity("conv-1", "act-1", activity)
+
+            assert isinstance(result, ResourceResponse)
+            assert result.id is None
+        finally:
+            await server.close()