microsoft-agents-activity 1.10.0.dev5__tar.gz → 1.10.0.dev7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-activity
-Version: 1.10.0.dev5
+Version: 1.10.0.dev7
 Summary: A protocol library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT

microsoft_agents_activity-1.10.0.dev7/VERSION.txt

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

{microsoft_agents_activity-1.10.0.dev5 → microsoft_agents_activity-1.10.0.dev7}/microsoft_agents/activity/config/__init__.py

@@ -1,8 +1,15 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+"""Configuration loading and typed settings binding.
+
+``load_configuration_from_env`` returns a root ``Configuration``. Plain mappings
+and extracted sections are scoped inputs; ``_RootConfigurable`` distinguishes
+these forms using ``Configuration.is_root_config``, not their contents or paths.
+"""
+
 from ._load_configuration import load_configuration_from_env
-from .configuration import Configuration, _Configurable
+from .configuration import Configuration, _Configurable, _RootConfigurable
 from ._configuration_protocol import _ConfigurationProtocol, _DictConfigurable
 from ._resolve import _resolve
 from ._utils import (
@@ -31,6 +38,7 @@ __all__ = [
     "_try_set",
     "_resolve",
     "_Configurable",
+    "_RootConfigurable",
     "_DictConfigurable",
     "coerce_bool",
     "coerce_int",

microsoft_agents_activity-1.10.0.dev7/microsoft_agents/activity/config/_load_configuration.py

@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from typing import Any, Mapping
+
+from .configuration import Configuration
+
+from ._logging import _configure_logging
+
+
+def load_configuration_from_env(
+    env_vars: Mapping[str, Any], defaults: Mapping[str, Any] | None = None
+) -> Configuration:
+    """Resolve environment values and defaults into root configuration.
+
+    Environment-style ``__`` paths are expanded and indexed mappings become
+    lists. Environment values take precedence over defaults without modifying
+    either input. The resolved logging section is applied before returning.
+
+    :param env_vars: A mapping of environment variable names to their values.
+    :param defaults: Optional fallback values, either nested or environment-style.
+    :return: A Configuration with ``is_root_config=True``, suitable for binding
+        application-level settings. Extracted sections are scoped configurations.
+    """
+    config = Configuration.resolve(env_vars, defaults or {}, _is_root_config=True)
+    _configure_logging(config)
+    return config

{microsoft_agents_activity-1.10.0.dev5 → microsoft_agents_activity-1.10.0.dev7}/microsoft_agents/activity/config/_logging/_logging_configuration.py

@@ -7,10 +7,11 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from typing import Mapping
+from typing_extensions import Self
 
 from microsoft_agents.activity.errors import configuration_errors
 
-from ..configuration import Configuration, _Configurable
+from ..configuration import Configuration, _RootConfigurable
 from .._utils import _xpath
 from ._constants import _NAME_TO_LEVEL
 
@@ -35,13 +36,23 @@ class _LogLevelEntry:
 
 
 @dataclass(frozen=True)
-class _LoggingConfiguration(_Configurable):
-    """Configuration class for logging levels."""
+class _LoggingConfiguration(_RootConfigurable):
+    """Bind namespace log levels from root configuration or a logging section.
+
+    Root input reads ``logging::log_level``; scoped input reads ``log_level``
+    directly. Missing entries produce no level overrides.
+    """
 
     log_levels: list[_LogLevelEntry]
 
     @classmethod
-    def _from_configuration(cls, config: Configuration) -> _LoggingConfiguration:
+    def _from_root_configuration(cls, config: Configuration) -> _LoggingConfiguration:
+        return cls._from_scoped_configuration(
+            config.get_section(_xpath("logging"), default=Configuration())
+        )
+
+    @classmethod
+    def _from_scoped_configuration(cls, config: Configuration) -> _LoggingConfiguration:
 
         raw_log_levels = config.get(_xpath("log_level"), default={})
         if not isinstance(raw_log_levels, Mapping):

{microsoft_agents_activity-1.10.0.dev5 → microsoft_agents_activity-1.10.0.dev7}/microsoft_agents/activity/config/configuration.py

@@ -6,7 +6,6 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from typing import (
     Any,
-    Callable,
     Iterable,
     Mapping,
     TypeVar,
@@ -47,34 +46,115 @@ class Configuration(dict, _ConfigurationProtocol):
     Paths use ``::`` separators. Alternative paths are tried in the supplied
     order. Sections carry the matched source path for diagnostics.
     Construction makes a shallow copy; nested mutable values can remain shared.
+
+    Plain mappings are scoped by default. Root configurations, such as those
+    returned by ``load_configuration_from_env``, let settings binders locate
+    their sections within the application configuration. Root identity is
+    explicit metadata, independent of the diagnostic base path.
     """
 
     def __init__(
-        self, _original: Mapping | None = None, _base_path: str | None = None, **kwargs
+        self,
+        original: Mapping | None = None,
+        _base_path: str | None = None,
+        _is_root_config: bool | None = None,
+        **kwargs,
     ):
         """Initialize a Configuration instance.
 
-        :param _original: The original mapping to initialize the configuration from.
-        :param _base_path: The base path for resolving nested configuration keys.
+        :param original: The original mapping to initialize the configuration from.
+        :param _base_path: Source path used in diagnostics; defaults to an empty
+            path, even when copying another Configuration.
+        :param _is_root_config: Whether this is application-level configuration.
+            When omitted, inherit the flag from an original Configuration;
+            otherwise default to False. Explicit False overrides an inherited
+            root flag.
+        :param kwargs: Configuration entries when no original mapping is supplied.
+        :raises ValueError: If both original and keyword entries are supplied.
         """
-        if _original is not None and kwargs:
-            raise ValueError("Cannot provide both '_original' and keyword arguments.")
-        super().__init__(_original or kwargs)
+        if original is not None and kwargs:
+            raise ValueError("Cannot provide both 'original' and keyword arguments.")
+        super().__init__(original or kwargs)
         self._base_path = _base_path or ""
+        if isinstance(original, Configuration) and _is_root_config is None:
+            _is_root_config = original._is_root_config
+        self._is_root_config = _is_root_config or False
+        self._key = None
+
+    @property
+    def is_root_config(self) -> bool:
+        """Whether settings binders should treat this as application-level input."""
+        return self._is_root_config
+
+    @property
+    def base_path(self) -> str:
+        """Source path used in diagnostics, not an indication of root identity."""
+        return self._base_path
+
+    @property
+    def key(self) -> str:
+        """Last source-path segment, or an empty string when no path is set."""
+        if not self._key:
+            self._key = (
+                self._base_path.rsplit(_PATH_SEPARATOR, maxsplit=1)[-1]
+                if self._base_path
+                else ""
+            )
+        return self._key
+
+    @classmethod
+    def resolve(
+        cls,
+        primary: Mapping | None = None,
+        defaults: Mapping | None = None,
+        *,
+        _base_path: str | None = None,
+        _is_root_config: bool | None = None,
+    ) -> Configuration:
+        """Normalize and merge sources, with primary values taking precedence.
+
+        Expand environment-style ``__`` paths and convert indexed mappings to
+        lists. Nested mappings merge recursively; primary lists replace default
+        lists. Neither input's containers are modified.
+
+        :param primary: Values that override defaults.
+        :param defaults: Optional fallback values.
+        :param _base_path: Diagnostic source path for the result.
+        :param _is_root_config: Mark the result as root when True. Unlike copying
+            a Configuration, resolution does not inherit input metadata; the
+            result is scoped unless explicitly marked as root.
+        """
+        resolved = _resolve(primary or {}, defaults or {})
+        return Configuration(
+            resolved, _base_path=_base_path, _is_root_config=_is_root_config
+        )
 
     @classmethod
     def from_mapping(
-        cls, _mapping: Mapping | None = None, _base_path: str | None = None, **kwargs
+        cls,
+        _mapping: Mapping | None = None,
+        _base_path: str | None = None,
+        _is_root_config: bool | None = None,
+        **kwargs,
     ) -> Configuration:
         """Create configuration, using keyword arguments as fallback values.
 
-        An existing Configuration is reused unless defaults or a different
-        diagnostic base path are supplied.
+        An existing Configuration is reused when no defaults or metadata changes
+        are requested. Otherwise a new instance is constructed. Root identity is
+        inherited from a Configuration unless explicitly overridden; ordinary
+        mappings are scoped by default.
+
+        :param _mapping: Primary values, which take precedence over kwargs.
+        :param _base_path: Diagnostic source path for a new instance. Use
+            ``from_config`` to preserve a source path when adding defaults.
+        :param _is_root_config: Optional override of root/scoped identity.
+        :param kwargs: Fallback configuration entries, not environment variables.
         """
         if (
             isinstance(_mapping, Configuration)
             and not kwargs
             and (_base_path is None or _base_path == _mapping._base_path)
+            and (_is_root_config is None or _is_root_config == _mapping._is_root_config)
         ):
             return _mapping
         if kwargs:
@@ -84,16 +164,28 @@ class Configuration(dict, _ConfigurationProtocol):
                 resolved = _resolve(_mapping, kwargs, path_transformer=lambda x: x)
         else:
             resolved = _mapping
-        return cls(resolved, _base_path=_base_path)
+
+        if _is_root_config is None:
+            if isinstance(_mapping, Configuration):
+                _is_root_config = _mapping._is_root_config
+        return cls(resolved, _base_path=_base_path, _is_root_config=_is_root_config)
 
     @classmethod
-    def from_config(self, base: Configuration | None, **kwargs) -> Configuration:
-        """Create a new Configuration instance by forking the current configuration with additional key-value pairs."""
+    def from_config(cls, base: Configuration | None, **kwargs) -> Configuration:
+        """Fork configuration, preserving its source path and root identity.
+
+        Values in base take precedence; kwargs supply missing defaults rather
+        than overwriting existing entries. If base is None, create a scoped
+        Configuration from kwargs.
+        """
         if base is None:
-            return Configuration(**kwargs)
+            return Configuration(**kwargs, _is_root_config=False)
         new_config = base.copy()
         return Configuration.from_mapping(
-            new_config, _base_path=base._base_path, **kwargs
+            new_config,
+            _base_path=base._base_path,
+            _is_root_config=base._is_root_config,
+            **kwargs,
         )
 
     def _resolve_path(self, key: str) -> str:
@@ -407,15 +499,22 @@ class Configuration(dict, _ConfigurationProtocol):
         if scopes is None:
             return []
         if isinstance(scopes, str):
+            scopes = scopes.replace(",", " ")
             lst = scopes.strip().split()
             return [s for s in lst if s]
-        return scopes
+        return list(scopes)
 
 
 class _Configurable(ABC):
+    """Bind typed settings from a Configuration or reuse an already-bound object."""
 
     @classmethod
     def from_mapping(cls, _mapping: Mapping | None = None, **kwargs) -> Self:
+        """Bind mapping values, using kwargs as fallbacks for missing entries.
+
+        Configuration inputs preserve their root identity. Ordinary mappings
+        are scoped; use a marked root Configuration for application-level input.
+        """
         return cls.from_configuration(Configuration.from_mapping(_mapping, **kwargs))
 
     @classmethod
@@ -423,9 +522,42 @@ class _Configurable(ABC):
     def _from_configuration(cls, config: Configuration) -> Self: ...
 
     @classmethod
-    def from_configuration(cls, config: Configuration | Self) -> Self:
+    def from_configuration(cls, config: Configuration | Self | None) -> Self:
+        """Bind a Configuration, reuse a settings instance, or bind defaults.
+
+        None binds an empty scoped Configuration. Plain mappings must instead
+        be passed to ``from_mapping``.
+
+        :raises TypeError: If config is not a supported input type.
+        """
+        if config is None:
+            config = Configuration()
         if isinstance(config, cls):
             return config
         if isinstance(config, Configuration):
             return cls._from_configuration(config)
         raise TypeError(f"Cannot create {cls.__name__} from {type(config).__name__}")
+
+
+class _RootConfigurable(_Configurable, ABC):
+    """Bind settings from either application-level or scoped configuration.
+
+    Subclasses implement root and scoped binding separately. Dispatch uses only
+    ``Configuration.is_root_config``: a root binder locates its own section,
+    while a scoped binder reads fields directly. Passing None uses the scoped
+    binder with empty configuration.
+    """
+
+    @classmethod
+    def _from_configuration(cls, config: Configuration) -> Self:
+        if config._is_root_config:
+            return cls._from_root_configuration(config)
+        return cls._from_scoped_configuration(config)
+
+    @classmethod
+    @abstractmethod
+    def _from_scoped_configuration(cls, config: Configuration) -> Self: ...
+
+    @classmethod
+    @abstractmethod
+    def _from_root_configuration(cls, config: Configuration) -> Self: ...

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-activity
-Version: 1.10.0.dev5
+Version: 1.10.0.dev7
 Summary: A protocol library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT

microsoft_agents_activity-1.10.0.dev5/VERSION.txt

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

microsoft_agents_activity-1.10.0.dev5/microsoft_agents/activity/config/_load_configuration.py

@@ -1,45 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-from typing import Any, Mapping
-
-from ._logging import _configure_logging
-from ._resolve import _resolve
-
-
-def load_configuration_from_env(env_vars: Mapping[str, Any]) -> dict:
-    """
-    Parses environment variables and returns a dictionary with the relevant configuration.
-    """
-    local_vars = dict(env_vars)
-    result = {}
-    for key, value in local_vars.items():
-        levels = key.split("__")
-        current_level = result
-        last_level = None
-        for next_level in levels:
-            if next_level not in current_level:
-                current_level[next_level] = {}
-            last_level = current_level
-            current_level = current_level[next_level]
-        last_level[levels[-1]] = value
-
-    if result.get("CONNECTIONSMAP") and isinstance(result["CONNECTIONSMAP"], dict):
-        result["CONNECTIONSMAP"] = [
-            conn for conn in result.get("CONNECTIONSMAP", {}).values()
-        ]
-
-    _configure_logging(result.get("LOGGING", {}))
-
-    # temporary fix before next PR
-    token_validation_options = _resolve(
-        result.get("TOKENVALIDATION", {}),
-    )
-
-    return {
-        "AGENTAPPLICATION": result.pop("AGENTAPPLICATION", {}),
-        "CONNECTIONS": result.pop("CONNECTIONS", {}),
-        "CONNECTIONSMAP": result.pop("CONNECTIONSMAP", []),
-        "LOGGING": result.pop("LOGGING", {}),
-        "TOKENVALIDATION": token_validation_options,
-    }