microsoft-agents-hosting-core 0.4.0.dev16__tar.gz → 0.4.0.dev18__tar.gz

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.4.0.dev16
+Version: 0.4.0.dev18
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 Project-URL: Homepage, https://github.com/microsoft/Agents
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
-Requires-Dist: microsoft-agents-activity==0.4.0.dev16
+Requires-Dist: microsoft-agents-activity==0.4.0.dev18
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/__init__.py

@@ -11,12 +11,13 @@ from .rest_channel_service_client_factory import RestChannelServiceClientFactory
 from .turn_context import TurnContext
 
 # Application Style
+from .app._type_defs import RouteHandler, RouteSelector, StateT
 from .app.agent_application import AgentApplication
 from .app.app_error import ApplicationError
 from .app.app_options import ApplicationOptions
 from .app.input_file import InputFile, InputFileDownloader
 from .app.query import Query
-from .app.route import Route, RouteHandler
+from .app._routes import _Route, _RouteList, RouteRank
 from .app.typing_indicator import TypingIndicator
 
 # App Auth

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/_oauth/__init__.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from ._flow_state import _FlowState, _FlowStateTag, _FlowErrorTag
 from ._flow_storage_client import _FlowStorageClient
 from ._oauth_flow import _OAuthFlow, _FlowResponse

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/activity_handler.py

@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
+
 from __future__ import annotations
 from http import HTTPStatus
 from pydantic import BaseModel

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/__init__.py

@@ -10,8 +10,9 @@ from .app_error import ApplicationError
 from .app_options import ApplicationOptions
 from .input_file import InputFile, InputFileDownloader
 from .query import Query
-from .route import Route, RouteHandler
+from ._routes import _RouteList, _Route, RouteRank
 from .typing_indicator import TypingIndicator
