Fix for Entity serialization

Author: axelsrz

libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py

@@ -18,9 +18,6 @@
     ConversationsResult,
     PagedMembersResult,
 )
-from microsoft.agents.authorization import (
-    AccessTokenProviderBase,
-)
 from microsoft.agents.connector import ConnectorClientBase
 from ..attachments_base import AttachmentsBase
 from ..conversations_base import ConversationsBase
@@ -179,15 +176,16 @@ 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 {}
+
             if response.status >= 400:
-                logger.error(f"Error replying to activity: {response.status}")
+                logger.error(f"Error replying to activity: {result or response.status}")
                 response.raise_for_status()
 
-            data = await response.json() if response.content_length else {}
             logger.info(
-                f"Reply to conversation/activity: {data.get('id')}, {activity_id}"
+                f"Reply to conversation/activity: {result.get('id')}, {activity_id}"
             )
-            return ResourceResponse.model_validate(data)
+            return ResourceResponse.model_validate(result)
 
     async def send_to_conversation(
         self, conversation_id: str, body: Activity

libraries/Core/microsoft-agents-core/microsoft/agents/core/models/entity.py

@@ -1,5 +1,8 @@
-from typing import Any
+from typing import Any, Optional
+
+from pydantic import model_serializer, model_validator
 from .agents_model import AgentsModel, ConfigDict
+from pydantic.alias_generators import to_camel, to_snake
 from ._type_aliases import NonEmptyString
 
 
@@ -18,3 +21,18 @@ class Entity(AgentsModel):
     def additional_properties(self) -> dict[str, Any]:
         """Returns the set of properties that are not None."""
         return self.model_extra
+
+    @model_validator(mode="before")
+    @classmethod
+    def to_snake_for_all(cls, data):
+        ret = {to_snake(k): v for k, v in data.items()}
+        return ret
+
+    @model_serializer(mode="plain")
+    def to_camel_for_all(self, config):
+        if config.by_alias:
+            new_data = {}
+            for k, v in self:
+                new_data[to_camel(k)] = v
+            return new_data
+        return {k: v for k, v in self}