microsoft-agents-hosting-core 1.2.0.dev1__tar.gz → 1.2.0.dev5__tar.gz

{microsoft_agents_hosting_core-1.2.0.dev1/microsoft_agents_hosting_core.egg-info → microsoft_agents_hosting_core-1.2.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.2.0.dev1
+Version: 1.2.0.dev5
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==1.2.0.dev1
+Requires-Dist: microsoft-agents-activity==1.2.0.dev5
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

microsoft_agents_hosting_core-1.2.0.dev5/VERSION.txt

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

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5}/microsoft_agents/hosting/core/app/_type_defs.py

@@ -12,4 +12,4 @@ StateT = TypeVar("StateT", bound=TurnState)
 
 
 class RouteHandler(Protocol[StateT]):
-    def __call__(self, context: TurnContext, state: StateT) -> Awaitable[None]: ...
+    def __call__(self, context: TurnContext, state: StateT, /) -> Awaitable[None]: ...

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5}/microsoft_agents/hosting/core/app/agent_application.py

@@ -16,9 +16,9 @@ from typing import (
     Callable,
     Generic,
     Optional,
-    Pattern,
     TypeVar,
     cast,
+    overload,
 )
 
 from microsoft_agents.activity import (
@@ -71,11 +71,12 @@ class AgentApplication(Agent, Generic[StateT]):
     _adapter: Optional[ChannelServiceAdapter] = None
     _auth: Optional[Authorization] = None
     _proactive: Optional[Proactive] = None
-    _internal_before_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
-    _internal_after_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
-    _route_list: _RouteList[StateT] = _RouteList[StateT]()
+    _internal_before_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]]
+    _internal_after_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]]
+    _route_list: _RouteList[StateT]
     _error: Optional[Callable[[TurnContext, Exception], Awaitable[None]]] = None
     _turn_state_factory: Optional[Callable[[TurnContext], StateT]] = None
+    _connection_manager: Connections
 
     def __init__(
         self,
@@ -98,6 +99,8 @@ class AgentApplication(Agent, Generic[StateT]):
         :type kwargs: Any
         """
         self._route_list = _RouteList[StateT]()
+        self._internal_before_turn = []
+        self._internal_after_turn = []
 
         configuration = kwargs
 
@@ -157,8 +160,25 @@ class AgentApplication(Agent, Generic[StateT]):
 
         # TODO: decide how to initialize the Authorization (params vs options vs kwargs)
         if authorization:
+            if connection_manager:
+                logger.error(
+                    "AgentApplication: connection_manager is not needed when authorization is provided."
+                )
+                raise ApplicationError(
+                    "The `AgentApplication` does not take a `connection_manager` when `authorization` is provided."
+                )
             self._auth = authorization
+            self._connection_manager = self._auth.connection_manager
         else:
+            if not connection_manager:
+                logger.error(
+                    "AgentApplication: connection_manager is required for Authorization.",
+                    stack_info=True,
+                )
+                raise ApplicationError(
+                    "The `AgentApplication` requires a `connection_manager` to initialize the `Authorization` instance."
+                )
+
             auth_options = {
                 key: value
                 for key, value in configuration.items()
@@ -167,9 +187,20 @@ class AgentApplication(Agent, Generic[StateT]):
             self._auth = Authorization(
                 storage=self._options.storage,
                 connection_manager=connection_manager,
-                handlers=options.authorization_handlers,
+                auth_handlers=options.authorization_handlers,
                 **auth_options,
             )
+            self._connection_manager = connection_manager
+
+    @property
+    def connection_manager(self) -> Connections:
+        """
+        The application's connection manager.
+
+        :return: The connection manager for the application.
+        :rtype: :class:`microsoft_agents.hosting.core.authorization.Connections`
+        """
+        return self._connection_manager
 
     @property
     def adapter(self) -> ChannelServiceAdapter:
@@ -244,6 +275,34 @@ class AgentApplication(Agent, Generic[StateT]):
                 """)
         return self._proactive
 