+from ._type_defs import RouteHandler, RouteSelector, StateT
 
 # Auth
 from .oauth import (

microsoft_agents_hosting_core-0.4.0.dev18/microsoft_agents/hosting/core/app/_routes/__init__.py

@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from ._route_list import _RouteList
+from ._route import _Route, _agentic_selector
+from .route_rank import RouteRank
+
+__all__ = [
+    "_RouteList",
+    "_Route",
+    "RouteRank",
+    "_agentic_selector",
+]

microsoft_agents_hosting_core-0.4.0.dev18/microsoft_agents/hosting/core/app/_routes/_route.py

@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from __future__ import annotations
+
+from typing import Generic, Optional, TypeVar
+
+from ...turn_context import TurnContext
+from .._type_defs import RouteHandler, RouteSelector
+from ..state.turn_state import TurnState
+from .route_rank import RouteRank
+
+
+def _agentic_selector(selector: RouteSelector) -> RouteSelector:
+    def wrapped_selector(context: TurnContext) -> bool:
+        return context.activity.is_agentic_request() and selector(context)
+
+    return wrapped_selector
+
+
+StateT = TypeVar("StateT", bound=TurnState)
+
+
+class _Route(Generic[StateT]):
+    selector: RouteSelector
+    handler: RouteHandler[StateT]
+    _is_invoke: bool
+    _rank: int
+    auth_handlers: list[str]
+    _is_agentic: bool
+
+    def __init__(
+        self,
+        selector: RouteSelector,
+        handler: RouteHandler[StateT],
+        is_invoke: bool = False,
+        rank: int = RouteRank.DEFAULT,
+        auth_handlers: Optional[list[str]] = None,
+        is_agentic: bool = False,
+        **kwargs,
+    ) -> None:
+
+        if rank < 0 or rank > RouteRank.LAST:
+            raise ValueError(
+                "Route rank must be between 0 and RouteRank.LAST (inclusive)"
+            )
+
+        self.selector = selector
+        self.handler = handler
+        self._is_invoke = is_invoke
+        self._rank = int(rank)  # conversion from RouteRank IntEnum if necessary
+        self._is_agentic = is_agentic
+        self.auth_handlers = auth_handlers or []
+
+    @property
+    def is_invoke(self) -> bool:
+        return self._is_invoke
+
+    @property
+    def rank(self) -> int:
+        return self._rank
+
+    @property
+    def is_agentic(self) -> bool:
+        return self._is_agentic
+
+    @property
+    def priority(self) -> list[int]:
+        """Lower "values" indicate higher priority.
+
+        Priority is determined by:
+        1. Whether the route is for an invoke activity (0) or not (1).
+        2. Whether the route is agentic (0) or not (1).
+        3. The rank of the route (lower numbers indicate higher priority).
+
+        In that order. If both are invokes, the agentic one has higher priority.
+        If both are agentic and invokes, then the rank determines priority.
+
+        priority is represented as a list of three integers for easy lexicographic comparison.
+        """
+        return [
+            0 if self._is_invoke else 1,
+            0 if self._is_agentic else 1,
+            self._rank,
+        ]
+
+    def __lt__(self, other: _Route) -> bool:
+        # built-in list ordering is a lexicographic comparison in Python
+        return self.priority < other.priority

microsoft_agents_hosting_core-0.4.0.dev18/microsoft_agents/hosting/core/app/_routes/_route_list.py

@@ -0,0 +1,32 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from __future__ import annotations
+
+import heapq
+from typing import Generic, TypeVar
+
+from ..state.turn_state import TurnState
+from ._route import _Route
+
+StateT = TypeVar("StateT", bound=TurnState)
+
+
+class _RouteList(Generic[StateT]):
+    _routes: list[_Route[StateT]]
+
+    def __init__(
+        self,
+    ) -> None:
+        # a min-heap where lower "values" indicate higher priority
+        self._routes = []
+
+    def add_route(self, route: _Route[StateT]) -> None:
+        """Adds a route to the list."""
+        heapq.heappush(self._routes, route)
+
+    def __iter__(self):
+        # sorted will return a new list, leaving the heap intact
+        # returning an iterator over the previous list would expose
+        # internal details
+        return iter(sorted(self._routes))

microsoft_agents_hosting_core-0.4.0.dev18/microsoft_agents/hosting/core/app/_routes/route_rank.py

@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from enum import IntEnum
+
+_MAX_RANK = 2**16 - 1  # 65,535
+
+
+class RouteRank(IntEnum):
+    """Defines the rank of a route. Lower values indicate higher priority."""
+
+    FIRST = 0
+    DEFAULT = _MAX_RANK // 2
+    LAST = _MAX_RANK

microsoft_agents_hosting_core-0.4.0.dev18/microsoft_agents/hosting/core/app/_type_defs.py

@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from typing import Callable, TypeVar, Awaitable, Protocol
+
+from ..turn_context import TurnContext
+from .state import TurnState
+
+RouteSelector = Callable[[TurnContext], bool]
+
+StateT = TypeVar("StateT", bound=TurnState)
+
+
+class RouteHandler(Protocol[StateT]):
+    def __call__(self, context: TurnContext, state: StateT) -> Awaitable[None]: ...

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/agent_application.py

@@ -13,9 +13,7 @@ from typing import (
     Any,
     Awaitable,
     Callable,
-    Dict,
     Generic,
-    List,
     Optional,
     Pattern,
     TypeVar,
@@ -38,16 +36,17 @@ from ..authorization import Connections
 from .app_error import ApplicationError
 from .app_options import ApplicationOptions
 
-from .route import Route, RouteHandler
 from .state import TurnState
 from ..channel_service_adapter import ChannelServiceAdapter
 from .oauth import Authorization
 from .typing_indicator import TypingIndicator
 
+from ._type_defs import RouteHandler, RouteSelector
+from ._routes import _RouteList, _Route, RouteRank, _agentic_selector
+
 logger = logging.getLogger(__name__)
 
 StateT = TypeVar("StateT", bound=TurnState)
-IN_SIGN_IN_KEY = "__InSignInFlow__"
 
 
 class AgentApplication(Agent, Generic[StateT]):
@@ -68,25 +67,25 @@ class AgentApplication(Agent, Generic[StateT]):
     _options: ApplicationOptions
     _adapter: Optional[ChannelServiceAdapter] = None
     _auth: Optional[Authorization] = None
-    _internal_before_turn: List[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
-    _internal_after_turn: List[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
-    _routes: List[Route[StateT]] = []
+    _internal_before_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
+    _internal_after_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]] = []
+    _route_list: _RouteList[StateT] = _RouteList[StateT]()
     _error: Optional[Callable[[TurnContext, Exception], Awaitable[None]]] = None
     _turn_state_factory: Optional[Callable[[TurnContext], StateT]] = None
 
     def __init__(
         self,
-        options: ApplicationOptions = None,
+        options: Optional[ApplicationOptions] = None,
         *,
-        connection_manager: Connections = None,
-        authorization: Authorization = None,
+        connection_manager: Optional[Connections] = None,
+        authorization: Optional[Authorization] = None,
         **kwargs,
     ) -> None:
         """
         Creates a new AgentApplication instance.
         """
         self.typing = TypingIndicator()
-        self._routes = []
+        self._route_list = _RouteList[StateT]()
 
         configuration = kwargs
 
@@ -204,11 +203,54 @@ class AgentApplication(Agent, Generic[StateT]):
         """
         return self._options
 
+    def add_route(
+        self,
+        selector: RouteSelector,
+        handler: RouteHandler[StateT],
+        is_invoke: bool = False,
+        is_agentic: bool = False,
+        rank: RouteRank = RouteRank.DEFAULT,
+        auth_handlers: Optional[list[str]] = None,
+    ) -> None:
+        """Adds a new route to the application.
+
+        Routes are ordered by: is_agentic, is_invoke, rank (lower is higher priority), in that order.
+
+        :param selector: A function that takes a TurnContext and returns a boolean indicating whether the route should be selected.
+        :type selector: RouteSelector
+        :param handler: A function that takes a TurnContext and a TurnState and returns an Awaitable.
+        :type handler: RouteHandler[StateT]
+        :param is_invoke: Whether the route is for an invoke activity, defaults to False
+        :type is_invoke: bool, optional
+        :param is_agentic: Whether the route is for an agentic request, defaults to False. For agentic requests
+            the selector will include a new check for `context.activity.is_agentic_request()`.
+        :type is_agentic: bool, optional
+        :param rank: The rank of the route, defaults to RouteRank.DEFAULT
+        :type rank: RouteRank, optional
+        :param auth_handlers: A list of authentication handler IDs to use for this route, defaults to None
+        :type auth_handlers: Optional[list[str]], optional
+        :raises ApplicationError: If the selector or handler are not valid.
+        """
+        if not selector or not handler:
+            logger.error(
+                "AgentApplication.add_route(): selector and handler are required."
+            )
+            raise ApplicationError("selector and handler are required.")
+
+        if is_agentic:
+            selector = _agentic_selector(selector)
+
+        route = _Route[StateT](
+            selector, handler, is_invoke, rank, auth_handlers, is_agentic
+        )
+        self._route_list.add_route(route)
+
     def activity(
         self,
-        activity_type: Union[str, ActivityTypes, List[Union[str, ActivityTypes]]],
+        activity_type: Union[str, ActivityTypes, list[Union[str, ActivityTypes]]],
         *,
-        auth_handlers: Optional[List[str]] = None,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
     ) -> Callable[[RouteHandler[StateT]], RouteHandler[StateT]]:
         """
         Registers a new activity event listener. This method can be used as either
@@ -233,18 +275,17 @@ class AgentApplication(Agent, Generic[StateT]):
             logger.debug(
                 f"Registering activity handler for route handler {func.__name__} with type: {activity_type} with auth handlers: {auth_handlers}"
             )
-            self._routes.append(
-                Route[StateT](__selector, func, auth_handlers=auth_handlers)
-            )
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
 
     def message(
         self,
-        select: Union[str, Pattern[str], List[Union[str, Pattern[str]]]],
+        select: Union[str, Pattern[str], list[Union[str, Pattern[str]]]],
         *,
-        auth_handlers: Optional[List[str]] = None,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
     ) -> Callable[[RouteHandler[StateT]], RouteHandler[StateT]]:
         """
         Registers a new message activity event listener. This method can be used as either
@@ -276,9 +317,7 @@ class AgentApplication(Agent, Generic[StateT]):
             logger.debug(
                 f"Registering message handler for route handler {func.__name__} with select: {select} with auth handlers: {auth_handlers}"
             )
-            self._routes.append(
-                Route[StateT](__selector, func, auth_handlers=auth_handlers)
-            )
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
@@ -287,7 +326,8 @@ class AgentApplication(Agent, Generic[StateT]):
         self,
         type: ConversationUpdateTypes,
         *,
-        auth_handlers: Optional[List[str]] = None,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
     ) -> Callable[[RouteHandler[StateT]], RouteHandler[StateT]]:
         """
         Registers a new message activity event listener. This method can be used as either
@@ -311,12 +351,12 @@ class AgentApplication(Agent, Generic[StateT]):
                 return False
 
             if type == "membersAdded":
-                if isinstance(context.activity.members_added, List):
+                if isinstance(context.activity.members_added, list):
                     return len(context.activity.members_added) > 0
                 return False
 
             if type == "membersRemoved":
-                if isinstance(context.activity.members_removed, List):
+                if isinstance(context.activity.members_removed, list):
                     return len(context.activity.members_removed) > 0
                 return False
 
@@ -330,15 +370,17 @@ class AgentApplication(Agent, Generic[StateT]):
             logger.debug(
                 f"Registering conversation update handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
             )
-            self._routes.append(
-                Route[StateT](__selector, func, auth_handlers=auth_handlers)
-            )
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
 
     def message_reaction(
-        self, type: MessageReactionTypes, *, auth_handlers: Optional[List[str]] = None
+        self,
+        type: MessageReactionTypes,
+        *,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
     ) -> Callable[[RouteHandler[StateT]], RouteHandler[StateT]]:
         """
         Registers a new message activity event listener. This method can be used as either
@@ -361,12 +403,12 @@ class AgentApplication(Agent, Generic[StateT]):
                 return False
 
             if type == "reactionsAdded":
-                if isinstance(context.activity.reactions_added, List):
+                if isinstance(context.activity.reactions_added, list):
                     return len(context.activity.reactions_added) > 0
                 return False
 
             if type == "reactionsRemoved":
-                if isinstance(context.activity.reactions_removed, List):
+                if isinstance(context.activity.reactions_removed, list):
                     return len(context.activity.reactions_removed) > 0
                 return False
 
@@ -376,15 +418,17 @@ class AgentApplication(Agent, Generic[StateT]):
             logger.debug(
                 f"Registering message reaction handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
             )
-            self._routes.append(
-                Route[StateT](__selector, func, auth_handlers=auth_handlers)
-            )
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
 
     def message_update(
-        self, type: MessageUpdateTypes, *, auth_handlers: Optional[List[str]] = None
+        self,
+        type: MessageUpdateTypes,
+        *,
+        auth_handlers: Optional[list[str]] = None,
+        **kwargs,
     ) -> Callable[[RouteHandler[StateT]], RouteHandler[StateT]]:
         """
         Registers a new message activity event listener. This method can be used as either
@@ -435,14 +479,14 @@ class AgentApplication(Agent, Generic[StateT]):
             logger.debug(
                 f"Registering message update handler for route handler {func.__name__} with type: {type} with auth handlers: {auth_handlers}"
             )
-            self._routes.append(
-                Route[StateT](__selector, func, auth_handlers=auth_handlers)
-            )
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
 
-    def handoff(self, *, auth_handlers: Optional[List[str]] = None) -> Callable[
+    def handoff(
+        self, *, auth_handlers: Optional[list[str]] = None, **kwargs
+    ) -> Callable[
         [Callable[[TurnContext, StateT, str], Awaitable[None]]],
         Callable[[TurnContext, StateT, str], Awaitable[None]],
     ]:
@@ -483,10 +527,7 @@ class AgentApplication(Agent, Generic[StateT]):
                 f"Registering handoff handler for route handler {func.__name__} with auth handlers: {auth_handlers}"
             )
 
-            self._routes.append(
-                Route[StateT](__selector, __handler, True, auth_handlers)
-            )
-            self._routes = sorted(self._routes, key=lambda route: not route.is_invoke)
+            self.add_route(__selector, func, auth_handlers=auth_handlers, **kwargs)
             return func
 
         return __call
@@ -598,7 +639,6 @@ class AgentApplication(Agent, Generic[StateT]):
         await self._start_long_running_call(context, self._on_turn)
 
     async def _on_turn(self, context: TurnContext):
-        # robrandao: TODO
         try:
             if context.activity.type != ActivityTypes.typing:
                 await self._start_typing(context)
@@ -663,7 +703,7 @@ class AgentApplication(Agent, Generic[StateT]):
             context.activity.text = context.remove_recipient_mention(context.activity)
 
     @staticmethod
-    def parse_env_vars_configuration(vars: Dict[str, Any]) -> dict:
+    def parse_env_vars_configuration(vars: dict[str, Any]) -> dict:
         """
         Parses environment variables and returns a dictionary with the relevant configuration.
         """
@@ -738,7 +778,7 @@ class AgentApplication(Agent, Generic[StateT]):
         return True
 
     async def _on_activity(self, context: TurnContext, state: StateT):
-        for route in self._routes:
+        for route in self._route_list:
             if route.selector(context):
                 if not route.auth_handlers:
                     await route.handler(context, state)

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/__init__.py

@@ -1,3 +1,7 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+
 from .authorization import Authorization
 from .auth_handler import AuthHandler
 from ._sign_in_state import _SignInState

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_handlers/__init__.py

@@ -1,3 +1,8 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
 from .agentic_user_authorization import AgenticUserAuthorization
 from ._user_authorization import _UserAuthorization
 from ._authorization_handler import _AuthorizationHandler

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_handlers/_authorization_handler.py

@@ -1,3 +1,8 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
 from abc import ABC
 from typing import Optional
 import logging

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_handlers/_user_authorization.py

@@ -1,5 +1,7 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
 
 from __future__ import annotations
 import logging

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_handlers/agentic_user_authorization.py

@@ -1,3 +1,8 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
 import logging
 
 from typing import Optional

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_sign_in_response.py

@@ -1,3 +1,7 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+
 from typing import Optional
 
 from microsoft_agents.activity import TokenResponse

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/_sign_in_state.py

@@ -1,3 +1,8 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
 from __future__ import annotations
 
 from typing import Optional

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/auth_handler.py

@@ -1,5 +1,7 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
 
 import logging
 from typing import Optional

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/app/oauth/authorization.py

@@ -1,3 +1,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

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/access_token_provider_base.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol, Optional
 from abc import abstractmethod
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/agent_auth_configuration.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Optional
 
 from microsoft_agents.hosting.core.authorization.auth_types import AuthTypes

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/anonymous_token_provider.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Optional
 
 from .access_token_provider_base import AccessTokenProviderBase

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/auth_types.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from enum import Enum
 
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/connections.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from abc import abstractmethod
 from typing import Protocol
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/authorization/jwt_token_validator.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import logging
 import jwt
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/channel_api_handler_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from abc import abstractmethod
 from typing import Protocol, Optional
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/channel_service_adapter.py

@@ -66,10 +66,7 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
 
             response = ResourceResponse()
 
-            if activity.type == "delay":
-                delay_time = int((activity.value or 1000) / 1000)
-                await sleep(delay_time)
-            elif activity.type == ActivityTypes.invoke_response:
+            if activity.type == ActivityTypes.invoke_response:
                 context.turn_state[self.INVOKE_RESPONSE_KEY] = activity
             elif (
                 activity.type == ActivityTypes.trace

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/channel_service_client_factory_base.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol, Optional
 from abc import abstractmethod
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/agent_conversation_reference.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from microsoft_agents.activity import AgentsModel, ConversationReference
 
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/channel_factory_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 
 from microsoft_agents.hosting.core.authorization import AccessTokenProviderBase

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/channel_host_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 
 from .channel_protocol import ChannelProtocol

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/channel_info_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/channel_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 
 from microsoft_agents.activity import AgentsModel, Activity, InvokeResponse

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/channels_configuration.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 
 from .channel_info_protocol import ChannelInfoProtocol

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/configuration_channel_host.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from copy import copy
 
 from microsoft_agents.hosting.core.authorization import Connections

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/conversation_constants.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from abc import ABC
 
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/conversation_id_factory.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from uuid import uuid4
 from functools import partial
 from typing import Type

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/conversation_id_factory_options.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from microsoft_agents.activity import Activity
 
 from .channel_info_protocol import ChannelInfoProtocol

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/conversation_id_factory_protocol.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol
 from abc import abstractmethod
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/http_agent_channel.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from copy import deepcopy, copy
 
 from aiohttp import ClientSession

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/client/http_agent_channel_factory.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from microsoft_agents.hosting.core.authorization import AccessTokenProviderBase
 
 from .channel_factory_protocol import ChannelFactoryProtocol

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/connector/client/connector_client.py

@@ -197,9 +197,6 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and activityId are required")
 
-        print("\n*3")
-        print(conversation_id)
-        print("\n*3")
         conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/rest_channel_service_client_factory.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Optional
 import logging
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/storage/error_handling.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from collections.abc import Callable, Awaitable
 from typing import TypeVar
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/storage/memory_storage.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from threading import Lock
 from typing import TypeVar
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/storage/storage.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Protocol, TypeVar, Type, Union
 from abc import ABC, abstractmethod
 from asyncio import gather

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents/hosting/core/storage/store_item.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from abc import ABC
 from typing import Protocol, runtime_checkable
 

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents_hosting_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.4.0.dev16
+Version: 0.4.0.dev18
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 Project-URL: Homepage, https://github.com/microsoft/Agents
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
-Requires-Dist: microsoft-agents-activity==0.4.0.dev16
+Requires-Dist: microsoft-agents-activity==0.4.0.dev18
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents_hosting_core.egg-info/SOURCES.txt

@@ -17,13 +17,17 @@ microsoft_agents/hosting/core/_oauth/_flow_state.py
 microsoft_agents/hosting/core/_oauth/_flow_storage_client.py
 microsoft_agents/hosting/core/_oauth/_oauth_flow.py
 microsoft_agents/hosting/core/app/__init__.py
+microsoft_agents/hosting/core/app/_type_defs.py
 microsoft_agents/hosting/core/app/agent_application.py
 microsoft_agents/hosting/core/app/app_error.py
 microsoft_agents/hosting/core/app/app_options.py
 microsoft_agents/hosting/core/app/input_file.py
 microsoft_agents/hosting/core/app/query.py
-microsoft_agents/hosting/core/app/route.py
 microsoft_agents/hosting/core/app/typing_indicator.py
+microsoft_agents/hosting/core/app/_routes/__init__.py
+microsoft_agents/hosting/core/app/_routes/_route.py
+microsoft_agents/hosting/core/app/_routes/_route_list.py
+microsoft_agents/hosting/core/app/_routes/route_rank.py
 microsoft_agents/hosting/core/app/oauth/__init__.py
 microsoft_agents/hosting/core/app/oauth/_sign_in_response.py
 microsoft_agents/hosting/core/app/oauth/_sign_in_state.py

{microsoft_agents_hosting_core-0.4.0.dev16 → microsoft_agents_hosting_core-0.4.0.dev18}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==0.4.0.dev16
+microsoft-agents-activity==0.4.0.dev18
 pyjwt>=2.10.1
 isodate>=0.6.1
 azure-core>=1.30.0

microsoft_agents_hosting_core-0.4.0.dev16/microsoft_agents/hosting/core/app/route.py

@@ -1,32 +0,0 @@
-"""
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the MIT License.
-"""
-
-from __future__ import annotations
-
-from typing import Awaitable, Callable, Generic, List, TypeVar
-
-from microsoft_agents.hosting.core import TurnContext
-from .state import TurnState
-
-StateT = TypeVar("StateT", bound=TurnState)
-RouteHandler = Callable[[TurnContext, StateT], Awaitable[None]]
-
-
-class Route(Generic[StateT]):
-    selector: Callable[[TurnContext], bool]
-    handler: RouteHandler[StateT]
-    is_invoke: bool
-
-    def __init__(
-        self,
-        selector: Callable[[TurnContext], bool],
-        handler: RouteHandler,
-        is_invoke: bool = False,
-        auth_handlers: List[str] = None,
-    ) -> None:
-        self.selector = selector
-        self.handler = handler
-        self.is_invoke = is_invoke
-        self.auth_handlers = auth_handlers or []