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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.10.0.dev5
+Version: 1.10.0.dev6
 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.dev6
 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.dev6/VERSION.txt

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

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

@@ -53,15 +53,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 +117,10 @@ from .errors import error_resources, ErrorMessage, ErrorResources
 
 # Define the package's public interface
 __all__ = [
+    "ConnectionSettingsBase",
     "ActivityHandler",
     "Agent",
+    "AuthTypes",
     "CardFactory",
     "ChannelAdapter",
     "ChannelApiHandlerProtocol",

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/app/oauth/auth_handler.py

@@ -71,8 +71,11 @@ class AuthHandler:
         self._alt_blueprint_name = kwargs.get("ALT_BLUEPRINT_NAME", None)
 
     @staticmethod
-    def _format_scopes(scopes: str) -> list[str]:
-        lst = scopes.strip().split(" ")
+    def _format_scopes(scopes: str | list[str]) -> list[str]:
+        if isinstance(scopes, str):
+            lst = scopes.strip().split(" ")
+        else:
+            lst = scopes
         return [s for s in lst if s]
 
     @staticmethod

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/app/oauth/authorization.py

@@ -17,6 +17,7 @@ from microsoft_agents.activity import (
     TokenResponse,
 )
 from microsoft_agents.activity.activity_types import ActivityTypes
+from microsoft_agents.activity.config import Configuration, xpath, _get, _get_str
 
 from microsoft_agents.hosting.core.authorization._helpers import (
     _CallableTokenCredential,
@@ -68,7 +69,9 @@ class Authorization:
         connection_manager: Connections,
         auth_handlers: dict[str, AuthHandler] | None = None,
         auto_sign_in: bool = False,
+        *,
         use_cache: bool = False,
+        config: Configuration | None = None,
         **kwargs,
     ):
         """
@@ -100,24 +103,25 @@ class Authorization:
 
         self._handlers = {}
 
-        auth_configuration: dict = kwargs.get("AGENTAPPLICATION", {}).get(
-            "USERAUTHORIZATION", {}
+        auth_configuration = Configuration.from_mapping(config, **kwargs).get_section(
+            xpath("agent_application", "user_authorization"), default=Configuration()
         )
+
         if not auth_handlers:
             # get from config
-            handlers_config: dict[str, dict] = auth_configuration.get("HANDLERS") or {}
+            handlers_config = auth_configuration.get(xpath("handlers"), default={})
             auth_handlers = {
                 handler_name: AuthHandler(
                     name=handler_name,
-                    auth_type=config.get("TYPE", ""),
-                    **config.get("SETTINGS", {}),
+                    auth_type=_get_str(config, *xpath("type"), default=""),
+                    **_get(config, *xpath("settings"), default={}),
                 )
                 for handler_name, config in handlers_config.items()
             }
 
         self._handler_settings = auth_handlers
-        self._auto_sign_in = auto_sign_in or bool(
-            auth_configuration.get("AUTO_SIGN_IN", False)
+        self._auto_sign_in = auto_sign_in or auth_configuration.get_bool(
+            xpath("auto_sign_in"), default=False
         )
 
         # operations default to the first handler if none specified

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

@@ -4,9 +4,12 @@
 from .access_token_provider_base import AccessTokenProviderBase
 from .authentication_constants import AuthenticationConstants
 from .anonymous_token_provider import AnonymousTokenProvider
-from .connections import Connections
-from .connection_manager import ConnectionManager
-from .agent_auth_configuration import AgentAuthConfiguration
+from .connections import (
+    AgentAuthConfiguration,
+    Connections,
+    ConnectionManager,
+    ConnectionSettingsBase,
+)
 from .claims_identity import ClaimsIdentity
 from .jwt import JwtTokenValidator
 from .auth_types import AuthTypes
@@ -21,4 +24,5 @@ __all__ = [
     "ClaimsIdentity",
     "JwtTokenValidator",
     "AuthTypes",
+    "ConnectionSettingsBase",
 ]

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/authorization/_entra_issuers.py

@@ -3,10 +3,9 @@
 
 """Shared helpers for recognizing Microsoft Entra ID / Bot Framework token issuers.
 
-Centralizes the cloud (public vs. US Government) and tenant-GUID parsing rules
-used by both :class:`AgentAuthConfiguration` (default ``ISSUERS``) and
-:class:`JwtTokenValidator` (issuer allow-list validation, tid-to-issuer
-binding, and JWKS routing) so the two stay consistent.
+Centralizes cloud (public vs. US Government) and tenant-GUID parsing for
+JwtTokenValidator's issuer validation, tenant binding, and JWKS routing.
+Also provides default issuer construction for legacy configuration compatibility.
 """
 
 from __future__ import annotations

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/authorization/_helpers.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 import datetime
-from typing import Protocol
+from typing import Any, Protocol
 
 from azure.core.credentials_async import AsyncTokenCredential
 from azure.core.credentials import AccessToken

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/authorization/_log_config.py

@@ -6,9 +6,10 @@ import json
 from logging import Logger
 from urllib.parse import urlparse
 
+from microsoft_agents.activity.config import Configuration, xpath
 from microsoft_agents.activity._model_utils import pick_model_dict, SkipNone
 
-from .agent_auth_configuration import AgentAuthConfiguration
+from .connections.connections_map import _ConnectionMap
 
 _REDACTION_PEEK_LENGTH = 3
 _REDACTION_THRESH = _REDACTION_PEEK_LENGTH + 6
@@ -90,53 +91,60 @@ def _redact_url_or_none(url: str | None) -> str | None:
     return _redact_url(url)
 
 
-def _summarize_auth_configs(config_map: dict[str, AgentAuthConfiguration]) -> str:
+def _summarize_auth_configs(config_map: dict[str, Configuration]) -> str:
     """
     Summarize the authentication configuration for logging.
 
     :arg config_map: A dictionary of connection configurations.
-    :type config_map: dict[str, :class:`microsoft_agents.hosting.core.AgentAuthConfiguration`]
+    :type config_map: dict[str, :class:`microsoft_agents.activity.config.Configuration`]
     :return: A string summarizing the authentication configuration.
     :rtype: str
     """
+    get_strn = lambda key: config.get_strn(xpath(key))
     summary = []
     for connection_name, config in config_map.items():
         summary.append(
             pick_model_dict(
                 CONNECTION=connection_name,
-                CONNECTION_NAME=SkipNone(config.CONNECTION_NAME),
-                CLIENTID=SkipNone(_redact_str_or_none(config.CLIENT_ID, peek=True)),
-                TENANTID=SkipNone(_redact_str_or_none(config.TENANT_ID, peek=True)),
-                CLIENTSECRET=SkipNone(_redact_str_or_none(config.CLIENT_SECRET)),
-                AUTHORITY=SkipNone(_redact_url_or_none(config.AUTHORITY)),
-                SCOPES=SkipNone(_redact_scopes(config.SCOPES)),
+                CONNECTION_NAME=SkipNone(get_strn("CONNECTION_NAME")),
+                CLIENTID=SkipNone(
+                    _redact_str_or_none(get_strn("CLIENT_ID"), peek=True)
+                ),
+                TENANTID=SkipNone(
+                    _redact_str_or_none(get_strn("TENANT_ID"), peek=True)
+                ),
+                CLIENTSECRET=SkipNone(_redact_str_or_none(get_strn("CLIENT_SECRET"))),
+                AUTHORITY=SkipNone(
+                    _redact_url_or_none(
+                        config.get_strn(xpath("authority"), xpath("authorityendpoint"))
+                    )
+                ),
+                SCOPES=SkipNone(_redact_scopes(config.get_scopes(xpath("SCOPES")))),
                 FEDERATED_CLIENT_ID=SkipNone(
-                    _redact_str_or_none(config.FEDERATED_CLIENT_ID, peek=True)
+                    _redact_str_or_none(get_strn("FEDERATED_CLIENT_ID"), peek=True)
                 ),
-                CERT_PFX_FILE=SkipNone(_redact_str_or_none(config.CERT_PFX_FILE)),
+                CERT_PFX_FILE=SkipNone(_redact_str_or_none(get_strn("CERT_PFX_FILE"))),
                 ALT_BLUEPRINT_ID=SkipNone(
-                    _redact_str_or_none(config.ALT_BLUEPRINT_ID, peek=True)
+                    _redact_str_or_none(get_strn("ALT_BLUEPRINT_ID"), peek=True)
                 ),
-                IDPM_RESOURCE=SkipNone(_redact_url_or_none(config.IDPM_RESOURCE)),
-                AZURE_REGION=SkipNone(_redact_url_or_none(config.AZURE_REGION)),
-                ANONYMOUS_ALLOWED=str(config.ANONYMOUS_ALLOWED),
+                IDPM_RESOURCE=SkipNone(_redact_url_or_none(get_strn("IDPM_RESOURCE"))),
+                AZURE_REGION=SkipNone(_redact_url_or_none(get_strn("AZURE_REGION"))),
+                ANONYMOUS_ALLOWED=str(config.get_booln(xpath("ANONYMOUS_ALLOWED"))),
             )
         )
     return json.dumps(summary, indent=2)
 
 
-def _summarize_connections_map(connections_map: list[dict[str, str]]) -> str:
+def _summarize_connections_map(connections_map: _ConnectionMap) -> str:
     connections_map_output = []
     for mapping in connections_map:
-        obj = {
-            "CONNECTION": mapping.get("CONNECTION", ""),
-        }
+        obj = {"CONNECTION": mapping.connection}
 
-        if "AUDIENCE" in mapping:
-            obj["AUDIENCE"] = mapping["AUDIENCE"]
+        if mapping.audience:
+            obj["AUDIENCE"] = mapping.audience
 
-        if "SERVICEURL" in mapping:
-            service_url = mapping.get("SERVICEURL", "").strip()
+        if mapping.service_url:
+            service_url = mapping.service_url.strip()
             if service_url != "*":
                 service_url = _redact_url(service_url)
             obj["SERVICEURL"] = service_url
@@ -148,18 +156,18 @@ def _summarize_connections_map(connections_map: list[dict[str, str]]) -> str:
 
 def _log_config(
     logger: Logger,
-    config_map: dict[str, AgentAuthConfiguration],
-    connections_map: list[dict[str, str]],
+    config_map: dict[str, Configuration],
+    connections_map: _ConnectionMap,
 ) -> None:
     """
-    Log the configuration of the MSAL connection manager.
+    Log redacted configuration for a provider-independent connection manager.
 
     :arg logger: The logger to use for logging.
     :type logger: :class:`logging.Logger`
     :arg connections_map: A list of connection mappings.
-    :type connections_map: list[dict[str, str]]
+    :type connections_map: _ConnectionMap
     :arg config_map: A dictionary of connection configurations.
-    :type config_map: dict[str, :class:`microsoft_agents.hosting.core.AgentAuthConfiguration`]
+    :type config_map: dict[str, Configuration]
     """
 
     connections_output = _summarize_auth_configs(config_map)

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/authorization/access_token_provider_base.py

@@ -1,26 +1,41 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from typing import Protocol
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Protocol
 from abc import abstractmethod
 
 from azure.core.credentials_async import AsyncTokenCredential
 
-from .agent_auth_configuration import AgentAuthConfiguration
+if TYPE_CHECKING:
+    from .connections import AgentAuthConfiguration, ConnectionSettingsBase
 
 
 class AccessTokenProviderBase(Protocol):
 
     @property
-    @abstractmethod
     def configuration(self) -> AgentAuthConfiguration:
         """
-        The configuration for the access token provider.
+        Deprecated legacy configuration view. Prefer :attr:`config`.
 
-        :return: The configuration for the access token provider.
+        :return: AgentAuthConfiguration retained for compatibility.
         """
+        # this property is deprecated and will be removed in future versions
         raise NotImplementedError()
 
+    @property
+    def config(self) -> ConnectionSettingsBase:
+        """
+        Bound provider-specific settings extending ConnectionSettingsBase.
+
+        :return: The provider's typed connection settings.
+        """
+        # Convert the deprecated configuration to the new connection settings format.
+        from .connections.connection_settings_base import ConnectionSettingsBase
+
+        return ConnectionSettingsBase.from_mapping(**self.configuration._to_dict())
+
     @abstractmethod
     async def get_access_token(
         self, resource_url: str, scopes: list[str], force_refresh: bool = False

{microsoft_agents_hosting_core-1.10.0.dev5 → microsoft_agents_hosting_core-1.10.0.dev6}/microsoft_agents/hosting/core/authorization/anonymous_token_provider.py

@@ -1,13 +1,11 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from typing import Optional
-
 from azure.core.credentials import AccessToken
 from azure.core.credentials_async import AsyncTokenCredential
 
 from .access_token_provider_base import AccessTokenProviderBase
-from .agent_auth_configuration import AgentAuthConfiguration
+from .connections import AgentAuthConfiguration, ConnectionSettingsBase
 from ._helpers import _CallableTokenCredential
 
 _ANONYMOUS_TOKEN_EXPIRATION = 2**31 - 1
@@ -27,6 +25,14 @@ class AnonymousTokenProvider(AccessTokenProviderBase):
         """
         return AgentAuthConfiguration()
 
+    @property
+    def config(self) -> ConnectionSettingsBase:
+        """
+        The configuration for the access token provider.
+        :return: The configuration for the access token provider.
+        """
+        return ConnectionSettingsBase()
+
     async def get_access_token(
         self, resource_url: str, scopes: list[str], force_refresh: bool = False
     ) -> str:
@@ -45,7 +51,7 @@ class AnonymousTokenProvider(AccessTokenProviderBase):
 
     async def get_agentic_application_token(
         self, tenant_id: str, agent_app_instance_id: str
-    ) -> Optional[str]:
+    ) -> str | None:
         return ""
 
     async def get_agentic_instance_token(
@@ -59,5 +65,5 @@ class AnonymousTokenProvider(AccessTokenProviderBase):
         agent_app_instance_id: str,
         agentic_user_id: str,
         scopes: list[str],
-    ) -> Optional[str]:
+    ) -> str | None:
         return ""