+    def before_turn(
+        self, handler: Callable[[TurnContext, StateT], Awaitable[bool]]
+    ) -> Callable[[TurnContext, StateT], Awaitable[bool]]:
+        """
+        Adds a handler to be called before each turn of the conversation.
+
+        :param handler: A function that takes a TurnContext and a StateT and returns an Awaitable.
+        :type handler: Callable[[TurnContext, StateT], Awaitable[bool]]
+        :return: The added handler.
+        :rtype: Callable[[TurnContext, StateT], Awaitable[bool]]
+        """
+        self._internal_before_turn.append(handler)
+        return handler
+
+    def after_turn(
+        self, handler: Callable[[TurnContext, StateT], Awaitable[bool]]
+    ) -> Callable[[TurnContext, StateT], Awaitable[bool]]:
+        """
+        Adds a handler to be called after each turn of the conversation.
+
+        :param handler: A function that takes a TurnContext and a StateT and returns an Awaitable.
+        :type handler: Callable[[TurnContext, StateT], Awaitable[bool]]
+        :return: The added handler.
+        :rtype: Callable[[TurnContext, StateT], Awaitable[bool]]
+        """
+        self._internal_after_turn.append(handler)
+        return handler
+
     def add_route(
         self,
         selector: RouteSelector,
@@ -259,7 +318,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
         :param selector: A function that takes a TurnContext and returns a boolean indicating whether the route should be selected.
         :type selector: Callable[[:class:`microsoft_agents.hosting.core.turn_context.TurnContext`], bool]
-        :param handler: A function that takes a TurnContext and a TurnState and returns an Awaitable.
+        :param handler: A function that takes a TurnContext and a StateT and returns an Awaitable.
         :type handler: :class:`microsoft_agents.hosting.core.app._type_defs.RouteHandler`[StateT]
         :param is_invoke: Whether the route is for an invoke activity, defaults to False
         :type is_invoke: bool, Optional
@@ -312,6 +371,8 @@ class AgentApplication(Agent, Generic[StateT]):
         """
 
         def __selector(context: TurnContext):
+            if isinstance(activity_type, list):
+                return context.activity.type in activity_type
             return activity_type == context.activity.type
 
         def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
@@ -325,7 +386,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
     def message(
         self,
-        select: str | Pattern[str] | list[str | Pattern[str]],
+        select: str | re.Pattern[str] | list[str | re.Pattern[str]],
         *,
         auth_handlers: Optional[list[str]] = None,
         **kwargs,
@@ -342,7 +403,7 @@ class AgentApplication(Agent, Generic[StateT]):
                     return True
 
         :param select: Literal text, compiled regex, or list of either used to match the incoming message.
-        :type select: str | Pattern[str] | list[str | Pattern[str]]
+        :type select: str | re.Pattern[str] | list[str | re.Pattern[str]]
         :param auth_handlers: Optional list of authorization handler IDs for the route.
         :type auth_handlers: Optional[list[str]]
         :param kwargs: Additional route configuration passed to :meth:`microsoft_agents.hosting.core.AgentApplication.add_route`.
@@ -353,9 +414,18 @@ class AgentApplication(Agent, Generic[StateT]):
                 return False
 
             text = context.activity.text if context.activity.text else ""
-            if isinstance(select, Pattern):
-                hits = re.fullmatch(select, text)
-                return hits is not None
+
+            if isinstance(select, list):
+                for item in select:
+                    if isinstance(item, re.Pattern):
+                        if re.fullmatch(item, text) is not None:
+                            return True
+                    elif text == item:
+                        return True
+                return False
+
+            if isinstance(select, re.Pattern):
+                return re.fullmatch(select, text) is not None
 
             return text == select
 
@@ -370,7 +440,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
     def conversation_update(
         self,
-        type: ConversationUpdateTypes,
+        type: ConversationUpdateTypes | str,
         *,
         auth_handlers: Optional[list[str]] = None,
         **kwargs,
@@ -387,35 +457,37 @@ class AgentApplication(Agent, Generic[StateT]):
                     return True
 
         :param type: Conversation update category that must match the incoming activity.
-        :type type: microsoft_agents.activity.ConversationUpdateTypes
+        :type type: microsoft_agents.activity.ConversationUpdateTypes | str
         :param auth_handlers: Optional list of authorization handler IDs for the route.
         :type auth_handlers: Optional[list[str]]
         :param kwargs: Additional route configuration passed to :meth:`microsoft_agents.hosting.core.AgentApplication.add_route`.
         """
 
+        update_type = type.value if isinstance(type, ConversationUpdateTypes) else type
+
         def __selector(context: TurnContext):
             if context.activity.type != ActivityTypes.conversation_update:
                 return False
 
-            if type == "membersAdded":
+            if update_type == "membersAdded":
                 if isinstance(context.activity.members_added, list):
                     return len(context.activity.members_added) > 0
                 return False
 
-            if type == "membersRemoved":
+            if update_type == "membersRemoved":
                 if isinstance(context.activity.members_removed, list):
                     return len(context.activity.members_removed) > 0
                 return False
 
             if isinstance(context.activity.channel_data, object):
                 data = vars(context.activity.channel_data)
-                return data["event_type"] == type
+                return data["event_type"] == update_type
 
             return False
 
         def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
             logger.debug(
-                f"Registering conversation update handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
+                f"Registering conversation update handler for route handler {func.__name__} with type: {update_type} with auth handlers: {auth_handlers}"
             )
             self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
@@ -424,7 +496,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
     def message_reaction(
         self,
-        type: MessageReactionTypes,
+        type: MessageReactionTypes | str,
         *,
         auth_handlers: Optional[list[str]] = None,
         **kwargs,
@@ -441,22 +513,24 @@ class AgentApplication(Agent, Generic[StateT]):
                     return True
 
         :param type: Reaction category that must match the incoming activity.
-        :type type: microsoft_agents.activity.MessageReactionTypes
+        :type type: microsoft_agents.activity.MessageReactionTypes | str
         :param auth_handlers: Optional list of authorization handler IDs for the route.
         :type auth_handlers: Optional[list[str]]
         :param kwargs: Additional route configuration passed to :meth:`microsoft_agents.hosting.core.AgentApplication.add_route`.
         """
 
+        reaction_type = type.value if isinstance(type, MessageReactionTypes) else type
+
         def __selector(context: TurnContext):
             if context.activity.type != ActivityTypes.message_reaction:
                 return False
 
-            if type == "reactionsAdded":
+            if reaction_type == "reactionsAdded":
                 if isinstance(context.activity.reactions_added, list):
                     return len(context.activity.reactions_added) > 0
                 return False
 
-            if type == "reactionsRemoved":
+            if reaction_type == "reactionsRemoved":
                 if isinstance(context.activity.reactions_removed, list):
                     return len(context.activity.reactions_removed) > 0
                 return False
@@ -465,7 +539,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
         def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
             logger.debug(
-                f"Registering message reaction handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
+                f"Registering message reaction handler for route handler {func.__name__} with type: {reaction_type} with auth handlers: {auth_handlers}"
             )
             self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
@@ -474,7 +548,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
     def message_update(
         self,
-        type: MessageUpdateTypes,
+        type: MessageUpdateTypes | str,
         *,
         auth_handlers: Optional[list[str]] = None,
         **kwargs,
@@ -491,56 +565,85 @@ class AgentApplication(Agent, Generic[StateT]):
                     return True
 
         :param type: Message update category that must match the incoming activity.
-        :type type: microsoft_agents.activity.MessageUpdateTypes
+        :type type: microsoft_agents.activity.MessageUpdateTypes | str
         :param auth_handlers: Optional list of authorization handler IDs for the route.
         :type auth_handlers: Optional[list[str]]
         :param kwargs: Additional route configuration passed to :meth:`microsoft_agents.hosting.core.AgentApplication.add_route`.
         """
 
+        update_type = type.value if isinstance(type, MessageUpdateTypes) else type
+
         def __selector(context: TurnContext):
-            if type == "editMessage":
+            if update_type == "editMessage":
                 if (
                     context.activity.type == ActivityTypes.message_update
                     and isinstance(context.activity.channel_data, dict)
                 ):
                     data = context.activity.channel_data
-                    return data["event_type"] == type
+                    return data["event_type"] == update_type
                 return False
 
-            if type == "softDeleteMessage":
+            if update_type == "softDeleteMessage":
                 if (
                     context.activity.type == ActivityTypes.message_delete
                     and isinstance(context.activity.channel_data, dict)
                 ):
                     data = context.activity.channel_data
-                    return data["event_type"] == type
+                    return data["event_type"] == update_type
                 return False
 
-            if type == "undeleteMessage":
+            if update_type == "undeleteMessage":
                 if (
                     context.activity.type == ActivityTypes.message_update
                     and isinstance(context.activity.channel_data, dict)
                 ):
                     data = context.activity.channel_data
-                    return data["event_type"] == type
+                    return data["event_type"] == update_type
                 return False
             return False
 
         def __call(func: RouteHandler[StateT]) -> RouteHandler[StateT]:
             logger.debug(
-                f"Registering message update handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
+                f"Registering message update handler for route handler {func.__name__} with type: {update_type} with auth handlers: {auth_handlers}"
             )
             self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
 
+    @overload
     def handoff(
-        self, *, auth_handlers: Optional[list[str]] = None, **kwargs
+        self,
+        func: Callable[[TurnContext, StateT, str], Awaitable[None]],
+        *,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
+    ) -> Callable[[TurnContext, StateT, str], Awaitable[None]]: ...
+
+    @overload
+    def handoff(
+        self,
+        *,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs: Any,
     ) -> Callable[
         [Callable[[TurnContext, StateT, str], Awaitable[None]]],
         Callable[[TurnContext, StateT, str], Awaitable[None]],
-    ]:
+    ]: ...
+
+    def handoff(
+        self,
+        func: Optional[Callable[[TurnContext, StateT, str], Awaitable[None]]] = None,
+        *,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
+    ) -> (
+        Callable[[TurnContext, StateT, str], Awaitable[None]]
+        | Callable[
+            [Callable[[TurnContext, StateT, str], Awaitable[None]]],
+            Callable[[TurnContext, StateT, str], Awaitable[None]],
+        ]
+    ):
         """
         Register a handler to hand off conversations from one copilot to another.
 
@@ -551,6 +654,8 @@ class AgentApplication(Agent, Generic[StateT]):
                 async def on_handoff(context: TurnContext, state: TurnState, continuation: str):
                     print(continuation)
 
+        :param func: Optional handler to register directly without using decorator syntax.
+        :type func: Optional[Callable[[TurnContext, StateT, str], Awaitable[None]]]
         :param auth_handlers: Optional list of authorization handler IDs for the route.
         :type auth_handlers: Optional[list[str]]
         :param kwargs: Additional route configuration passed to :meth:`microsoft_agents.hosting.core.AgentApplication.add_route`.
@@ -566,24 +671,29 @@ class AgentApplication(Agent, Generic[StateT]):
             func: Callable[[TurnContext, StateT, str], Awaitable[None]],
         ) -> Callable[[TurnContext, StateT, str], Awaitable[None]]:
             async def __handler(context: TurnContext, state: StateT):
-                if not context.activity.value:
-                    return False
-                await func(context, state, context.activity.value["continuation"])
+                if (
+                    isinstance(context.activity.value, dict)
+                    and "continuation" in context.activity.value
+                ):
+                    await func(context, state, context.activity.value["continuation"])
+                else:
+                    logger.warning("Invalid handoff action received")
                 await context.send_activity(
                     Activity(
                         type=ActivityTypes.invoke_response,
                         value=InvokeResponse(status=200),
                     )
                 )
-                return True
 
             logger.debug(
                 f"Registering handoff handler for route handler {func.__name__} with auth handlers: {auth_handlers}"
             )
 
-            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
+            self.add_route(__selector, __handler, auth_handlers=auth_handlers, **kwargs)
             return func
 
+        if func is not None:
+            return __call(func)
         return __call
 
     def on_sign_in_success(

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5}/microsoft_agents/hosting/core/app/oauth/authorization.py

@@ -3,10 +3,8 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the MIT License.
 """
 
-from datetime import datetime
 import logging
-from typing import TypeVar, Optional, Callable, Awaitable, Generic, cast
-import jwt
+from typing import Optional, Callable, Awaitable, cast
 
 from microsoft_agents.activity import Activity, Channels, SignInConstants, TokenResponse
 from microsoft_agents.activity.activity_types import ActivityTypes
@@ -126,6 +124,18 @@ class Authorization:
                 auth_handler=auth_handler,
             )
 
