Users/axsuarez/cherrypick proactive and docs

libraries/microsoft-agents-activity/microsoft_agents/activity/channel_account.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from typing import Any
+from typing import Any, Optional
 
 from pydantic import ConfigDict
 from .agents_model import AgentsModel
@@ -12,7 +12,7 @@ class ChannelAccount(AgentsModel):
     """Channel account information needed to route a message.
 
     :param id: Channel id for the user or agent on this channel (Example:
-     joe@smith.com, or @joesmith or 123456)
+     ``joe@smith.com``, or ``@joesmith`` or ``123456``)
     :type id: str
     :param name: Display friendly name
     :type name: str
@@ -27,11 +27,11 @@ class ChannelAccount(AgentsModel):
 
     id: NonEmptyString = None
     name: str = None
-    aad_object_id: NonEmptyString = None
-    role: NonEmptyString = None
-    agentic_user_id: NonEmptyString = None
-    agentic_app_id: NonEmptyString = None
-    tenant_id: NonEmptyString = None
+    aad_object_id: Optional[NonEmptyString] = None
+    role: Optional[NonEmptyString] = None
+    agentic_user_id: Optional[NonEmptyString] = None
+    agentic_app_id: Optional[NonEmptyString] = None
+    tenant_id: Optional[NonEmptyString] = None
 
     @property
     def properties(self) -> dict[str, Any]:

libraries/microsoft-agents-activity/microsoft_agents/activity/conversation_account.py

@@ -16,7 +16,7 @@ class ConversationAccount(AgentsModel):
      channels that distinguish between conversation types
     :type conversation_type: str
     :param id: Channel id for the user or agent on this channel (Example:
-     joe@smith.com, or @joesmith or 123456)
+     ``joe@smith.com``, or ``@joesmith`` or ``123456``)
     :type id: str
     :param name: Display friendly name
     :type name: str
@@ -31,11 +31,11 @@ class ConversationAccount(AgentsModel):
     :type properties: object
     """
 
-    is_group: bool = None
+    is_group: Optional[bool] = None
     conversation_type: NonEmptyString = None
     id: NonEmptyString
-    name: NonEmptyString = None
-    aad_object_id: NonEmptyString = None
-    role: NonEmptyString = None
+    name: Optional[NonEmptyString] = None
+    aad_object_id: Optional[NonEmptyString] = None
+    role: Optional[NonEmptyString] = None
     tenant_id: Optional[NonEmptyString] = None
     properties: object = None

libraries/microsoft-agents-activity/microsoft_agents/activity/teams/teams_channel_account.py

@@ -9,7 +9,7 @@
 class TeamsChannelAccount(AgentsModel):
     """Teams channel account detailing user Azure Active Directory details.
 
-    :param id: Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or 123456)
+    :param id: Channel id for the user or bot on this channel (Example: ``joe@smith.com``, or ``@joesmith`` or ``123456``)
     :type id: str
     :param name: Display friendly name
     :type name: str

libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/msal_auth.py

@@ -58,7 +58,7 @@ def __init__(self, msal_configuration: AgentAuthConfiguration):
 
         :param msal_configuration: The MSAL authentication configuration. Assumed to
             not be mutated after being passed in.
-        :type msal_configuration: AgentAuthConfiguration
+        :type msal_configuration: :class:`microsoft_agents.hosting.core.authorization.agent_auth_configuration.AgentAuthConfiguration`
         """
 
         self._msal_configuration = msal_configuration

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/activity_handler.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 from http import HTTPStatus
+from typing import Awaitable
 from pydantic import BaseModel
 
 from microsoft_agents.activity import TurnContextProtocol
@@ -24,25 +25,26 @@ class ActivityHandler(Agent):
     """
     Handles activities and should be subclassed.
 
-    .. remarks::
+    .. note::
         Derive from this class to handle particular activity types.
-        Yon can add pre and post processing of activities by calling the base class
+        You can add pre and post processing of activities by calling the base class
         in the derived class.
     """
 
     async def on_turn(
         self, turn_context: TurnContextProtocol
     ):  # pylint: disable=arguments-differ
         """
-        Called by the adapter (for example, :class:`ChannelAdapter`) at runtime
+        Called by the adapter (for example, :class:`microsoft_agents.hosting.core.channel_adapter.ChannelAdapter`) at runtime
         in order to process an inbound :class:`microsoft_agents.activity.Activity`.
 
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
 
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             It calls other methods in this class based on the type of the activity to
             process, which allows a derived class to provide type-specific logic in a controlled way.
             In a derived class, override this method to add logic that applies to all activity types.
@@ -108,6 +110,7 @@ async def on_message_activity(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -121,6 +124,7 @@ async def on_message_update_activity(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -134,6 +138,7 @@ async def on_message_delete_activity(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -145,17 +150,18 @@ async def on_conversation_update_activity(self, turn_context: TurnContextProtoco
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_turn()` method receives a conversation update activity, it calls this
             method.
             Also
             - If the conversation update activity indicates that members other than the agent joined the conversation,
-            it calls the  :meth:`on_members_added_activity()` method.
+              it calls the :meth:`on_members_added_activity()` method.
             - If the conversation update activity indicates that members other than the agent left the conversation,
-            it calls the  :meth:`on_members_removed_activity()`  method.
+              it calls the :meth:`on_members_removed_activity()` method.
             - In a derived class, override this method to add logic that applies to all conversation update activities.
-            Add logic to apply before the member added or removed logic before the call to this base class method.
+              Add logic to apply before the member added or removed logic before the call to this base class method.
         """
         # TODO: confirm behavior of added and removed at the same time as C# doesn't support it
         if turn_context.activity.members_added:
