Internal utilities and wrappers for Storage protocols

libraries/microsoft-agents-activity/microsoft_agents/activity/__init__.py

@@ -101,7 +101,11 @@
 
 from .channel_adapter_protocol import ChannelAdapterProtocol
 from .turn_context_protocol import TurnContextProtocol
-from ._load_configuration import load_configuration_from_env
+from ._utils import (
+    load_configuration_from_env,
+    _raise_if_falsey,
+    _raise_if_none
+)
 
 __all__ = [
     "AgentsModel",
@@ -194,6 +198,8 @@
     "ConversationUpdateTypes",
     "MessageUpdateTypes",
     "load_configuration_from_env",
+    "_raise_if_falsey",
+    "_raise_if_none",
     "ChannelAdapterProtocol",
     "TurnContextProtocol",
     "TokenOrSignInResourceResponse",

libraries/microsoft-agents-activity/microsoft_agents/activity/_utils/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from ._error_handling import (
+    _raise_if_falsey,
+    _raise_if_none,
+)
+from ._load_configuration import load_configuration_from_env
+
+__all__ = [
+    "_raise_if_falsey",
+    "_raise_if_none",
+    "load_configuration_from_env",
+]

libraries/microsoft-agents-activity/microsoft_agents/activity/_utils/_error_handling.py

@@ -0,0 +1,30 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+def _raise_if_none(label: str, **kwargs) -> None:
+    """Raises an exception if any of the provided keyword arguments are None.
+
+    :param label: A label to include in the exception message.
+    :param kwargs: The keyword arguments to check.
+    :raises ValueError: If any of the provided keyword arguments are None.
+    """
+
+    none_args = [name for name, value in kwargs.items() if value is None]
+    if none_args:
+        raise ValueError(
+            f"{label}: The following arguments must be set and non-None: {', '.join(none_args)}"
+        )
+
+def _raise_if_falsey(label: str, **kwargs) -> None:
+    """Raises an exception if any of the provided keyword arguments are falsey.
+
+    :param label: A label to include in the exception message.
+    :param kwargs: The keyword arguments to check.
+    :raises ValueError: If any of the provided keyword arguments are falsey.
+    """
+
+    falsey_args = [name for name, value in kwargs.items() if not value]
+    if falsey_args:
+        raise ValueError(
+            f"{label}: The following arguments must be set and non-falsey (cannot be None or an empty string, for example): {', '.join(falsey_args)}"
+        )

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/_oauth/__init__.py

@@ -2,14 +2,12 @@
 # Licensed under the MIT License.
 
 from ._flow_state import _FlowState, _FlowStateTag, _FlowErrorTag
-from ._flow_storage_client import _FlowStorageClient
 from ._oauth_flow import _OAuthFlow, _FlowResponse
 
 __all__ = [
     "_FlowState",
     "_FlowStateTag",
     "_FlowErrorTag",
     "_FlowResponse",
-    "_FlowStorageClient",
     "_OAuthFlow",
 ]

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/app/oauth/_handlers/_user_authorization.py

@@ -24,9 +24,13 @@
     _OAuthFlow,
     _FlowResponse,
     _FlowState,
-    _FlowStorageClient,
     _FlowStateTag,
 )
+from microsoft_agents.hosting.core.storage import (
+    _ItemNamespace,
+    _Namespaces
+)
+
 from .._sign_in_response import _SignInResponse
 from ._authorization_handler import _AuthorizationHandler
 
@@ -41,7 +45,7 @@ class _UserAuthorization(_AuthorizationHandler):
 
     async def _load_flow(
         self, context: TurnContext
-    ) -> tuple[_OAuthFlow, _FlowStorageClient]:
+    ) -> tuple[_OAuthFlow, _ItemNamespace[_FlowState]]:
         """Loads the OAuth flow for a specific auth handler.
 
         A new flow is created in Storage if none exists for the channel, user, and handler
@@ -72,9 +76,13 @@ async def _load_flow(
         ms_app_id = context.turn_state.get(context.adapter.AGENT_IDENTITY_KEY).claims[
             "aud"
         ]
+
+        namespace = _Namespaces._USER_AUTHORIZATION.format(
+            channel_id=channel_id,
+            user_id=user_id,
+        )
+        flow_storage_client = _ItemNamespace(namespace, self._storage, _FlowState)
 
-        # try to load existing state
-        flow_storage_client = _FlowStorageClient(channel_id, user_id, self._storage)
         logger.info("Loading OAuth flow state from storage")
         flow_state: _FlowState = await flow_storage_client.read(self._id)
         if not flow_state:
@@ -86,7 +94,6 @@ async def _load_flow(
                 connection=self._handler.abs_oauth_connection_name,
                 ms_app_id=ms_app_id,
             )
-            # await flow_storage_client.write(flow_state)
 
         flow = _OAuthFlow(flow_state, user_token_client)
         return flow, flow_storage_client