+    @property
+    def connection_manager(self) -> Connections:
+        """
+        The connection manager for the authorization instance.
+
+        The connection manager is responsible for managing the connections to the various authentication providers.
+
+        :return: The connection manager.
+        :rtype: :class:`microsoft_agents.hosting.core.authorization.Connections`
+        """
+        return self._connection_manager
+
     @staticmethod
     def _sign_in_state_key(context: TurnContext) -> str:
         """Generate a unique storage key for the sign-in state based on the context.

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5}/microsoft_agents/hosting/core/turn_context.py

@@ -93,12 +93,12 @@ class TurnContext(TurnContextProtocol):
             setattr(context, attribute, getattr(self, attribute))
 
     @property
-    def activity(self):
+    def activity(self) -> Activity:
         """
         The received activity.
         :return:
         """
-        return self._activity
+        return self._activity  # type: ignore[return-value]
 
     @activity.setter
     def activity(self, value):

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5/microsoft_agents_hosting_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.2.0.dev1
+Version: 1.2.0.dev5
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==1.2.0.dev1
+Requires-Dist: microsoft-agents-activity==1.2.0.dev5
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-1.2.0.dev1 → microsoft_agents_hosting_core-1.2.0.dev5}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==1.2.0.dev1
+microsoft-agents-activity==1.2.0.dev5
 pyjwt>=2.10.1
 isodate>=0.6.1
 azure-core>=1.30.0

microsoft_agents_hosting_core-1.2.0.dev1/VERSION.txt

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