microsoft-agents-activity 1.2.0.dev9__tar.gz → 1.2.0.dev16__tar.gz

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/PKG-INFO

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

microsoft_agents_activity-1.2.0.dev16/VERSION.txt

@@ -0,0 +1 @@
+1.2.0.dev16

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/microsoft_agents/activity/activity.py

@@ -793,21 +793,14 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         if self.type is None:
             return False
 
-        type_attribute = f"ActivityTypes.{str(self.type)}".lower()
-        activity_type = str(activity_type).lower()
+        type_value = str(getattr(self.type, "value", self.type)).lower()
+        activity_type_value = str(
+            getattr(activity_type, "value", activity_type)
+        ).lower()
 
-        result = type_attribute.startswith(activity_type)
-
-        if result:
-            result = len(type_attribute) == len(activity_type)
-
-            if not result:
-                result = (
-                    len(type_attribute) > len(activity_type)
-                    and type_attribute[len(activity_type)] == "/"
-                )
-
-        return result
+        return type_value == activity_type_value or type_value.startswith(
+            f"{activity_type_value}/"
+        )
 
     def add_ai_metadata(
         self,

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/microsoft_agents/activity/conversation_reference.py

@@ -4,22 +4,18 @@
 from __future__ import annotations
 
 from uuid import uuid4 as uuid
-from typing import Optional
-import logging
+from typing import Optional, Annotated
 
 from pydantic import Field
 
 from .channel_account import ChannelAccount
 from ._channel_id_field_mixin import _ChannelIdFieldMixin
-from .channel_id import ChannelId
 from .conversation_account import ConversationAccount
 from .agents_model import AgentsModel
 from ._type_aliases import NonEmptyString
 from .activity_types import ActivityTypes
 from .activity_event_names import ActivityEventNames
 
-logger = logging.getLogger(__name__)
-
 
 class ConversationReference(AgentsModel, _ChannelIdFieldMixin):
     """An object relating to a particular point in a conversation.
@@ -48,7 +44,7 @@ class ConversationReference(AgentsModel, _ChannelIdFieldMixin):
     # optionals here are due to webchat
     activity_id: Optional[NonEmptyString] = None
     user: Optional[ChannelAccount] = None
-    agent: ChannelAccount = Field(None, alias="bot")
+    agent: Annotated[ChannelAccount, Field(alias="bot")] = None
     conversation: ConversationAccount
     locale: Optional[NonEmptyString] = None
     service_url: NonEmptyString = None

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/microsoft_agents/activity/teams/teams_channel_account.py

@@ -11,6 +11,10 @@ class TeamsChannelAccount(AgentsModel):
 
     :param id: Channel id for the user or bot on this channel (Example: ``joe@smith.com``, or ``@joesmith`` or ``123456``)
     :type id: str
+    :param aad_object_id: Azure Active Directory object id for the user.
+    :type aad_object_id: str
+    :param role: Role of the user in the channel.
+    :type role: str
     :param name: Display friendly name
     :type name: str
     :param given_name: Given name part of the user name.
@@ -30,6 +34,8 @@ class TeamsChannelAccount(AgentsModel):
     model_config = ConfigDict(extra="allow")
 
     id: str = None
+    aad_object_id: str = None
+    role: str = None
     name: str = None
     given_name: str = None
     surname: str = None

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/microsoft_agents/activity/token_exchange_state.py

@@ -3,7 +3,7 @@
 
 import base64
 import json
-from typing import Optional
+from typing import Optional, Annotated
 from pydantic import Field
 
 from .conversation_reference import ConversationReference
@@ -29,7 +29,7 @@ class TokenExchangeState(AgentsModel):
     connection_name: NonEmptyString = None
     conversation: ConversationReference = None
     relates_to: Optional[ConversationReference] = None
-    agent_url: NonEmptyString = Field(None, alias="bot_url")
+    agent_url: Annotated[NonEmptyString, Field(alias="bot_url")] = None
     ms_app_id: NonEmptyString = None
 
     def get_encoded_state(self) -> str:

{microsoft_agents_activity-1.2.0.dev9 → microsoft_agents_activity-1.2.0.dev16}/microsoft_agents_activity.egg-info/PKG-INFO

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

microsoft_agents_activity-1.2.0.dev9/VERSION.txt

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