microsoft-agents-activity 1.7.0.dev6__tar.gz → 1.7.0.dev9__tar.gz

{microsoft_agents_activity-1.7.0.dev6/microsoft_agents_activity.egg-info → microsoft_agents_activity-1.7.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-activity
-Version: 1.7.0.dev6
+Version: 1.7.0.dev9
 Summary: A protocol library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT

microsoft_agents_activity-1.7.0.dev9/VERSION.txt

@@ -0,0 +1 @@
+1.7.0.dev9

{microsoft_agents_activity-1.7.0.dev6 → microsoft_agents_activity-1.7.0.dev9}/microsoft_agents/activity/attachment.py

@@ -21,7 +21,7 @@ class Attachment(AgentsModel):
     """
 
     content_type: NonEmptyString
-    content_url: NonEmptyString = None
+    content_url: NonEmptyString | None = None
     content: object = None
-    name: NonEmptyString = None
+    name: NonEmptyString | None = None
     thumbnail_url: NonEmptyString = None

{microsoft_agents_activity-1.7.0.dev6 → microsoft_agents_activity-1.7.0.dev9}/microsoft_agents/activity/channels.py

@@ -79,6 +79,9 @@ class Channels(str, Enum):
     copilot_studio = "pva-studio"
     """Microsoft Copilot Studio channel."""
 
+    m365_copilot = f"msteams:COPILOT"
+    """Microsoft 365 Copilot channel."""
+
     ms_teams = "msteams"
     """Deprecated alias for :attr:`msteams`. Kept for backwards compatibility."""
 

microsoft_agents_activity-1.7.0.dev9/microsoft_agents/activity/entity/_schema_mixin.py

@@ -0,0 +1,96 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from typing import Any
+from pydantic import (
+    model_serializer,
+    model_validator,
+    ModelWrapValidatorHandler,
+    SerializerFunctionWrapHandler,
+    SerializationInfo,
+    BaseModel,
+)
+
+
+def validate_schema_model(
+    data: Any,
+    handler: ModelWrapValidatorHandler,
+    model_type: type[BaseModel],
+):
+    """Custom validator to handle the aliases @type, @context, and @id if defined in the destination type."""
+    if isinstance(data, dict):
+        normalized_data = dict(data)
+        extra_schema_fields = {}
+        allows_extra = model_type.model_config.get("extra") == "allow"
+
+        for model_field, input_field in [
+            ("at_type", "@type"),
+            ("at_context", "@context"),
+            ("at_id", "@id"),
+        ]:
+            if input_field not in data:
+                continue
+
+            field = model_type.model_fields.get(model_field)
+            if field is not None:
+                normalized_data.pop(input_field, None)
+                normalized_data[model_field] = data[input_field]
+            elif allows_extra:
+                extra_schema_fields[model_field] = data[input_field]
+
+        model = handler(normalized_data)
+        for model_field, value in extra_schema_fields.items():
+            setattr(model, model_field, value)
+        return model
+
+    model = handler(data)
+    return model
+
+
+def _serialize_at_field(
+    model: BaseModel,
+    serialized: dict[str, Any],
+    model_field_name: str,
+    output_field_name: str,
+) -> None:
+    """Serialize a non-None schema field using its @-prefixed name."""
+    field = type(model).model_fields.get(model_field_name)
+    if field is None:
+        return
+
+    alias = field.serialization_alias or field.alias or model_field_name
+    serialized.pop(alias, None)
+
+    value = getattr(model, model_field_name)
+    if value is not None:
+        serialized[output_field_name] = value
+
+
+def serialize_schema_model(
+    self, handler: SerializerFunctionWrapHandler, info: SerializationInfo
+) -> dict[str, Any]:
+    """Custom serializer to convert keys to force inclusion of @type, @context, and @id if defined."""
+    serialized = handler(self)
+    if info.by_alias:
+        for model_field, out_field in [
+            ("at_type", "@type"),
+            ("at_context", "@context"),
+            ("at_id", "@id"),
+        ]:
+            _serialize_at_field(self, serialized, model_field, out_field)
+    return serialized
+
+
+class _SchemaMixin(BaseModel):
+    """Mixin class to force inclusion of @property fields when serializing."""
+
+    @model_validator(mode="wrap")
+    @classmethod
+    def _validate_model(cls, data: Any, handler: ModelWrapValidatorHandler):
+        return validate_schema_model(data, handler, cls)
+
+    @model_serializer(mode="wrap")
+    def _serialize_model(
+        self, handler: SerializerFunctionWrapHandler, info: SerializationInfo
+    ) -> dict[str, Any]:
+        return serialize_schema_model(self, handler, info)

{microsoft_agents_activity-1.7.0.dev6 → microsoft_agents_activity-1.7.0.dev9}/microsoft_agents/activity/entity/ai_entity.py

@@ -96,6 +96,7 @@ class ClientCitation(AgentsModel, _SchemaMixin):
     """
 
     at_type: Literal["Claim"] = "Claim"
+    at_id: str | None = None
 
     position: int = 0
     appearance: ClientCitationAppearance = Field(

{microsoft_agents_activity-1.7.0.dev6 → microsoft_agents_activity-1.7.0.dev9}/microsoft_agents/activity/entity/entity.py

@@ -51,8 +51,8 @@ class Entity(AgentsModel):
 
         if isinstance(data, dict):
             new_data = {to_snake(k): v for k, v in data.items()}
-            return validate_schema_model(new_data, handler)
-        return validate_schema_model(data, handler)
+            return validate_schema_model(new_data, handler, cls)
+        return validate_schema_model(data, handler, cls)
 
     @model_serializer(mode="wrap")
     def _serialize_model(

{microsoft_agents_activity-1.7.0.dev6 → microsoft_agents_activity-1.7.0.dev9/microsoft_agents_activity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-activity
-Version: 1.7.0.dev6
+Version: 1.7.0.dev9
 Summary: A protocol library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT

microsoft_agents_activity-1.7.0.dev6/VERSION.txt

@@ -1 +0,0 @@
-1.7.0.dev6

microsoft_agents_activity-1.7.0.dev6/microsoft_agents/activity/entity/_schema_mixin.py

@@ -1,55 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-from typing import Any
-from pydantic import (
-    model_serializer,
-    model_validator,
-    ModelWrapValidatorHandler,
-    SerializerFunctionWrapHandler,
-    SerializationInfo,
-    BaseModel,
-)
-
-
-def validate_schema_model(data: Any, handler: ModelWrapValidatorHandler):
-    """Custom validator to handle the aliases @type, @context, and @id if defined in the destination type."""
-    model = handler(data)
-    if isinstance(data, dict):
-        if "@type" in data:
-            setattr(model, "at_type", data["@type"])
-        if "@context" in data:
-            setattr(model, "at_context", data["@context"])
-        if "@id" in data:
-            setattr(model, "at_id", data["@id"])
-    return model
-
-
-def serialize_schema_model(
-    self, handler: SerializerFunctionWrapHandler, info: SerializationInfo
-) -> dict[str, Any]:
-    """Custom serializer to convert keys to force inclusion of @type, @context, and @id if defined."""
-    serialized = handler(self)
-    if info.by_alias:
-        if hasattr(self, "at_type"):
-            serialized["@type"] = getattr(self, "at_type")
-        if hasattr(self, "at_context"):
-            serialized["@context"] = getattr(self, "at_context")
-        if hasattr(self, "at_id"):
-            serialized["@id"] = getattr(self, "at_id")
-    return serialized
-
-
-class _SchemaMixin(BaseModel):
-    """Mixin class to force inclusion of @property fields when serializing."""
-
-    @model_validator(mode="wrap")
-    @classmethod
-    def _validate_model(cls, data: Any, handler: ModelWrapValidatorHandler):
-        return validate_schema_model(data, handler)
-
-    @model_serializer(mode="wrap")
-    def _serialize_model(
-        self, handler: SerializerFunctionWrapHandler, info: SerializationInfo
-    ) -> dict[str, Any]:
-        return serialize_schema_model(self, handler, info)