microsoft-agents-activity 1.2.0.dev20__tar.gz → 1.4.0.dev10__tar.gz

{microsoft_agents_activity-1.2.0.dev20 → microsoft_agents_activity-1.4.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-activity
-Version: 1.2.0.dev20
+Version: 1.4.0.dev10
 Summary: A protocol library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -35,6 +35,24 @@ This library is part of the **Microsoft 365 Agents SDK for Python** - a comprehe
     <th style="width:20%">Date</th>
     <th style="width:60%">Release Notes</th>
   </tr>
+  <tr>
+    <td>1.3.0</td>
+    <td>2026-07-30</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v130">
+        1.3.0 Release Notes
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td>1.2.0</td>
+    <td>2026-07-17</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v120">
+        1.2.0 Release Notes
+      </a>
+    </td>
+  </tr>
   <tr>
     <td>1.1.0</td>
     <td>2026-06-19</td>
@@ -53,6 +71,15 @@ This library is part of the **Microsoft 365 Agents SDK for Python** - a comprehe
       </a>
     </td>
   </tr>
+  <tr>
+    <td>0.9.1</td>
+    <td>2026-05-04</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v091">
+        0.9.1 Release Notes
+      </a>
+    </td>
+  </tr>
   <tr>
     <td>0.9.0</td>
     <td>2026-04-15</td>
@@ -118,11 +145,14 @@ We offer the following PyPI packages to create conversational experiences based
 | `microsoft-agents-activity` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-activity)](https://pypi.org/project/microsoft-agents-activity/) | Types and validators implementing the Activity protocol spec. |
 | `microsoft-agents-hosting-core` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-core)](https://pypi.org/project/microsoft-agents-hosting-core/) | Core library for Microsoft Agents hosting. |
 | `microsoft-agents-hosting-aiohttp` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-aiohttp)](https://pypi.org/project/microsoft-agents-hosting-aiohttp/) | Configures aiohttp to run the Agent. |
-| `microsoft-agents-hosting-teams` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-teams)](https://pypi.org/project/microsoft-agents-hosting-teams/) | Provides classes to host an Agent for Teams. |
+| `microsoft-agents-hosting-fastapi` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-fastapi)](https://pypi.org/project/microsoft-agents-hosting-fastapi/) | Configures fastapi to run the Agent. |
+| `microsoft-agents-hosting-msteams` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-msteams)](https://pypi.org/project/microsoft-agents-hosting-msteams/) | Provides classes to host an Agent for Teams. |
 | `microsoft-agents-hosting-dialogs` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-dialogs)](https://pypi.org/project/microsoft-agents-hosting-dialogs/) | Dialog system with waterfall dialogs, prompts, and multi-turn conversation management. |
+| `microsoft-agents-hosting-slack` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-hosting-slack)](https://pypi.org/project/microsoft-agents-hosting-slack/) | Provides classes to host an Agent for Slack. |
 | `microsoft-agents-storage-blob` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-storage-blob)](https://pypi.org/project/microsoft-agents-storage-blob/) | Extension to use Azure Blob as storage. |
 | `microsoft-agents-storage-cosmos` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-storage-cosmos)](https://pypi.org/project/microsoft-agents-storage-cosmos/) | Extension to use CosmosDB as storage. |
 | `microsoft-agents-authentication-msal` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-authentication-msal)](https://pypi.org/project/microsoft-agents-authentication-msal/) | MSAL-based authentication for Microsoft Agents. |
+| `microsoft-agents-authentication-entra-auth-sidecar` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-authentication-entra-auth-sidecar)](https://pypi.org/project/microsoft-agents-authentication-entra-auth-sidecar/) | Credential-free Entra ID Agent ID authentication via the sidecar. | 
 
 Additionally we provide a Copilot Studio Client, to interact with Agents created in CopilotStudio:
 

microsoft_agents_activity-1.4.0.dev10/VERSION.txt

@@ -0,0 +1 @@
+1.4.0.dev10

{microsoft_agents_activity-1.2.0.dev20 → microsoft_agents_activity-1.4.0.dev10}/microsoft_agents/activity/__init__.py

@@ -6,6 +6,7 @@ from .action_types import ActionTypes
 from .activity import Activity
 from .activity_event_names import ActivityEventNames
 from .activity_types import ActivityTypes
+from .adaptive_card_card import AdaptiveCardCard
 from .adaptive_card_invoke_action import AdaptiveCardInvokeAction
 from .adaptive_card_invoke_response import AdaptiveCardInvokeResponse
 from .adaptive_card_invoke_value import AdaptiveCardInvokeValue
@@ -16,11 +17,11 @@ from .attachment_info import AttachmentInfo
 from .attachment_view import AttachmentView
 from .audio_card import AudioCard
 from .basic_card import BasicCard
+from .card import Card
 from .card_action import CardAction
 from .card_image import CardImage
 from .channels import Channels
 from .channel_account import ChannelAccount
-from ._channel_id_field_mixin import _ChannelIdFieldMixin
 from .channel_id import ChannelId
 from .conversation_account import ConversationAccount
 from .conversation_members import ConversationMembers
@@ -28,6 +29,7 @@ from .conversation_parameters import ConversationParameters
 from .conversation_reference import ConversationReference
 from .conversation_resource_response import ConversationResourceResponse
 from .conversations_result import ConversationsResult
+from .content_types import ContentTypes
 from .expected_replies import ExpectedReplies
 from .entity import (
     Entity,
@@ -45,6 +47,8 @@ from .entity import (
     ProductInfo,
     Thing,
     StreamInfo,
+    ActivityTreatment,
+    ActivityTreatmentTypes,
 )
 from .error import Error
 from .error_response import ErrorResponse
@@ -69,6 +73,7 @@ from .thumbnail_card import ThumbnailCard
 from .thumbnail_url import ThumbnailUrl
 from .token_exchange_invoke_request import TokenExchangeInvokeRequest
 from .token_exchange_invoke_response import TokenExchangeInvokeResponse
+from .token_exchange_request import TokenExchangeRequest
 from .token_exchange_state import TokenExchangeState
 from .token_or_sign_in_resource_response import TokenOrSignInResourceResponse
 from .token_request import TokenRequest
@@ -94,7 +99,6 @@ from .sign_in_resource import SignInResource
 from .token_exchange_resource import TokenExchangeResource
 from .token_post_resource import TokenPostResource
 
-from .delivery_modes import DeliveryModes
 from .caller_id_constants import CallerIdConstants
 
 from .conversation_update_types import ConversationUpdateTypes
@@ -109,6 +113,7 @@ __all__ = [
     "Activity",
     "ActionTypes",
     "ActivityEventNames",
+    "AdaptiveCardCard",
     "AdaptiveCardInvokeAction",
     "AdaptiveCardInvokeResponse",
     "AdaptiveCardInvokeValue",
@@ -119,18 +124,19 @@ __all__ = [
     "AttachmentView",
     "AudioCard",
     "BasicCard",
+    "Card",
     "CardAction",
     "CardImage",
     "Channels",
     "ChannelAccount",
     "ChannelId",
-    "_ChannelIdFieldMixin",
     "ConversationAccount",
     "ConversationMembers",
     "ConversationParameters",
     "ConversationReference",
     "ConversationResourceResponse",
     "ConversationsResult",
+    "ContentTypes",
     "ExpectedReplies",
     "Entity",
     "AIEntity",
@@ -170,6 +176,7 @@ __all__ = [
     "ThumbnailUrl",
     "TokenExchangeInvokeRequest",
     "TokenExchangeInvokeResponse",
+    "TokenExchangeRequest",
     "TokenExchangeState",
     "TokenRequest",
     "TokenResponse",
@@ -199,5 +206,7 @@ __all__ = [
     "load_configuration_from_env",
     "ChannelAdapterProtocol",
     "TurnContextProtocol",
+    "ActivityTreatment",
+    "ActivityTreatmentTypes",
     "TokenOrSignInResourceResponse",
 ]

{microsoft_agents_activity-1.2.0.dev20 → microsoft_agents_activity-1.4.0.dev10}/microsoft_agents/activity/_model_utils.py

@@ -2,10 +2,12 @@
 # Licensed under the MIT License.
 
 from abc import ABC
-from typing import Any, Callable
+from typing import Any, Callable, TypeVar
 
 from .agents_model import AgentsModel
 
+AgentsModelT = TypeVar("AgentsModelT", bound=AgentsModel)
+
 
 class ModelFieldHelper(ABC):
     """Base class for model field processing prior to initialization of an AgentsModel"""
@@ -55,7 +57,7 @@ def pick_model_dict(**kwargs):
     return model_dict
 
 
-def pick_model(model_class: type[AgentsModel], **kwargs) -> AgentsModel:
+def pick_model(model_class: type[AgentsModelT], **kwargs) -> AgentsModelT:
     """Picks model fields from the given keyword arguments.
 
     Usage:

{microsoft_agents_activity-1.2.0.dev20 → microsoft_agents_activity-1.4.0.dev10}/microsoft_agents/activity/activity.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import logging
+import re
 from copy import copy
 from datetime import datetime, timezone
 from typing import Optional, Any, cast, Annotated, TypeVar
@@ -16,7 +17,6 @@ from pydantic import (
     model_validator,
     SerializerFunctionWrapHandler,
     ModelWrapValidatorHandler,
-    computed_field,
     ValidationError,
 )
 
@@ -31,6 +31,8 @@ from .entity import (
     Entity,
     EntityTypes,
     Mention,
+    ActivityTreatment,
+    ActivityTreatmentTypes,
     AIEntity,
     ClientCitation,
     ProductInfo,
@@ -41,7 +43,6 @@ from .text_highlight import TextHighlight
 from .semantic_action import SemanticAction
 from .agents_model import AgentsModel
 from .role_types import RoleTypes
-from ._channel_id_field_mixin import _ChannelIdFieldMixin
 from .channel_id import ChannelId
 from ._model_utils import pick_model, SkipNone
 from ._type_aliases import NonEmptyString
@@ -53,7 +54,7 @@ _EntityT = TypeVar("_EntityT", bound=Entity)
 
 
 # TODO: A2A Agent 2 is responding with None as id, had to mark it as optional (investigate)
-class Activity(AgentsModel, _ChannelIdFieldMixin):
+class Activity(AgentsModel):
     """An Activity is the basic communication type for the protocol.
 
     :param type: Contains the activity type. Possible values include:
@@ -155,6 +156,7 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
     """
 
     type: NonEmptyString
+    channel_id: Optional[ChannelId] = None
     id: Optional[NonEmptyString] = None
     timestamp: datetime = None
     local_timestamp: datetime = None
@@ -211,10 +213,6 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
             # run Pydantic's standard validation first
             activity = handler(data)
 
-            # needed to assign to a computed field
-            # needed because we override the mixin validator
-            activity._set_validated_channel_id(data)
-
             # sync sub_channel with productInfo entity
             product_info = activity.get_product_info_entity()
             if product_info and activity.channel_id:
@@ -280,9 +278,6 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
             if not serialized["entities"]:  # after removal above, list may be empty
                 del serialized["entities"]
 
-        # necessary due to computed_field serialization
-        self._remove_serialized_unset_channel_id(serialized)
-
         return serialized
 
     def apply_conversation_reference(
@@ -437,6 +432,377 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         """
         return self if self.__is_activity(ActivityTypes.typing) else None
 
+    def with_text(self, text: str) -> Self:
+        """
+        Sets the text content of the activity.
+
+        :param text: The text content of the message.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.text = text
+        return self
+
+    def with_speak(self, speak: str) -> Self:
+        """
+        Sets the text to speak for the activity.
+
+        :param speak: The text to speak.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.speak = speak
+        return self
+
+    def with_input_hint(self, input_hint: str) -> Self:
+        """
+        Sets the input hint for the activity.
+
+        :param input_hint: Indicates whether the agent is accepting, expecting, or ignoring user input.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.input_hint = input_hint
+        return self
+
+    def with_summary(self, summary: str) -> Self:
+        """
+        Sets the summary of the activity.
+
+        :param summary: The text to display if the channel cannot render cards.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.summary = summary
+        return self
+
+    def with_locale(self, locale: str) -> Self:
+        """
+        Sets the locale of the activity.
+
+        :param locale: A locale name for the contents of the text field.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.locale = locale
+        return self
+
+    def with_text_format(self, text_format: str) -> Self:
+        """
+        Sets the text format of the activity.
+
+        :param text_format: Format of the text fields. Possible values include: 'markdown', 'plain', 'xml'.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.text_format = text_format
+        return self
+
+    def with_attachment_layout(self, attachment_layout: str) -> Self:
+        """
+        Sets the attachment layout hint for the activity.
+
+        :param attachment_layout: The layout hint for multiple attachments. Possible values include: 'list', 'carousel'.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.attachment_layout = attachment_layout
+        return self
+
+    def with_delivery_mode(self, delivery_mode: str) -> Self:
+        """
+        Sets the delivery mode of the activity.
+
+        :param delivery_mode: The delivery mode for the activity.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.delivery_mode = delivery_mode
+        return self
+
+    def with_name(self, name: str) -> Self:
+        """
+        Sets the name of the activity.
+
+        :param name: The name of the operation associated with an invoke or event activity.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.name = name
+        return self
+
+    def with_value(self, value: object, value_type: str | None = None) -> Self:
+        """
+        Sets the value of the activity, and optionally its value type.
+
+        :param value: A value that is associated with the activity.
+        :param value_type: The type of the activity's value object. Only set when provided.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.value = value
+        if value_type is not None:
+            self.value_type = value_type
+        return self
+
+    def with_suggested_actions(self, suggested_actions: SuggestedActions) -> Self:
+        """
+        Sets the suggested actions for the activity.
+
+        :param suggested_actions: The suggested actions for the activity.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.suggested_actions = suggested_actions
+        return self
+
+    def add_text(self, text: str) -> Self:
+        """
+        Appends text to the existing text content of the activity.
+
+        :param text: The text to append to the activity's text.
+        :returns: This activity, to allow for method chaining.
+        """
+        self.text = (self.text or "") + text
+        return self
+
+    def add_attachment(self, *attachments: Attachment) -> Self:
+        """
+        Adds one or more attachments to the activity.
+
+        :param attachments: The attachments to add to the activity.
+        :returns: This activity, to allow for method chaining.
+        """
+        if not attachments:
+            return self
+
+        self.attachments = self.attachments or []
+        self.attachments.extend(attachments)
+        return self
+
+    def add_entity(self, *entities: Entity) -> Self:
+        """
+        Adds one or more entities to the activity.
+
+        :param entities: The entities to add to the activity.
+        :returns: This activity, to allow for method chaining.
+        """
+        if not entities:
+            return self
+
+        self.entities = self.entities or []
+        self.entities.extend(entities)
+        return self
+
+    def add_mention(
+        self,
+        account: ChannelAccount,
+        text: NonEmptyString | None = None,
+        add_text: bool = True,
+    ) -> Self:
+        """
+        Adds a mention of the given account to the activity.
+
+        :param account: The account to mention.
+        :param text: The text of the mention. Defaults to the account's name.
+        :param add_text: Whether to prepend the mention markup to the activity's text.
+        :returns: This activity, to allow for method chaining.
+        """
+        mention_text = text if text is not None else (account.name if account else None)
+        if mention_text is None:
+            logger.warning("Adding a mention with no text or account name.")
+
+        markup = f"<at>{mention_text}</at>"
+
+        if add_text:
+            self.text = markup if not self.text else f"{markup} {self.text}"
+
+        return self.add_entity(Mention(mentioned=account, text=markup))
+
+    def get_account_mention(self, account_id: NonEmptyString) -> Optional[Mention]:
+        """
+        Resolves the mention for the given account id, if any.
+
+        :param account_id: The id of the account to find a mention for.
+        :returns: The matching mention; or None, if none is found.
+        """
+        if not self.entities or account_id is None:
+            return None
+
+        for mention in self.get_mentions():
+            if mention.mentioned and mention.mentioned.id == account_id:
+                return mention
+
+        return None
+
+    def is_recipient_mentioned(self) -> bool:
+        """
+        Indicates whether the recipient of this activity was mentioned.
+
+        :returns: True if the recipient was mentioned; otherwise, False.
+        """
+        return (
+            self.recipient is not None
+            and self.recipient.id is not None
+            and self.get_account_mention(self.recipient.id) is not None
+        )
+
+    def remove_recipient_mention(self) -> str:
+        """
+        Removes the recipient's mention text from the activity's text.
+
+        :returns: The updated activity text.
+
+        .. remarks::
+            This method is defined on the :class:`microsoft_agents.activity.Activity` class, but is only intended for
+            use with a message activity, where the activity Activity.Type is set to ActivityTypes.Message.
+        """
+        return self.remove_mention_text(self.recipient.id if self.recipient else None)
+
+    def remove_mention_text(self, identifier: NonEmptyString | None) -> str:
+        """
+        Removes the mention text for the given account id from the activity's text.
+
+        For example, given the message `<at>echoAgent</at> Hi Agent`, this removes
+        `<at>echoAgent</at>`, leaving `Hi Agent`.
+
+        :param identifier: The id of the account whose mention text should be removed.
+        :returns: The updated activity text.
+
+        .. remarks::
+            The format of a mention entity is dependent on the channel, but in all cases
+            the Mention.text is expected to contain the exact text for the user as it
+            appears in Activity.text.
+        """
+        if not identifier:
+            return self.text
+
+        for mention in self.get_mentions():
+            if not mention.mentioned or mention.mentioned.id != identifier:
+                continue
+
+            if mention.text is None:
+                pattern = f"<at>{re.escape(mention.mentioned.name)}</at>"
+            else:
+                pattern = re.escape(mention.text)
+
+            self.text = re.sub(
+                pattern, "", self.text or "", flags=re.IGNORECASE
+            ).strip()
+
+        return self.text
+
+    def is_targeted_activity(self) -> bool:
+        """
+        Indicates whether this activity is targeted.
+
+        :returns: True if this activity carries a targeted treatment; otherwise, False.
+        """
+        if not self.entities:
+            return False
+
+        for entity in self.entities:
+            if (
+                entity.type == EntityTypes.ACTIVITY_TREATMENT
+                and isinstance(entity, ActivityTreatment)
+                and entity.treatment == ActivityTreatmentTypes.TARGETED
+            ):
+                return True
+
+        return False
+
+    def make_targeted_activity(self, user: ChannelAccount | None = None) -> Self:
+        """
+        Marks this activity as targeted, setting the recipient if provided.
+
+        :param user: The account to target. Defaults to the current recipient.
+        :returns: This activity, to allow for method chaining.
+        :raises ValueError: If both the activity's recipient and the user argument are None.
+        """
+        if self.is_targeted_activity():
+            return self
+
+        if self.recipient is None and user is None:
+            raise ValueError(str(activity_errors.InvalidTargetedActivityRecipient))
+
+        self.entities = self.entities or []
+        self.entities.append(
+            ActivityTreatment(treatment=ActivityTreatmentTypes.TARGETED)
+        )
+
+        self.recipient = user if user is not None else self.recipient
+
+        return self
+
+    def is_message(self) -> bool:
+        """
+        Indicates whether this activity is a message activity.
+
+        :return: True if this activity is a message activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.message)
+
+    def is_event(self) -> bool:
+        """
+        Indicates whether this activity is an event activity.
+
+        :return: True if this activity is an event activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.event)
+
+    def is_invoke(self) -> bool:
+        """
+        Indicates whether this activity is an invoke activity.
+
+        :return: True if this activity is an invoke activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.invoke)
+
+    def is_typing(self) -> bool:
+        """
+        Indicates whether this activity is a typing activity.
+
+        :return: True if this activity is a typing activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.typing)
+
+    def is_conversation_update(self) -> bool:
+        """
+        Indicates whether this activity is a conversation update activity.
+
+        :return: True if this activity is a conversation update activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.conversation_update)
+
+    def is_end_of_conversation(self) -> bool:
+        """
+        Indicates whether this activity is an end of conversation activity.
+
+        :return: True if this activity is an end of conversation activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.end_of_conversation)
+
+    def is_handoff(self) -> bool:
+        """
+        Indicates whether this activity is a handoff activity.
+
+        :return: True if this activity is a handoff activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.handoff)
+
+    def is_trace(self) -> bool:
+        """
+        Indicates whether this activity is a trace activity.
+
+        :return: True if this activity is a trace activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.trace)
+
+    def is_command(self) -> bool:
+        """
+        Indicates whether this activity is a command activity.
+
+        :return: True if this activity is a command activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.command)
+
+    def is_command_result(self) -> bool:
+        """
+        Indicates whether this activity is a command result activity.
+
+        :return: True if this activity is a command result activity; otherwise, False.
+        """
+        return self.__is_activity(ActivityTypes.command_result)
+
     @staticmethod
     def create_contact_relation_update_activity():
         """
@@ -500,7 +866,9 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         """
         return Activity(type=ActivityTypes.message)
 
