microsoft-agents-activity 1.10.0.dev4__tar.gz → 1.10.0.dev6__tar.gz

{microsoft_agents_activity-1.10.0.dev4/microsoft_agents_activity.egg-info → microsoft_agents_activity-1.10.0.dev6}/PKG-INFO

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

microsoft_agents_activity-1.10.0.dev6/VERSION.txt

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

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

@@ -0,0 +1,30 @@
+# 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
+from ._utils import _xpath
+from ._resolve import _resolve
+
+
+def load_configuration_from_env(
+    env_vars: Mapping[str, Any], defaults: Mapping[str, Any] | None = None
+) -> Configuration:
+    """
+    Parses environment variables and returns a Configuration object with the relevant configuration.
+
+    :param env_vars: A mapping of environment variable names to their values.
+    :param defaults: A mapping of default configuration values.
+    :return: A Configuration object containing the resolved configuration.
+    """
+    local_vars = dict(env_vars)
+
+    resolved = _resolve(local_vars, defaults or {})
+    config = Configuration(resolved)
+    _configure_logging(
+        config.get_section(_xpath("logging"), default=None) or Configuration()
+    )
+    return config

{microsoft_agents_activity-1.10.0.dev4 → microsoft_agents_activity-1.10.0.dev6}/microsoft_agents/activity/config/configuration.py

@@ -61,6 +61,21 @@ class Configuration(dict, _ConfigurationProtocol):
             raise ValueError("Cannot provide both '_original' and keyword arguments.")
         super().__init__(_original or kwargs)
         self._base_path = _base_path or ""
+        self._key = None
+
+    @property
+    def base_path(self) -> str:
+        return self._base_path
+
+    @property
+    def key(self) -> str:
+        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 from_mapping(
@@ -352,7 +367,7 @@ class Configuration(dict, _ConfigurationProtocol):
             name = self._resolve_path(_PATH_SEPARATOR.join(path) or keys[0])
             before_split = _handle_str(val, None, name)
             if before_split is None:
-                return default
+                return default if default is not None else []
             if "," in before_split:
                 return [s.strip() for s in before_split.split(",")]
             return [s.strip() for s in before_split.strip().split()]
@@ -407,6 +422,7 @@ 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

{microsoft_agents_activity-1.10.0.dev4 → microsoft_agents_activity-1.10.0.dev6/microsoft_agents_activity.egg-info}/PKG-INFO

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

microsoft_agents_activity-1.10.0.dev4/VERSION.txt

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

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

@@ -1,37 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-from typing import Any, Mapping
-
-from ._logging import _configure_logging
-
-
-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", {}))
-
-    return {
-        "AGENTAPPLICATION": result.get("AGENTAPPLICATION", {}),
-        "CONNECTIONS": result.get("CONNECTIONS", {}),
-        "CONNECTIONSMAP": result.get("CONNECTIONSMAP", []),
-    }