microsoft_agents_hosting_core-1.10.0.dev6/microsoft_agents/hosting/core/authorization/connection_manager.py

@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from .connections.connection_manager import ConnectionManager
+
+__all__ = ["ConnectionManager"]

microsoft_agents_hosting_core-1.10.0.dev6/microsoft_agents/hosting/core/authorization/connections/__init__.py

@@ -0,0 +1,16 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from .agent_auth_configuration import AgentAuthConfiguration
+from .connection_settings_base import ConnectionSettingsBase
+from .connections import Connections
+from .connection_manager import ConnectionManager
+from .connections_map import _ConnectionMap
+
+__all__ = [
+    "AgentAuthConfiguration",
+    "ConnectionSettingsBase",
+    "Connections",
+    "ConnectionManager",
+    "_ConnectionMap",
+]

{microsoft_agents_hosting_core-1.10.0.dev5/microsoft_agents/hosting/core/authorization → microsoft_agents_hosting_core-1.10.0.dev6/microsoft_agents/hosting/core/authorization/connections}/agent_auth_configuration.py

@@ -3,9 +3,11 @@
 
 from __future__ import annotations
 
+import warnings
+
 from typing import Any
 
-from microsoft_agents.activity.config._coercion import coerce_bool
+from microsoft_agents.activity.config import coerce_bool
 
 from microsoft_agents.hosting.core.authorization.auth_types import AuthTypes
 from microsoft_agents.hosting.core.authorization._entra_issuers import (
@@ -120,6 +122,10 @@ class AgentAuthConfiguration:
     # not directly access _connections.
     _connections: dict[str, AgentAuthConfiguration]
 
+    @staticmethod
+    def from_dict(config: dict[str, Any]) -> AgentAuthConfiguration:
+        return AgentAuthConfiguration(**config)
+
     def __init__(
         self,
         auth_type: AuthTypes | None = None,
@@ -142,6 +148,12 @@ class AgentAuthConfiguration:
         **kwargs: Any,
     ):
 
+        warnings.warn(
+            "AgentAuthConfiguration is deprecated and will be removed in a future version. Please use ConnectionSettings instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
         self.AUTH_TYPE = auth_type or kwargs.get("AUTHTYPE", AuthTypes.client_secret)
         self.CLIENT_ID = client_id or kwargs.get("CLIENTID", None)
         # .NET binds the authority from the "AuthorityEndpoint" configuration key;
@@ -257,6 +269,32 @@ class AgentAuthConfiguration:
                 "FEDERATED_TOKEN_FILE is required for workload_identity authentication."
             )
 
+    def _to_dict(self) -> dict[str, Any]:
+        """
+        Converts the agent auth configuration to a dictionary representation.
+
+        :return: A dictionary containing the configuration fields and their values.
+        """
+        return {
+            "tenant_id": self.TENANT_ID,
+            "client_id": self.CLIENT_ID,
+            "authority": self.AUTHORITY,
+            "scopes": self.SCOPES,
+            "auth_type": self.AUTH_TYPE,
+            "cert_pfx_file": self.CERT_PFX_FILE,
+            "federated_client_id": self.FEDERATED_CLIENT_ID,
+            "federated_token_file": self.FEDERATED_TOKEN_FILE,
+            "alt_blueprint_id": self.ALT_BLUEPRINT_ID,
+            "alternate_blueprint_connection_name": self.ALT_BLUEPRINT_ID,
+            "idpm_resource": self.IDPM_RESOURCE,
+            "validate_issuer": self.VALIDATE_ISSUER,
+            "issuers": self._configured_issuers,
+            "anonymous_allowed": self.ANONYMOUS_ALLOWED,
+            "client_secret": self.CLIENT_SECRET,
+            "azure_region": self.AZURE_REGION,
+            **self.provider_settings,
+        }
+
     @property
     def ISSUERS(self) -> list[str]:
         """
@@ -300,6 +338,14 @@ class AgentAuthConfiguration:
         """Alias for :attr:`ALT_BLUEPRINT_ID` (.NET ``AlternateBlueprintConnectionName``)."""
         return self.ALT_BLUEPRINT_ID
 
+    def _get_audiences(self) -> list[str]:
+        """Returns a list of all audiences (CLIENT_IDs) for the configured connections."""
+        audiences = []
+        for conn in self._connections.values():
+            if conn.CLIENT_ID:
+                audiences.append(conn.CLIENT_ID)
+        return audiences
+
     def _jwt_patch_is_valid_aud(self, aud: Any) -> bool:
         """
         JWT-patch: Checks if the given audience is valid for any of the