-    def create_reply(self, text: str | None = None, locale: str | None = None):
+    def create_reply(
+        self, text: str | None = None, locale: str | None = None
+    ) -> Activity:
         """
         Creates a new message activity as a response to this activity.
 
@@ -629,7 +997,7 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         )
 
     @staticmethod
-    def create_typing_activity() -> "Activity":
+    def create_typing_activity() -> Activity:
         """
         Creates an instance of the :class:`microsoft_agents.activity.Activity` class as a TypingActivity object.
 
@@ -662,8 +1030,8 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
                 agent=copy(self.recipient),
                 conversation=copy(self.conversation),
                 channel_id=(
-                    self.channel_id.split(":", 1)[0]
-                    if force_base_channel and self.channel_id is not None
+                    ChannelId.get_channel(self.channel_id)
+                    if force_base_channel
                     else self.channel_id
                 ),
                 locale=self.locale,
@@ -721,13 +1089,13 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         :returns: The array of mentions; or an empty array, if none are found.
 
         .. remarks::
-            This method is defined on the :class:`microsoft_agents.activity.Activity` class, but is only intended for use with a message activity,
-            where the activity Activity.Type is set to ActivityTypes.Message.
+            This method is defined on the :class:`microsoft_agents.activity.Activity` class, but is only intended for use with
+            a message activity, where the activity Activity.Type is set to ActivityTypes.Message.
         """
         if not self.entities:
             return []
         raw_mentions = [
-            x for x in self.entities if x.type.lower() == EntityTypes.MENTION
+            x for x in self.entities if x.type.lower() == EntityTypes.MENTION.value
         ]
 
         return Activity._convert_entity_list(raw_mentions, Mention)
@@ -736,7 +1104,8 @@ class Activity(AgentsModel, _ChannelIdFieldMixin):
         self, reply: ResourceResponse
     ) -> ConversationReference:
         """
-        Create a ConversationReference based on this Activity's Conversation info and the ResourceResponse from sending an activity.
+        Create a ConversationReference based on this Activity's Conversation info and the ResourceResponse from sending an
+        activity.
 
         :param reply: ResourceResponse returned from send_activity.