@@ -175,13 +181,14 @@ async def on_members_added_activity(
         the conversation. You can add your agent's welcome logic.
 
         :param members_added: A list of all the members added to the conversation, as described by the
-        conversation update activity
+            conversation update activity
         :type members_added: list[:class:`microsoft_agents.activity.ChannelAccount`]
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_conversation_update_activity()` method receives a conversation
             update activity that indicates
             one or more users other than the agent are joining the conversation, it calls this method.
@@ -196,13 +203,14 @@ async def on_members_removed_activity(
         the conversation.  You can add your agent's good-bye logic.
 
         :param members_removed: A list of all the members removed from the conversation, as described by the
-        conversation update activity
+            conversation update activity
         :type members_removed: list[:class:`microsoft_agents.activity.ChannelAccount`]
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_conversation_update_activity()` method receives a conversation
             update activity that indicates one or more users other than the agent are leaving the conversation,
             it calls this method.
@@ -219,8 +227,9 @@ async def on_message_reaction_activity(self, turn_context: TurnContextProtocol):
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
 
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             Message reactions correspond to the user adding a 'like' or 'sad' etc. (often an emoji) to a previously
             sent activity.
 
@@ -231,9 +240,9 @@ async def on_message_reaction_activity(self, turn_context: TurnContextProtocol):
             method.
 
             - If the message reaction indicates that reactions were added to a message, it calls
-            :meth:`on_reaction_added()`.
+              :meth:`on_reactions_added()`.
             - If the message reaction indicates that reactions were removed from a message, it calls
-            :meth:`on_reaction_removed()`.
+              :meth:`on_reactions_removed()`.
 
             In a derived class, override this method to add logic that applies to all message reaction activities.
             Add logic to apply before the reactions added or removed logic before the call to the this base class
@@ -264,8 +273,9 @@ async def on_reactions_added(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             Message reactions correspond to the user adding a 'like' or 'sad' etc. (often an emoji)
             to a previously sent message on the conversation.
             Message reactions are supported by only a few channels.
@@ -290,8 +300,9 @@ async def on_reactions_removed(  # pylint: disable=unused-argument
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
 
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             Message reactions correspond to the user adding a 'like' or 'sad' etc. (often an emoji)
             to a previously sent message on the conversation. Message reactions are supported by only a few channels.
             The activity that the message is in reaction to is identified by the activity's reply to Id property.
@@ -308,8 +319,9 @@ async def on_event_activity(self, turn_context: TurnContextProtocol):
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_turn()` method receives an event activity, it calls this method.
             If the activity name is `tokens/response`, it calls :meth:`on_token_response_event()`;
             otherwise, it calls :meth:`on_event()`.
@@ -338,8 +350,9 @@ async def on_token_response_event(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_event()` method receives an event with an activity name of
             `tokens/response`, it calls this method. If your agent uses an `oauth_prompt`, forward the incoming
             activity to the current dialog.
@@ -352,11 +365,13 @@ async def on_event(  # pylint: disable=unused-argument
         """
         Invoked when an event other than `tokens/response` is received when the base behavior of
         :meth:`on_event_activity()` is used.
+
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_event_activity()` is used method receives an event with an
             activity name other than `tokens/response`, it calls this method.
             This method could optionally be overridden if the agent is meant to handle miscellaneous events.
@@ -368,9 +383,11 @@ async def on_end_of_conversation_activity(  # pylint: disable=unused-argument
     ):
         """
         Invoked when a conversation end activity is received from the channel.
+
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -384,6 +401,7 @@ async def on_typing_activity(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -397,6 +415,7 @@ async def on_installation_update(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         if turn_context.activity.action in ("add", "add-upgrade"):
             return await self.on_installation_update_add(turn_context)
@@ -414,6 +433,7 @@ async def on_installation_update_add(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -427,6 +447,7 @@ async def on_installation_update_remove(  # pylint: disable=unused-argument
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         return
 
@@ -440,10 +461,10 @@ async def on_unrecognized_activity_type(  # pylint: disable=unused-argument
 
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
-
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
 
-        .. remarks::
+        .. note::
             When the :meth:`on_turn()` method receives an activity that is not a message,
             conversation update, message reaction, or event activity, it calls this method.
         """
@@ -494,8 +515,8 @@ async def on_sign_in_invoke(  # pylint: disable=unused-argument
 
         :param turn_context: The context object for this turn
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
-
         :returns: A task that represents the work queued to execute
+        :rtype: Awaitable[None]
         """
         raise _InvokeResponseException(HTTPStatus.NOT_IMPLEMENTED)
 
@@ -512,7 +533,7 @@ async def on_adaptive_card_invoke(
         :type turn_context: :class:`microsoft_agents.activity.TurnContextProtocol`
         :param invoke_value: A string-typed object from the incoming activity's value.
         :type invoke_value: :class:`microsoft_agents.activity.AdaptiveCardInvokeValue`
-        :return: The HealthCheckResponse object
+        :returns: The HealthCheckResponse object
         :rtype: :class:`microsoft_agents.activity.AdaptiveCardInvokeResponse`
         """
         raise _InvokeResponseException(HTTPStatus.NOT_IMPLEMENTED)