microsoft-agents-hosting-core 1.10.0.dev5__tar.gz → 1.10.0.dev7__tar.gz

{microsoft_agents_hosting_core-1.10.0.dev5/microsoft_agents_hosting_core.egg-info → microsoft_agents_hosting_core-1.10.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.10.0.dev5
+Version: 1.10.0.dev7
 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.10.0.dev5
+Requires-Dist: microsoft-agents-activity==1.10.0.dev7
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: python-dotenv>=1.1.1
@@ -216,6 +216,24 @@ Additionally we provide a Copilot Studio Client, to interact with Agents created
 | `microsoft-agents-copilotstudio-client` | [![PyPI](https://img.shields.io/pypi/v/microsoft-agents-copilotstudio-client)](https://pypi.org/project/microsoft-agents-copilotstudio-client/) | Direct to Engine client to interact with Agents created in CopilotStudio |
 
 
+## Connection Configuration
+
+`microsoft_agents.hosting.core.authorization.connections` contains `Connections`,
+`ConnectionManager`, `ConnectionSettingsBase`, and the legacy `AgentAuthConfiguration`.
+Existing top-level and legacy module imports remain supported.
+
+Pass application settings as `ConnectionManager(provider_factory, config=configuration)`
+to deliver each connection's settings to the provider as a `Configuration`. Read bound
+provider settings through `provider.config`; provider-specific settings derive from
+`ConnectionSettingsBase`. Connection maps accept ordered lists or named mappings with
+`service_url`, `audience`, and `connection` fields, including environment-style aliases.
+
+Existing `connections_configurations`, `connections_map`, and `**legacy_config`
+constructor calls still pass `AgentAuthConfiguration` objects to the provider factory.
+`get_default_connection_configuration()` remains available for those legacy calls;
+configuration-based managers should use `get_default_connection().config`.
+The environment loader is unchanged.
+
 ## Installation
 
 ```bash

microsoft_agents_hosting_core-1.10.0.dev7/VERSION.txt

@@ -0,0 +1 @@
+1.10.0.dev7

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/__init__.py

@@ -43,6 +43,7 @@ from .app.streaming import (
 from .app.oauth import (
     Authorization,
     AuthHandler,
+    AuthHandlerSettings,
     AgenticUserAuthorization,
 )
 
@@ -53,15 +54,18 @@ from .app.state.temp_state import TempState
 from .app.state.turn_state import TurnState
 
 # Authorization
-from .authorization.access_token_provider_base import AccessTokenProviderBase
-from .authorization.authentication_constants import AuthenticationConstants
-from .authorization.anonymous_token_provider import AnonymousTokenProvider
-from .authorization.connections import Connections
-from .authorization.connection_manager import ConnectionManager
-from .authorization.agent_auth_configuration import AgentAuthConfiguration
-from .authorization.claims_identity import ClaimsIdentity
-from .authorization.jwt.jwt_token_validator import JwtTokenValidator
-from .authorization.auth_types import AuthTypes
+from .authorization import (
+    AccessTokenProviderBase,
+    AuthenticationConstants,
+    AnonymousTokenProvider,
+    Connections,
+    ConnectionManager,
+    AgentAuthConfiguration,
+    ClaimsIdentity,
+    JwtTokenValidator,
+    AuthTypes,
+    ConnectionSettingsBase,
+)
 
 # Client API
 from .client.agent_conversation_reference import AgentConversationReference
@@ -114,8 +118,10 @@ from .errors import error_resources, ErrorMessage, ErrorResources
 
 # Define the package's public interface
 __all__ = [
+    "ConnectionSettingsBase",
     "ActivityHandler",
     "Agent",
+    "AuthTypes",
     "CardFactory",
     "ChannelAdapter",
     "ChannelApiHandlerProtocol",
@@ -151,6 +157,7 @@ __all__ = [
     "TempState",
     "Authorization",
     "AuthHandler",
+    "AuthHandlerSettings",
     "AccessTokenProviderBase",
     "AuthenticationConstants",
     "AnonymousTokenProvider",

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/__init__.py

@@ -18,6 +18,7 @@ from ._type_defs import RouteHandler, RouteSelector, StateT
 from .oauth import (
     Authorization,
     AuthHandler,
+    AuthHandlerSettings,
     AgenticUserAuthorization,
 )
 
@@ -44,7 +45,6 @@ __all__ = [
     "InputFile",
     "InputFileDownloader",
     "Query",
-    "Route",
     "RouteRank",
     "RouteHandler",
     "TypingChannelStrategy",
@@ -58,9 +58,10 @@ __all__ = [
     "TurnState",
     "TempState",
     "Authorization",
-    "AuthHandler",
+    "AuthHandlerSettings",
     "AgenticUserAuthorization",
     # Proactive
+    "AuthHandler",
     "Conversation",
     "ConversationBuilder",
     "ConversationReferenceBuilder",

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/app_options.py

@@ -8,8 +8,7 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Callable, Optional
 
-from microsoft_agents.hosting.core.app.oauth import AuthHandler
-from microsoft_agents.hosting.core.authorization import Connections
+from microsoft_agents.hosting.core.app.oauth import AuthHandlerSettings
 from microsoft_agents.hosting.core.storage import Storage
 
 # from .auth import AuthOptions
@@ -81,10 +80,13 @@ class ApplicationOptions:
     If not provided, the default `TurnState` will be used.
     """
 
-    authorization_handlers: Optional[dict[str, AuthHandler]] = None
+    authorization_handlers: Optional[dict[str, AuthHandlerSettings]] = None
     """
-    Optional. Authorization handler for OAuth flows.
-    If not provided, no OAuth flows will be supported.
+    Optional mapping of OAuth handler IDs to AuthHandlerSettings.
+    A nonempty mapping overrides configured handlers when AgentApplication
+    creates its Authorization instance. Otherwise handlers may be bound from
+    application configuration. Prefer AuthHandlerSettings over the deprecated
+    AuthHandler constructor.
     """
 
     proactive: Optional[ProactiveOptions] = None

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/oauth/__init__.py

@@ -3,7 +3,7 @@
 
 
 from .authorization import Authorization
-from .auth_handler import AuthHandler
+from .auth_handler import AuthHandler, AuthHandlerSettings
 from ._sign_in_state import _SignInState
 from ._sign_in_response import _SignInResponse
 from ._handlers import (
@@ -16,6 +16,7 @@ from ._handlers import (
 __all__ = [
     "Authorization",
     "AuthHandler",
+    "AuthHandlerSettings",
     "_AuthorizationHandler",
     "_SignInState",
     "_SignInResponse",

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/oauth/_handlers/_authorization_handler.py

@@ -3,16 +3,18 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the MIT License.
 """
 
-from abc import ABC
-from typing import Optional
 import logging
+import warnings
+
+from abc import ABC
+from typing import Mapping
 
 from microsoft_agents.activity import TokenResponse
 
 from ....turn_context import TurnContext
 from ....storage import Storage
 from ....authorization import Connections
-from ..auth_handler import AuthHandler
+from ..auth_handler import AuthHandlerSettings
 from .._sign_in_response import _SignInResponse
 
 logger = logging.getLogger(__name__)
@@ -23,47 +25,72 @@ class _AuthorizationHandler(ABC):
 
     _storage: Storage
     _connection_manager: Connections
-    _handler: AuthHandler
+    _handler: AuthHandlerSettings
 
     def __init__(
         self,
         storage: Storage,
         connection_manager: Connections,
-        auth_handler: Optional[AuthHandler] = None,
+        settings: Mapping | AuthHandlerSettings | None = None,
         *,
-        auth_handler_id: Optional[str] = None,
-        auth_handler_settings: Optional[dict] = None,
+        auth_handler_id: str | None = None,
+        auth_handler: AuthHandlerSettings | None = None,
+        auth_handler_settings: dict | None = None,
         **kwargs,
     ) -> None:
-        """
-        Creates a new instance of Authorization.
+        """Initialize an authorization strategy from handler settings.
+
+        A nonempty settings mapping is bound through AuthHandlerSettings;
+        an AuthHandlerSettings instance is reused. Settings take precedence
+        over the deprecated auth_handler and auth_handler_settings arguments.
+        The handler ID comes from auth_handler_id, or from the settings name.
 
         :param storage: The storage system to use for state management.
         :type storage: Storage
         :param connection_manager: The connection manager for OAuth providers.
         :type connection_manager: Connections
-        :param auth_handlers: Configuration for OAuth providers.
-        :type auth_handlers: dict[str, AuthHandler], Optional
-        :raises ValueError: When storage is None or no auth handlers provided.
+        :param settings: Preferred handler settings, accepted positionally or
+            by keyword.
+        :type settings: Mapping | AuthHandlerSettings | None
+        :param auth_handler_id: Optional override of the settings name.
+        :type auth_handler_id: str | None
+        :param auth_handler: Deprecated bound settings; use settings instead.
+        :type auth_handler: AuthHandlerSettings | None
+        :param auth_handler_settings: Deprecated mapping; use settings instead.
+        :type auth_handler_settings: dict | None
+        :param kwargs: Accepted for compatibility, not used to bind settings.
+        :raises ValueError: If storage, nonempty settings, or a handler ID is
+            missing.
         """
         if not storage:
             raise ValueError("Storage is required for Authorization")
-        if not auth_handler and not auth_handler_settings:
+        if not settings and not auth_handler and not auth_handler_settings:
             raise ValueError(
-                "At least one of auth_handler or auth_handler_settings is required."
+                "At least one of settings, auth_handler, or auth_handler_settings is required."
+            )
+        if auth_handler or auth_handler_settings:
+            warnings.warn(
+                "auth_handler and auth_handler_settings are deprecated. Please use settings instead.",
+                DeprecationWarning,
+                stacklevel=2,
             )
 
         self._storage = storage
         self._connection_manager = connection_manager
 
-        if auth_handler:
+        if settings:
+            if isinstance(settings, AuthHandlerSettings):
+                self._handler = settings
+            else:
+                self._handler = AuthHandlerSettings.from_mapping(settings)
+        elif auth_handler:  # deprecated
             self._handler = auth_handler
-        else:
+        else:  # deprecated
             if not auth_handler_settings:
                 raise ValueError(
                     "auth_handler_settings must be provided if auth_handler is None."
                 )
-            self._handler = AuthHandler._from_settings(auth_handler_settings)
+            self._handler = AuthHandlerSettings.from_mapping(auth_handler_settings)
 
         self._id = auth_handler_id or self._handler.name
         if not self._id:
@@ -72,7 +99,7 @@ class _AuthorizationHandler(ABC):
             )
 
     async def _sign_in(
-        self, context: TurnContext, scopes: Optional[list[str]] = None
+        self, context: TurnContext, scopes: list[str] | None = None
     ) -> _SignInResponse:
         """Initiate or continue the sign-in process for the user with the given auth handler.
 
@@ -88,8 +115,8 @@ class _AuthorizationHandler(ABC):
     async def get_refreshed_token(
         self,
         context: TurnContext,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> TokenResponse:
         """Attempts to get a refreshed token for the user with the given scopes
 

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/oauth/_handlers/_user_authorization.py

@@ -4,8 +4,8 @@ Licensed under the MIT License.
 """
 
 from __future__ import annotations
+
 import logging
-from typing import cast
 
 from microsoft_agents.activity import (
     Activity,

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/oauth/_handlers/agentic_user_authorization.py

@@ -5,7 +5,7 @@ Licensed under the MIT License.
 
 import logging
 
-from typing import Optional
+from typing import Mapping
 
 from microsoft_agents.activity import TokenResponse
 
@@ -15,7 +15,7 @@ from .._sign_in_response import _SignInResponse
 from ._authorization_handler import _AuthorizationHandler
 from ....storage import Storage
 from ....authorization import Connections
-from ..auth_handler import AuthHandler
+from ..auth_handler import AuthHandlerSettings
 from ..telemetry import spans
 
 logger = logging.getLogger(__name__)
@@ -28,34 +28,44 @@ class AgenticUserAuthorization(_AuthorizationHandler):
         self,
         storage: Storage,
         connection_manager: Connections,
-        auth_handler: Optional[AuthHandler] = None,
+        settings: Mapping | AuthHandlerSettings | None = None,
         *,
-        auth_handler_id: Optional[str] = None,
-        auth_handler_settings: Optional[dict] = None,
+        auth_handler_id: str | None = None,
+        auth_handler: AuthHandlerSettings | None = None,
+        auth_handler_settings: dict | None = None,
         **kwargs,
     ) -> None:
-        """
-        Creates a new instance of Authorization.
+        """Create an agentic authorization strategy.
+
+        Prefer settings containing an AuthHandlerSettings instance or a mapping.
+        The bound settings also supply the optional alternate blueprint
+        connection name. Legacy settings arguments remain accepted but emit a
+        DeprecationWarning.
 
         :param storage: The storage system to use for state management.
         :type storage: Storage
         :param connection_manager: The connection manager for OAuth providers.
         :type connection_manager: Connections
-        :param auth_handlers: Configuration for OAuth providers.
-        :type auth_handlers: dict[str, AuthHandler], Optional
-        :raises ValueError: When storage is None or no auth handlers provided.
+        :param settings: Handler settings, accepted positionally or by keyword.
+        :type settings: Mapping | AuthHandlerSettings | None
+        :param auth_handler_id: Optional override of the settings name.
+        :param auth_handler: Deprecated bound settings; use settings instead.
+        :type auth_handler: AuthHandlerSettings | None
+        :param auth_handler_settings: Deprecated mapping; use settings instead.
+        :param kwargs: Compatibility arguments forwarded to the base handler.
+        :raises ValueError: If storage, nonempty settings, or a handler ID is
+            missing.
         """
         super().__init__(
             storage,
             connection_manager,
-            auth_handler,
+            settings,
+            auth_handler=auth_handler,
             auth_handler_id=auth_handler_id,
             auth_handler_settings=auth_handler_settings,
             **kwargs,
         )
-        self._alt_blueprint_name = (
-            auth_handler._alt_blueprint_name if auth_handler else None
-        )
+        self._alt_blueprint_name = self._handler._alt_blueprint_name
 
     async def get_agentic_instance_token(self, context: TurnContext) -> TokenResponse:
         """Gets the agentic instance token for the current agent instance.
@@ -163,17 +173,17 @@ class AgenticUserAuthorization(_AuthorizationHandler):
     async def _sign_in(
         self,
         context: TurnContext,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> _SignInResponse:
         """Retrieves the agentic user token if available.
 
         :param context: The context object for the current turn.
         :type context: TurnContext
-        :param connection_name: The name of the connection to use for sign-in.
-        :type connection_name: str
-        :param scopes: The scopes to request for the token.
-        :type scopes: Optional[list[str]]
+        :param exchange_connection: The name of the connection to use for sign-in.
+        :type exchange_connection: str | None
+        :param exchange_scopes: The scopes to request for the token.
+        :type exchange_scopes: Optional[list[str]]
         :return: A _SignInResponse containing the token response and flow state tag.
         :rtype: _SignInResponse
         """
@@ -189,8 +199,8 @@ class AgenticUserAuthorization(_AuthorizationHandler):
     async def get_refreshed_token(
         self,
         context: TurnContext,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> TokenResponse:
         """Attempts to get a refreshed token for the user with the given scopes
 
@@ -211,6 +221,6 @@ class AgenticUserAuthorization(_AuthorizationHandler):
             return await self.get_agentic_user_token(context, exchange_scopes)
 
     async def sign_out(
-        self, context: TurnContext, auth_handler_id: Optional[str] = None
+        self, context: TurnContext, auth_handler_id: str | None = None
     ) -> None:
         """Nothing to do for agentic sign out."""

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev7}/microsoft_agents/hosting/core/app/oauth/_handlers/connector_user_authorization.py

@@ -6,7 +6,7 @@ Licensed under the MIT License.
 import logging
 import jwt
 from datetime import datetime, timezone
-from typing import Optional
+from typing import Mapping
 
 from microsoft_agents.activity import TokenResponse
 from microsoft_agents.hosting.core.errors import ErrorResources
@@ -15,7 +15,7 @@ from ...._oauth._flow_state import _FlowStateTag
 from ....turn_context import TurnContext
 from ....storage import Storage
 from ....authorization import Connections
-from ..auth_handler import AuthHandler
+from ..auth_handler import AuthHandlerSettings
 from ._authorization_handler import _AuthorizationHandler
 from .._sign_in_response import _SignInResponse
 
@@ -32,30 +32,39 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
         self,
         storage: Storage,
         connection_manager: Connections,
-        auth_handler: Optional[AuthHandler] = None,
+        settings: Mapping | AuthHandlerSettings | None = None,
         *,
-        auth_handler_id: Optional[str] = None,
-        auth_handler_settings: Optional[dict] = None,
+        auth_handler_id: str | None = None,
+        auth_handler: AuthHandlerSettings | None = None,
+        auth_handler_settings: dict | None = None,
         **kwargs,
     ) -> None:
-        """
-        Creates a new instance of ConnectorUserAuthorization.
+        """Create a connector authorization strategy.
+
+        Prefer settings containing an AuthHandlerSettings instance or a mapping.
+        Legacy settings arguments remain accepted but emit a DeprecationWarning.
 
         :param storage: The storage system to use for state management.
         :type storage: Storage
         :param connection_manager: The connection manager for OAuth providers.
         :type connection_manager: Connections
-        :param auth_handler: Configuration for OAuth provider.
-        :type auth_handler: AuthHandler, Optional
-        :param auth_handler_id: Optional ID of the auth handler.
-        :type auth_handler_id: str, Optional
-        :param auth_handler_settings: Optional settings dict for the auth handler.
-        :type auth_handler_settings: dict, Optional
+        :param settings: Handler settings, accepted positionally or by keyword.
+        :type settings: Mapping | AuthHandlerSettings | None
+        :param auth_handler_id: Optional override of the settings name.
+        :type auth_handler_id: str | None
+        :param auth_handler: Deprecated bound settings; use settings instead.
+        :type auth_handler: AuthHandlerSettings | None
+        :param auth_handler_settings: Deprecated mapping; use settings instead.
+        :type auth_handler_settings: dict | None
+        :param kwargs: Compatibility arguments forwarded to the base handler.
+        :raises ValueError: If storage, nonempty settings, or a handler ID is
+            missing.
         """
         super().__init__(
             storage,
             connection_manager,
-            auth_handler,
+            settings,
+            auth_handler=auth_handler,
             auth_handler_id=auth_handler_id,
             auth_handler_settings=auth_handler_settings,
             **kwargs,
@@ -64,8 +73,8 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
     async def _sign_in(
         self,
         context: TurnContext,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> _SignInResponse:
         """
         For connector requests, there is no separate sign-in flow.
@@ -74,9 +83,9 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
         :param context: The turn context for the current turn of conversation.
         :type context: TurnContext
         :param exchange_connection: Optional connection name for token exchange.
-        :type exchange_connection: Optional[str]
+        :type exchange_connection: str | None
         :param exchange_scopes: Optional list of scopes (unused for connector auth).
-        :type exchange_scopes: Optional[list[str]]
+        :type exchange_scopes: list[str] | None
         :return: A SignInResponse with the extracted token.
         :rtype: _SignInResponse
         """
@@ -89,8 +98,8 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
     async def get_refreshed_token(
         self,
         context: TurnContext,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> TokenResponse:
         """
         Gets the connector user token and optionally exchanges it via OBO.
@@ -148,8 +157,8 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
         self,
         context: TurnContext,
         input_token_response: TokenResponse,
-        exchange_connection: Optional[str] = None,
-        exchange_scopes: Optional[list[str]] = None,
+        exchange_connection: str | None = None,
+        exchange_scopes: list[str] | None = None,
     ) -> TokenResponse:
         """
         Exchanges a token for another token with different scopes via OBO flow.
@@ -159,9 +168,9 @@ class ConnectorUserAuthorization(_AuthorizationHandler):
         :param input_token_response: The input token to exchange.
         :type input_token_response: TokenResponse
         :param exchange_connection: Optional connection name for exchange.
-        :type exchange_connection: Optional[str]
+        :type exchange_connection: str | None
         :param exchange_scopes: Optional scopes for the exchanged token.
-        :type exchange_scopes: Optional[list[str]]
+        :type exchange_scopes: list[str] | None
         :return: The token response after exchange, or the original if exchange not configured.
         :rtype: TokenResponse
         """